QA: do not try to guess whether the package will work with the kernel or not; cross-compilation is common and this doesn't even look entirely right; don't execute econf during src_unpack phase.

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

4 files changed, 32 insertions, 30 deletions

diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index 94dfe2a02647..05f2047ee977 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/ulogd
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.65 2010/10/15 19:33:54 wormo Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.66 2011/07/02 10:27:29 flameeyes Exp $
+
+  02 Jul 2011; Diego E. Pettenò <flameeyes@gentoo.org> ulogd-1.23-r1.ebuild,
+  ulogd-1.24-r2.ebuild:
+  QA: do not try to guess whether the package will work with the kernel or not;
+  cross-compilation is common and this doesn't even look entirely right; don't
+  execute econf during src_unpack phase.
 
   15 Oct 2010; Stephanie Lockwood-Childs <wormo@gentoo.org>
   -files/ulogd-1.23-configure.in.patch, -files/configure-fixes.patch:
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 5a6bcc29770f..5c00381044ef 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ulogd 744 RMD160 9ed4cb7f7b9defb34437fbd83ad417964b2b14e0 SHA1 38021198683944468f14c70228980314a1379151 SHA256 61185f9136ecf1a5a0fb5bafcaf156202c4581cda8ee1b9d1bde7dbd477988f8
 AUX ulogd-0.98 681 RMD160 fa4a7448519339d561a2ab958e8d52a460bca023 SHA1 21a1fdebc687d010a3d1a83248c3cf43b04a5dbc SHA256 ee598c0de45e4af05ec459902a9f13fa607c9df158ff52ef393c86e99ec9285b
 AUX ulogd-1.23-gcc41.patch 848 RMD160 40c38db24ef5917794b4994f8b86db344c6f9eb9 SHA1 b031edf49d329cdaf9209dcd2b902b89789a5002 SHA256 9453360a7c1e189df892e87f0f553a156eaea462641ade3e5db328c5fd208819
@@ -7,8 +10,15 @@ DIST ulogd-1.24.tar.bz2 177398 RMD160 e46c886af5bcec96775ec3516ae5a45d77e9bdb9 S
 DIST ulogd-2.0.0beta4.tar.bz2 354526 RMD160 9208fcbd0d637ae1c99822dba67a2311dc28826d SHA1 92f9bbd6dfd5b72673c392fa6ccd6cc7ff811f24 SHA256 f29a75b87e2da6284a6e52a359c9d9e1f7c14b6dd96a4cd1b68f18a91f48e7a2
 DIST ulogd-glsa-200701.patch.bz2 5279 RMD160 2b119c5e6b41672923246743d32dd8d14edc9cfc SHA1 d48d1e8f6f7fded03cd6d831f4027f16833153df SHA256 7b37b10e68761423f2fbf1b0ec15433c1364f8e27c7a8572b094450a7cb963ea
 DIST ulogd-glsa-200805.patch.bz2 11649 RMD160 258877d03e6420e39d932ed1946e4ecf655abfe8 SHA1 b385116d4a24fad08317e5eddbbf98998e636626 SHA256 144426251c151f9cbd48931540865da11ff5cafd5039d1b4db46dba505aaebb7
-EBUILD ulogd-1.23-r1.ebuild 1801 RMD160 aaea016a37fc7da1af90f82d066469a0ba41c1b1 SHA1 cd3d96e28413a84c78dacae4b81619be838a50b8 SHA256 8f13b6689dc1ec58aad3e46876e4f7d5b25fdcdc4c1af7e46e8d315d43960884
-EBUILD ulogd-1.24-r2.ebuild 3200 RMD160 c723a0cf8be41070f2ce4af5eee72bae99d1a2b1 SHA1 0392afdef4d4ace8f966d06548b34933dddbd164 SHA256 4d88874c031b62fa1e7cfe0ffe83df2e7b87e9234bdc2c37914dc06740acf7d7
+EBUILD ulogd-1.23-r1.ebuild 1505 RMD160 f440d5c41ea2853a3ad629b9ec344ac497a77846 SHA1 005afb73c39bf5de48103c55d2c03b28ac266775 SHA256 6f442663652ae190c0105ece8549f17e373919111d1d35dd8ea81906b616e339
+EBUILD ulogd-1.24-r2.ebuild 2831 RMD160 29a65d87b1da018b5f37fa5cb7ada9611079489e SHA1 2aa4ca0736446f84ad94defac322a434d70a27d1 SHA256 41cda05693654d4c17e03ae1f3021635e5a3bc9d394d417bf637cdaeb557efbd
 EBUILD ulogd-2.0.0_beta4.ebuild 2210 RMD160 966d1553e2095124dc528bfe8a834b5c21abdafd SHA1 813438bc17a205074f7e6a18ddaafc7b2fe4445f SHA256 b9f1923e41683e85ae1bfc78bd44d4d2b056b5eab8bbdac8c801f86cc8b8cc20
