Use only autotools-utils functions. Bug #392101

Package-Manager: portage-2.1.10.41/cvs/Linux i686

3 files changed, 30 insertions, 32 deletions

diff --git a/media-libs/hamlib/ChangeLog b/media-libs/hamlib/ChangeLog
index b06bd4d18788..2628242895d3 100644
--- a/media-libs/hamlib/ChangeLog
+++ b/media-libs/hamlib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/hamlib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/ChangeLog,v 1.61 2011/09/01 18:42:33 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/ChangeLog,v 1.62 2011/12/15 09:01:06 tomjbe Exp $
+
+  15 Dec 2011; Thomas Beierlein <tomjbe@gentoo.org> hamlib-1.2.14.ebuild:
+  Use only autotools-utils functions. Bug #392101
 
 *hamlib-1.2.14 (01 Sep 2011)
 
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index aa12dbf837d8..60218709f1fb 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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
@@ -12,15 +12,13 @@ EBUILD hamlib-1.2.10.ebuild 2003 RMD160 2221f9f359cb3bf0ddcf4a087d88447e1b5be861
 EBUILD hamlib-1.2.11.ebuild 1783 RMD160 a90f26c13aa1f6d03ae0ea7e58e92b891f33aebd SHA1 6b2ae50062675b9b56e3343c95b164609463c552 SHA256 9c288938475d56aa2e4e66728ea7d0dd38a78a9bd575175b58c10c8fe083e5b2
 EBUILD hamlib-1.2.12-r2.ebuild 2031 RMD160 94fe5dfdf502547cb57640579e0259fd2d1936ac SHA1 e6d6ea5f5377a7ce05e9b8185d12773dce7bd2d6 SHA256 0a72a6f4b47d9f7a49104faaf38de47d5ac2529b27378c4ff9930640f08915fe
 EBUILD hamlib-1.2.13.ebuild 2031 RMD160 eb771748c9f19d3a58dea360a5c4f4e04ab98b0e SHA1 323fc347ac53a8e8b42fe26a7be38eb0c500949f SHA256 b7dc692cc4d6d157281a3c27f5a93476c34468bb5b068eded25c0f07d599a85b
-EBUILD hamlib-1.2.14.ebuild 2027 RMD160 115efa455604a3e6a6f67b6183fddec1a20accbd SHA1 6628b4c1a7047b1947e29f27922c79dd89db0dfa SHA256 706c5b863fa84c569680a679a24a452701bd6a557f61d0d4c73d5368eb261144
-MISC ChangeLog 9674 RMD160 85f81d63768601d0179901e4e11561cb7f4be27e SHA1 30eff8d1603783fd7f761a33e5fac6dbd1548b53 SHA256 03aab0484c9576fd3e4af5a55cc72a42b85ff9480f8a2e9abf9f0696727d4270
+EBUILD hamlib-1.2.14.ebuild 2104 RMD160 554245af2399eb1cb5dc3c87e190fdc0daadbacc SHA1 00b976e54c3967ddadfe9078da8679a2721daee0 SHA256 45b194e790b145a345d345d5b9c230b6477ad1def01f8459d5f82989c847275c
+MISC ChangeLog 9799 RMD160 33e168b082af43ce51426b92ed0cb0de7610d677 SHA1 9d88b6d3c5be712d181c97fde94287534e9693b5 SHA256 f68cc17a9921d0b91c03f4e335150784687157ff5c91d987119b627f9c741250
 MISC metadata.xml 235 RMD160 f4ff4565289571ee422eccea7fdfefad9ee6be79 SHA1 8bd6a736d788a9b631454c68331b18f94402ea59 SHA256 ae15692b7066faecf636a6f882d1b44a4fb1e6357ba1c0a91b5753d43eb0139d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59pdgACgkQfXuS5UK5QB0X/wQAq5sN4XHPg1VRNGRRTWaaKXqn
-/oFydt01BMvhU3Dg33c7E7O+lrqiuUH2lgS8bcuYS4+Lp6WD8q1pO8EFiz4Fnf6w
-Jn5XCjcxFMBxlp7IsbpJMxJ6ovimhSvrm/Y1ruPjEJTGjsvRcMk3h2BdX50qBU/E
-UZDbCyxnyZA4x5UMkfc=
-=x0+1
+iEYEARECAAYFAk7pt2QACgkQQe4uqXYgU9W6aQCfcAKl1RAnzwp6I0t8ZpxNjdo9
+eyYAn1FCoIm5o8GYrTG+DQ3/T38XlHLm
+=L6pE
 -----END PGP SIGNATURE-----
diff --git a/media-libs/hamlib/hamlib-1.2.14.ebuild b/media-libs/hamlib/hamlib-1.2.14.ebuild
index 462c987a4030..a08e866286c1 100644
--- a/media-libs/hamlib/hamlib-1.2.14.ebuild
+++ b/media-libs/hamlib/hamlib-1.2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/hamlib-1.2.14.ebuild,v 1.1 2011/09/01 18:42:33 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/hamlib-1.2.14.ebuild,v 1.2 2011/12/15 09:01:06 tomjbe Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -29,6 +29,8 @@ DEPEND=" ${RDEPEND}
 	>=sys-devel/libtool-2.2
 	doc? ( app-doc/doxygen )"
 
+DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer TODO)
+
 pkg_setup() {
 	if use python; then
 		python_set_active_version 2
@@ -42,6 +44,9 @@ src_prepare() {
 		-e "s#fix}/include#fix}/include/hamlib#" \
 		hamlib.pc.in || die "sed failed"
 
+	# make building of documentation compatible with autotools-utils
+	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
+
 	# fix tcl lib path
 	epatch "${FILESDIR}"/${PN}-1.2.11-bindings.diff
 
@@ -49,36 +54,28 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir)/hamlib \
-		--disable-static \
-		--with-rpc-backends \
-		--without-perl-binding \
-		$(use_with python python-binding) \
+	local myeconfargs=(
+		--libdir=/usr/$(get_libdir)/hamlib
+		--disable-static
+		--with-rpc-backends
+		--without-perl-binding
+		$(use_with python python-binding)
 		$(use_enable tcl tcl-binding)
+	)
+	autotools-utils_src_configure
 }
 
 src_compile() {
-	emake || die "emake failed"
-
-	if use doc ; then
-		cd doc && make doc || die "make doc failed"
-	fi
+	autotools-utils_src_compile
+	use doc && autotools-utils_src_compile html
 }
 
 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
+	use doc && HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/doc/html/")
+	autotools-utils_src_install
 
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins hamlib.pc || die "doins failed"
+	doins "${AUTOTOOLS_BUILD_DIR}"/hamlib.pc || die "doins failed"
 
 	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
 	doenvd "${T}"/73hamlib || die "doenvd failed"