5 files changed, 51 insertions, 72 deletions
diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index aa288e9cd5e9..98e6979376a6 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.139 2007/04/22 08:44:35 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.140 2007/04/30 08:59:14 grobian Exp $
+
+  30 Apr 2007; Fabian Groffen <grobian@gentoo.org> ncurses-5.5-r3.ebuild,
+  ncurses-5.6.ebuild, ncurses-5.6-r1.ebuild:
+  Removed weird darwin hacks
 
   22 Apr 2007; Bryan Østergaard <kloeri@gentoo.org> ncurses-5.6.ebuild:
   Stable on Mips, bug 173728.
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 1341d2411bd1..39c9aeedb9ec 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ncurses-5.4-c++-templates.patch 351 RMD160 d9a0e9387367be813e7067b4ddeddf907a2217b8 SHA1 80471645bee521e6f154c7ff5a9acdc2e87879ef SHA256 853fc14f7ab2f5eb156b2e7d658d79243877102a18cd2845e3ebd4eb24193d7c
 MD5 118971faee11066510aa77e6c6a2c51b files/ncurses-5.4-c++-templates.patch 351
 RMD160 d9a0e9387367be813e7067b4ddeddf907a2217b8 files/ncurses-5.4-c++-templates.patch 351
@@ -33,22 +30,22 @@ EBUILD ncurses-5.4-r6.ebuild 4805 RMD160 a95e26ae1629a3d3fc52ce3d940c51f4e87e3c3
 MD5 8c5bea4fec93dc5e03824b86a6cc8fbb ncurses-5.4-r6.ebuild 4805
 RMD160 a95e26ae1629a3d3fc52ce3d940c51f4e87e3c3e ncurses-5.4-r6.ebuild 4805
 SHA256 29242bba0360463d371ca9f6e3466dc05f8cd3d6be4bed9eb651d9f417d458c3 ncurses-5.4-r6.ebuild 4805
