Remove ppc-macos conditional code

(Portage version: 2.1.3.19)

6 files changed, 25 insertions, 75 deletions

diff --git a/dev-lang/lua/lua-5.0.2.ebuild b/dev-lang/lua/lua-5.0.2.ebuild
index ba0af540f367..b3b22550a129 100644
--- a/dev-lang/lua/lua-5.0.2.ebuild
+++ b/dev-lang/lua/lua-5.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.2.ebuild,v 1.25 2007/02/28 22:04:00 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.2.ebuild,v 1.26 2008/01/29 21:24:44 grobian Exp $
 
 inherit eutils portability
 
@@ -21,30 +21,16 @@ src_unpack() {
 
 	epatch ${FILESDIR}/lua-${PV}-pic.patch
 	#epatch ${FILESDIR}/lua-${PV}-LDFLAGS_and_as-needed.patch
-	use ppc-macos && epatch ${FILESDIR}/lua-ppc-macos-Makefile.patch
 
 	cd ${S}
 
-	if ! use ppc-macos; then
-		sed -i config \
-			-e 's:^#\(LOADLIB= -DUSE_DLOPEN=1\):\1:' \
-			-e "s:^#\(DLLIB=\) -ldl:\1 $(dlopen_lib):" \
-			-e 's:^#\(MYLDFLAGS= -Wl,-E\):\1:' \
-			-e "s:^#\(LDFLAGS=\).*:\1 ${LDFLAGS}:" \
-			-e 's:^#\(POPEN= -DUSE_POPEN=1\)$:\1:' \
-			-e "s:^\(MYCFLAGS= \)-O2:\1${CFLAGS}:" \
-			-e 's:^\(INSTALL_ROOT= \)/usr/local:\1$(DESTDIR)/usr:' \
-			-e "s:^\(INSTALL_LIB= \$(INSTALL_ROOT)/\)lib:\1$(get_libdir):" \
-			-e 's:^\(INSTALL_MAN= $(INSTALL_ROOT)\)/man/man1:\1/share/man/man1:'
-	else
-		sed -i config \
-			-e 's:^#\(LOADLIB= -DUSE_DLOPEN=1\):\1:' \
-			-e 's:^#\(DLLIB= -ldl\):\1:' \
-			-e 's:^#\(POPEN= -DUSE_POPEN=1\)$:\1:' \
-			-e "s:^\(MYCFLAGS= \)-O2:\1${CFLAGS}:" \
-			-e 's:^\(INSTALL_ROOT= \)/usr/local:\1/usr:' \
-			-e 's:^\(INSTALL_MAN= $(INSTALL_ROOT)\)/man/man1:\1/share/man/man1:'
-	fi
+	sed -i config \
+		-e 's:^#\(LOADLIB= -DUSE_DLOPEN=1\):\1:' \
+		-e 's:^#\(DLLIB= -ldl\):\1:' \
+		-e 's:^#\(POPEN= -DUSE_POPEN=1\)$:\1:' \
+		-e "s:^\(MYCFLAGS= \)-O2:\1${CFLAGS}:" \
+		-e 's:^\(INSTALL_ROOT= \)/usr/local:\1/usr:' \
+		-e 's:^\(INSTALL_MAN= $(INSTALL_ROOT)\)/man/man1:\1/share/man/man1:'
 
 	sed -i doc/readme.html \
 		-e 's:\(/README\)\("\):\1.gz\2:g'
@@ -74,21 +60,11 @@ EOF
 src_compile() {
 	export PICFLAGS=-fPIC
 	emake || die "emake failed"
-	if use ppc-macos; then
-		# OSX does not have so files.
-		emake dylib dylibbin || die "emake dylib failed"
-	else
-		emake so || die "emake so failed"
-	fi
+	emake so || die "emake so failed"
 }
 
 src_install() {
-	if use ppc-macos; then
-		# OSX does not have so files.
-		make DESTDIR=${D} install dylibinstall || die "make install	dylibinstall failed"
-	else
-		make DESTDIR=${D} install soinstall || die "make install soinstall failed"
-	fi
+	make DESTDIR=${D} install soinstall || die "make install soinstall failed"
 
 	dodoc HISTORY UPDATE
 	dohtml doc/*.html doc/*.gif
diff --git a/dev-lang/lua/lua-5.0.3.ebuild b/dev-lang/lua/lua-5.0.3.ebuild
index af2cbed442e7..40918cb0f109 100644
--- a/dev-lang/lua/lua-5.0.3.ebuild
+++ b/dev-lang/lua/lua-5.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.3.ebuild,v 1.7 2007/02/28 22:04:00 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.3.ebuild,v 1.8 2008/01/29 21:24:44 grobian Exp $
 
 inherit eutils portability
 
@@ -38,8 +38,6 @@ src_unpack() {
 
 	[[ ${ELIBC} != *BSD ]] && sed -i -e 's:^#\(DLLIB= -ldl\):\1:' config
 
-	use ppc-macos || sed -i -e 's:^#\(MYLDFLAGS= -Wl,-E\):\1:' config
-
 	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
 
 	if use readline ; then
@@ -66,21 +64,13 @@ EOF
 
 src_compile() {
 	emake || die "emake failed"
-	if use ppc-macos; then
-		emake dylib || die "emake dylib failed"
-	else
-		emake so || die "emake so failed"
-	fi
+	emake so || die "emake so failed"
 	mv bin/lua test/lua.static
 	emake sobin || die "emake sobin failed"
 }
 
 src_install() {
-	if use ppc-macos; then
-		make DESTDIR="${D}" install dylibinstall || die "make install dylibinstall failed"
-	else
-		make DESTDIR="${D}" install soinstall || die "make install soinstall failed"
-	fi
+	make DESTDIR="${D}" install soinstall || die "make install soinstall failed"
 
 	dodoc HISTORY UPDATE
 	dohtml doc/*.html doc/*.gif
diff --git a/dev-lang/lua/lua-5.1.1-r2.ebuild b/dev-lang/lua/lua-5.1.1-r2.ebuild
index 053230bee16d..fe461ba1e876 100644
--- a/dev-lang/lua/lua-5.1.1-r2.ebuild
+++ b/dev-lang/lua/lua-5.1.1-r2.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/dev-lang/lua/lua-5.1.1-r2.ebuild,v 1.15 2007/06/24 23:55:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.1-r2.ebuild,v 1.16 2008/01/29 21:24:44 grobian Exp $
 
 inherit eutils portability versionator
 
@@ -45,12 +45,8 @@ src_compile() {
 	myflags=
 	# what to link to liblua
 	liblibs="-lm"
-	if use ppc-macos; then
-		mycflags="${mycflags} -DLUA_USE_MACOSX"
-	else # building for standard linux (and bsd too)
-		mycflags="${mycflags} -DLUA_USE_LINUX"
-		liblibs="${liblibs} $(dlopen_lib)"
-	fi
+	mycflags="${mycflags} -DLUA_USE_LINUX"
+	liblibs="${liblibs} $(dlopen_lib)"
 
 	# what to link to the executables
 	mylibs=
diff --git a/dev-lang/lua/lua-5.1.2-r1.ebuild b/dev-lang/lua/lua-5.1.2-r1.ebuild
index 929db0027148..6247177105ca 100644
--- a/dev-lang/lua/lua-5.1.2-r1.ebuild
+++ b/dev-lang/lua/lua-5.1.2-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/dev-lang/lua/lua-5.1.2-r1.ebuild,v 1.2 2007/06/24 23:55:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.2-r1.ebuild,v 1.3 2008/01/29 21:24:44 grobian Exp $
 
 inherit eutils portability versionator
 
@@ -48,12 +48,8 @@ src_compile() {
 	myflags=
 	# what to link to liblua
 	liblibs="-lm"
-	if use ppc-macos; then
-		mycflags="${mycflags} -DLUA_USE_MACOSX"
-	else # building for standard linux (and bsd too)
-		mycflags="${mycflags} -DLUA_USE_LINUX"
-		liblibs="${liblibs} $(dlopen_lib)"
-	fi
+	mycflags="${mycflags} -DLUA_USE_LINUX"
+	liblibs="${liblibs} $(dlopen_lib)"
 
 	# what to link to the executables
 	mylibs=
diff --git a/dev-lang/lua/lua-5.1.2-r2.ebuild b/dev-lang/lua/lua-5.1.2-r2.ebuild
index 95d7bccfab7e..006b81713c02 100644
--- a/dev-lang/lua/lua-5.1.2-r2.ebuild
+++ b/dev-lang/lua/lua-5.1.2-r2.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/dev-lang/lua/lua-5.1.2-r2.ebuild,v 1.1 2007/09/18 08:14:28 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.2-r2.ebuild,v 1.2 2008/01/29 21:24:44 grobian Exp $
 
 inherit eutils portability versionator
 
@@ -48,12 +48,8 @@ src_compile() {
 	myflags=
 	# what to link to liblua
 	liblibs="-lm"
-	if use ppc-macos; then
-		mycflags="${mycflags} -DLUA_USE_MACOSX"
-	else # building for standard linux (and bsd too)
-		mycflags="${mycflags} -DLUA_USE_LINUX"
-		liblibs="${liblibs} $(dlopen_lib)"
-	fi
+	mycflags="${mycflags} -DLUA_USE_LINUX"
+	liblibs="${liblibs} $(dlopen_lib)"
 
 	# what to link to the executables
 	mylibs=
diff --git a/dev-lang/lua/lua-5.1.2.ebuild b/dev-lang/lua/lua-5.1.2.ebuild
index 7ca69ebd935c..d4445647e5cf 100644
--- a/dev-lang/lua/lua-5.1.2.ebuild
+++ b/dev-lang/lua/lua-5.1.2.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/dev-lang/lua/lua-5.1.2.ebuild,v 1.2 2007/06/24 23:55:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.2.ebuild,v 1.3 2008/01/29 21:24:44 grobian Exp $
 
 inherit eutils portability versionator
 
@@ -45,12 +45,8 @@ src_compile() {
 	myflags=
 	# what to link to liblua
 	liblibs="-lm"
-	if use ppc-macos; then
-		mycflags="${mycflags} -DLUA_USE_MACOSX"
-	else # building for standard linux (and bsd too)
-		mycflags="${mycflags} -DLUA_USE_LINUX"
-		liblibs="${liblibs} $(dlopen_lib)"
-	fi
+	mycflags="${mycflags} -DLUA_USE_LINUX"
+	liblibs="${liblibs} $(dlopen_lib)"
 
 	# what to link to the executables
 	mylibs=