Add patch to allow hamlib to use the system libltdl instead of a bundled one, patch by Thomas Beierlein. bug 252326

Package-Manager: portage-2.2_rc19/cvs/Linux 2.6.27.10 x86_64

4 files changed, 58 insertions, 11 deletions

diff --git a/media-libs/hamlib/ChangeLog b/media-libs/hamlib/ChangeLog
index e6acf353a94e..16d1150d9d4b 100644
--- a/media-libs/hamlib/ChangeLog
+++ b/media-libs/hamlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/hamlib
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/ChangeLog,v 1.29 2008/12/04 17:58:18 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/ChangeLog,v 1.30 2008/12/27 17:11:47 darkside Exp $
+
+*hamlib-1.2.8-r1 (27 Dec 2008)
+
+  27 Dec 2008; Jeremy Olexa <darkside@gentoo.org> +files/hamlib-ltdl.diff,
+  -hamlib-1.2.8.ebuild, +hamlib-1.2.8-r1.ebuild:
+  Add patch to allow hamlib to use the system libltdl instead of a bundled
+  one, patch by Thomas Beierlein. bug 252326
 
 *hamlib-1.2.8 (04 Dec 2008)
 
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 1b6b61597065..45623fa75fff 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,9 +1,10 @@
+AUX hamlib-ltdl.diff 1359 RMD160 ffc06ebe344f14e54c92abdc5b22c09739b1963e SHA1 5e734d14f77584fd65a8ad0b1fea399a8a9c52c3 SHA256 059ce76b9d56a7fd028815c78aa1214b21bb5d2c3ccbe72dcf06534b09d63e4e
 AUX hamlib-pkgconfig-fix.diff 373 RMD160 fe7a8275b28ea73480b9bf1eb916302d84eb351f SHA1 bc0abd242bc35897000d405bc1fb831a48fad976 SHA256 6c45445bf2bc12b9738b6315543df662a0dd36167a57a3623bb11446e882802c
 DIST hamlib-1.2.6.1.tar.gz 1474242 RMD160 177b9ac3454edac5ceeb0794b4d2215253aaa665 SHA1 de83ec55c0c7114e59fa17eb752ff07fd5980d43 SHA256 a70d54ee60f26ba8b5c183cf1c140cc1ebbcb10640b04aad03a297830e0c6293
 DIST hamlib-1.2.7.1.tar.gz 1541572 RMD160 41fd458660c1267176f3bbe28830a14eed139254 SHA1 32a174ddb831f06f4befdd36762c9a63b93ec968 SHA256 709504ef1774b69ab15ebfb9ec3d1e605307072300ada891e8baf50f61227f03
 DIST hamlib-1.2.8.tar.gz 1577532 RMD160 9a1409fabd6dba10a9bbbdfe1e7bddabfa3ea7c6 SHA1 09b94775a96718c8c21ad4a87cca3e03338d7db0 SHA256 be81153a6e2830234d62818c8aa5658b1410b538a3676686a3f1373f03036b81
 EBUILD hamlib-1.2.6.1.ebuild 1792 RMD160 8d260dba2aa29d9f1ba0b46c597620cb6b33991e SHA1 a9c4b4ba6a9a8e90d6d04963f7df21432e5032b0 SHA256 e39f9e7cde62ab3dba7a2284067d23a3d3697afb3310425d423f1652680573d3
 EBUILD hamlib-1.2.7.1.ebuild 1628 RMD160 bda01cc7b93af6282ef357e7b39bb1f321e7ed90 SHA1 0ef898d5c50b4c9bbf7c08bd6decffbdfb4dd12f SHA256 5eff27555827a203ba26134d2979e45033eb0e3c5e7da7fcd86663643721eb29
-EBUILD hamlib-1.2.8.ebuild 1589 RMD160 59a9694f938cd3b132d8df689636426e4951c6f8 SHA1 99d90fa625f403c8be6608d5556d87b7c06c0b0c SHA256 63f990af6f35e657584a0030dd3e66ce591eb2f915b7383e672abb0249478efe
-MISC ChangeLog 5428 RMD160 8226785d39706cd9db15d6d2a16251b804bc482d SHA1 3f8528fa13db5a48acf4f49786e12a33a5a897e1 SHA256 d41db0be4032416e9116e3635911b601990895735e3d0606a37a920f29d9d856
+EBUILD hamlib-1.2.8-r1.ebuild 1644 RMD160 9718e1ccda2bb6f610a33e717b7c34b3187471c3 SHA1 e0bb136234241368eda322fb3cd9ec12f9cfae9e SHA256 626360efb88b5667939271f59d6128855497f52809a4372f109dd0ed6f15f0a2
+MISC ChangeLog 5705 RMD160 031fd10bc6316dbe0b33ebd5271a7fa844b6224f SHA1 146883f1ab4400c84d1b1f6036e42fbcc71ceaf1 SHA256 974ceb1a91aa1baa33bd81e3a703df9240c17128b34e29ab25a1f3190eaa0c23
 MISC metadata.xml 445 RMD160 5c4df32a3cd29ba926c9c5457ad462ac00798b87 SHA1 db84ad4be4f3e05bddbcbd4eafdf17b9f1b68bf6 SHA256 f47eb6e8c3746271d2996691a234c9216c9821ec937828d8c8aeedca29b10d00
