Correct X11 paths (thanks Joe M, bug 458796), verbose build.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

6 files changed, 28 insertions, 110 deletions

diff --git a/x11-terms/st/ChangeLog b/x11-terms/st/ChangeLog
index cc53a6c6d2a9..b136afdc53a1 100644
--- a/x11-terms/st/ChangeLog
+++ b/x11-terms/st/ChangeLog
@@ -1,6 +1,10 @@
 # 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.10 2013/02/22 16:16:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/ChangeLog,v 1.11 2013/02/23 15:12:43 xmw Exp $
+
+  23 Feb 2013; Michael Weber <xmw@gentoo.org> -st-0.1.1.ebuild,
+  -st-0.2.1.ebuild, st-0.3.ebuild, st-9999.ebuild:
+  Correct X11 paths (thanks Joe M, bug 458796), verbose build.
 
   22 Feb 2013; Michael Weber <xmw@gentoo.org> st-0.3.ebuild, st-9999.ebuild,
   metadata.xml:
diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
index 70934c2ea982..8e2f0da97acc 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -1,19 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST st-0.1.1.tar.gz 17210 SHA256 55898f80b3fbe1300ccbb20bcf94d4be63192458bc227429ae2afe7ef877f2bb SHA512 5dd8be1dfd357ffcfd4713f525f725e1d57c5ebea584dc441992a691c83a3caab83db54f07e9af516300b1717a9d39c988870337db062b2993397cf9b91f31dd WHIRLPOOL d090e99e7e7af9a94e24099f6d13d987c28e66e7ae6be4a4939079148fc56205129d7c1d575880e7f79c593d7eae6f1dca3c5a422c2677693b0de6eba890f0be
-DIST st-0.2.1.tar.gz 19804 SHA256 4bf5817483d3274fae9a205e692b308a5fd0cfcb55ed9f3761d2c564b4f7d897 SHA512 750d1f727e4cdf3510df93ac530b7da19ff568a3d2a6dd8a300af35898a3cc9e43774f03b7239050dedb7d0eaf39386ba652624e5bc1ace31ee081e3fe7647b0 WHIRLPOOL 0fb860c9e535a31f3e23fb57ffe818f5572e10f60a8a5b43da0d0d7dee46d9523fa7b47c57ff9f8dd6895d6856005b728e5cf24b8c4d2b84e8a0c9a0bef8044e
 DIST st-0.3.tar.gz 25637 SHA256 94a5be6c6879ec6bcb441c476cc0df8c4ffc38995abeafe1b603eb2b65a3d78b SHA512 8edb434e2f845894d90bfca15dbfc0feb787e65934e931b28c54a309b98f0b03116826fcf1c6e34068ac3c42ba18237cfbfef4a73480f273ec9e39bd68029990 WHIRLPOOL 850605a2bf9a638751bcaf264a97c40e9ba336197983292849667a8277713ea8f4dfb6316b6bc236923fe4ca088191b9b498fe981a667adf1c67292b7f356d20
