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.

(Portage version: 2.2.0_alpha42/cvs/Linux x86_64)

3 files changed, 19 insertions, 27 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/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"