Attempt to fix automagic dep on libupnp for bug 186102.

Package-Manager: portage-2.1.3_rc8

4 files changed, 59 insertions, 11 deletions

diff --git a/net-p2p/linkage/ChangeLog b/net-p2p/linkage/ChangeLog
index b55df5cba2e6..2d892b92d363 100644
--- a/net-p2p/linkage/ChangeLog
+++ b/net-p2p/linkage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/linkage
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/linkage/ChangeLog,v 1.2 2007/07/22 14:43:26 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/linkage/ChangeLog,v 1.3 2007/07/22 16:28:56 drac Exp $
+
+  22 Jul 2007; Samuli Suominen <drac@gentoo.org>
+  +files/linkage-0.1.2-enable-disable-upnp.patch, linkage-0.1.2.ebuild:
+  Attempt to fix automagic dep on libupnp for bug 186102.
 
   22 Jul 2007; Samuli Suominen <drac@gentoo.org> linkage-0.1.2.ebuild:
   Use fdo-mime.eclass to update mime and desktop databases.
diff --git a/net-p2p/linkage/Manifest b/net-p2p/linkage/Manifest
index ea543c69a001..9a89916acaed 100644
--- a/net-p2p/linkage/Manifest
+++ b/net-p2p/linkage/Manifest
@@ -1,12 +1,16 @@
+AUX linkage-0.1.2-enable-disable-upnp.patch 932 RMD160 b30f534fd91d9d048918a387e9ceae7a831b698f SHA1 0220960c9904e52b4ecc5cd6d742228c0c03b5be SHA256 06d4e4491f6a2c9b89d6c8e0b5f23ddaf1acd6c9a3efe1b89683703547b28f75
+MD5 aea4a8d259210bbc1d3fc7516688bdfb files/linkage-0.1.2-enable-disable-upnp.patch 932
+RMD160 b30f534fd91d9d048918a387e9ceae7a831b698f files/linkage-0.1.2-enable-disable-upnp.patch 932
+SHA256 06d4e4491f6a2c9b89d6c8e0b5f23ddaf1acd6c9a3efe1b89683703547b28f75 files/linkage-0.1.2-enable-disable-upnp.patch 932
 DIST linkage-0.1.2.tar.gz 543936 RMD160 da2062ed514dfda53ea1eef57222ac5830e0cdbc SHA1 9ecc0f0645f08b7b69145bc949a9462451f6f2b6 SHA256 4efcc9ffe5d67e8e98ac6a2af184ae5a487b7f6adf878efc4d365a480cfd2b01
