Remove old. Fix tests and use autotools-utils eclass.

Package-Manager: portage-2.2.0_alpha9/cvs/Linux x86_64

5 files changed, 44 insertions, 76 deletions

diff --git a/net-libs/libisds/ChangeLog b/net-libs/libisds/ChangeLog
index 59d77d7c2a37..bbefed54fbf7 100644
--- a/net-libs/libisds/ChangeLog
+++ b/net-libs/libisds/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libisds
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libisds/ChangeLog,v 1.5 2010/12/20 10:57:48 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libisds/ChangeLog,v 1.6 2010/12/20 13:53:30 scarabeus Exp $
+
+  20 Dec 2010; Tomáš Chvátal <scarabeus@gentoo.org> -libisds-0.3.1.ebuild,
+  libisds-0.4.ebuild, libisds-9999.ebuild:
+  Remove old. Fix tests and use autotools-utils eclass.
 
 *libisds-0.4 (20 Dec 2010)
 
diff --git a/net-libs/libisds/Manifest b/net-libs/libisds/Manifest
index 05806f55afce..f2a8eb39c74a 100644
--- a/net-libs/libisds/Manifest
+++ b/net-libs/libisds/Manifest
@@ -1,7 +1,5 @@
-DIST libisds-0.3.1.tar.bz2 724667 RMD160 c7a5610fec7cc17c5c053ab5d89a8e8523f254bd SHA1 0f52991b9981202b0ef909c3649842514343d06d SHA256 e18330697ff07c0316c0d1b5a4b087d667548a6ea0e9515dd7434b20d93685f9
 DIST libisds-0.4.tar.xz 595856 RMD160 64b57e35997ce6541201d311cde9d43eec87a4ce SHA1 018fa6ccaaf556f764849e2b421a40c7fd0b50b6 SHA256 1c60350ad41533fa8afb8752dae0462ba12170ffdb530c7be538edcdd569f8a3
-EBUILD libisds-0.3.1.ebuild 1159 RMD160 1f9d8f831a6b80ddd809d801c499a8f0fb1fcf2e SHA1 7d9b9cc3cce4ac723888696cdf5a5f6786424d47 SHA256 4fd0c27b6113e6a21484a7e8ee26a38aad82db4905c1bec09b982a3a4a7d0955
-EBUILD libisds-0.4.ebuild 1156 RMD160 4b5e2e97d6169abdfda0e1b4232502fb14da1e30 SHA1 f5b3d5ff3c52d43b5579042010eaf3165199b069 SHA256 63ec78741d76a32710c37642f2c7f0023412a2b3610f07ffe1f5f30218b974ac
-EBUILD libisds-9999.ebuild 1157 RMD160 1576a35f1188336d891790d24ae28ad655ebb27d SHA1 83e64787703f6ca18319eb3c24373180a1b32a19 SHA256 b77eb5009e52aaf423e3c374f01d4d7d2c03a133999901bb94a0f9debf171165
-MISC ChangeLog 1055 RMD160 48d41c0c3ebc77ae19b3aa2208eed6fdd31383f1 SHA1 d6f71250f3b00ceee8b463e27a7c69f7b20a6c84 SHA256 7e2befa1825188857dcc56e25643efbd9bcdcec1339442938b67b2473c1414d3
+EBUILD libisds-0.4.ebuild 1339 RMD160 6952ef619db17aa6ff99e6feae6ff07a74b143f7 SHA1 1b273694c99056719f5441f1d0356b387f09f060 SHA256 218b39404c8c99f08c1b81151269689c8bcf5a691f1271ae2b5bffafec5bbcdb
+EBUILD libisds-9999.ebuild 1340 RMD160 8ffd001842ea69f42f884f09dada58761c78e46f SHA1 735257a4c3aa7b2beaa377bbfd46ebd58d0c2241 SHA256 a2b20eda96c422008e3e36742b0777cb48d03a8dd97e296e3d633778624134cb
+MISC ChangeLog 1233 RMD160 a76276e8d6c07057beb9e249d100d9cbb6d00022 SHA1 c98654277210fb7e4355311245bb701d58f00a12 SHA256 33fe8df9a1bcc0b054182b57c66f564d16dad81a034a809236b9d853516342e7
 MISC metadata.xml 482 RMD160 700041f7b8c30bed9e537f27460956c2eaba87a3 SHA1 c817e28471067789d298314817a90d45ec17ab78 SHA256 20937df87513ac5f18963d546b9cb8509594676e9e64874554f1dbe35f492ba0
