Clean up and add ppc64 KEYWORDS.

(Portage version: 2.0.51.19)

2 files changed, 22 insertions, 26 deletions

diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog
index e397ab1ff75e..9cbeb8cde5b9 100644
--- a/sys-fs/xfsprogs/ChangeLog
+++ b/sys-fs/xfsprogs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/xfsprogs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.31 2005/03/20 00:06:43 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.32 2005/03/30 00:25:46 vapier Exp $
+
+  30 Mar 2005; Mike Frysinger <vapier@gentoo.org> xfsprogs-2.6.25.ebuild:
+  Clean up and add ppc64 KEYWORDS.
 
   20 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> xfsprogs-2.6.25.ebuild:
   Stable on alpha.
diff --git a/sys-fs/xfsprogs/xfsprogs-2.6.25.ebuild b/sys-fs/xfsprogs/xfsprogs-2.6.25.ebuild
index 482eb5802972..b623b3802827 100644
--- a/sys-fs/xfsprogs/xfsprogs-2.6.25.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-2.6.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.6.25.ebuild,v 1.10 2005/03/20 00:06:43 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.6.25.ebuild,v 1.11 2005/03/30 00:25:46 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,14 +10,12 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ~sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ~ppc64 ~sparc x86"
 IUSE="nls uclibc"
 
-RDEPEND="virtual/libc
-	sys-fs/e2fsprogs"
+RDEPEND="sys-fs/e2fsprogs"
 DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	>=sys-apps/sed-4"
+	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
@@ -26,12 +24,17 @@ src_unpack() {
 	# temp work around till a _syscall6() exists. bug #73855
 	use uclibc && epatch ${FILESDIR}/2.6.25-uclibc-fadvise.patch
 
+	# Inject our own CFLAGS / docpath
 	sed -i \
 		-e '/^GCFLAGS/s:-O1::' \
 		-e "/^PKG_DOC_DIR/s:=.*:= /usr/share/doc/${PF}:" \
-		-e '/^PKG_[[:upper:]]*_DIR/s:= := $(DESTDIR):' \
 		include/builddefs.in \
 		|| die "sed include/builddefs.in failed"
+	# make sure the PLATFORM envvar doesn't break crap
+	sed -i -e '/PLATFORM/d' configure || die "sed PLATFORM"
+	# We'll handle /lib versus /usr/lib install
+	sed -i -e '/INSTALL.* -S .*LIBNAME/d' \
+		include/buildmacros || die "sed symlinks"
 }
 
 src_compile() {
@@ -39,35 +42,25 @@ src_compile() {
 	export OPTIMIZER="${CFLAGS}"
 	export DEBUG=-DNDEBUG
 
-	# Some archs need the PLATFORM var unset 
-	if hasq ${ARCH} mips ppc sparc; then
-		unset PLATFORM
-	fi
-
 	econf \
 		--bindir=/bin \
 		--sbindir=/sbin \
-		--libdir=/lib \
-		--libexecdir=/lib \
+		--libexecdir=/usr/$(get_libdir) \
 		$(use_enable nls gettext) \
 		|| die "config failed"
 	emake || die
 }
 
 src_install() {
-	make \
-		DESTDIR=${D} \
-		DK_INC_DIR=${D}/usr/include/disk \
+	make DIST_ROOT="${D}" \
 		install install-dev \
 		|| die "make install failed"
-	dosym /lib/libhandle.so.1 /lib/libhandle.so
 
-	dodir /usr/lib
-	sed \
-		-e 's:installed=no:installed=yes:g' \
-		${S}/libhandle/.libs/libhandle.la \
-		> ${D}/usr/lib/libhandle.la \
-		|| die "sed failed"
-	mv ${D}/lib/*.a ${D}/usr/lib/ || die "mv failed"
+	# shared in /lib, static in /usr/lib, ldscript fun too
+	dodir /$(get_libdir)
+	mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)/
+	dosym libhandle.so.1 /$(get_libdir)/libhandle.so
+	gen_usr_ldscript libhandle.so
+
 	prepalldocs
 }