-EBUILD linkage-0.1.2.ebuild 955 RMD160 13b52dc647fb6def8c803f2917df6c960efc5e64 SHA1 8530dc69d5972f45e64c57cce2eee79c6f278c14 SHA256 e7bcd7cc8ab24122361e09b9e79287848f978124d072a9581d829986d16dd3d9
-MD5 fcc06ca29f7ccfc938e95e3876ddeac0 linkage-0.1.2.ebuild 955
-RMD160 13b52dc647fb6def8c803f2917df6c960efc5e64 linkage-0.1.2.ebuild 955
-SHA256 e7bcd7cc8ab24122361e09b9e79287848f978124d072a9581d829986d16dd3d9 linkage-0.1.2.ebuild 955
-MISC ChangeLog 469 RMD160 8b0da7c374d46503288f716a04e289545d1a9f40 SHA1 6ffe44940b4f49514c9bd89ec9895ed9c8106f46 SHA256 481d0c9ac0fb56c445581d0e62a1186b4d86ac6d18cd1778e4971ca18c074259
-MD5 c61301bfd6d0eb46d3fa4e9b42d2e132 ChangeLog 469
-RMD160 8b0da7c374d46503288f716a04e289545d1a9f40 ChangeLog 469
-SHA256 481d0c9ac0fb56c445581d0e62a1186b4d86ac6d18cd1778e4971ca18c074259 ChangeLog 469
+EBUILD linkage-0.1.2.ebuild 1148 RMD160 daa0b913910919905de1b49ff18689c4131cafc3 SHA1 8a521538c6fd9e59809dbbb0ab93e129b720e6d5 SHA256 b8f70c266b3f73a2b2615f3ed3246cd7ffcd1412ca417a2206c0e3bada77d51b
+MD5 3fdb463a2050356de669646c840a2d29 linkage-0.1.2.ebuild 1148
+RMD160 daa0b913910919905de1b49ff18689c4131cafc3 linkage-0.1.2.ebuild 1148
+SHA256 b8f70c266b3f73a2b2615f3ed3246cd7ffcd1412ca417a2206c0e3bada77d51b linkage-0.1.2.ebuild 1148
+MISC ChangeLog 649 RMD160 80ff927fadb25b080a33b96e40a84c3817a1eb30 SHA1 36476777192988d59aa89ec8368a449db49f7369 SHA256 82d98f62985618233c86a3b95f742165ff451388ddad6966237a8053997d6888
+MD5 e50470d1b19759c05222b634e5e29273 ChangeLog 649
+RMD160 80ff927fadb25b080a33b96e40a84c3817a1eb30 ChangeLog 649
+SHA256 82d98f62985618233c86a3b95f742165ff451388ddad6966237a8053997d6888 ChangeLog 649
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
diff --git a/net-p2p/linkage/files/linkage-0.1.2-enable-disable-upnp.patch b/net-p2p/linkage/files/linkage-0.1.2-enable-disable-upnp.patch
new file mode 100644
index 000000000000..540bd88ff6e2
--- /dev/null
+++ b/net-p2p/linkage/files/linkage-0.1.2-enable-disable-upnp.patch
@@ -0,0 +1,28 @@
+diff -ur linkage-0.1.2.orig/configure.ac linkage-0.1.2/configure.ac
+--- linkage-0.1.2.orig/configure.ac	2007-05-04 18:44:57.000000000 +0300
++++ linkage-0.1.2/configure.ac	2007-07-22 18:28:14.000000000 +0300
+@@ -37,8 +37,22 @@
+ AC_SUBST(DBUSGLIB_CFLAGS)
+ AC_SUBST(DBUSGLIB_LIBS)
+ 
+-PKG_CHECK_MODULES(LIBUPNP, libupnp >= 1.4.1, USE_UPNP="yes", USE_UPNP="no")
+-AM_CONDITIONAL(BUILDUPNP, test x$USE_UPNP = xyes)
++AC_ARG_ENABLE([upnp],
++    [AS_HELP_STRING([--enable-upnp], [Enable libupnp (default=disabled)])],
++    [enable_upnp="$enableval"],
++    [enable_upnp="no"]
++)
++
++if test "$enable_upnp" = "yes"; then
++    PKG_CHECK_MODULES([LIBUPNP], [libupnp >= 1.4.1])
++    AC_DEFINE([BUILDUPNP], [], [Define when building with libupnp])    
++    BUILDUPNP="true"
++else
++    BUILDUPNP="false"
++fi
++
++AC_SUBST([ENABLE_LIBUPNP])
++AM_CONDITIONAL([BUILDUPNP], [test "$enable_upnp" = "yes"])
+ 
+ AC_SUBST(LIBUPNP_CFLAGS)
+ AC_SUBST(LIBUPNP_LIBS)
diff --git a/net-p2p/linkage/linkage-0.1.2.ebuild b/net-p2p/linkage/linkage-0.1.2.ebuild
index aeea6f0da31e..2d388e012d47 100644
--- a/net-p2p/linkage/linkage-0.1.2.ebuild
+++ b/net-p2p/linkage/linkage-0.1.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/linkage/linkage-0.1.2.ebuild,v 1.2 2007/07/22 14:43:26 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/linkage/linkage-0.1.2.ebuild,v 1.3 2007/07/22 16:28:56 drac Exp $
 
-inherit fdo-mime
+inherit autotools fdo-mime
 
 DESCRIPTION="BitTorrent client written in C++ using gtkmm and libtorrent."
 HOMEPAGE="http://code.google.com/p/linkage"
@@ -22,6 +22,18 @@ RDEPEND=">=net-libs/rb_libtorrent-0.12
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-enable-disable-upnp.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf $(use_enable upnp)
+	emake || die "emake failed."
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed."
 	dodoc AUTHORS ChangeLog NEWS README TODO