Version bump. Drop old version and related patches

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

5 files changed, 34 insertions, 82 deletions

diff --git a/media-libs/hamlib/ChangeLog b/media-libs/hamlib/ChangeLog
index cd04d35bce02..69b51b26f7b8 100644
--- a/media-libs/hamlib/ChangeLog
+++ b/media-libs/hamlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/hamlib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/ChangeLog,v 1.49 2010/08/21 19:21:50 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/ChangeLog,v 1.50 2010/09/10 18:47:21 tomjbe Exp $
+
+*hamlib-1.2.12 (10 Sep 2010)
+
+  10 Sep 2010; Thomas Beierlein <tomjbe@gentoo.org> -hamlib-1.2.9.ebuild,
+  +hamlib-1.2.12.ebuild, -files/hamlib-ltdl.diff,
+  -files/hamlib-pkgconfig-fix.diff:
+  Version bump. Drop old version and related patches
 
   21 Aug 2010; Markos Chandras <hwoarang@gentoo.org> hamlib-1.2.11.ebuild:
   Stable on amd64 wrt bug #333603
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index b9d7ebac940a..86228e8bdb57 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,22 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX hamlib-1.2.11-bindings.diff 844 RMD160 19261d2c77f521418ad1335113e28c991393890c SHA1 66b040ddeb8d2adc7a5c064d0784066334adc712 SHA256 989355ceab9223d5fb9bdcbbeaca5732349f6b17e8afe92a1b0118bacd00336b
 AUX hamlib-bindings.diff 2421 RMD160 b9a5bc522fc46c6a42cfd8f577129cd5254e9493 SHA1 795942e0158e3b0b3fe74259d766e5fc2b813930 SHA256 2dc3427a965a0a3bc3813da9801ecead78bef7881e2cfee0a93b0afa956b9f66
-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.10.tar.gz 1799309 RMD160 7e5e887e9e1188b19157e76f88b40b3bf7c157a3 SHA1 c8ea2cafc8286805aa815d37e72857286db93d88 SHA256 9b50825666519b0b86469f1988a0de09ce2ffc08fa221f9aa40d18c7b7f6c651
 DIST hamlib-1.2.11.tar.gz 1846225 RMD160 795071afc4cfc0952c46e866e82e9c22225b7199 SHA1 775c562b7c327303ec31fc49eb09766fd7517b2e SHA256 9687a94a6cb9cee7e3daa12630f36a7ce64c9024d58fb3880b4842253fa26147
-DIST hamlib-1.2.9.tar.gz 1611457 RMD160 3261d4e6de39a9a050f304dfd747fe8a036a782b SHA1 9cfbfad347b254ab73cb00714b494aaa8cd21f8d SHA256 ba75e64e1b6d5ffaa41e2063e475eca5b35ad68cb4ee6e888e0fc73bd6fa9fba
+DIST hamlib-1.2.12.tar.gz 1860387 RMD160 9216b1801b458968d299d4c4e2141a4b15df04d2 SHA1 94115df13eae3e1046911cce585503ff49a8dcbd SHA256 735782ecd83de4036cef7dfcc87eac5095420406bd0ac2262d967e808c2d108c
 EBUILD hamlib-1.2.10.ebuild 2002 RMD160 b677cf37d3e7d0560313353fa13b7ddd780466ae SHA1 02657809c0c7e9defe9305cade66c08cca006afe SHA256 b857aa531c38ba3900a452b7d9b8420e8488bb63217ef0abed82a17f74949110
 EBUILD hamlib-1.2.11.ebuild 1787 RMD160 fcd4f10ea335c1a71ec9eb6bfce38bd13ccc4ec8 SHA1 52d8b5b3e686528e072bde1d75261db6742584f1 SHA256 bb5067935e7be0af83ec206fc555a17a5ad2920185b5230088fa5fd1b1fb585f
