Removed weird darwin hacks

(Portage version: 2.1.2.2)

4 files changed, 35 insertions, 46 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/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