Add ~x86, remove old, wrt to bug #464252

Package-Manager: portage-2.1.11.55/cvs/Linux ppc64
Manifest-Sign-Key: 0x7194459F

4 files changed, 22 insertions, 67 deletions

diff --git a/x11-terms/st/ChangeLog b/x11-terms/st/ChangeLog
index d44e325a1668..6865d2f80feb 100644
--- a/x11-terms/st/ChangeLog
+++ b/x11-terms/st/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-terms/st
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/ChangeLog,v 1.13 2013/04/02 07:11:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/ChangeLog,v 1.14 2013/04/02 23:33:56 ago Exp $
+
+  02 Apr 2013; Agostino Sarubbo <ago@gentoo.org> -st-0.3.ebuild, st-0.4.ebuild:
+  Add ~x86, remove old, wrt to bug #464252
 
 *st-0.4 (02 Apr 2013)
 
diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
index 40ff21028df3..95d2ecb74c75 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -1,17 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-DIST st-0.3.tar.gz 25637 SHA256 94a5be6c6879ec6bcb441c476cc0df8c4ffc38995abeafe1b603eb2b65a3d78b SHA512 8edb434e2f845894d90bfca15dbfc0feb787e65934e931b28c54a309b98f0b03116826fcf1c6e34068ac3c42ba18237cfbfef4a73480f273ec9e39bd68029990 WHIRLPOOL 850605a2bf9a638751bcaf264a97c40e9ba336197983292849667a8277713ea8f4dfb6316b6bc236923fe4ca088191b9b498fe981a667adf1c67292b7f356d20
 DIST st-0.4.tar.gz 32396 SHA256 307aef01d0de0411439bf32d55c23a930e779efd003a31acaa0ddcf8b45a3afe SHA512 d8e4f9c28756d2f8d2f7f041cf8c6fa4026c722edddab5f682d82d7fcab842b23fcc087770986b3e1383e47be115576dbfdd444c6edb6ba860d27d30c92122f1 WHIRLPOOL 55445903b621c87b5bee23b47bdc2f797ee225b044618533068b6667e3f56b7df1b93b3bb00d0952ec3ff52f07c0383a5a903031227f3ecdf67343a50cfc7c1f
-EBUILD st-0.3.ebuild 1440 SHA256 8a402eac9571542103cdd2e16d42f44a4f0c3170ee8191db9b0e70195921539c SHA512 fea233f78cb002f6820efe5c2dd7acc15bedc112cb416926ebe780223e1731aa4ff3d993a79c43e8d512bf5382761d37c5a8e9bae0ba80c6b2b25cad082594a1 WHIRLPOOL af7c130747a373d628d9271be4f0fcea1c65dbab888da0a195a5adcff9bfccf721fdd3dcd7798611f0e4540f73fb6dba27aa735b287381789414d4646d968bab
-EBUILD st-0.4.ebuild 1314 SHA256 9815356cede5e8dd279c650943673aa9cde7d4128e500b59a7afc46a5dc76c9f SHA512 4e967d99b708af662951602e5e160a76d37cb2604bb207fa8ab4a888c162ea51d2e631ab67dd1c83348a7b0dc58e0801c628d436469b256f4283e1b80ed938ca WHIRLPOOL 8b1c98b292e5cee4976eed233b8c48818ff41d2b64164fd6f492eb5bd13ea66cc3f5b98a202373e858dbe0274cec67fb4b72356a9cc934a093c1be982a582643
+EBUILD st-0.4.ebuild 1319 SHA256 5ab3c274ac5e2f0a6a41773325760a8d830421e97bd4efac4fb200030c0387fa SHA512 6c79b9e2551cceb5974d3d714297c99314be4fbcc786c1a422fb8b0a42de87e689177f20459905e5a10b43d71aefad00596dbb4940bebf037568908e2f5f4357 WHIRLPOOL 81272246a8501e65f41df7bf6181f201c4a4c4483a7d482d55bf8b4779c41fbf5f47c7d0f192d6f23c4ad9d5396bc4c5e988fa884819bbde82a6f5874ca83812
 EBUILD st-9999.ebuild 1372 SHA256 5b350d3649859cd6167458366ab40f722ba4193570e3af86e84937b1763d5aed SHA512 b8706f6e71c9bd4b7c3a703642e5b15283e99135344035acae42f3a87be3d8094628ac1417d0bfe4d111e1c04dd68e05f13f3463742bedeacce36012d2fc8ac3 WHIRLPOOL 4ff15426c6a01ee3a6a587bbe368f8bc6bf84c68a1c51b20852867426dad16ca4b56e774c199f0644384ba26e94de7bc863e576c0ecce19fe75cd6475258462b