-EBUILD st-0.1.1.ebuild 1120 SHA256 be3a1674c29dc00f3df12ee72fc58962b3e3bd583db2e03033b84512096e622c SHA512 61830c9ba8fb6b32b389e3d512462351379d5b95419f03ff3dcf0ea767a83908af59334d072bce018f4f8f434914363e097fb4b6f66d39b56f50f02e23802544 WHIRLPOOL cd4cbce111800ebb32f94d90928cb1da8e8617f9cf93cff9ee25b69f6277109884005033ff1d63465f9d591b9a25c8d31d7c28586bc949836c941825318e2290
-EBUILD st-0.2.1.ebuild 1115 SHA256 6102f4bc9d5455642a29c812c3b81fac6c16b50696223acb88a977e9bb9a9fa1 SHA512 cf80b1a4bc23197c118f06414b835ad1b449fe977d707373b3571de6fe3a08e463250ea197fc2e35622301cddee6f165236ac02743b2481e60ca670eb279c0a9 WHIRLPOOL 4b40c686d49257a2346f1a03dc02040cb1dc6d9040e927222852e056a6a23dec3e254f154057c6eb75e9dd537ad983e4d3bd04795d9b1d5d241aa53346c25524
-EBUILD st-0.3.ebuild 1270 SHA256 c515ec70eaa3e2a3181fe10e9bd9f7cb8936629973ffd400077898ead8a127e6 SHA512 2df680b944b17eb495117da3a19599c43142da7eb8bd8448414fd2f9b5c2bb273ac34da73b0fc82c120b97eeac499cbd284c98a42cab473646a807c0f0538bf2 WHIRLPOOL 5af0b645f82ea14a5f634d884c8190e33c71f32c45bf01666d5593cd4ff2425269b76e4925a933ed1242b86c4f0937f86fa5aa04c9400d45d60a70abcf314ff4
-EBUILD st-9999.ebuild 1205 SHA256 cdc80b36823de30f82cceda643827dfe52e55254fe439b28e55bc0d966088210 SHA512 1448c51791a50d621196aef313ffd798d6199763ac7dcc22c150301d2fc439258177019d4ac3a22cbd94f93820277972893030d4b09429b8c49610c4c9dcdd5b WHIRLPOOL 7c1768d2c051d47ddaeb99048988292d206b977e35a8ba5510e5b5d28a4053705ab49b5e29ea30d37e54d366210e6f9b68e3103b38cad2296be506a6d7fa5754
-MISC ChangeLog 1592 SHA256 7a17ae06a9ee9602a6e4643eea2b56ac0de3ccf04ae5e42d7afb0ec85b818763 SHA512 89a3638d7be031da59555bfdfba4fb17e154d2a93d54b3517942996dbc03338baf5493469c3162fdf498a9eb49a455912b250eac5e89f13880fe287e12edda39 WHIRLPOOL 4f587317fe295fcb913097dfb9d21c7512322a0f82145c93164137227b34b1c1015f09513c4e9a8531422b3e3144027b697a39c761b75387718a00ff03bbe45e
+EBUILD st-0.3.ebuild 1440 SHA256 8a402eac9571542103cdd2e16d42f44a4f0c3170ee8191db9b0e70195921539c SHA512 fea233f78cb002f6820efe5c2dd7acc15bedc112cb416926ebe780223e1731aa4ff3d993a79c43e8d512bf5382761d37c5a8e9bae0ba80c6b2b25cad082594a1 WHIRLPOOL af7c130747a373d628d9271be4f0fcea1c65dbab888da0a195a5adcff9bfccf721fdd3dcd7798611f0e4540f73fb6dba27aa735b287381789414d4646d968bab
+EBUILD st-9999.ebuild 1366 SHA256 8d1f764200f053f6e2c6de4074bf25abb7435fc9c03bfc99074ce3ffbc6c636d SHA512 bf8b48433b048cef8b112700e8f59d0e17c65d58d51ee5b8efafca676b2ebd11abe8176d30adacbf121b90b8266421261a4e5f7d9dd54090e563d505a348f581 WHIRLPOOL 0113410523c6f9d54919855c6a607fa4df3c7a2d3c89f70d1c7bb7b897963c051fd0b36de99110e2589dad215083a01d28698bbf28bfbf1d9c85bf4f54e7e377
+MISC ChangeLog 1771 SHA256 745780425f9704e20197da7c7dc13df85c364a9170960d4b9a8a4152b2f06633 SHA512 cd4715037be9784b7cce369489d59e808db26f9a04cc2ef04715e311a039b8d0702fe3418eb2bfb7de473e8f2f52674019d477b7ad2944341e5ab02fc2bf347c WHIRLPOOL a3e9a02381c9f027710f3e32a4d15286120cc01f351c87ab0c1363dc85af1e211c80acce912cbde549c552d650aedfc1d1ca21d8f02806838f4234a0c2ff29a2
 MISC metadata.xml 223 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d SHA512 c9f6a48b2aa05afdf73b8bd824c65480d76e54b659ca39928398c66f764d34faf186255d8aea034737424a962cf35151b610d078a01f8193b027c63e1e3c51b5 WHIRLPOOL 1ce20c98a7e177b8f510ef41f3935b0db5e04b2ecf465a683b2f2515f6a3043c33e6e9efc87f5aaaf59b2ed9be376d9d16bc8beff66b11aaa50ea899bfdc1f62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlEnmeYACgkQknrdDGLu8JBCSwD/UPSKokcj+vWAu6n5fULy6Ns4