-EBUILD hamlib-1.2.9.ebuild 1556 RMD160 73b28d2f2dfcaab0bdaaf9056a2c95ad5f62f215 SHA1 b32aa93ff01add3cc463bc5d0a0749897d0219ea SHA256 0d0afd9248eb041678842ad592d33d890bc865f46d117baa3ded8b4f57b5038f
-MISC ChangeLog 7903 RMD160 881d0e0a9eb93cfbcd4e6f9e85b3f251e6414c8a SHA1 d4bd18c0a15855f17f1c6b24161113ec0a43e921 SHA256 58561765174336c9edfbe45186ade2da4cf9bc1e4ae13e79053ab285d74c4eff
+EBUILD hamlib-1.2.12.ebuild 1795 RMD160 a9b14c7890e4db14ce23d5c3e88aafc8dff5d724 SHA1 825eb1c1e59091a15c6779ac30659e7fc6faee6e SHA256 0eaf29054319547a2710b12437548316df5b0d56a6e178f5da46a941894944c2
+MISC ChangeLog 8145 RMD160 fc654247b5202f7d1acea9729f4c596531e8c176 SHA1 7d1369451b0bc316758f94ad1e1ccf6606735d8a SHA256 6a45fa5d1f941f381dff0e676167db39508e1c9728f022bd93423fdd29d56378
 MISC metadata.xml 257 RMD160 c6f05f5951c1ad7388dd56f4abe0ccdbe23505dd SHA1 e31f6d71d2344810cca782e2accf9058eeb2c1fd SHA256 e52fb7be2e8c1ca2b7ce0066517558a34ee01c9e6340e0a31a053594b9077eda
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkxwKBoACgkQ9/cejkQaxBA/KwCfTj2mV/CrPaThoAGIlb638ACc
-j40AmwZMFaZacCoYt/+WBtk2Qzz0h/KF
-=4hva
------END PGP SIGNATURE-----
diff --git a/media-libs/hamlib/files/hamlib-ltdl.diff b/media-libs/hamlib/files/hamlib-ltdl.diff
deleted file mode 100644
index 4bf14ac1189e..000000000000
--- a/media-libs/hamlib/files/hamlib-ltdl.diff
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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/files/hamlib-pkgconfig-fix.diff b/media-libs/hamlib/files/hamlib-pkgconfig-fix.diff
deleted file mode 100644
index 0d3b1e47d27f..000000000000
--- a/media-libs/hamlib/files/hamlib-pkgconfig-fix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- hamlib.pc.in.orig	2004-05-28 21:16:07.647003088 -0500
-+++ hamlib.pc.in	2004-05-28 21:26:28.230660032 -0500
-@@ -1,7 +1,7 @@
- prefix=@prefix@
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
--includedir=${prefix}/include
-+libdir=${exec_prefix}/lib/hamlib
-+includedir=${prefix}/include/hamlib
- 
- Name: hamlib
- Description: Library to control radio and rotator equipments
diff --git a/media-libs/hamlib/hamlib-1.2.9.ebuild b/media-libs/hamlib/hamlib-1.2.12.ebuild
index 3da1414182e9..826d86c78a83 100644
--- a/media-libs/hamlib/hamlib-1.2.9.ebuild
+++ b/media-libs/hamlib/hamlib-1.2.12.ebuild
@@ -1,39 +1,44 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/hamlib-1.2.9.ebuild,v 1.6 2009/09/23 15:15:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/hamlib-1.2.12.ebuild,v 1.1 2010/09/10 18:47:21 tomjbe Exp $
 
-inherit autotools eutils multilib
+PYTHON_DEPEND="2"
+inherit autotools eutils multilib python
 
 DESCRIPTION="Ham radio backend rig control libraries"
-HOMEPAGE="http://hamlib.sourceforge.net/"
+HOMEPAGE="http://sourceforge.net/apps/mediawiki/hamlib"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="doc python tcl"
 
 RESTRICT="test"
 
-RDEPEND="=virtual/libusb-0*
-	python? ( dev-lang/python
-		dev-lang/tcl )
+RDEPEND="
+	=virtual/libusb-0*
+	dev-libs/libxml2
+	python? ( dev-lang/python )
 	tcl? ( dev-lang/tcl )"
+
 DEPEND=" ${RDEPEND}
 	dev-util/pkgconfig
 	dev-lang/swig
-	dev-libs/libxml2
+	>=sys-devel/libtool-2.2
 	doc? ( app-doc/doxygen )"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${PN}-pkgconfig-fix.diff \
-		"${FILESDIR}"/${PN}-ltdl.diff
+	# fix hardcoded libdir paths
+	sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
+		-e "s#fix}/include#fix}/include/hamlib#" \
+		hamlib.pc.in || die "sed failed"
 
-	# remove bundled libltdl copy
-	rm -rf libltdl
+	# fix tcl lib path
+	epatch "${FILESDIR}"/${PN}-1.2.11-bindings.diff
 
 	eautoreconf
 }
@@ -45,7 +50,7 @@ src_compile() {
 		--with-rpc-backends \
 		--without-perl-binding \
 		$(use_with python python-binding) \
-		$(use_with tcl    tcl-binding)
+		$(use_enable tcl tcl-binding)
 
 	emake || die "emake failed"
 
@@ -58,15 +63,15 @@ src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
 	dodoc AUTHORS PLAN README README.betatester \
-		README.developer LICENSE NEWS TODO
+		README.developer NEWS TODO || die "dodoc failed"
 
 	if use doc; then
-		dohtml doc/html/*
+		dohtml doc/html/* || die "dohtml failed"
 	fi
 
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins hamlib.pc
+	doins hamlib.pc || die "doins failed"
 
 	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
-	doenvd "${T}"/73hamlib
+	doenvd "${T}"/73hamlib || die "doenvd failed"
 }