Clean up ebuild and fix install permissions #24178.

Package-Manager: portage-2.0.52-r1 http://ronaldmcnightrider.ytmnd.com/

4 files changed, 77 insertions, 31 deletions

diff --git a/sys-libs/gdbm/ChangeLog b/sys-libs/gdbm/ChangeLog
index 13fbeff06959..697b358c3344 100644
--- a/sys-libs/gdbm/ChangeLog
+++ b/sys-libs/gdbm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/gdbm
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/ChangeLog,v 1.34 2005/09/10 14:55:53 grobian Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/ChangeLog,v 1.35 2005/09/21 23:15:19 vapier Exp $
+
+  21 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/gdbm-1.8.3-fix-install-ownership.patch, gdbm-1.8.3-r1.ebuild:
+  Clean up ebuild and fix install permissions #24178.
 
   10 Sep 2005; Fabian Groffen <grobian@gentoo.org> gdbm-1.8.3-r1.ebuild:
   Replace "uclibctoolize" with "elibtoolize" and add the bin user/group if on
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index f38d71126212..72aea3cea324 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -1,6 +1,17 @@
-MD5 035bd71b9dbef7ba02a7a33de5461a4e gdbm-1.8.3-r1.ebuild 1582
-MD5 22314eff7a4f923601e6dba3863baf3d gdbm-1.8.0-r5.ebuild 1232
-MD5 cc4fb38733aaeb94a7613f61f1c53cb6 ChangeLog 4414
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e77dfc3f70817b0d79d6de1ef72a9262 gdbm-1.8.3-r1.ebuild 1371
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 017b1a2d0ae227d89ee16480e3129a3b files/digest-gdbm-1.8.0-r5 62
+MD5 22314eff7a4f923601e6dba3863baf3d gdbm-1.8.0-r5.ebuild 1232
+MD5 71105d688b424414cf6701315d17d75e ChangeLog 4589
+MD5 9ed34cb95efec19c95fbf28a2e7e0986 files/gdbm-1.8.3-fix-install-ownership.patch 1567
 MD5 c7bef9bbd37f161be399c58c61edef94 files/digest-gdbm-1.8.3-r1 62
