Let it compile against glib-2.32

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 40 insertions, 14 deletions

diff --git a/net-misc/gwget/ChangeLog b/net-misc/gwget/ChangeLog
index 60d5c01f0ae6..bd64fccb05ce 100644
--- a/net-misc/gwget/ChangeLog
+++ b/net-misc/gwget/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/gwget
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gwget/ChangeLog,v 1.26 2012/05/05 03:20:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gwget/ChangeLog,v 1.27 2012/07/21 16:18:17 pacho Exp $
+
+  21 Jul 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/gwget-1.0.4-glib-single-include.patch, gwget-1.0.4.ebuild:
+  Let it compile against glib-2.32
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> gwget-1.0.4.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
@@ -160,4 +164,3 @@
   13 Aug 2003; Mike Gardiner <obz@gentoo.org> gwget2-0.5.ebuild:
   New package. Thanks to Jose Romildo Malaquias (romildo@iber.com.br). See bug
   #18255
-
diff --git a/net-misc/gwget/Manifest b/net-misc/gwget/Manifest
index 31b94d7343d3..36528aebb562 100644
--- a/net-misc/gwget/Manifest
+++ b/net-misc/gwget/Manifest
@@ -1,5 +1,16 @@
-AUX gwget-1.0.4-libnotify-0.7.patch 911 RMD160 fec3ec249816827abf6483b5b3fa8b9f58be6900 SHA1 fe3760cf6be3d167f0cf00bf73d3db852a833cb2 SHA256 47c89f4331d20c841d11ed732288cfb68482a80134d72241a88f1843a200dec0
-DIST gwget-1.0.4.tar.bz2 444843 RMD160 461bc7823aaf5043def1dbf15b07fb098216086d SHA1 d2cc6eafb23488798939f99f6aad4e1a87f1d7c0 SHA256 a65b2b2b3befb6cf34a697a13111b35498a6d63f9a9b048a22b8654f35ef643f
-EBUILD gwget-1.0.4.ebuild 1315 RMD160 e818270b4c575a560240faa3ac4e26195b5a8e30 SHA1 90cd1e407554c893341238312e270aa8f289b06f SHA256 0f1e384b15e33f6f2296089021791a2dd0fcf7ecfb94bd661ccd6e8621664d73
-MISC ChangeLog 5412 RMD160 951d74ee7813467d83c4864356416a964194cfe2 SHA1 25016f325318c273003c24e7f89b7b10dcf49697 SHA256 004f24337d63ece3a3aacaf9908379a190c541bdbde82cda9e3918b802d8878c
-MISC metadata.xml 1146 RMD160 7ff1842eafef7cd12f9c42cc2533faa69d26a1aa SHA1 0810625057df6d5cf332efb99ebb59375132ba73 SHA256 3969ef8156d53645717a708d60b8d0f9509c74bebfab44deefd246b5be375c10
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX gwget-1.0.4-glib-single-include.patch 362 SHA256 014b44eed660837559e02e5f7047bf0027552dda1f0169676b37892a81a9157f SHA512 84bbe5d8f5f5add2a21623f8334d222e85b521dbcdc536833a327e35bd02a46726575b5fdab08939f233f2f744ef18fe66eb5f034dbbebdb73f5b18338e6938c WHIRLPOOL 9a9ef68894ab503dbc579f6276495adc4008b26c85edfc39f4d1e06a2a7407e819a887ce08d0447a69d35b108a39a29501e2079080acd1ef2f0272a1862fbae9
+AUX gwget-1.0.4-libnotify-0.7.patch 911 SHA256 47c89f4331d20c841d11ed732288cfb68482a80134d72241a88f1843a200dec0 SHA512 9956089d73b7eec3f27d8fff106b354332b02f71788b67da3f59827e858cdeddd80e09be3ed626386914766d5a8f0f16e6dddfdc7eb2d75dd637f89ae24f4a62 WHIRLPOOL f5eca4e364c206738b72f70e7eb375316382028b0bd6789924e979124fcba4ba5dd9b2dfcef2acf628341f430ec86dd4330cc6c8bf09509e27353ac5c6a4dd09
+DIST gwget-1.0.4.tar.bz2 444843 SHA256 a65b2b2b3befb6cf34a697a13111b35498a6d63f9a9b048a22b8654f35ef643f SHA512 fab9d5eb4e6fd9d061a51848d7f4df9a44925ef8c74386753a7250c4d92b0c95419a8355acf83611c83838e87d906613659e146132a086ada0bdb69cc2ac13cd WHIRLPOOL 1179c07d3330611573c9cfe61d0380289a4f71a7d1b6bafc02e111cc8964acf4c25c6fa5b0801fca4c4fc7e5b94428ca13745eba9bf9e8836da6b1324acf6fdd
+EBUILD gwget-1.0.4.ebuild 1353 SHA256 268285f956a86fc324ae2fefff0382fc81894286faecac0baac894efb91fedd4 SHA512 77defc2ded6aefd063d1cf30cf52c3c1537d764b7b254e0962c558bc5f6fd06352de94f12965e42c4e48b2e9fb4d3e912ead7126dd88c171f6003e1e510afbc0 WHIRLPOOL f52666702caece5fd57bb51320c3d049600444947c4c50403feabbed95cea46ff57ff8bef6e7d2fa4840514ac3c6aba5b2a4f0d3027a84a512bf90eff30820d1
+MISC ChangeLog 5560 SHA256 03dece437f8f79fe5cdc11ff4ca929dd464bbb8c0dfd4778e493988b7ed1b143 SHA512 50bc2061f972ccfc7cb4245983b4b9f4fe8735093af9c6cb334ce923aeaa370e5cc8291efc0afbe930a1183e25d005691c6384a03e1a1e27e1d19e14c949bdbe WHIRLPOOL 5dbd43d88f50aac11219ee5873b0c0decbd4cd9758d9eea3c287df598f6153e6b52a3c2f581d552e020d6794fe5b34090b80ca99169d7487958d38ccfeddc4d2
+MISC metadata.xml 1146 SHA256 3969ef8156d53645717a708d60b8d0f9509c74bebfab44deefd246b5be375c10 SHA512 4eee3cdd21a3c74e65ead9a2a38a74a567bdbd1f3f2df916b470f4e98c755bd603d18340425ffea824f42f3627bbfee8eefa5583a04eff773ccdd96cfff98253 WHIRLPOOL 8fe5e05a28c265ce7b0f5d59c579d1f3bba3583b12e3dde7db5acb4a3a02ec6a2d03c5f183b774f54fa17441dc6d9acef83943955c5baa9fcccb732c5e95cf52
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlAK1k4ACgkQCaWpQKGI+9RcygCfbhZuwdUADnxwqrkA/aWTe865
+0ikAn2xqgdmIx/x3d1Hw9vHRsGvWGWjW
+=kZBl
+-----END PGP SIGNATURE-----
diff --git a/net-misc/gwget/files/gwget-1.0.4-glib-single-include.patch b/net-misc/gwget/files/gwget-1.0.4-glib-single-include.patch
new file mode 100644
index 000000000000..a5cf4ee995bc
--- /dev/null
+++ b/net-misc/gwget/files/gwget-1.0.4-glib-single-include.patch
@@ -0,0 +1,13 @@
+Index: gwget-1.0.4/src/gwget-application.h
+===================================================================
+--- gwget-1.0.4.orig/src/gwget-application.h
++++ gwget-1.0.4/src/gwget-application.h
+@@ -18,7 +18,7 @@
+ #ifndef GWGET_APPLICATION_H
+ #define GWGET_APPLICATION_H
+ 
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <glib-object.h>
+ 
+ G_BEGIN_DECLS
diff --git a/net-misc/gwget/gwget-1.0.4.ebuild b/net-misc/gwget/gwget-1.0.4.ebuild
index 38ed80ecf05d..de8532c5d7c6 100644
--- a/net-misc/gwget/gwget-1.0.4.ebuild
+++ b/net-misc/gwget/gwget-1.0.4.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gwget/gwget-1.0.4.ebuild,v 1.7 2012/05/05 03:20:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gwget/gwget-1.0.4.ebuild,v 1.8 2012/07/21 16:18:17 pacho Exp $
 
-EAPI="2"
+EAPI="4"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
 
 inherit eutils gnome2
 
@@ -30,9 +32,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35.0
 	>=sys-devel/gettext-0.10.4"
 
-DOCS="AUTHORS ChangeLog NEWS README THANKS TODO"
-
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README THANKS TODO"
 	G2CONF="${G2CONF}
 		$(use_enable epiphany epiphany-extension)
 		$(use_enable libnotify)
@@ -42,6 +43,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+	epatch "${FILESDIR}"/${P}-glib-single-include.patch
 	gnome2_src_prepare
 }
 
@@ -50,7 +52,4 @@ src_install() {
 
 	# remove /var/lib, which is created without any reason
 	rm -rf "${D}"/var || die "rm failed"
-
-	# remove useless la files
-	find "${D}" -name '*.la' -delete
 }