Drop autotools-utils, fix up SRC_URI mirror, add USE=zlib, and touch up style.

Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64

3 files changed, 26 insertions, 28 deletions

diff --git a/sys-apps/man-db/ChangeLog b/sys-apps/man-db/ChangeLog
index 6ce4ab9038c7..a747ed5b6b4a 100644
--- a/sys-apps/man-db/ChangeLog
+++ b/sys-apps/man-db/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/man-db
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-db/ChangeLog,v 1.23 2011/07/09 16:41:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-db/ChangeLog,v 1.24 2011/11/27 18:35:39 vapier Exp $
+
+  27 Nov 2011; Mike Frysinger <vapier@gentoo.org> man-db-2.6.0.2.ebuild:
+  Drop autotools-utils, fix up SRC_URI mirror, add USE=zlib, and touch up
+  style.
 
   09 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> man-db-2.6.0.2.ebuild:
   Marked ~ppc64 wrt #371687
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 150d404213df..a09f0ee11019 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,19 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX man-db-2.6.0.2-flock.h.patch 1339 RMD160 f035ff42289922a3a2a53df93beab03e2defcee4 SHA1 93d2affc08e75ad06c79a2344423ec6aee8311e9 SHA256 8952602bf0abd75a11e786ce89bfac1283800012403cf75dd2b97d87200ed9aa
 DIST man-db-2.5.9.tar.gz 2367799 RMD160 4ab6035559ff2b5181174a8b95abcb9c482df1ce SHA1 e307ec4c440b82c20c9c20984852046d01426333 SHA256 c657865c3ec7ce4bd94064602b12358d0037ba938da450d7a524504f60be20f1
 DIST man-db-2.6.0.2.tar.gz 2377869 RMD160 063d3ebecad584ec1c56d7f0ef563bf5da857a3d SHA1 864e79e9369f993bfce0934132d41f29a687a6f4 SHA256 537bdb60b12c7d34aa21c397024a6d604c5130b61f9aff5554ab443329b728a7
 EBUILD man-db-2.5.9.ebuild 1180 RMD160 37e4ac0bec09458d415b88d1f5dcece8f82dd2b1 SHA1 5a220210de351e97544a230b49bff440f1f595eb SHA256 af5dd42da03725fb92c7aeb9f997a19d59ee6b21924a7ddb5e55a0981109eb80
-EBUILD man-db-2.6.0.2.ebuild 1407 RMD160 0e86f4af0fca9dd3fb4d9837a01d1d170c5f8012 SHA1 b7d1e8f0eed14f2339607a2284e5a18f73439b3e SHA256 ad8a349d41fc8cec21d2a86b54d2d9725275cb5753b55de8ff5aa75810ea5e74
-MISC ChangeLog 3715 RMD160 01217d302e66880e86a4d48c84cf2ac3ebbbb181 SHA1 d3a3f6cfa864e20aeb8811438fc8ac23c0768769 SHA256 98fb7fba8ced50097f207d30de5077b67c674fa7b2c92eb1be9c29a820c90495
+EBUILD man-db-2.6.0.2.ebuild 1480 RMD160 56ef4f21469c740ea6bfbc8f6f46dc24867e5a55 SHA1 7c467a70fad68e5e0b241dba422b9c85e0ce9e49 SHA256 206118eca41b261d0dce8332fae50b8ad302c77890f662ed3e9d654e5f323076
+MISC ChangeLog 3868 RMD160 3c4cdca1a7ea846b08e92b6e2def5bb25a85e1b8 SHA1 fadea9b2e937cb4896ca2814386c9ad35b4f243a SHA256 0d7b9af20b445b54b2431b2188630aa70e24d2578fde457ec0988552a3b49ba5
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk4YhMoACgkQIiMqcbOVdxQcGQP/VqkRaaIOIiGk/yD5NyIxbnK4
-ujFGcKL28EvAilZ7UZgtIutEOK7vERYOx8dqa6cCS3A8ElezAZ1j/j8pr473PyEg
-TRXeNIEg8Nucp5zT7bX64cWrvRcRYkGc66orTj26UQBdnfkZ326fflO2hjtLjd59
-rQISL7IGJMOeZnmZQ/c=
-=g7ix
+iF4EAREIAAYFAk7SgxgACgkQaC/OocHi7JYRQgD9Gkk5wzaOH5Gjs4CuFywdzDYR
+4PZGnR9FRHlUBOWL16cA+wSJK+2yUI13+4v39bdcyhrLNJhPUIpnTvXBEJ7CBf2T
+=/6jt
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/man-db/man-db-2.6.0.2.ebuild b/sys-apps/man-db/man-db-2.6.0.2.ebuild
index cb526905fd0c..07b00b75cfa0 100644
--- a/sys-apps/man-db/man-db-2.6.0.2.ebuild
+++ b/sys-apps/man-db/man-db-2.6.0.2.ebuild
@@ -1,55 +1,51 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-db/man-db-2.6.0.2.ebuild,v 1.8 2011/07/09 16:41:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-db/man-db-2.6.0.2.ebuild,v 1.9 2011/11/27 18:35:39 vapier Exp $
 
 EAPI="2"
 
-inherit autotools-utils eutils
+inherit eutils
 
 DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
 HOMEPAGE="http://www.nongnu.org/man-db/"
-SRC_URI="http://download.savannah.nongnu.org/releases/man-db/${P}.tar.gz"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="berkdb +gdbm nls static-libs"
+IUSE="berkdb +gdbm nls static-libs zlib"
 
-RDEPEND="
-	dev-libs/libpipeline
+RDEPEND="dev-libs/libpipeline
 	berkdb? ( sys-libs/db )
 	gdbm? ( sys-libs/gdbm )
 	!berkdb? ( !gdbm? ( sys-libs/gdbm ) )
 	|| ( sys-apps/groff >=app-doc/heirloom-doctools-080407-r2 )
-	!sys-apps/man
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
+	zlib? ( sys-libs/zlib )
+	!sys-apps/man"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
 
 pkg_setup() {
+	# Create user now as Makefile in src_install does setuid/chown
 	enewgroup man 15
 	enewuser man 13 -1 /usr/share/man man
 }
 
 src_prepare() {
-	# bug #371937
-	epatch "${FILESDIR}"/${PN}-2.6.0.2-flock.h.patch
+	epatch "${FILESDIR}"/${PN}-2.6.0.2-flock.h.patch #371937
 }
 
 src_configure() {
-	local db="gdbm"
-	use berkdb && ! use gdbm && db="db"
+	export ac_cv_lib_z_gzopen=$(usex zlib)
 	econf \
 		--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x" \
 		$(use_enable nls) \
 		$(use_enable static-libs static) \
-		--with-db=${db}
+		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
 }
 
 src_install() {
 	emake install DESTDIR="${D}" || die
 	dodoc README ChangeLog NEWS docs/{HACKING,TODO}
-	use static-libs || remove_libtool_files
+	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
 }