+MD5 017b1a2d0ae227d89ee16480e3129a3b files/digest-gdbm-1.8.0-r5 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDMemngIKl8Uu19MoRApnrAJ9u+YoRcBoBdYot/FrIWsZaVAzaKwCcCFio
+tF9nIRcbcuPmsH7KJ5f2y7A=
+=DpBn
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/gdbm/files/gdbm-1.8.3-fix-install-ownership.patch b/sys-libs/gdbm/files/gdbm-1.8.3-fix-install-ownership.patch
new file mode 100644
index 000000000000..970bb7976939
--- /dev/null
+++ b/sys-libs/gdbm/files/gdbm-1.8.3-fix-install-ownership.patch
@@ -0,0 +1,45 @@
+Install with proper ownership.
+
+http://bugs.gentoo.org/24178
+
+--- gdbm/Makefile.in
++++ gdbm/Makefile.in
+@@ -14,10 +14,6 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ 
+-# File ownership and group
+-BINOWN = bin
+-BINGRP = bin
+-
+ MAKEINFO = makeinfo
+ TEXI2DVI = texi2dvi
+ 
+@@ -131,22 +127,17 @@
+ 		$(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \
+ 		$(INSTALL_ROOT)$(infodir)
+ 	$(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
+-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \
+-		$(INSTALL_ROOT)$(includedir)/gdbm.h
+-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
+-		$(INSTALL_ROOT)$(man3dir)/gdbm.3
+-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \
+-		$(INSTALL_ROOT)$(infodir)/gdbm.info
++	$(INSTALL_DATA) gdbm.h $(INSTALL_ROOT)$(includedir)/gdbm.h
++	$(INSTALL_DATA) $(srcdir)/gdbm.3 $(INSTALL_ROOT)$(man3dir)/gdbm.3
++	$(INSTALL_DATA) $(srcdir)/gdbm.info $(INSTALL_ROOT)$(infodir)/gdbm.info
+ 
+ install-compat:
+ 	$(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
+ 		$(INSTALL_ROOT)$(includedir)
+ 	$(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \
+ 		$(INSTALL_ROOT)$(libdir)/libgdbm_compat.la
+-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
+-		$(INSTALL_ROOT)$(includedir)/dbm.h
+-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \
+-		$(INSTALL_ROOT)$(includedir)/ndbm.h
++	$(INSTALL_DATA) $(srcdir)/dbm.h $(INSTALL_ROOT)$(includedir)/dbm.h
++	$(INSTALL_DATA) $(srcdir)/ndbm.h $(INSTALL_ROOT)$(includedir)/ndbm.h
+ 
+ #libgdbm.a: $(OBJS) gdbm.h
+ #	rm -f libgdbm.a
diff --git a/sys-libs/gdbm/gdbm-1.8.3-r1.ebuild b/sys-libs/gdbm/gdbm-1.8.3-r1.ebuild
index 0c673c1efc87..dd390e52800e 100644
--- a/sys-libs/gdbm/gdbm-1.8.3-r1.ebuild
+++ b/sys-libs/gdbm/gdbm-1.8.3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.8.3-r1.ebuild,v 1.15 2005/09/10 14:55:53 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.8.3-r1.ebuild,v 1.16 2005/09/21 23:15:19 vapier Exp $
 
-inherit flag-o-matic eutils libtool
+inherit eutils libtool
 
 DESCRIPTION="Standard GNU database libraries included for compatibility with Perl"
 HOMEPAGE="http://www.gnu.org/software/gdbm/gdbm.html"
@@ -15,49 +15,35 @@ IUSE="berkdb"
 
 DEPEND="berkdb? ( sys-libs/db )"
 
-pkg_setup() {
-	# On OSX there is no user/group bin, see bug #96743
-	if use ppc-macos;
-	then
-		enewgroup bin
-		enewuser bin -1 -1 -1 bin
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	append-flags -fomit-frame-pointer
+	epatch "${FILESDIR}"/${P}-fix-install-ownership.patch #24178
 	elibtoolize
 }
 
 src_compile() {
-	econf || die
-	use berkdb || sed -i '/HAVE_LIBNDBM/s:.*::' autoconf.h
+	use berkdb || export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no
+	econf --includedir=/usr/include/gdbm || die
 	emake || die
 }
 
 src_install() {
-	make INSTALL_ROOT="${D}" install || die
-
-	make \
-		includedir=/usr/include/gdbm \
-		INSTALL_ROOT="${D}" \
-		install-compat || die
-
+	make INSTALL_ROOT="${D}" install install-compat || die
 	dodoc ChangeLog NEWS README
+}
 
+pkg_preinst() {
 	# temp backwards support #32510
 	if [[ -e ${ROOT}/usr/$(get_libdir)/libgdbm.so.2 ]] ; then
-		cp ${ROOT}/usr/$(get_libdir)/libgdbm.so.2 ${D}/usr/$(get_libdir)/
-		touch ${D}/usr/$(get_libdir)/libgdbm.so.2
+		touch "${D}"/usr/$(get_libdir)/libgdbm.so.2
 	fi
 }
 
 pkg_postinst() {
-	if [ -e ${ROOT}/usr/$(get_libdir)/libgdbm.so.2 ] ; then
+	if [[ -e ${ROOT}/usr/$(get_libdir)/libgdbm.so.2 ]] ; then
 		ewarn "Please run revdep-rebuild --soname libgdbm.so.2"
 		ewarn "After that completes, it will be safe to remove the old"
-		ewarn "library (${ROOT}/usr/$(get_libdir)/libgdbm.so.2)."
+		ewarn "library (${ROOT}usr/$(get_libdir)/libgdbm.so.2)."
 	fi
 }