DEPEND on x11-libs/gdk-pixbuf too.

(Portage version: 2.2.0_alpha28/cvs/Linux i686)

5 files changed, 24 insertions, 78 deletions

diff --git a/net-misc/packETH/ChangeLog b/net-misc/packETH/ChangeLog
index 0768dc6d81da..1d915a775d41 100644
--- a/net-misc/packETH/ChangeLog
+++ b/net-misc/packETH/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/packETH
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/packETH/ChangeLog,v 1.13 2011/03/24 17:24:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/packETH/ChangeLog,v 1.14 2011/03/24 17:44:58 jer Exp $
+
+  24 Mar 2011; Jeroen Roovers <jer@gentoo.org> packETH-1.7.1.ebuild,
+  +files/packETH-1.7.1-gdk-pixbuf.patch:
+  DEPEND on x11-libs/gdk-pixbuf too.
 
 *packETH-1.7.1 (24 Mar 2011)
 
diff --git a/net-misc/packETH/files/packETH-1.7.1-gdk-pixbuf.patch b/net-misc/packETH/files/packETH-1.7.1-gdk-pixbuf.patch
new file mode 100644
index 000000000000..3dac1b825e92
--- /dev/null
+++ b/net-misc/packETH/files/packETH-1.7.1-gdk-pixbuf.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2010-10-05 18:28:18.000000000 +0200
++++ configure.ac	2011-03-24 18:35:57.000000000 +0100
+@@ -20,7 +20,7 @@
+ AC_CHECK_HEADERS([libintl.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h sys/timeb.h unistd.h])
+ 
+ # We need GTK
+-pkg_modules="gtk+-2.0 >= 2.4 glib-2.0 >= 2.4 gthread-2.0 >= 2.4"
++pkg_modules="gtk+-2.0 >= 2.4 glib-2.0 >= 2.4 gthread-2.0 >= 2.4 gdk-pixbuf-2.0"
+ PKG_CHECK_MODULES(DEPS, [$pkg_modules])
+ 
+ # Checks for library functions.
diff --git a/net-misc/packETH/packETH-1.6.5.ebuild b/net-misc/packETH/packETH-1.6.5.ebuild
deleted file mode 100644
index b834d6f06287..000000000000
--- a/net-misc/packETH/packETH-1.6.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/packETH/packETH-1.6.5.ebuild,v 1.3 2011/03/24 17:15:33 jer Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs autotools
-
-DESCRIPTION="Packet generator tool for ethernet"
-HOMEPAGE="http://packeth.sourceforge.net/"
-SRC_URI="mirror://sourceforge/packeth/${P}.tar.bz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="
-	dev-util/pkgconfig
-	${RDEPEND}
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-forced-as-needed.patch"
-	eautomake
-}
-
-src_compile() {
-	tc-export CC
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README || die
-}
diff --git a/net-misc/packETH/packETH-1.7.1.ebuild b/net-misc/packETH/packETH-1.7.1.ebuild
index 5ed3d16740ab..a4e3f18acc56 100644
--- a/net-misc/packETH/packETH-1.7.1.ebuild
+++ b/net-misc/packETH/packETH-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/packETH/packETH-1.7.1.ebuild,v 1.1 2011/03/24 17:24:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/packETH/packETH-1.7.1.ebuild,v 1.2 2011/03/24 17:44:58 jer Exp $
 
 EAPI="2"
 
@@ -15,7 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="x11-libs/gtk+:2"
+RDEPEND="
+	x11-libs/gtk+:2
+	x11-libs/gdk-pixbuf
+"
 DEPEND="
 	dev-util/pkgconfig
 	${RDEPEND}
@@ -24,7 +27,9 @@ DEPEND="
 S="${WORKDIR}/${P/.1}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.6.5-forced-as-needed.patch"
+	epatch \
+		"${FILESDIR}/${PN}-1.6.5-forced-as-needed.patch" \
+		"${FILESDIR}/${P}-gdk-pixbuf.patch"
 	eautomake
 }
 
diff --git a/net-misc/packETH/packETH-1.7.ebuild b/net-misc/packETH/packETH-1.7.ebuild
deleted file mode 100644
index b06d618f3fca..000000000000
--- a/net-misc/packETH/packETH-1.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/packETH/packETH-1.7.ebuild,v 1.2 2011/03/24 17:15:33 jer Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs autotools
-
-DESCRIPTION="Packet generator tool for ethernet"
-HOMEPAGE="http://packeth.sourceforge.net/"
-SRC_URI="mirror://sourceforge/packeth/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="
-	dev-util/pkgconfig
-	${RDEPEND}
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.6.5-forced-as-needed.patch"
-	eautomake
-}
-
-src_compile() {
-	tc-export CC
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README || die
-}