-EBUILD ncurses-5.5-r3.ebuild 4863 RMD160 75f6f79cc7f299f7bb7960108437b1698286d061 SHA1 ff6a329c9ba61ef789ac8713f65e4bc48c435a12 SHA256 070029894fc3117ea12f89f63f8ea42b36c95484593b1bde9f646e7aea286dd3
-MD5 508732d8c2625adc50c62c9a9b59bd44 ncurses-5.5-r3.ebuild 4863
-RMD160 75f6f79cc7f299f7bb7960108437b1698286d061 ncurses-5.5-r3.ebuild 4863
-SHA256 070029894fc3117ea12f89f63f8ea42b36c95484593b1bde9f646e7aea286dd3 ncurses-5.5-r3.ebuild 4863
-EBUILD ncurses-5.6-r1.ebuild 4660 RMD160 12ea58e048025e9725ab1d597017a0a3d3c9dd7f SHA1 78402b44dc98ae1fbb634f342c4a0b8147b7f79b SHA256 cc047ac63a7a208148c6a52e34e5d8d31b0d40f473e31ce4568648f090d9ed91
-MD5 4c09f9175241790c130680a5971a5b29 ncurses-5.6-r1.ebuild 4660
-RMD160 12ea58e048025e9725ab1d597017a0a3d3c9dd7f ncurses-5.6-r1.ebuild 4660
-SHA256 cc047ac63a7a208148c6a52e34e5d8d31b0d40f473e31ce4568648f090d9ed91 ncurses-5.6-r1.ebuild 4660
-EBUILD ncurses-5.6.ebuild 4577 RMD160 3569576a9db8be558fafc070fee040b9b3b29ce4 SHA1 09a8c5a1c55cab9eb0f2580802ba8c546f062a0f SHA256 d10687ba0f7020a4c8fb45fe407b806f6991ea0c32affda6d2a72cd90992c86e
-MD5 5d2e320764ce6259688602923c9038b5 ncurses-5.6.ebuild 4577
-RMD160 3569576a9db8be558fafc070fee040b9b3b29ce4 ncurses-5.6.ebuild 4577
-SHA256 d10687ba0f7020a4c8fb45fe407b806f6991ea0c32affda6d2a72cd90992c86e ncurses-5.6.ebuild 4577
-MISC ChangeLog 20435 RMD160 f918f0d9d50ba3f88556350bca35069cc07780c5 SHA1 40c6aa741fae59123680a2b585b9f01ed06070d5 SHA256 9c766ef4b41a7e064e25e927cd42bbc96ef0cd54ebffa3279749a360dab4cdee
-MD5 6630ec9b6396b39d6b190cd33700ed6f ChangeLog 20435
-RMD160 f918f0d9d50ba3f88556350bca35069cc07780c5 ChangeLog 20435
-SHA256 9c766ef4b41a7e064e25e927cd42bbc96ef0cd54ebffa3279749a360dab4cdee ChangeLog 20435
+EBUILD ncurses-5.5-r3.ebuild 4726 RMD160 9686f2aea71d053e1a0da8b3c596fd60a692d318 SHA1 ef53496fcf4a921da718d088d1575ff4df000680 SHA256 95d59168f376f8a270e5e44962dea14c6ee2d166b76e50cefd390666778ebcd2
+MD5 92204b3366b32a28b6d444a2e1abea55 ncurses-5.5-r3.ebuild 4726
+RMD160 9686f2aea71d053e1a0da8b3c596fd60a692d318 ncurses-5.5-r3.ebuild 4726
+SHA256 95d59168f376f8a270e5e44962dea14c6ee2d166b76e50cefd390666778ebcd2 ncurses-5.5-r3.ebuild 4726
+EBUILD ncurses-5.6-r1.ebuild 4523 RMD160 a3f485a589cb26b8366c3454d2a16e9cd782c5d2 SHA1 01ee070e7daa3c69bd67a6d49ebe061cc63102f7 SHA256 17985f7c87b8f824d22dbb2ecc71e4fcec0798fde86e08cbcd9f1b8087069db5
+MD5 b66523c8e32b7e20db8184955468f6f1 ncurses-5.6-r1.ebuild 4523
+RMD160 a3f485a589cb26b8366c3454d2a16e9cd782c5d2 ncurses-5.6-r1.ebuild 4523
+SHA256 17985f7c87b8f824d22dbb2ecc71e4fcec0798fde86e08cbcd9f1b8087069db5 ncurses-5.6-r1.ebuild 4523
+EBUILD ncurses-5.6.ebuild 4440 RMD160 a52592fa52df37fc10b88afcd233ada177acf0f0 SHA1 c074a68dc742f17a1d5d2100fba7aa756793c1f4 SHA256 64e2c6fd56c06fea4eec93e49fbfdeaf3342a1d79c32c5f868ced17a373f87ae
+MD5 04c5c49ff9ecef9f65d4f94f76fd7049 ncurses-5.6.ebuild 4440
+RMD160 a52592fa52df37fc10b88afcd233ada177acf0f0 ncurses-5.6.ebuild 4440
+SHA256 64e2c6fd56c06fea4eec93e49fbfdeaf3342a1d79c32c5f868ced17a373f87ae ncurses-5.6.ebuild 4440
+MISC ChangeLog 20585 RMD160 672baa571ea427c2801e84a85888132e8a1cc6dd SHA1 82e7f426e1239c0b0c0d465db33150640673af3a SHA256 58eb6c88eaa55616ba95752056f4e1e067afa20a5162f3039034ddced26d1383
+MD5 52ea592a85c74830fb6c82f0cfca3340 ChangeLog 20585
+RMD160 672baa571ea427c2801e84a85888132e8a1cc6dd ChangeLog 20585
+SHA256 58eb6c88eaa55616ba95752056f4e1e067afa20a5162f3039034ddced26d1383 ChangeLog 20585
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -65,10 +62,3 @@ SHA256 aeae266804b5463f9acb8a7ece8f88dfcb520a6b7705011e727b1c0cbe83632d files/di
 MD5 4113e58a2761a788de58821d1058f534 files/digest-ncurses-5.6-r1 500
 RMD160 467579d539f83f3e670698737d5c1a5a2b78a05b files/digest-ncurses-5.6-r1 500
 SHA256 0ebdcdfd302a82613b796db3a2cfce0c7a6319992f7fc9ec80c1301444766042 files/digest-ncurses-5.6-r1 500
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGKyA1ugEuf3OQ0akRAvm8AJwMYibuWUr8UyBR44iIYIA5gCbrwQCdHnEo
-8cfmlGnpGAmcLbanqeA93uM=
-=8d7L
------END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/ncurses-5.5-r3.ebuild b/sys-libs/ncurses/ncurses-5.5-r3.ebuild
index fa2fc4d2ef0d..4c552c870623 100644
--- a/sys-libs/ncurses/ncurses-5.5-r3.ebuild
+++ b/sys-libs/ncurses/ncurses-5.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.5-r3.ebuild,v 1.14 2007/02/21 17:26:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.5-r3.ebuild,v 1.15 2007/04/30 08:59:14 grobian Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -59,16 +59,13 @@ src_compile() {
 do_compile() {
 	ECONF_SOURCE=${S}
 
-	local mylibprefix=""
-	[[ ${CHOST} == *-darwin* ]] && mylibprefix="/usr"
-
 	# We need the basic terminfo files in /etc, bug #37026.  We will
 	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
 	# src_install() ...
 	# The chtype/mmask-t settings below are to retain ABI compat
 	# with ncurses-5.4 so dont change em !
 	econf \
-		--libdir=${mylibprefix}/$(get_libdir) \
+		--libdir="/$(get_libdir)" \
 		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
 		--disable-termcap \
 		--with-shared \
@@ -104,16 +101,14 @@ src_install() {
 	cd "${WORKDIR}"/narrowc
 	make DESTDIR="${D}" install || die "make narrowc install failed"
 
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		# Move static and extraneous ncurses libraries out of /lib
-		dodir /usr/$(get_libdir)
-		cd "${D}"/$(get_libdir)
-		mv lib{form,menu,panel}.so* *.a "${D}"/usr/$(get_libdir)/
-		gen_usr_ldscript lib{,n}curses.so
-		if use unicode ; then
-			mv lib{form,menu,panel}w.so* "${D}"/usr/$(get_libdir)/
-			gen_usr_ldscript lib{,n}cursesw.so
-		fi
+	# Move static and extraneous ncurses libraries out of /lib
+	dodir /usr/$(get_libdir)
+	cd "${D}"/$(get_libdir)
+	mv lib{form,menu,panel}.so* *.a "${D}"/usr/$(get_libdir)/
+	gen_usr_ldscript lib{,n}curses.so
+	if use unicode ; then
+		mv lib{form,menu,panel}w.so* "${D}"/usr/$(get_libdir)/
+		gen_usr_ldscript lib{,n}cursesw.so
 	fi
 
 	# We need the basic terminfo files in /etc, bug #37026
diff --git a/sys-libs/ncurses/ncurses-5.6-r1.ebuild b/sys-libs/ncurses/ncurses-5.6-r1.ebuild
index 1ec5ec73faad..8d14ba2275e1 100644
--- a/sys-libs/ncurses/ncurses-5.6-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-5.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.6-r1.ebuild,v 1.1 2007/04/08 06:57:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.6-r1.ebuild,v 1.2 2007/04/30 08:59:14 grobian Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -58,16 +58,13 @@ src_compile() {
 do_compile() {
 	ECONF_SOURCE=${S}
 
-	local mylibprefix=""
-	[[ ${CHOST} == *-darwin* ]] && mylibprefix="/usr"
-
 	# We need the basic terminfo files in /etc, bug #37026.  We will
 	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
 	# src_install() ...
 	# The chtype/mmask-t settings below are to retain ABI compat
 	# with ncurses-5.4 so dont change em !
 	econf \
-		--libdir=${mylibprefix}/$(get_libdir) \
+		--libdir="/$(get_libdir)" \
 		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
 		--disable-termcap \
 		--with-shared \
@@ -102,16 +99,14 @@ src_install() {
 		emake DESTDIR="${D}" install || die "make widec install failed"
 	fi
 
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		# Move static and extraneous ncurses libraries out of /lib
-		dodir /usr/$(get_libdir)
-		cd "${D}"/$(get_libdir)
-		mv lib{form,menu,panel}.so* *.a "${D}"/usr/$(get_libdir)/
-		gen_usr_ldscript lib{,n}curses.so
-		if use unicode ; then
-			mv lib{form,menu,panel}w.so* "${D}"/usr/$(get_libdir)/
-			gen_usr_ldscript lib{,n}cursesw.so
-		fi
+	# Move static and extraneous ncurses libraries out of /lib
+	dodir /usr/$(get_libdir)
+	cd "${D}"/$(get_libdir)
+	mv lib{form,menu,panel}.so* *.a "${D}"/usr/$(get_libdir)/
+	gen_usr_ldscript lib{,n}curses.so
+	if use unicode ; then
+		mv lib{form,menu,panel}w.so* "${D}"/usr/$(get_libdir)/
+		gen_usr_ldscript lib{,n}cursesw.so
 	fi
 
 	# We need the basic terminfo files in /etc, bug #37026
diff --git a/sys-libs/ncurses/ncurses-5.6.ebuild b/sys-libs/ncurses/ncurses-5.6.ebuild
index 6ca3b5cb4847..300c28d6fdc8 100644
--- a/sys-libs/ncurses/ncurses-5.6.ebuild
+++ b/sys-libs/ncurses/ncurses-5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.6.ebuild,v 1.12 2007/04/22 08:44:35 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.6.ebuild,v 1.13 2007/04/30 08:59:14 grobian Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -57,16 +57,13 @@ src_compile() {
 do_compile() {
 	ECONF_SOURCE=${S}
 
-	local mylibprefix=""
-	[[ ${CHOST} == *-darwin* ]] && mylibprefix="/usr"
-
 	# We need the basic terminfo files in /etc, bug #37026.  We will
 	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
 	# src_install() ...
 	# The chtype/mmask-t settings below are to retain ABI compat
 	# with ncurses-5.4 so dont change em !
 	econf \
-		--libdir=${mylibprefix}/$(get_libdir) \
+		--libdir="/$(get_libdir)" \
 		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
 		--disable-termcap \
 		--with-shared \
@@ -102,16 +99,14 @@ src_install() {
 		emake DESTDIR="${D}" install || die "make widec install failed"
 	fi
 
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		# Move static and extraneous ncurses libraries out of /lib
-		dodir /usr/$(get_libdir)
-		cd "${D}"/$(get_libdir)
-		mv lib{form,menu,panel}.so* *.a "${D}"/usr/$(get_libdir)/
-		gen_usr_ldscript lib{,n}curses.so
-		if use unicode ; then
-			mv lib{form,menu,panel}w.so* "${D}"/usr/$(get_libdir)/
-			gen_usr_ldscript lib{,n}cursesw.so
-		fi
+	# Move static and extraneous ncurses libraries out of /lib
+	dodir /usr/$(get_libdir)
+	cd "${D}"/$(get_libdir)
+	mv lib{form,menu,panel}.so* *.a "${D}"/usr/$(get_libdir)/
+	gen_usr_ldscript lib{,n}curses.so
+	if use unicode ; then
+		mv lib{form,menu,panel}w.so* "${D}"/usr/$(get_libdir)/
+		gen_usr_ldscript lib{,n}cursesw.so
 	fi
 
 	# We need the basic terminfo files in /etc, bug #37026