diff --git a/media-libs/hamlib/files/hamlib-ltdl.diff b/media-libs/hamlib/files/hamlib-ltdl.diff
new file mode 100644
index 000000000000..4bf14ac1189e
--- /dev/null
+++ b/media-libs/hamlib/files/hamlib-ltdl.diff
@@ -0,0 +1,36 @@
+--- Makefile.am.orig	2008-12-27 15:31:15.000000000 +0100
++++ Makefile.am	2008-12-27 15:31:47.000000000 +0100
+@@ -10,11 +10,11 @@
+ 	README.betatester README.win32 hamlib.spec
+ 
+ # BINDINGS_LIST subdirs are no longer built
+-SUBDIRS = macros include lib libltdl src @BACKEND_LIST@ @ROT_BACKEND_LIST@ \
++SUBDIRS = macros include lib src @BACKEND_LIST@ @ROT_BACKEND_LIST@ \
+ 			@BINDINGS@ tests doc
+ 
+ # tcl, perl, and kylix subdirs are no longer distributed
+-DIST_SUBDIRS = macros include lib libltdl src c++ bindings tests doc \
++DIST_SUBDIRS = macros include lib src c++ bindings tests doc \
+ 	icom kenwood aor yaesu dummy pcr alinco uniden tentec kachina jrc \
+ 	rpcrig winradio easycomm fodtrack rpcrot gnuradio drake rotorez \
+ 	flexradio sartek lowe rft tapr kit skanti wj racal tuner \
+--- configure.ac.orig	2008-12-27 12:59:03.000000000 +0100
++++ configure.ac	2008-12-27 12:59:48.000000000 +0100
+@@ -174,7 +174,7 @@
+ ## ------------------------ ##
+ dnl Enable building of the convenience library
+ dnl and set LIBLTDL accordingly
+-AC_LIBLTDL_CONVENIENCE
++AC_LIBLTDL_INSTALLABLE
+ dnl Substitute INCLTDL and LIBLTDL in the Makefiles
+ AC_SUBST([INCLTDL])
+ AC_SUBST([LIBLTDL])
+@@ -187,7 +187,7 @@
+ AC_SUBST([LIBTOOL_DEPS])
+ AC_LIB_LTDL
+ dnl Configure libltdl
+-AC_CONFIG_SUBDIRS(libltdl)
++#AC_CONFIG_SUBDIRS(libltdl)
+ 
+ case "$host_os" in
+ darwin* | rhapsody*)
diff --git a/media-libs/hamlib/hamlib-1.2.8.ebuild b/media-libs/hamlib/hamlib-1.2.8-r1.ebuild
index 9c94e3a287a7..45031f0f290d 100644
--- a/media-libs/hamlib/hamlib-1.2.8.ebuild
+++ b/media-libs/hamlib/hamlib-1.2.8-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/hamlib-1.2.8.ebuild,v 1.1 2008/12/04 17:58:18 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/hamlib-1.2.8-r1.ebuild,v 1.1 2008/12/27 17:11:47 darkside Exp $
 
-inherit eutils multilib libtool
+inherit autotools eutils libtool multilib
 
 DESCRIPTION="Ham radio backend rig control libraries"
 HOMEPAGE="http://hamlib.sourceforge.net/"
@@ -16,12 +16,13 @@ IUSE="doc python tcl"
 RESTRICT="test"
 
 RDEPEND="virtual/libc
+	>=sys-devel/libtool-1.5
+	dev-libs/libusb
 	python? ( dev-lang/python
 		dev-lang/tcl )
 	tcl? ( dev-lang/tcl )"
 
 DEPEND=" ${RDEPEND}
-	>=sys-devel/libtool-1.5
 	>=dev-util/pkgconfig-0.15
 	>=dev-lang/swig-1.3.14
 	dev-libs/libxml2
@@ -31,17 +32,19 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${PN}-pkgconfig-fix.diff
-
-	# Needed for FreeBSD - Please do not remove
-	elibtoolize
+	epatch "${FILESDIR}"/${PN}-pkgconfig-fix.diff \
+	    "${FILESDIR}"/${PN}-ltdl.diff
+	
+	# remove bundled libltdl copy
+	rm -rf libltdl
+	    
+	eautoreconf
 }
 
 src_compile() {
 	econf \
 		--libdir=/usr/$(get_libdir)/hamlib \
 		--disable-static \
-		--with-microtune \
 		--with-rpc-backends \
 		--without-perl-binding \
 		$(use_with python python-binding) \