DEPEND on x11-libs/gdk-pixbuf too.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux i686

6 files changed, 30 insertions, 87 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/Manifest b/net-misc/packETH/Manifest
index aecf40982f8b..64e86548d750 100644
--- a/net-misc/packETH/Manifest
+++ b/net-misc/packETH/Manifest
@@ -4,20 +4,17 @@ Hash: SHA1
 AUX packETH-1.6.3-gentoo.patch 1196 RMD160 b4b35c6ad8b82829c12e2a556733c3ff5d6e8a58 SHA1 626d889bb5232ff5da788ec4b1ed35bb4f724878 SHA256 350ad570ea93e618284c0ca32be0eb734f1388ae6a3945e0acc5fa4bc597e057
 AUX packETH-1.6.3-pixmaps.patch 479 RMD160 72248dc086818eb6b041212957c79589f618192f SHA1 0ba023c76f1314dde095d1f714e8a3f66b8caba5 SHA256 fe9f7b4ecded9c7b05f04b2ad3eebaecf62400206ff4ce09f728169d04a2942f
 AUX packETH-1.6.5-forced-as-needed.patch 261 RMD160 9a604c4e1589cbea61183254672f2a9fdafce004 SHA1 4e5c75a0e15de796e8455d54c9344a7b3244f027 SHA256 267682e1ab00ffb1b5a6761fef57eade3f0172fbc654e6c0720d62fc15c4544d
+AUX packETH-1.7.1-gdk-pixbuf.patch 496 RMD160 8a2559d871051eb8e4f703b76410ebab250ace48 SHA1 f3a599a4678edc6cf5559baeb7a51d876a1cd133 SHA256 19d63154db5c87dbc51a81cbb0654a665104cb6eea1e133a24e672f1d3ac34d7
 DIST packETH-1.6.3.tar.gz 204102 RMD160 1680795a21a7d5df7556986b9081fc3d48a1e99e SHA1 322bdd48bc1a334fb5f09278ab32ad67f45f3d02 SHA256 d1c74c609184fe9bd076d5ec434587cb7f9ea86c139e3aa012679fd6e647ae77
-DIST packETH-1.6.5.tar.bz 212613 RMD160 e31a3087dd587839df5586f5164d5cbda4d18533 SHA1 1d06843779ed73e37544c7aceed811e4fab28db6 SHA256 062cfde5868b696a813af1ffa35981fd403af44b6df8a05906d0ea3ef8a73ea5
 DIST packETH-1.7.1.tar.bz2 397224 RMD160 3787c4e90e4668b3a1d0b74c35ebe5226fced130 SHA1 2f807483389833d214bffae0a775fe54a074f565 SHA256 0458e223def847d3450837db77885f3a94cd14d776b08419c91e2fbfcef58067
-DIST packETH-1.7.tar.bz2 377410 RMD160 682485ecddc6d6886ecb0ec2b031589ece664872 SHA1 97967ba0d0a000537f56bff09311f6dcb413d610 SHA256 96f7629ac70bdfebf23d24a0404d66b45df36c78e119cc4fa82553d242162453
 EBUILD packETH-1.6.3.ebuild 829 RMD160 e14e6950a57b5945e9223e0a2b0a82f904d42a37 SHA1 50d2c6760281497ba107ff2fe0cc39f7c58bf230 SHA256 44f5fc076ba0846a59af24c0ced16a873b22c12841f4ddd7715bfa310e578f9d
-EBUILD packETH-1.6.5.ebuild 746 RMD160 fa05e9d85d2ec73153fdfeb9521187f09f28eeba SHA1 c15e49f9fdb5005b4372fd5cf6ae212114c2092e SHA256 10aef6b284774d5a353b8dccde7701ac2655e0072531b969b33a73611d407c59
-EBUILD packETH-1.7.1.ebuild 778 RMD160 91a7be781826bfda665b686e81cb81a38e45ce44 SHA1 0b63a90bbab4938fa78042f2b87fe25cb1f7e0dd SHA256 09e48f224df1a3b29df7f2203ec82be42d45e9056313e458c2898564b3662cc5
-EBUILD packETH-1.7.ebuild 752 RMD160 949cee8dea8a83c3a2c60088b52c336172e9d822 SHA1 58f5f972c435a84fa24a8bd952db94e74bb996d0 SHA256 d246b2f53e257a18a9b38b4fc57935f818fdfe4a786871a66f452a03879d3f1b
-MISC ChangeLog 2210 RMD160 6a0b212a22a1e1634c12109436ead352069acd99 SHA1 d1620e023c6f16b1b31e82937efed15cf5903225 SHA256 3440a3200b1b8d897efe1049fb87b5959adc3ed7bccc3f88ebd8548ae610b45a
+EBUILD packETH-1.7.1.ebuild 846 RMD160 572d91a93a4a8adda2f80c2e9dbf8c505b9aee89 SHA1 40145866a7eb63180cffbb32c53d1ec28aa8a7fe SHA256 b0bcb230db0adf1408401f8f4979984c0dfdd44c7e69c07e27174b6f996c28e7
+MISC ChangeLog 2358 RMD160 672195b1be4ab8ecb3e86eb8c8c86994feb7798c SHA1 6c96cdf72b8efc044851ce532849c3b1f5c4bfc0 SHA256 e300e50792a25aab9bd4f77d02750184b459b4480737662d12572f5344ecfc3b
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2LfjsACgkQVWmRsqeSphPdWQCfYTcdDF7+zS+1dXV2pp9FeFTl
-Sl8AnjGs6XT9O2C6LxTZ9yRsaAmJhDJf
-=KxA6
+iEYEARECAAYFAk2LgyQACgkQVWmRsqeSphPJowCeJI8ggALhBOSFA2LX0ERWQ3wZ
+y/wAnA71vZh9e9HG8oxr3VBrUmcE+zYh
+=NXqr
 -----END PGP SIGNATURE-----
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
-}