-MISC ChangeLog 1963 SHA256 e5d6a45f8c05e8c31f2c44201a38cf707a30cd635021676bf9a1471544babf77 SHA512 6d69efe6673305d6588776d327df03e9732743f396bbe8e2bdde16fa504ad3ee0c8bacaa1d18fb28d1069794fb87a73e6427945c64f6ef170dd84dbb8c8ab3a7 WHIRLPOOL ce42a6f62ea066e0c9eb3ea6e3a562cb8a6f154104c888a6c0838669cb9f039d4a9dd3d3883c79f3b0765302240637476ee51c98bb31d98ced2a5a7e0ca54a8c
+MISC ChangeLog 2087 SHA256 cab2fabd1300be6dc038e0bcaaad9b197532bf417b373638782c3d56eacb9f5e SHA512 6abdb61e44dc963efc63694a2d2223667a11b93488b1da1f54632c90233c1e533ed656b5f38e2ddb13db3fc3cae510c5be585da468c06eb63c6f9268dd5f95df WHIRLPOOL c698f82d125a49ea3b7f60721606497baebc8a9b8b15d0769e0b6bb423492d4a4a6b85e45852d04de51f47477a9635424bbd5753607679441ade611d4a88d968
 MISC metadata.xml 223 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d SHA512 c9f6a48b2aa05afdf73b8bd824c65480d76e54b659ca39928398c66f764d34faf186255d8aea034737424a962cf35151b610d078a01f8193b027c63e1e3c51b5 WHIRLPOOL 1ce20c98a7e177b8f510ef41f3935b0db5e04b2ecf465a683b2f2515f6a3043c33e6e9efc87f5aaaf59b2ed9be376d9d16bc8beff66b11aaa50ea899bfdc1f62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlFahLYACgkQknrdDGLu8JCGjAD+I2QrT+XS4NOqKVTNnYfQ0/tA
-DH+MJs8EbvBskG7htqEA/20WnTdxArWm206e6JiM7RMG+ZSKeYoln9gJh4Vudr4V
-=q//n
+iQIcBAEBCgAGBQJRW2pQAAoJELp701BxlEWfjAoP/0B13G67TE13Bqp0Hn6W/bX2
+ElFDrkmroZU3Bz8Yg/DN8nEp/GaPmin8FeuABUv6ZHCf8CPc0AnLNy7+vwxuKx7w
+94R3UXogp+Fu8ZUinEAFAMusSHnMPrI++HVqFWUfh31GwIsCMyJrTU1p3lwXfIph
+ad8JNjNq5hZhBENHwLk3/t19z0cBuqThNJg7uG0GknKPrCbKUCscF5K+Mu5aiO0+
+zyZFSCpRoJ3/MI3Wl8MpnhFvDpKHBF4ae6jcaeNGyQTK4JyadWp4qM4oCk5AzhdT
+vfk26SSrT5zuJNbKqM1Hs/vaiBvQm3lgTRGy7X/JlgFx5VauiqO1RSXfj1hRbGCF
+V98VLK28HBc9tSkhBDwd3W4yhiBDAHBnsRSin4LWFVanXVstIcx2vZ6LbSlkMdFK
+zSG3122jyNOPkU+ByJnXrsbqO22OaFJhmErkztm2NTfEZUp9x+nQChYYOMD91oOC
+/YXKtpic1Std4AMgyUbNZ4BCFkW3lBGd8gI3Az/Zaqo6FHoR+8f1VsZNnpR6xcxI
+OiE39OThORNBhRy9ad8BVqcIspzMR5gip2gSk4eobxC+hoE6vOdZJq18ymbSlOkF
+DTIM9heJmwB3LurNWv8Shx9aHX/q18k/t32ITO8sT+T/scCRPZf2cRCZCB4sr2NY
+kALZPeyt5l0edAcY4Wt3
+=oKiq
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/st/st-0.3.ebuild b/x11-terms/st/st-0.3.ebuild
deleted file mode 100644
index 092927aaf42c..000000000000
--- a/x11-terms/st/st-0.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-0.3.ebuild,v 1.5 2013/02/23 15:12:43 xmw Exp $
-
-EAPI=5
-
-inherit multilib savedconfig toolchain-funcs
-
-DESCRIPTION="simple terminal implementation for X"
-HOMEPAGE="http://st.suckless.org/"
-SRC_URI="http://hg.suckless.org/st/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="savedconfig"
-
-RDEPEND="media-libs/fontconfig
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft"
-DEPEND="${RDEPEND}
-	sys-libs/ncurses
-	x11-proto/xextproto
-	x11-proto/xproto"
-
-src_prepare() {
-	sed -e '/^CFLAGS/s:[[:space:]]-Wall[[:space:]]: :' \
-		-e '/^CFLAGS/s:[[:space:]]-O[^[:space:]]*[[:space:]]: :' \
-		-e '/^LDFLAGS/{s:[[:space:]]-s[[:space:]]: :}' \
-		-e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
-		-e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
-		-i config.mk || die
-	sed -e '/@echo/!s:@::' \
-		-i Makefile || die
-	tc-export CC
-
-	restore_config config.h
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-	tic -s -o "${ED}"/usr/share/terminfo st.info || die
-	dodoc TODO
-
-	save_config config.h
-}
-
-pkg_postinst() {
-	if ! [[ "${REPLACING_VERSIONS}" ]]; then
-		elog "Please ensure a usable font is installed, like"
-		elog "    media-fonts/corefonts"
-		elog "    media-fonts/dejavu"
-		elog "    media-fonts/urw-fonts"
-	fi
-}
diff --git a/x11-terms/st/st-0.4.ebuild b/x11-terms/st/st-0.4.ebuild
index fe356b5813d5..efab34e84b34 100644
--- a/x11-terms/st/st-0.4.ebuild
+++ b/x11-terms/st/st-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-0.4.ebuild,v 1.1 2013/04/02 07:11:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-0.4.ebuild,v 1.2 2013/04/02 23:33:56 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://dl.suckless.org/st/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="savedconfig"
 
 RDEPEND="media-libs/fontconfig