DEPEND on virtual/pkgconfig, X11 protos. Version bump.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 78 insertions, 21 deletions

diff --git a/x11-terms/st/ChangeLog b/x11-terms/st/ChangeLog
index 6865d2f80feb..349216474f77 100644
--- a/x11-terms/st/ChangeLog
+++ b/x11-terms/st/ChangeLog
@@ -1,6 +1,12 @@
 # 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.14 2013/04/02 23:33:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/ChangeLog,v 1.15 2013/04/27 17:19:31 jer Exp $
+
+*st-0.4.1 (27 Apr 2013)
+
+  27 Apr 2013; Jeroen Roovers <jer@gentoo.org> st-0.4.ebuild, +st-0.4.1.ebuild,
+  st-9999.ebuild:
+  DEPEND on virtual/pkgconfig, X11 protos. Version bump.
 
   02 Apr 2013; Agostino Sarubbo <ago@gentoo.org> -st-0.3.ebuild, st-0.4.ebuild:
   Add ~x86, remove old, wrt to bug #464252
diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
index 95d2ecb74c75..de9fb2a518ce 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -1,25 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+DIST st-0.4.1.tar.gz 32947 SHA256 ee2f93c6d8cd95a5ab47423eeebde4a474be470309ceee33fa3c7757eae2bf31 SHA512 06a75cdf7d22c64c1331276b0f58577c3c42c1c2edcb41a33a3c37f7b65bd284a3b006dd94e0dc081f42f028dd18b60f278e8b3f33a1cf6611b1398bff80df7d WHIRLPOOL ef59a069eaceaa8ed606913645525b5bf44828f5e82cc024f802a0f4bd1962a6df01253dd1787aacf0bdefb94071792551b3362a0d3e7326ac4cceb718fc8272
 DIST st-0.4.tar.gz 32396 SHA256 307aef01d0de0411439bf32d55c23a930e779efd003a31acaa0ddcf8b45a3afe SHA512 d8e4f9c28756d2f8d2f7f041cf8c6fa4026c722edddab5f682d82d7fcab842b23fcc087770986b3e1383e47be115576dbfdd444c6edb6ba860d27d30c92122f1 WHIRLPOOL 55445903b621c87b5bee23b47bdc2f797ee225b044618533068b6667e3f56b7df1b93b3bb00d0952ec3ff52f07c0383a5a903031227f3ecdf67343a50cfc7c1f
