diff options
| -rw-r--r-- | net-p2p/gtk-gnutella/ChangeLog | 10 | ||||
| -rw-r--r-- | net-p2p/gtk-gnutella/Manifest | 23 | ||||
| -rw-r--r-- | net-p2p/gtk-gnutella/files/gtk-gnutella-0.96.7-ldflags.patch | 11 | ||||
| -rw-r--r-- | net-p2p/gtk-gnutella/files/gtk-gnutella-1.0.0-bdf.patch | 101 | ||||
| -rw-r--r-- | net-p2p/gtk-gnutella/files/gtk-gnutella-1.0.0-gtkg-hostile.patch | 20 | ||||
| -rw-r--r-- | net-p2p/gtk-gnutella/gtk-gnutella-1.0.1.ebuild | 91 |
6 files changed, 12 insertions, 244 deletions
diff --git a/net-p2p/gtk-gnutella/ChangeLog b/net-p2p/gtk-gnutella/ChangeLog index af4751521682..ab9264bfa1d6 100644 --- a/net-p2p/gtk-gnutella/ChangeLog +++ b/net-p2p/gtk-gnutella/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-p2p/gtk-gnutella -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.165 2014/10/18 14:22:04 ago Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.166 2015/01/01 15:20:41 graaff Exp $ + + 01 Jan 2015; Hans de Graaff <graaff@gentoo.org> -gtk-gnutella-1.0.1.ebuild, + -files/gtk-gnutella-0.96.7-ldflags.patch, + -files/gtk-gnutella-1.0.0-bdf.patch, + -files/gtk-gnutella-1.0.0-gtkg-hostile.patch: + Cleanup. 18 Oct 2014; Agostino Sarubbo <ago@gentoo.org> gtk-gnutella-1.1.1.ebuild: Stable for ppc, wrt bug #524424 diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest index 210087269e2a..23542d090a9f 100644 --- a/net-p2p/gtk-gnutella/Manifest +++ b/net-p2p/gtk-gnutella/Manifest @@ -1,29 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX gtk-gnutella-0.96.7-ldflags.patch 379 SHA256 65cd57a59ba8922714a3d8535b15e9e81e60133eb2bd0e4233500774885d53eb SHA512 84101d0acea3eba80bcf5cfc22d0c6399da086de30820bac0596292566b17b052f94d8dd599b4085e34bb5798a8ac2e226737fc03943099cb7195bc84f2b0957 WHIRLPOOL 03c2a42a4b78465c34822d26b9367ec608d0eb0af40d01f107d22d93afff0761aeccb2d1bc3d828e6296e7fc4704e6ea6ab23dc7a0b085f248f47a2ca5cd8ac5 -AUX gtk-gnutella-1.0.0-bdf.patch 3299 SHA256 d70c417075271e7455ff9f632ec027acda2e2c9baaab18d560c2a163a29a4cc7 SHA512 96e017227db560c95a9352439fdc6cb6bd2775cc9f3a437e214323f397aa3c7cd139d308419b1d0e3b975e23dd1872e647f9db6a78e810b57af3401427cd5a3c WHIRLPOOL f8420440776009cbe55a3eb0cc3e5d7c8574fb1c15d13aca522bfbd1db53c2ab6aedfeece4c150cf908ff75e70012ce734530b563d86edfa1fd1b4d935bc3ea6 -AUX gtk-gnutella-1.0.0-gtkg-hostile.patch 658 SHA256 b915d8e8644156fec5668b9787c6929877cd00202057af5f5e341bab4d4fe354 SHA512 cfaef346827f7483cfe5e27a8ddb7441417b177bdf7bfa9eb7d80f4ae6c92d74b71405b7dffbe251754f14f9699104edd277d575c75af658c1de08f78125dc0e WHIRLPOOL 2f5146937fd9dea9385d64146e29972e5da6ee76a70e88881f1e772ef5a8b353e767eb6832c2a3462fbb0c989cec1b3a578305db72492901942353034f159668 -DIST gtk-gnutella-1.0.1.tar.bz2 19010641 SHA256 0f54871782afac7f55f214597bf7162926081f12b3488b13187562dcc5fc0f04 SHA512 4722276f928baa7dec5e56de1b7d21b078f47637a68e60e60a572d49de0f17aabb23ae963a2059e2683c344fdb0c82600377e33da85a688b9df8da39e40bfbaf WHIRLPOOL f416d469ab97561808baea4a6a4106a8f89b8ac62bf64e8f99fbc5499d991cb5eb11fb7bedf3b42d4bf09940088705c1673bf7bf5d42e1ba51052a860ae37295 DIST gtk-gnutella-1.1.1.tar.bz2 35342037 SHA256 6e077204ddc23d0b8a044c3d7f12f40e8876b523f12a90c00b6725170611b501 SHA512 c8226f74bbbc901a608aa59544ba5d7f924f5bcef0e98ba16145c4ae07a93dc710376201cf46bedaddcefb4438e18c259ce06be076a5f365a80b445cf788ec02 WHIRLPOOL 19e41cea5dfbfc27d21c7a5ed7ea69a14ef4fb4c0285eedd218d2506a6a133bb9f81462e4396bc936528618216d419f1ac38e53ff887c9e640cd51264727d824 -EBUILD gtk-gnutella-1.0.1.ebuild 2120 SHA256 bae15758a6b8e3abc122e76ecaddffbd19802c012fe0122f41f5cf4a9849ef46 SHA512 96012a2a10c82434f1883ccabb8945935a188596703d4769e58c0514f3cf14e3833c7402145eb1adc5c55adc1fcbec1511491e5b393749b7568442f3d20e0fb6 WHIRLPOOL 48fe1f123759118e01461859d8ab3938db3b7e5a794cdd6b950996d652706a3eb07c04aacedd2935361ede884cf0370bdcf444d51f24783425b57a3f03876540 EBUILD gtk-gnutella-1.1.1.ebuild 1948 SHA256 1d0cc69124177cf7cadbaba262a57a50daafa1cfb2d9dfecbea0102c0e8bea75 SHA512 00890a6063afe460071786fa5f9a6d325589bb557bc98f494c66f0cdf1fe1ab6dc152a9db69fd4849e3b98a7ba1a0dcbe5971938255dc1ce42142891f97fb69d WHIRLPOOL 3c54e9b9a08534e6f6877366fd3ba069422f9e908a7b191d3923e1a55954178294ef35cdbc77ddc0c6a0059e925c012aa0a7dd8381f94df5e1fe8a3226c20812 -MISC ChangeLog 24151 SHA256 ac8c394558a1163528ac8d1778ae95b87e12334fa6e614d5c5464118ba31a343 SHA512 153aab52b6ef65b49c260044011654f168e15c40d2ab66db45b4f280f06b997e54b58f20b8a676c1ecaea6efc19a03d8f47cb8df4b4d77464f897c2fa71cb20b WHIRLPOOL 55bd754271d24d085b8448708fe2c5c5b8e47b7ed399bdf25ac72d0753ace889a6f8687412b0562bc49b4b256c7d9bb5acb6baf4e764f3ebe8a6a674ab53d08e +MISC ChangeLog 24375 SHA256 9e89a8723a1c0f1107e05f9e6a7b9eea3fbe9957656848ee8aa70ba2351f2ed2 SHA512 8bc626bb1c5c94d0f152b4e9efeddb8eaceb5affc2cf0e6b02ea37726f96ae767259ab1ea1b44e605980ae3bf2ae89e5396d6d1f3c5611843a672324fe4ce2d1 WHIRLPOOL 4ed560cc5d56317308a9e2113e0801cf099c686508fc53da6c7343892cc9794d3d9f142bf62549c9879468cd18761a3f59ad9fda971c90cedaaa1998f6c27876 MISC metadata.xml 220 SHA256 d58e366dd43b562958c2857ad163829d8bc5061a7b855715ba07fa0edb1cd201 SHA512 aeb560115bbb1de6094c8637a6f6b6196a5a83d63670935236820580c6b36b5f41c7ac104ea8716bd25bc5daabfff6229e4117d280812fb63746aa371f30741d WHIRLPOOL 8510e0e6893b57af04c14659cb75799aa7452e06c10f64ac1b3c3ed55c23e8365b829872e9c60a230de64af728e4d11dfcedeaf325c05353e8f081c37d6ae728 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUQneNAAoJELp701BxlEWf94kP/RVTLv5II1Kou4O7raQhwCnd -q9zvCW0wqZidDAMUVzb7n01/P26u2PE2gvFGmPLSUIdS7FLULNs5CbU++gEgLpZA -SVq1Z/C7KZtqNJdridB5BwIB0RkxSW3/IcurDQ7aXfISAy431g4rMpY+L6MxM7jD -abY8TIY8VuSquMRddMvaZCdX7n4ZtsfpRUweTurYystDfRD+fKCWHnQMjlFu461R -+Wy7O+nyexYnfqbZ1aPyjZKrQs2Jn/3Tut/VYfjcQmd9gnDRPE7nW9ZJIsQGmW2o -kA9uWwkZWJo1B39kaHuHZAIp80jQ97oMYhYqOR/7G6OZEn0y18U/eFRDq6UGxppd -HX6YDNVZmg5saX9jMyrgKGD/EmPwMKg0Id232LFvd6CVW6++QpFSsRaLnnWL3uuM -n775f089EotW5pBsejUVSamx6S9YnLz4wvUzSLG8sWHIWkikwCqh0hLp3MgL39YJ -p/4EjmMLP0AKh9QR/jQ3hJtjQxYbQ7XOmvXulkI5orIBE+wScjArNMvo/o5ODyqW -I3e4VJLyfX386SevZei4a3Qlkew7BDXFcy5wVEmO6isIPRmwD8UXpVopXE2krKGz -L/R/gJnZ5mfz4Q7FYFmlxfVpy41SwMSYLGBTziXi2VBzpPnSL8Lt58rbtWVgVS0y -TU108rV1cTkzqXLKxQG0 -=HlPu +iF4EAREIAAYFAlSlZdQACgkQiIP6VqMIqNfBdQD9HaRxTGF1Apd2N2Us89d2QRIL +5KrAs8nbxU0qHHzmkzEA/0PPLXYdCvaiyOuz7yyv/CTs0SFfZzcZFpaktrHQTjmd +=Rz86 -----END PGP SIGNATURE----- diff --git a/net-p2p/gtk-gnutella/files/gtk-gnutella-0.96.7-ldflags.patch b/net-p2p/gtk-gnutella/files/gtk-gnutella-0.96.7-ldflags.patch deleted file mode 100644 index 57964a073f2c..000000000000 --- a/net-p2p/gtk-gnutella/files/gtk-gnutella-0.96.7-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ -Reset LDFLAGS variable. Fixed upstream in r17379. ---- src/sdbm/Makefile.SH.orig 2010-03-17 19:08:04.559093208 +0100 -+++ src/sdbm/Makefile.SH 2010-03-17 19:08:19.623092585 +0100 -@@ -49,6 +49,7 @@ - RANLIB = $ranlib - RM = $rm -f - SED = $sed -+LDFLAGS = - - ######################################################################## - # Automatically generated parameters -- do not edit diff --git a/net-p2p/gtk-gnutella/files/gtk-gnutella-1.0.0-bdf.patch b/net-p2p/gtk-gnutella/files/gtk-gnutella-1.0.0-bdf.patch deleted file mode 100644 index 2e66c3a77436..000000000000 --- a/net-p2p/gtk-gnutella/files/gtk-gnutella-1.0.0-bdf.patch +++ /dev/null @@ -1,101 +0,0 @@ -commit 6710d4a880b10d9e3f08255a194a8186ec764caf -Author: Raphael Manfredi <Raphael_Manfredi@pobox.com> -Date: Wed Sep 4 19:54:04 2013 +0200 - - Make sure we can compile with recent versions of the BFD library. - -diff --git a/Configure b/Configure -index a596c81..351a4a0 100755 ---- a/Configure -+++ b/Configure -@@ -18,7 +18,7 @@ - - # $Id: gtk-gnutella-1.0.0-bdf.patch,v 1.1 2013/09/10 16:01:13 graaff Exp $ - # --# Generated on Sat Aug 31 16:12:14 CEST 2013 [metaconfig 3.5-170] -+# Generated on Wed Sep 4 19:50:17 CEST 2013 [metaconfig 3.5-171] - - cat >c1$$ <<EOF - ARGGGHHHH!!!!! -@@ -1017,7 +1017,7 @@ while test $# -gt 0; do - esac - shift - ;; -- -V) echo "$me generated by metaconfig 3.5-170." >&2 -+ -V) echo "$me generated by metaconfig 3.5-171." >&2 - exit 0;; - --) break;; - -*) echo "$me: unknown option $1" >&2; shift; error=true;; -@@ -4870,6 +4870,8 @@ eval $trylink - - : see whether the bfd library is available - $cat >try.c <<EOC -+#define PACKAGE -+#define PACKAGE_VERSION - #include <bfd.h> - int main(void) - { -diff --git a/config_h.SH b/config_h.SH -index b872de0..1e9f49d 100644 ---- a/config_h.SH -+++ b/config_h.SH -@@ -160,9 +160,11 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un - #$d_bcopy HAS_BCOPY /**/ - - /* HAS_BFD_LIBRARY: -- * This symbol, if defined, indicates that the bfd library is available -+ * This symbol, if defined, indicates that the BFD library is available - * to inspect symbols and debugging information. You can safely include -- * the <bfd.h> file when this symbol is defined. -+ * the <bfd.h> file when this symbol is defined, making sure to define -+ * the PACKAGE and PACKAGE_VERSION symbols, just in case we're facing -+ * binutils 2.23 or higher. - */ - #$d_bfd_lib HAS_BFD_LIBRARY /**/ - -diff --git a/src/lib/bfd_util.c b/src/lib/bfd_util.c -index 52b10ef..2fc9997 100644 ---- a/src/lib/bfd_util.c -+++ b/src/lib/bfd_util.c -@@ -53,8 +53,28 @@ - #include "common.h" - - #ifdef HAS_BFD_LIBRARY -+/* -+ * Starting with binutils 2.23, we need to define two symbols to be able -+ * to compile with <bfd.h>. It is a shame to have to go through contorsions -+ * like that, but the BFD folks wish to keep their library unsuitable for -+ * the general use. -+ * -+ * See https://sourceware.org/bugzilla/show_bug.cgi?id=15920 -+ * -+ * Their mindset being what it is, let's be smarter and adapt. There is no -+ * way we are going to bloat our source tree by including a version of the BFD -+ * sources, just to workaround a library design bug! -+ * --RAM, 2013-09-94 -+ * -+ * There's no need to define the PACKAGE symbol: since it is present in a -+ * comment, that metaconfig symbol will be automatically defined in config.h. -+ */ -+#define PACKAGE_VERSION /* PACKAGE is already a metaconfig symbol */ -+ - #include <bfd.h> --#endif -+ -+#undef PACKAGE_VERSION -+#endif /* HAS_BFD_LIBRARY */ - - #include "bfd_util.h" - #include "concat.h" -diff --git a/src/lib/mingw32.c b/src/lib/mingw32.c -index 943a8bc..bf9ca91 100644 ---- a/src/lib/mingw32.c -+++ b/src/lib/mingw32.c -@@ -53,7 +53,6 @@ - #include <conio.h> /* For _kbhit() */ - #include <imagehlp.h> /* For backtrace() emulation */ - #include <iphlpapi.h> /* For GetBestRoute() */ --#include <bfd.h> /* For access to debugging information */ - - #include <glib.h> - #include <glib/gprintf.h> diff --git a/net-p2p/gtk-gnutella/files/gtk-gnutella-1.0.0-gtkg-hostile.patch b/net-p2p/gtk-gnutella/files/gtk-gnutella-1.0.0-gtkg-hostile.patch deleted file mode 100644 index b5ed4bee412b..000000000000 --- a/net-p2p/gtk-gnutella/files/gtk-gnutella-1.0.0-gtkg-hostile.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit e4dc3902f6c451448bbeb5c1908df617bd44e244 -Author: Raphael Manfredi <Raphael.Manfredi@pobox.com> -Date: Tue Dec 3 23:41:31 2013 +0100 - - guid_extract_gtkg_info(): fixed grave bug, making all GTKGs appear hostile. - -diff --git a/src/core/guid.c b/src/core/guid.c -index c6f1651..fb4c838 100644 ---- a/src/core/guid.c -+++ b/src/core/guid.c -@@ -345,7 +345,8 @@ guid_extract_gtkg_info(const struct guid *guid, size_t start, - product_major = product_get_major(); - - if (major != product_major) { -- if (major + 1 != product_major || major - 1 != product_major) -+ int8 delta = product_major - major; -+ if (delta < -1 || delta > 1) - return FALSE; - } - diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.0.1.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.0.1.ebuild deleted file mode 100644 index 13b7173189ce..000000000000 --- a/net-p2p/gtk-gnutella/gtk-gnutella-1.0.1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-1.0.1.ebuild,v 1.5 2014/05/10 13:42:53 ago Exp $ - -EAPI=5 - -inherit eutils - -IUSE="nls dbus ssl +gtk" - -DESCRIPTION="A GTK+ Gnutella client" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" -HOMEPAGE="http://gtk-gnutella.sourceforge.net/" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86 ~x86-fbsd" - -RDEPEND=" - dev-libs/glib:2 - sys-libs/zlib - gtk? ( >=x11-libs/gtk+-2.2.1:2 ) - dbus? ( >=sys-apps/dbus-0.35.2 ) - ssl? ( >=net-libs/gnutls-2.2.5 ) - nls? ( >=sys-devel/gettext-0.11.5 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - strip-linguas -i po - - echo "# Gentoo-selected LINGUAS" > po/LINGUAS - for ling in ${LINGUAS}; do - echo $ling >> po/LINGUAS - done - - # Already fixed upstream but not released yet. Included as requested - # by upstream. -# epatch "${FILESDIR}/${P}-bdf.patch" -# epatch "${FILESDIR}/${P}-gtkg-hostile.patch" -} - -src_configure() { - # There is no option to turn off optimization through the build.sh - # script. - sed -i -e "s/Configure -Oder/Configure -Oder -Doptimize=none/" build.sh || die - - # The build script does not support the equivalent --enable - # options so we must construct the configuration by hand. - - local myconf - - if ! use nls; then - myconf="${myconf} --disable-nls" - fi - - if ! use dbus; then - myconf="${myconf} --disable-dbus" - fi - - if ! use ssl; then - myconf="${myconf} --disable-gnutls" - fi - - if use gtk; then - myconf="${myconf} --gtk2" - else - myconf="${myconf} --topless" - fi - - ./build.sh \ - --configure-only \ - --prefix="/usr" \ - --cc=$(tc-getCC) \ - ${myconf} -} - -src_compile() { - # Build system is not parallel-safe, bug 500760 - emake -j1 -} - -src_install() { - dodir /usr/bin - emake INSTALL_PREFIX="${D}" install || die "Install failed" - dodoc AUTHORS ChangeLog README TODO - - # Touch the symbols file into the future to avoid warnings from - # gtk-gnutella later on, since we will most likely strip the binary. - touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" || die -} |