-6Z9R4JiGBuJuHMy4DVMA/3+2howrfkls2FiFxjebQ1A4CkofB7vcdy4WkygZfZY8
-=ZVuT
+iF4EAREIAAYFAlEo3OgACgkQknrdDGLu8JAObwD+L+TOXVHlWoVfVSMsRAoChpet
+gUzNxi/dq8/WNPmAPE8BAIa5GMgje6T8zV3LtzFYXAG77j8yAa6l0S+HGr3efmK7
+=cIbv
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/st/st-0.1.1.ebuild b/x11-terms/st/st-0.1.1.ebuild
deleted file mode 100644
index 5bdddc48341d..000000000000
--- a/x11-terms/st/st-0.1.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-0.1.1.ebuild,v 1.5 2012/03/07 18:17:30 jer Exp $
-
-EAPI=3
-
-inherit 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=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	sys-libs/ncurses"
-
-pkg_setup() {
-	elog "Please ensure an usable font is installed, like"
-	elog "    media-fonts/corefonts"
-	elog "    media-fonts/dejavu"
-	elog "    media-fonts/urw-fonts"
-}
-
-src_prepare() {
-	sed -e '/^CFLAGS/s:[[:space:]]-Wall[[:space:]]: :' \
-		-e '/^CFLAGS/s:[[:space:]]-O[^[:space:]]*[[:space:]]: :' \
-		-e '/^LDFLAGS/{s:[[:space:]]-s[[:space:]]: :}' \
-		-i config.mk || die
-	tc-export CC
-
-	restore_config config.h
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install || die
-	tic -s -o "${ED}"/usr/share/terminfo st.info || die
-	dodoc TODO || die
-
-	save_config config.h
-}
diff --git a/x11-terms/st/st-0.2.1.ebuild b/x11-terms/st/st-0.2.1.ebuild
deleted file mode 100644
index f72d04289d8e..000000000000
--- a/x11-terms/st/st-0.2.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-0.2.1.ebuild,v 1.2 2012/03/07 18:17:30 jer Exp $
-
-EAPI=4
-
-inherit 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=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	sys-libs/ncurses"
-
-src_prepare() {
-	sed -e '/^CFLAGS/s:[[:space:]]-Wall[[:space:]]: :' \
-		-e '/^CFLAGS/s:[[:space:]]-O[^[:space:]]*[[:space:]]: :' \
-		-e '/^LDFLAGS/{s:[[:space:]]-s[[:space:]]: :}' \
-		-i config.mk || die
-	tc-export CC
-
-	restore_config config.h
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install || die
-	tic -s -o "${ED}"/usr/share/terminfo st.info || die
-	dodoc TODO
-
-	save_config config.h
-}
-
-pkg_postinst() {
-	elog "Please ensure a usable font is installed, like"
-	elog "    media-fonts/corefonts"
-	elog "    media-fonts/dejavu"
-	elog "    media-fonts/urw-fonts"
-}
diff --git a/x11-terms/st/st-0.3.ebuild b/x11-terms/st/st-0.3.ebuild
index 61881a1a32b6..092927aaf42c 100644
--- a/x11-terms/st/st-0.3.ebuild
+++ b/x11-terms/st/st-0.3.ebuild
@@ -1,9 +1,10 @@
 # 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.4 2013/02/22 16:16:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-0.3.ebuild,v 1.5 2013/02/23 15:12:43 xmw Exp $
 
-EAPI=4
-inherit savedconfig toolchain-funcs
+EAPI=5
+
+inherit multilib savedconfig toolchain-funcs
 
 DESCRIPTION="simple terminal implementation for X"
 HOMEPAGE="http://st.suckless.org/"
@@ -27,14 +28,18 @@ 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 || die
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
 	tic -s -o "${ED}"/usr/share/terminfo st.info || die
 	dodoc TODO
 
diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild
index 8df10f32c2f4..07d4e6fce4a9 100644
--- a/x11-terms/st/st-9999.ebuild
+++ b/x11-terms/st/st-9999.ebuild
@@ -1,10 +1,10 @@
 # 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.7 2013/02/22 16:16:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-9999.ebuild,v 1.8 2013/02/23 15:12:43 xmw Exp $
 
 EAPI=5
 
-inherit git-2 savedconfig toolchain-funcs
+inherit multilib savedconfig toolchain-funcs
 
 DESCRIPTION="simple terminal implementation for X"
 HOMEPAGE="http://st.suckless.org/"
@@ -15,8 +15,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="savedconfig"
 
-RDEPEND="
-	media-libs/fontconfig
+RDEPEND="media-libs/fontconfig
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXft"
@@ -27,14 +26,18 @@ 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 || die
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
 	tic -s -o "${ED}"/usr/share/terminfo st.info || die
 	dodoc TODO