-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 2087 SHA256 cab2fabd1300be6dc038e0bcaaad9b197532bf417b373638782c3d56eacb9f5e SHA512 6abdb61e44dc963efc63694a2d2223667a11b93488b1da1f54632c90233c1e533ed656b5f38e2ddb13db3fc3cae510c5be585da468c06eb63c6f9268dd5f95df WHIRLPOOL c698f82d125a49ea3b7f60721606497baebc8a9b8b15d0769e0b6bb423492d4a4a6b85e45852d04de51f47477a9635424bbd5753607679441ade611d4a88d968
+EBUILD st-0.4.1.ebuild 1340 SHA256 5ee3cdf5253d9d8013f3a5645ad5436bdf4657214c8afb942868ca31c542ded6 SHA512 92faad33346a60a98d8ec94068a316201826ec3cdc97bdea58330a7c46e2acd90257d7612470f5931e29296ff7c06dceefac72a513537b980d3463319f5dbcb2 WHIRLPOOL 0a7b4c14d3a439fb7d11519d8210264893036759a991b73081b455dae3b9cad5fa843bc6f903c0ca3322c2663f620de46723fcf22bf42a7b981be92f62b26de0
+EBUILD st-0.4.ebuild 1338 SHA256 f404de42bb01c6d8afe7334b23b6859711f27fd827b362c19e1ab6143067fe5a SHA512 6df47dfc887268c3547e6ab90f4c3ea69d01e780c179577ae489fe0d7d74e3ecd19d4ee59e0942ec53db6da09aa3ec6b5b9603399b9bd1fac295061b90a925a1 WHIRLPOOL 1ee660539954945cc39b22b4cd1ce02a74bd2a5dff0d6b9b81ed20a2e87bb3c2a6bf92752682c78df03449868162e9afba240cd7d6aac2321b2b83051cef97bb
+EBUILD st-9999.ebuild 1431 SHA256 d48b75d6d65dd56cf2a1ba74522041d2116fb45ef69c08c662da79eb71436d45 SHA512 6071ecbb50712d895765a26f1c9afd172e2fde6522f82b2b1f7702478a0964b3c10df93eda6a6463e6b675dcfc82d5101c147bde0b69e63eba19d9a7b9b457ab WHIRLPOOL 2bf154b0f2a7639abbc5f147d29edc3ec4cfcbdd9338509d04e11f8e2303b8673aaa9bdf4d23f6a11ed0a3532b90ddefb1911c438fe9595f3faae6fa4d876761
+MISC ChangeLog 2268 SHA256 5728604bc344059b177616e91ec3aadfb5c074276dcafa3fd01d71c1691b4ad4 SHA512 1d8abbbd79b8b6c02ebf6fbae7cd44ecfd3d9f1b4748e64ca2694ad1ac973a8b37d6ee601a19fff88e8aed69bc69658e96b88897fd8e1d707bf61b7fbf2bbb86 WHIRLPOOL 0707661a734b652d44da5c43c0288bcdd6e8938c049c491347bcab58ba754e0d42a8d32d8b67e1235a25bf5d1683ac7dbb267405b4e14179034d58c85536a4a0
 MISC metadata.xml 223 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d SHA512 c9f6a48b2aa05afdf73b8bd824c65480d76e54b659ca39928398c66f764d34faf186255d8aea034737424a962cf35151b610d078a01f8193b027c63e1e3c51b5 WHIRLPOOL 1ce20c98a7e177b8f510ef41f3935b0db5e04b2ecf465a683b2f2515f6a3043c33e6e9efc87f5aaaf59b2ed9be376d9d16bc8beff66b11aaa50ea899bfdc1f62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-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
+iEYEAREIAAYFAlF8CKQACgkQVWmRsqeSphPRIACffLviM4YzQKybbonitGseXf7F
+RksAn3aLtQ/GK7fqAV3s53CRUVRHTsAb
+=G74+
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/st/st-0.4.1.ebuild b/x11-terms/st/st-0.4.1.ebuild
new file mode 100644
index 000000000000..974361bbf97f
--- /dev/null
+++ b/x11-terms/st/st-0.4.1.ebuild
@@ -0,0 +1,55 @@
+# 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.1.ebuild,v 1.1 2013/04/27 17:19:31 jer Exp $
+
+EAPI=5
+
+inherit multilib savedconfig toolchain-funcs
+
+DESCRIPTION="simple terminal implementation for X"
+HOMEPAGE="http://st.suckless.org/"
+SRC_URI="http://dl.suckless.org/st/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="savedconfig"
+
+RDEPEND="media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft"
+DEPEND="${RDEPEND}
+	sys-libs/ncurses
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+src_prepare() {
+	sed -e '/^CFLAGS/s:[[:space:]]-O[^[:space:]]*[[: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 efab34e84b34..643e72a0326c 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.2 2013/04/02 23:33:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-0.4.ebuild,v 1.3 2013/04/27 17:19:31 jer Exp $
 
 EAPI=5
 
@@ -21,6 +21,7 @@ RDEPEND="media-libs/fontconfig
 	x11-libs/libXft"
 DEPEND="${RDEPEND}
 	sys-libs/ncurses
+	virtual/pkgconfig
 	x11-proto/xextproto
 	x11-proto/xproto"
 
diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild
index b8b6c099aab5..9db68c5effbd 100644
--- a/x11-terms/st/st-9999.ebuild
+++ b/x11-terms/st/st-9999.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-9999.ebuild,v 1.9 2013/02/23 22:52:45 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-9999.ebuild,v 1.10 2013/04/27 17:19:31 jer Exp $
 
 EAPI=5
 
@@ -20,7 +20,10 @@ RDEPEND="media-libs/fontconfig
 	x11-libs/libXext
 	x11-libs/libXft"
 DEPEND="${RDEPEND}
-	sys-libs/ncurses"
+	sys-libs/ncurses
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xproto"
 
 src_prepare() {
 	sed -e '/^CFLAGS/s:[[:space:]]-Wall[[:space:]]: :' \