added parts of the prefix changes (bug #519052)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

3 files changed, 24 insertions, 17 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 9e1a73b1271f..9d1a15bc0ef2 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.229 2014/07/13 19:30:57 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.230 2014/08/05 16:09:26 ottxor Exp $
+
+  05 Aug 2014; Christoph Junghans <ottxor@gentoo.org> ncurses-5.9-r3.ebuild:
+  added parts of the prefix changes (bug #519052)
 
   13 Jul 2014; Mikle Kolyada <zlogene@gentoo.org> ncurses-5.9-r3.ebuild:
   ppc/ppc64 stable wrt bug #507154
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index d9e4f107b7ed..835d22eb34d8 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -19,16 +19,18 @@ DIST ncurses-5.9.tar.gz 2826473 SHA256 9046298fb440324c9d4135ecea7879ffed8546dd1
 EBUILD ncurses-5.7-r7.ebuild 5156 SHA256 3c1f3374af972166fd9418035accd4b06702aaf4de0880cba7bdfcf3083cd598 SHA512 eb7ad4c6b3e13e46c1be8453bac8e13e2073cc04c2f640e3b776388ae4c031e7f973088a47246f011329bc4a892235f3eecd73fed467f69a47709188252b22ad WHIRLPOOL bfee437aa6d657525df005b3899d4ece1046f20cd57824add4f13200ef4c0a2d0d6e96b016d631b552e3c4cc4cb6a703f4ecc18bf4cacf80cadc6107f53a4bac
 EBUILD ncurses-5.9-r1.ebuild 5278 SHA256 a0b4642b95cef0e696c65ef4ba12324fe528777a2ee249627d33ea723146928e SHA512 bdacc83bf75a318a260edc1257d473d3200f6cb62e9e5a40f1ac65073b1b2d7fad9e3501ad975d041b32425d4194bed63733eaf743d69120849069f15dc5c234 WHIRLPOOL bd821d341991d98520da5ce4b0f8d0bf2c774ac91ab4af4ff3f318c7ac552d604cfaca23ec678565eef577b254c2d1fcc22f7f00e285ca2783db626c42a729b2
 EBUILD ncurses-5.9-r2.ebuild 5661 SHA256 c18ec80f17ad898717f9c802c6692aea6a86e3f93ab2b3c4277c9cab649190b8 SHA512 aae0a8d4de674bd35c75fb42cec9e3b9094ed182fc07551b8db0db011b2d3c6d43cb1aecd9519cc6c343f17345a6ec36cdf97aca325d9c8aa9f8b5cfbaab9d51 WHIRLPOOL e53bfbd3cbfd807d4a806e61f06d422fb7eb6eb7828e5facf06946392894330933cc7d8126972817c37033dd18ed831a9f6e20e76082cc7ff3e17a32b62681f5
-EBUILD ncurses-5.9-r3.ebuild 6975 SHA256 9f4eca3d611772a63d7a867b041166eb21fed0352c9c0b0ddc2d60cb53de1f30 SHA512 717d0e8d29b227f04aa9cd0c449c61881b2727f2440122873fb8afb5bdd66896b51baa2eb10b38c9812db8c19ab17695754ff9e7a10f2e4d8c92214ceed06abe WHIRLPOOL 65e1a7ee60e5d3cf918266b4f97eb37393b46ba98137710fae65b7c5156d9e1a1a311fc8b1421dbe32c5e49feb8595a01422a0926821470830c68ee3990b9049
+EBUILD ncurses-5.9-r3.ebuild 7079 SHA256 6469e2e8827f6b56e9eec89c4eeb8c27c05896458b3cb5d2e8c0178c4502362f SHA512 7881efb51872705471ba07c9a3b67c1bc2ecec34e54aaa197ee85486a638887a5f64961f824ac4c1cf9da1a18b89ccad6b99d01dd7e213acc135ddb265bec565 WHIRLPOOL 10d50400d41f67c2d8aad059553b7b6f1fc43ec97faa6fbe12d7f9d1b3002fdc466cf2fea84f523a3b70d25c771a02bfb784f93b306c4ca22d5188befbae5089
 EBUILD ncurses-5.9.ebuild 4910 SHA256 0e95316b82ce63227e20f2653d239b289b527100459ab995efa370beeb798e3b SHA512 40f4db535eaa496460095a276979cda32b30d0f649bf0c2229e07c4ccd94e51d7de2021981474c112cccb1f4636d91ff27eda1599bb9d681d0d15d63dd6c401b WHIRLPOOL 79badbfdbf1b71dbceca73160c2623f97d8b472ff166d905d8a24ef50198e5668a90cf76f7eaa12d5c69a3e78d436e592cd0fe3dbbceaa6770905a1562fb75e3
-MISC ChangeLog 32949 SHA256 0e326e1ff7ef34d8e6e8376fc26f15e6d3f0d8dad53467081ef6c845c160308e SHA512 2d1f0bbfaf151c171e8c6402a65dc2b7a44aef4961dd747dc22ed6478afa6969750184fbab836e8bb60ec2b233ddcb16490104b69fb8b37330f9b0274142de4f WHIRLPOOL 83a6c4f8f0eab041956ccd783234b675b1af7308de88859b7d4348709daeac4fd5efb2aa9e26b676ce1160df3ad77aeacbc3c96687643474fc642d58ec8c14f7
+MISC ChangeLog 33076 SHA256 03a7c73ca2ef1a9fe20af56d265e99647516195d01a86fdb35e61dc39fa250c1 SHA512 c40df5ecf500207d19f2da29f515d0dd1e9390a985ec657ec38e9b534b9ee62c61d276e1de14e4a67698436d1a95cb2e61ca032d10d9713f971679221edc5180 WHIRLPOOL d0a2d838066bcd2ec1a9c378b740dc206cdb514a78f7d8328183f6845526ef3d2867aab26e84396f6c5405167519a139cce4cbdc9cc1e3e8c8e76932f21a5559
 MISC metadata.xml 530 SHA256 3a0f1bf7ab8ec067416e6535c3270113b53716b12aac504a581acf5b27f8114f SHA512 27d968272c8d184804d9764bb2ec8fb86eb5826bfe14e7f445c7c5f0b89cc7fe4271546a6994d830cb1270fa93f187ded1c96b4f4f1fe1b5c417c78a2082dfd3 WHIRLPOOL 54ff921a2a89b19d6d75830033b7d18c0f7643af248bea029b1a7ebe201eded0eff54dde04858be08903cb6607e7cbcb8ca100712d4992324dbb757184150d44
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlPC364ACgkQG9wOWsQutdZb6wQAp4Em2NZBWvIYvqTNrvrcs7eZ
-e7ucLMjyXywPVNu/6sHNUKs7Y5iSxuQRGpCeE1aIWOG4mK3VKqAR8HvyTo9GSFDM
-/srWl3vaWDxkoXQeeZIKJWhvYRVuwPSmD9GSPWlR3BBJe2jZNSk8+gPeTkJKlbUu
-K32EBxW5/jDAweXzpAU=
-=Tm2r
+iQEcBAEBCAAGBQJT4QG5AAoJEOeBhlrCAAWGYzoH/RXnbz5VKEXhUbk+47DrWWlK
+5syic2+qzUb2/NUgB2qGLfiEynG/hYxQgXJBDqL007r0OhvelROwbjbp8b4pquuF
+CWmhV65v6sdpVq7ys4gAK9gHRayUyplTGEjbZItsrxHKoFuFZmhhEPXomwxeh4Uo
+s7K6bXHxUKKILWdlRkVN4PfaK588WqtGyuszp17BXPIYHYhlGIED3987krlDFvmM
+k5PJgYf8XSi1gOjh7ake45rBxzThPAMilxEyZvmuZCKxHU0I0IySwmlk7WAGwpQ4
+PwL28z+rzeTamuwHDAVzQT1xvmuZae60dYuX/i6bQE5nnsaz2LkSqLDAmIF/jcU=
+=RWfX
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/ncurses-5.9-r3.ebuild b/sys-libs/ncurses/ncurses-5.9-r3.ebuild
index 563a0714f746..c93eb8ab2e25 100644
--- a/sys-libs/ncurses/ncurses-5.9-r3.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r3.ebuild,v 1.16 2014/07/13 19:30:57 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r3.ebuild,v 1.17 2014/08/05 16:09:26 ottxor Exp $
 
 EAPI="4"
 inherit eutils flag-o-matic toolchain-funcs multilib-minimal
@@ -63,7 +63,7 @@ src_configure() {
 
 multilib_src_configure() {
 	do_configure narrowc
-	use unicode && do_configure widec --enable-widec --includedir=/usr/include/ncursesw
+	use unicode && do_configure widec --enable-widec --includedir="${EPREFIX}"/usr/include/ncursesw
 }
 
 do_configure() {
@@ -77,7 +77,7 @@ do_configure() {
 		# We need the basic terminfo files in /etc, bug #37026.  We will
 		# add '--with-terminfo-dirs' and then populate /etc/terminfo in
 		# src_install() ...
-		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo"
+		--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
 
 		# Disabled until #245417 is sorted out.
 		#$(use_with berkdb hashed-db)
@@ -88,7 +88,7 @@ do_configure() {
 		--enable-pc-files
 		--with-pkg-config="$(tc-getPKG_CONFIG)"
 		# This path is used to control where the .pc files are installed.
-		PKG_CONFIG_LIBDIR="/usr/$(get_libdir)/pkgconfig"
+		PKG_CONFIG_LIBDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
 
 		# Now the rest of the various standard flags.
 		--with-shared
@@ -183,8 +183,10 @@ multilib_src_install() {
 		$(usex unicode 'ncursesw' '') \
 		$(use tinfo && usex unicode 'tinfow' '') \
 		$(usev tinfo)
-	ln -sf libncurses.so "${D}"/usr/$(get_libdir)/libcurses.so || die
-	use static-libs || find "${D}"/usr/ -name '*.a' -a '!' -name '*curses++*.a' -delete
+	if ! tc-is-static-only ; then
+		ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
+	fi
+	use static-libs || find "${ED}"/usr/ -name '*.a' -a '!' -name '*curses++*.a' -delete
 
 	# Build fails to create this ...
 	dosym ../share/terminfo /usr/$(get_libdir)/terminfo
@@ -197,12 +199,12 @@ multilib_src_install_all() {
 		for x in ansi console dumb linux rxvt rxvt-unicode screen sun vt{52,100,102,200,220} \
 				 xterm xterm-color xterm-xfree86
 		do
-			local termfile=$(find "${D}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
+			local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
 			local basedir=$(basename $(dirname "${termfile}"))
 
 			if [[ -n ${termfile} ]] ; then
 				dodir /etc/terminfo/${basedir}
-				mv ${termfile} "${D}"/etc/terminfo/${basedir}/
+				mv ${termfile} "${ED}"/etc/terminfo/${basedir}/
 				dosym ../../../../etc/terminfo/${basedir}/${x} \
 					/usr/share/terminfo/${basedir}/${x}
 			fi
@@ -212,7 +214,7 @@ multilib_src_install_all() {
 	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
 	doenvd "${T}"/50ncurses
 
-	use minimal && rm -r "${D}"/usr/share/terminfo*
+	use minimal && rm -r "${ED}"/usr/share/terminfo*
 	# Because ncurses5-config --terminfo returns the directory we keep it
 	keepdir /usr/share/terminfo #245374