diff --git a/net-libs/libisds/libisds-0.3.1.ebuild b/net-libs/libisds/libisds-0.3.1.ebuild
deleted file mode 100644
index cfb140399986..000000000000
--- a/net-libs/libisds/libisds-0.3.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libisds/libisds-0.3.1.ebuild,v 1.4 2010/07/09 10:37:37 scarabeus Exp $
-
-EAPI=3
-
-[[ ${PV} = 9999* ]] && GIT="git autotools"
-EGIT_REPO_URI="git://repo.or.cz/${PN}.git"
-inherit base ${GIT}
-
-DESCRIPTION="Client library for accessing ISDS Soap services"
-HOMEPAGE="http://xpisar.wz.cz/libisds/"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="debug nls static-libs test"
-
-COMMON_DEPEND="
-	app-crypt/gpgme
-	dev-libs/expat
-	dev-libs/libgcrypt
-	dev-libs/libxml2
-	net-misc/curl[ssl]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=app-crypt/gnupg-2
-"
-
-DOCS=( "NEWS" "README" "AUTHORS" "ChangeLog" )
-
-src_prepare() {
-	base_src_prepare
-	[[ ${PV} = 9999* ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-fatalwarnings \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_enable test)
-}
diff --git a/net-libs/libisds/libisds-0.4.ebuild b/net-libs/libisds/libisds-0.4.ebuild
index 35561f38f4d1..8e2b35f5175f 100644
--- a/net-libs/libisds/libisds-0.4.ebuild
+++ b/net-libs/libisds/libisds-0.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libisds/libisds-0.4.ebuild,v 1.1 2010/12/20 10:57:48 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libisds/libisds-0.4.ebuild,v 1.2 2010/12/20 13:53:30 scarabeus Exp $
 
 EAPI=3
 
 [[ ${PV} = 9999* ]] && GIT="git autotools"
 EGIT_REPO_URI="git://repo.or.cz/${PN}.git"
-inherit base ${GIT}
+inherit autotools-utils ${GIT}
 
 DESCRIPTION="Client library for accessing ISDS Soap services"
 HOMEPAGE="http://xpisar.wz.cz/libisds/"
@@ -40,15 +40,25 @@ RDEPEND="${COMMON_DEPEND}
 DOCS=( "NEWS" "README" "AUTHORS" "ChangeLog" )
 
 src_prepare() {
-	base_src_prepare
+	autotools-utils_src_prepare
 	[[ ${PV} = 9999* ]] && eautoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-fatalwarnings \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		"--disable-fatalwarnings"
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable static-libs static)
 		$(use_enable test)
+	)
+
+	autotools-utils_src_configure
+}
+
+src_test() {
+	# hack for failing gnupg testing
+	export HOME="${T}"
+	mkdir "${HOME}/.gnupg"
+	autotools-utils_src_test
 }
diff --git a/net-libs/libisds/libisds-9999.ebuild b/net-libs/libisds/libisds-9999.ebuild
index e777d503b85b..db8d0d727bc8 100644
--- a/net-libs/libisds/libisds-9999.ebuild
+++ b/net-libs/libisds/libisds-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libisds/libisds-9999.ebuild,v 1.5 2010/12/20 10:57:48 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libisds/libisds-9999.ebuild,v 1.6 2010/12/20 13:53:30 scarabeus Exp $
 
 EAPI=3
 
 [[ ${PV} = 9999* ]] && GIT="git autotools"
 EGIT_REPO_URI="git://repo.or.cz/${PN}.git"
-inherit base ${GIT}
+inherit autotools-utils ${GIT}
 
 DESCRIPTION="Client library for accessing ISDS Soap services"
 HOMEPAGE="http://xpisar.wz.cz/libisds/"
@@ -40,15 +40,25 @@ RDEPEND="${COMMON_DEPEND}
 DOCS=( "NEWS" "README" "AUTHORS" "ChangeLog" )
 
 src_prepare() {
-	base_src_prepare
+	autotools-utils_src_prepare
 	[[ ${PV} = 9999* ]] && eautoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-fatalwarnings \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		"--disable-fatalwarnings"
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable static-libs static)
 		$(use_enable test)
+	)
+
+	autotools-utils_src_configure
+}
+
+src_test() {
+	# hack for failing gnupg testing
+	export HOME="${T}"
+	mkdir "${HOME}/.gnupg"
+	autotools-utils_src_test
 }