-MISC ChangeLog 10854 RMD160 35396f0a3651b22c10c834faada303d3bd2559de SHA1 e00b928ededea0136c4ce094f694952c9502aeeb SHA256 31307ac920dceddc6b704a37782ffe437f134bfec20016bd73442d1b4cfb81d4
+MISC ChangeLog 11161 RMD160 6d696fb84f53325dc83bb16c690270c0d836b6cf SHA1 49b5078387b9e3827c9ebe5153963d6580a700ef SHA256 b1a961f817e89f02c5d2fb56c94ab01003bc4c6de6f1c02d5487dd6b1e3c5863
 MISC metadata.xml 652 RMD160 23706f56c049f16cca45951bb722d1ead5272bea SHA1 3741f428522626bd92878bfb087540c6e97baf31 SHA256 a99faca17715ced900841407711595e7b67e41bb68645ebaac124db5a2a55f6c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4O8okACgkQAiZjviIA2Xj5EACgrgZv7tALohkmXfahScUhFz0c
+eLMAnRuO6AGebTQYGOBOZRSQWMlAwuju
+=aG7h
+-----END PGP SIGNATURE-----
diff --git a/app-admin/ulogd/ulogd-1.23-r1.ebuild b/app-admin/ulogd/ulogd-1.23-r1.ebuild
index 22c6888dd3d1..ca00c6b5f43d 100644
--- a/app-admin/ulogd/ulogd-1.23-r1.ebuild
+++ b/app-admin/ulogd/ulogd-1.23-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.23-r1.ebuild,v 1.8 2010/10/07 15:45:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.23-r1.ebuild,v 1.9 2011/07/02 10:27:29 flameeyes Exp $
 
-inherit eutils flag-o-matic linux-info
+inherit eutils flag-o-matic
 
 DESCRIPTION="iptables daemon for ULOG target for userspace iptables filter logging"
 SRC_URI="http://ftp.netfilter.org/pub/ulogd/${P}.tar.bz2
@@ -18,14 +18,6 @@ DEPEND="net-firewall/iptables
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-server )"
 
-pkg_setup() {
-	# can't depend on supported kernel versions because dependencies
-	# on virtuals are not versioned
-	linux-info_pkg_setup
-	kernel_is lt 2 6 14 && die "requires at least 2.6.14 kernel version"
-	kernel_is ge 2 6 31 && die "kernel version is too new -- try a newer ulogd"
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
diff --git a/app-admin/ulogd/ulogd-1.24-r2.ebuild b/app-admin/ulogd/ulogd-1.24-r2.ebuild
index 9656b094e989..2dce4e352f0e 100644
--- a/app-admin/ulogd/ulogd-1.24-r2.ebuild
+++ b/app-admin/ulogd/ulogd-1.24-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.24-r2.ebuild,v 1.4 2010/10/07 15:45:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.24-r2.ebuild,v 1.5 2011/07/02 10:27:29 flameeyes Exp $
 
 EAPI="1"
 
-inherit eutils flag-o-matic autotools linux-info
+inherit eutils flag-o-matic autotools
 
 DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
 HOMEPAGE="http://netfilter.org/projects/ulogd/index.html"
@@ -24,12 +24,6 @@ RDEPEND="${DEPEND}
 	net-libs/libpcap"
 
 pkg_setup() {
-	# can't depend on supported kernel versions because dependencies
-	# on virtuals are not versioned
-	linux-info_pkg_setup
-	kernel_is lt 2 6 14 && die "requires at least 2.6.14 kernel version"
-	kernel_is ge 2 6 31 && die "kernel version is too new -- try a newer ulogd"
-
 	enewgroup ulogd
 	enewuser ulogd -1 -1 /var/log/ulogd ulogd
 }
@@ -54,8 +48,10 @@ src_unpack() {
 		sed -i -e 's/$(LD)/$(CC) -nostartfiles/' $f || die "failed to update $f"
 	done
 
-	ewarn "Regenerating build system (this may take a bit)..."
-	eautoconf || die "Autoreconf failed"
+	eautoconf
+}
+
+src_compile() {
 	econf \
 		$(use_with mysql) \
 		$(use_with postgres pgsql) \
@@ -64,9 +60,7 @@ src_unpack() {
 
 	# Configure uses incorrect syntax for ld
 	use mysql && sed -i -e "s:-Wl,::g;s:-rdynamic::g" Rules.make
-}
 
-src_compile() {
 	# not parallel make safe: bug #128976
 	emake -j1 || die "make failed"
 }
@@ -87,7 +81,7 @@ src_install() {
 	use mysql  && UsedServices+=" mysql"
 	use postgres && UsedServices+=" postgresql"
 	if  [[ ${UsedServices} = "use" ]]; then
-	    UsedServices=""
+		UsedServices=""
 	fi
 	sed -i -e "s:use mysql:${UsedServices}:g" "${D}/etc/init.d/ulogd" || die "sed failed"