Mark 1.2.4 stable on amd64, bug #138107. Add new version from upstream. Remove old versions.

(Portage version: 2.1.1_pre2-r4)

5 files changed, 93 insertions, 5 deletions

diff --git a/media-libs/hamlib/ChangeLog b/media-libs/hamlib/ChangeLog
index 5f1e253ced5c..beaebc70c1a2 100644
--- a/media-libs/hamlib/ChangeLog
+++ b/media-libs/hamlib/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/hamlib
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/ChangeLog,v 1.17 2006/06/23 14:57:01 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/ChangeLog,v 1.18 2006/07/06 23:34:41 squinky86 Exp $
+
+*hamlib-1.2.5 (06 Jul 2006)
+
+  06 Jul 2006; Jon Hood <squinky86@gentoo.org> -hamlib-1.2.1.ebuild,
+  -hamlib-1.2.2.ebuild, -hamlib-1.2.3.ebuild, hamlib-1.2.4.ebuild,
+  +hamlib-1.2.5.ebuild:
+  Mark 1.2.4 stable on amd64 with fixes from Michael Weyershauser
+  <thedude0001@gmx.de> in bug #138107. Add newer version of hamlib.
+  Remove old versions.
 
   23 Jun 2006; Simon Stelling <blubb@gentoo.org> +metadata.xml,
   hamlib-1.2.4.ebuild:
diff --git a/media-libs/hamlib/files/digest-hamlib-1.2.4 b/media-libs/hamlib/files/digest-hamlib-1.2.4
index cfc97f071c3a..81540d8f8d78 100644
--- a/media-libs/hamlib/files/digest-hamlib-1.2.4
+++ b/media-libs/hamlib/files/digest-hamlib-1.2.4
@@ -1 +1,3 @@
 MD5 f49f961fd8d895aec7bd247d5fd5b772 hamlib-1.2.4.tar.gz 1423048
+RMD160 ec03d4ec5deafe2a148e363a65cd9664a17da84f hamlib-1.2.4.tar.gz 1423048
+SHA256 d6e0f170e0ce4fda05302402bbb019325e0b043c8b172c071d22cd5a7bf17132 hamlib-1.2.4.tar.gz 1423048
diff --git a/media-libs/hamlib/files/digest-hamlib-1.2.5 b/media-libs/hamlib/files/digest-hamlib-1.2.5
new file mode 100644
index 000000000000..127367892654
--- /dev/null
+++ b/media-libs/hamlib/files/digest-hamlib-1.2.5
@@ -0,0 +1,3 @@
+MD5 9725a6ae60c1c8ead8669e42a67cc5e8 hamlib-1.2.5.tar.gz 1420619
+RMD160 72e664d54abd298feb19c0206fc026d1d32f1d16 hamlib-1.2.5.tar.gz 1420619
+SHA256 1a66cee68486087305b1f9ccfc2ea816aa88a50817257d6213608ec16a65c1ba hamlib-1.2.5.tar.gz 1420619
diff --git a/media-libs/hamlib/hamlib-1.2.4.ebuild b/media-libs/hamlib/hamlib-1.2.4.ebuild
index 78dcdc13f926..72f9e9e8fc32 100644
--- a/media-libs/hamlib/hamlib-1.2.4.ebuild
+++ b/media-libs/hamlib/hamlib-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/hamlib-1.2.4.ebuild,v 1.5 2006/06/23 14:57:01 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/hamlib-1.2.4.ebuild,v 1.6 2006/07/06 23:34:41 squinky86 Exp $
 
 inherit eutils multilib
 
@@ -10,15 +10,17 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~ppc x86"
+KEYWORDS="alpha amd64 ~ppc x86"
 IUSE="doc gd python tcltk X"
 
 RESTRICT="test"
 
 RDEPEND="virtual/libc
 	gd? ( media-libs/gd )
-	python? ( dev-lang/python )
-	tcltk? ( dev-lang/tk )"
+	python? ( dev-lang/python
+		dev-lang/tcl )
+	tcltk? ( dev-lang/tk
+		dev-lang/tcl )"
 DEPEND=">=sys-devel/libtool-1.5
 	>=sys-devel/autoconf-2.54
 	>=sys-devel/automake-1.7
diff --git a/media-libs/hamlib/hamlib-1.2.5.ebuild b/media-libs/hamlib/hamlib-1.2.5.ebuild
new file mode 100644
index 000000000000..f66c9a010964
--- /dev/null
+++ b/media-libs/hamlib/hamlib-1.2.5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/hamlib-1.2.5.ebuild,v 1.1 2006/07/06 23:34:41 squinky86 Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="Ham radio backend rig control libraries"
+HOMEPAGE="http://hamlib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="doc gd python tcltk X"
+
+RESTRICT="test"
+
+RDEPEND="virtual/libc
+	gd? ( media-libs/gd )
+	python? ( dev-lang/python
+		dev-lang/tcl )
+	tcltk? ( dev-lang/tk
+		dev-lang/tcl )"
+DEPEND=">=sys-devel/libtool-1.5
+	>=sys-devel/autoconf-2.54
+	>=sys-devel/automake-1.7
+	>=dev-util/pkgconfig-0.15
+	>=dev-lang/swig-1.3.14
+	dev-libs/libxml2
+	doc? ( >=app-doc/doxygen-1.3.5 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-pkgconfig-fix.diff || \
+		die "epatch failed"
+}
+
+src_compile() {
+	econf \
+		--libdir=/usr/$(get_libdir)/hamlib \
+		--disable-static \
+		--with-microtune \
+		--without-rpc-backends \
+		--without-perl-binding \
+		$(use_with python python-binding) \
+		$(use_with tcltk tcl-binding) \
+		$(use_with gd rigmatrix) \
+		$(use_with X x) \
+		|| die "configure failed"
+	emake || die "emake failed"
+	if use doc ; then
+		cd doc && make doc || die "make doc failed"
+	fi
+}
+
+src_install() {
+	einstall \
+		libdir=${D}/usr/$(get_libdir)/hamlib || \
+		die "einstall failed"
+	dodoc AUTHORS PLAN README README.betatester
+	dodoc README.developer LICENSE NEWS TODO
+	if use doc; then
+		dohtml doc/html/*
+		doman doc/man/man3/*
+	fi
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins hamlib.pc
+	echo "LDPATH=/usr/$(get_libdir)/hamlib" > 73hamlib
+	insinto /etc/env.d
+	doins 73hamlib
+}