Verify and potentially improve Python-related code, #313257

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

3 files changed, 99 insertions, 2 deletions

diff --git a/media-libs/hamlib/ChangeLog b/media-libs/hamlib/ChangeLog
index c22f6e41dca7..203dca8ffee3 100644
--- a/media-libs/hamlib/ChangeLog
+++ b/media-libs/hamlib/ChangeLog
@@ -1,6 +1,11 @@
 # 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.52 2010/12/21 19:56:13 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/ChangeLog,v 1.53 2010/12/22 12:41:00 tomjbe Exp $
+
+*hamlib-1.2.12-r2 (22 Dec 2010)
+
+  22 Dec 2010; Thomas Beierlein <tomjbe@gentoo.org> +hamlib-1.2.12-r2.ebuild:
+  Verify and potentially improve Python-related code, #313257
 
 *hamlib-1.2.12-r1 (21 Dec 2010)
 
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 8f20ef972301..85216bb1ff31 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -6,6 +6,7 @@ DIST hamlib-1.2.12.tar.gz 1860387 RMD160 9216b1801b458968d299d4c4e2141a4b15df04d
 EBUILD hamlib-1.2.10.ebuild 2002 RMD160 b677cf37d3e7d0560313353fa13b7ddd780466ae SHA1 02657809c0c7e9defe9305cade66c08cca006afe SHA256 b857aa531c38ba3900a452b7d9b8420e8488bb63217ef0abed82a17f74949110
 EBUILD hamlib-1.2.11.ebuild 1786 RMD160 8aa35a9607db0be4a8bf2c95f813457201f13c45 SHA1 d1aba3f23305f1fa5b8d21ca7a3500a37f460414 SHA256 aa80ca3375598e3a0c5c72ddc5afd9f5a5bd26e97135973e9c06d6ad0c9f9891
 EBUILD hamlib-1.2.12-r1.ebuild 1835 RMD160 240050e7cf640c0acd91ef99cd73341fc350ae7d SHA1 3b791b1c0b16710a276033ac7730e5855a2054ec SHA256 4e967cc77fc46000bd39656e5196ca851ea738872fb4ef0cdb35b7a6791f2eef
+EBUILD hamlib-1.2.12-r2.ebuild 2010 RMD160 3b290895d1983af70a1d3f29800efc0d9651fb79 SHA1 eb8429c99272595891464503dc25eb97daf747ed SHA256 00cbce0f8032cea802f845f855c993d845570fc958abc8fa833db2f92fe16980
 EBUILD hamlib-1.2.12.ebuild 1795 RMD160 a9b14c7890e4db14ce23d5c3e88aafc8dff5d724 SHA1 825eb1c1e59091a15c6779ac30659e7fc6faee6e SHA256 0eaf29054319547a2710b12437548316df5b0d56a6e178f5da46a941894944c2
-MISC ChangeLog 8391 RMD160 f57e87447d0a3125bdc90955944e14a55b168a13 SHA1 7779a5bc95db22c87895d5b1770c20ac19735369 SHA256 f1be7320b2f0fff396aba5222e54e8a0e26ff4847ae5acef3b9f58b31c7b8316
+MISC ChangeLog 8565 RMD160 d1bf32d2ed210874653e032ec1732f970124128d SHA1 9f239451366522dd33361ea9181ac210b186720d SHA256 8937fafa86684a56e880a01ed910da79f316ff394a52c20b18fb859097513204
 MISC metadata.xml 257 RMD160 c6f05f5951c1ad7388dd56f4abe0ccdbe23505dd SHA1 e31f6d71d2344810cca782e2accf9058eeb2c1fd SHA256 e52fb7be2e8c1ca2b7ce0066517558a34ee01c9e6340e0a31a053594b9077eda
diff --git a/media-libs/hamlib/hamlib-1.2.12-r2.ebuild b/media-libs/hamlib/hamlib-1.2.12-r2.ebuild
new file mode 100644
index 000000000000..a49be8fb70b8
--- /dev/null
+++ b/media-libs/hamlib/hamlib-1.2.12-r2.ebuild
@@ -0,0 +1,91 @@
+# 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.12-r2.ebuild,v 1.1 2010/12/22 12:41:00 tomjbe Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+
+inherit autotools-utils eutils multilib python
+
+DESCRIPTION="Ham radio backend rig control libraries"
+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"
+IUSE="doc python tcl"
+
+RESTRICT="test"
+
+RDEPEND="
+	=virtual/libusb-0*
+	dev-libs/libxml2
+	python? ( <dev-lang/python-3 )
+	tcl? ( dev-lang/tcl )"
+
+DEPEND=" ${RDEPEND}
+	dev-util/pkgconfig
+	dev-lang/swig
+	>=sys-devel/libtool-2.2
+	doc? ( app-doc/doxygen )"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	# 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"
+
+	# fix tcl lib path
+	epatch "${FILESDIR}"/${PN}-1.2.11-bindings.diff
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--libdir=/usr/$(get_libdir)/hamlib \
+		--disable-static \
+		--with-rpc-backends \
+		--without-perl-binding \
+		$(use_with python python-binding) \
+		$(use_enable tcl tcl-binding)
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use doc ; then
+		cd doc && make doc || die "make doc failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	remove_libtool_files all
+
+	dodoc AUTHORS NEWS PLAN README README.betatester \
+		README.developer TODO || die "dodoc failed"
+
+	if use doc; then
+		dohtml doc/html/* || die "dohtml failed"
+	fi
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins hamlib.pc || die "doins failed"
+
+	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
+	doenvd "${T}"/73hamlib || die "doenvd failed"
+}
+
+pkg_postinst()  {
+	python_mod_optimize $(python_get_sitedir)
+}
+
+pkg_postrm()  {
+	python_mod_cleanup $(python_get_sitedir)
+}