Clean up build so that we no longer have .a or .la files in /.

Package-Manager: portage-2.0.53_rc7

5 files changed, 47 insertions, 35 deletions

diff --git a/sys-apps/dmapi/ChangeLog b/sys-apps/dmapi/ChangeLog
index 55dda933fc18..9dcc9a0ecaf9 100644
--- a/sys-apps/dmapi/ChangeLog
+++ b/sys-apps/dmapi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/dmapi
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/ChangeLog,v 1.26 2005/04/25 06:34:09 kloeri Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/ChangeLog,v 1.27 2005/11/29 02:22:43 vapier Exp $
+
+  29 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/dmapi-2.2.1-only-symlink-when-needed.patch, dmapi-2.2.1.ebuild:
+  Clean up build so that we no longer have .a or .la files in /.
 
   25 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> dmapi-2.2.1.ebuild:
   Stable on alpha.
diff --git a/sys-apps/dmapi/Manifest b/sys-apps/dmapi/Manifest
index 0362b9b09919..ee4a27757a77 100644
--- a/sys-apps/dmapi/Manifest
+++ b/sys-apps/dmapi/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0642b0cd6a13c17236990affe381a1f3 ChangeLog 3286
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 a683706b0c4600f000dbacabd942e373 dmapi-2.2.1.ebuild 1062
+MD5 45a5713f4a0140b4eb4eb90397f6ffc3 ChangeLog 3475
+MD5 799e08ae5995a0253aa9587b6706a1be dmapi-2.2.1.ebuild 1141
 MD5 c38b511afc9ceb131628d5d903ee3834 files/digest-dmapi-2.2.1 66
+MD5 6204834fe8dda5a8e61bb52b8db06673 files/dmapi-2.2.1-only-symlink-when-needed.patch 836
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC0cJmBXaUFmZvwyMRArixAJ9iwuqyLGjMZ++PKaYMRVtDAjpoeQCfX17Z
-arai+FzQ+pkHFXnC5/LnGc4=
-=RJ+6
+iD8DBQFDi7v/gIKl8Uu19MoRAjQ2AJ9ZeKzqWtdFO7sgOr8C8RuY9DP7FACeJZh7
+R7Vug1QFotKKfXJi77PKlKQ=
+=QYw4
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dmapi/dmapi-2.2.1.ebuild b/sys-apps/dmapi/dmapi-2.2.1.ebuild
index 53af76f42248..2c97dc33e347 100644
--- a/sys-apps/dmapi/dmapi-2.2.1.ebuild
+++ b/sys-apps/dmapi/dmapi-2.2.1.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-apps/dmapi/dmapi-2.2.1.ebuild,v 1.7 2005/07/11 00:50:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/dmapi-2.2.1.ebuild,v 1.8 2005/11/29 02:22:43 vapier Exp $
 
 inherit eutils
 
@@ -17,29 +17,30 @@ DEPEND="sys-fs/xfsprogs"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-only-symlink-when-needed.patch
 	sed -i \
 		-e "/^PKG_DOC_DIR/s:=.*:= /usr/share/doc/${PF}:" \
-		-e 's:^PKG_\(.*\)_DIR[[:space:]]*= \(.*\)$:PKG_\1_DIR = $(DESTDIR)\2:' \
-		include/builddefs.in || die
+		include/builddefs.in \
+		|| die "failed to update builddefs"
 }
 
 src_compile() {
 	use debug \
 		&& export DEBUG=-DDEBUG \
 		|| export DEBUG=-DNDEBUG
-	export OPTIMIZER="${CFLAGS}"
+	export OPTIMIZER=${CFLAGS}
 
-	# Some archs need the PLATFORM var unset
-	unset PLATFORM
-
-	econf \
-		--libdir=/$(get_libdir) \
-		--libexecdir=/usr/$(get_libdir) \
-		|| die
+	econf --libexecdir=/usr/$(get_libdir) || die
 	emake || die
 }
 
 src_install() {
-	make DESTDIR=${D} install install-dev || die
+	make DIST_ROOT="${D}" install install-dev || die
+	prepalldocs
+
+	# move shared libs to /
+	dodir /$(get_libdir)
+	mv "${D}"/usr/$(get_libdir)/libdm.so* "${D}"/$(get_libdir)/ || die
+	gen_usr_ldscript libdm.so
 }
diff --git a/sys-apps/dmapi/files/dmapi-2.2.1-only-symlink-when-needed.patch b/sys-apps/dmapi/files/dmapi-2.2.1-only-symlink-when-needed.patch
new file mode 100644
index 000000000000..387a08352e16
--- /dev/null
+++ b/sys-apps/dmapi/files/dmapi-2.2.1-only-symlink-when-needed.patch
@@ -0,0 +1,18 @@
+We dont want to generate symlinks when the libdir is the same as the
+devlibdir, otherwise we clobber the real files with broken symlinks
+
+--- include/buildmacros
++++ include/buildmacros
+@@ -102,9 +102,11 @@
+ 	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
+ 	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+ 	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
++	if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
+ 	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
+ 	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
+-	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so
++	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
++	fi
+ else
+ INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
+ endif
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 48a6da28299a..3509c2aeab71 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,12 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a6b713632ad06779ad521eb06562edf8 ChangeLog 8405
 MD5 792f6cb13959979de2b10537067603bb files/2.5.1-manpage-line-buffering.patch 477
 MD5 41f77ef6693dc91a37b5ec51ce5a3e2d files/2.5.1-manpage.patch 283
 MD5 16d6cd54c93041d4f4bef59a9e327d04 files/2.5.1-tests.patch 1786
 MD5 e39e9fd198a2c0a5984f2c7d188b3c49 files/2.5.1-utf8-case.patch 933
-MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r6 62
 MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r8 62
 MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r9 62
 MD5 b43c763953a7b7d3345fc0dd625f299c files/grep-2.5.1-fgrep.patch.bz2 1678
@@ -17,14 +13,6 @@ MD5 af3a45582aa7c857f0500c63c823bd52 files/grep-2.5.1-libintl.patch 2662
 MD5 f108b43aae8b2abc6326efa8ab44e8dd files/grep-2.5.1-oi.patch 1695
 MD5 b6da5288895ddd97074deb10f48b4364 files/grep-2.5.1-perl-segv.patch 410
 MD5 1eee743f3bf8a7926c07f9a0307a6b64 files/grep-2.5.1-restrict_arr.patch 410
-MD5 d2f3ae97c78e82789156a70976b35a39 grep-2.5.1-r6.ebuild 2237
-MD5 ff75e5df1dad1b337c9aed5313bc07be grep-2.5.1-r8.ebuild 2085
+MD5 4c998f6d8d6ee9690d26e2ff67138d4b grep-2.5.1-r8.ebuild 2097
 MD5 e853cf278bda1dc5f46c743c9f3fe197 grep-2.5.1-r9.ebuild 2156
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDiMFvgIKl8Uu19MoRArKWAJ9OB3FtXhT/DQUFqchc4JC/jAwOxACcC3BY
-V8WDyu5nfq2rhFnfHYdwJ9g=
-=4N/o
------END PGP SIGNATURE-----