Update to install static libs only when required. Update deps. Use upstream tarball.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 64 insertions, 38 deletions

diff --git a/net-libs/libisds/ChangeLog b/net-libs/libisds/ChangeLog
index 02b064312fe1..53187affec9f 100644
--- a/net-libs/libisds/ChangeLog
+++ b/net-libs/libisds/ChangeLog
@@ -1,11 +1,16 @@
 # 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.1 2010/06/29 14:03:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libisds/ChangeLog,v 1.2 2010/06/29 14:21:08 scarabeus Exp $
+
+  29 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> libisds-0.3.1.ebuild,
+  libisds-9999.ebuild, metadata.xml:
+  Update to install static libs only when required. Update deps. Use
+  upstream tarball.
 
 *libisds-9999 (29 Jun 2010)
 *libisds-0.3.1 (29 Jun 2010)
 
   29 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   +libisds-0.3.1.ebuild, +libisds-9999.ebuild, +metadata.xml:
-  Add client interface to czech "datove stranky" soap service.
+  Add client interface to czech "datove schranky" soap service.
 
diff --git a/net-libs/libisds/Manifest b/net-libs/libisds/Manifest
index 27b08b48ce1e..d984dcb06d5a 100644
--- a/net-libs/libisds/Manifest
+++ b/net-libs/libisds/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST libisds-0.3.1.tar.bz2 667987 RMD160 fa616494e5c901463a6aa195291770f83901025f SHA1 d738fac355b627f724f2cbfa018747ed5831f3e0 SHA256 f03b382e46ed310ec48fd625119b51af440a6c48f32d1fd1df7f61cf8cad13cc
-EBUILD libisds-0.3.1.ebuild 954 RMD160 162287e93474065f6d2b0c029beff556f12c5bc0 SHA1 6a2866e6614fbc5529df38ca0e5e2c0b5a700fe4 SHA256 130640c5f63eec6ad3b0f9b797de0955a89144e27f95754253ab3945e8833061
-EBUILD libisds-9999.ebuild 953 RMD160 274b13e8f4900e3f5a8684ec56c3e686fe7ee667 SHA1 2bb8749865f17afd36b3ae676ee85f8a8849c7de SHA256 086ceaad228e35687ad9290ba752a3baf8d84d8965e07f48bf9122c4e9ec37bf
-MISC ChangeLog 447 RMD160 94a577ed88609ef3a56cb496d9ea54eb36a6cff6 SHA1 84d6f3664730dce642e247c0b65c68d0398ae757 SHA256 e0b907eaeb0bf5c0d8dec26f8e9dfd824aec514aef062b861e20639f1369c76b
-MISC metadata.xml 255 RMD160 b20087fe384c26e7b744ef10046a1abfe649493c SHA1 4c2bd0b326d004810cf566e1b55acdb98b8a0c8f SHA256 b4212fc51bccd99ce923af3707f6481e0f55ca006071ea059d324b4c0258fb4e
+DIST libisds-0.3.1.tar.bz2 724667 RMD160 c7a5610fec7cc17c5c053ab5d89a8e8523f254bd SHA1 0f52991b9981202b0ef909c3649842514343d06d SHA256 e18330697ff07c0316c0d1b5a4b087d667548a6ea0e9515dd7434b20d93685f9
+EBUILD libisds-0.3.1.ebuild 1161 RMD160 bccfb2029b81e0abb1d5779a1943bf27f3d5ce93 SHA1 b2b1b12a287f971ea12fe4a8b13f92aa8d7edf36 SHA256 700e8e4f7d72cfdb5068aae96b78086d938e5892cc9e5846ab0716951770c8cb
+EBUILD libisds-9999.ebuild 1160 RMD160 ff3302d27dc725b63a2526a127d1920d4e7b005b SHA1 8504e2ec1fae23541da9cc9f7183d825b2a059af SHA256 06e6d15d48056093f03931768212c727bc814b03a25e9bc5dbab7c88b636d72b
+MISC ChangeLog 652 RMD160 31f3a816a83e243befed4742b668dc74f198774f SHA1 d6f959bb93317f9d3a881ed55ef0be2f772f0e19 SHA256 23b6eb597437fa686fb62f39aaf7c9dcbe5fc96c4494d7cd48c018b26b9be639
+MISC metadata.xml 482 RMD160 700041f7b8c30bed9e537f27460956c2eaba87a3 SHA1 c817e28471067789d298314817a90d45ec17ab78 SHA256 20937df87513ac5f18963d546b9cb8509594676e9e64874554f1dbe35f492ba0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwp/TwACgkQHB6c3gNBRYf/KQCeMSaCGng5Gx/MtDuNoMgwSgud
-hzYAn1+9K1A80mzoahF2t6u5Pa+cbxWU
-=biPS
+iEYEARECAAYFAkwqAUkACgkQHB6c3gNBRYc5EgCeJpFXSKmMK6ob+axhEnVVPxLt
+mIcAoM9OFbHhPlVmHHBmFQDXDddAvTTV
+=ru0X
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libisds/libisds-0.3.1.ebuild b/net-libs/libisds/libisds-0.3.1.ebuild
index fc0ed0738fdf..3343cb0e7d64 100644
--- a/net-libs/libisds/libisds-0.3.1.ebuild
+++ b/net-libs/libisds/libisds-0.3.1.ebuild
@@ -1,46 +1,54 @@
 # 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.1 2010/06/29 14:03:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libisds/libisds-0.3.1.ebuild,v 1.2 2010/06/29 14:21:08 scarabeus Exp $
 
 EAPI=3
 
-[[ ${PV} = 9999* ]] && GIT="git"
+[[ ${PV} = 9999* ]] && GIT="git autotools"
 EGIT_REPO_URI="git://repo.or.cz/${PN}.git"
-inherit base autotools ${GIT}
+inherit base ${GIT}
 
-DESCRIPTION="Client library to access ISDS Soap service"
-HOMEPAGE="http://www.abclinuxu.cz/datove-schranky/libisds"
+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://dev.gentooexperimental.org/~scarabeus/${P}.tar.bz2"
+	SRC_URI="http://xpisar.wz.cz/libisds/dist/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 fi
 LICENSE="LGPL-2"
 
 SLOT="0"
-IUSE="debug test"
+IUSE="debug nls static-libs test"
 
-RDEPEND="
+COMMON_DEPEND="
+	app-crypt/gpgme
 	dev-libs/expat
 	dev-libs/libgcrypt
 	dev-libs/libxml2
 	net-misc/curl[ssl]
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig
-	sys-devel/gettext"
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=app-crypt/gnupg-2
+"
+
+DOCS=( "NEWS" "README" "AUTHORS" "ChangeLog" )
 
 src_prepare() {
 	base_src_prepare
-	eautoreconf
+	[[ ${PV} = 9999* ]] && eautoreconf
 }
 
 src_configure() {
 	econf \
 		--disable-fatalwarnings \
-		$(use_enable test) \
-		$(use_enable debug)
-
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		$(use_enable test)
 }
diff --git a/net-libs/libisds/libisds-9999.ebuild b/net-libs/libisds/libisds-9999.ebuild
index 830559645975..47f24886a362 100644
--- a/net-libs/libisds/libisds-9999.ebuild
+++ b/net-libs/libisds/libisds-9999.ebuild
@@ -1,46 +1,54 @@
 # 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.1 2010/06/29 14:03:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libisds/libisds-9999.ebuild,v 1.2 2010/06/29 14:21:08 scarabeus Exp $
 
 EAPI=3
 
-[[ ${PV} = 9999* ]] && GIT="git"
+[[ ${PV} = 9999* ]] && GIT="git autotools"
 EGIT_REPO_URI="git://repo.or.cz/${PN}.git"
-inherit base autotools ${GIT}
+inherit base ${GIT}
 
-DESCRIPTION="Client library to access ISDS Soap service"
-HOMEPAGE="http://www.abclinuxu.cz/datove-schranky/libisds"
+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://dev.gentooexperimental.org/~scarabeus/${P}.tar.bz2"
+	SRC_URI="http://xpisar.wz.cz/libisds/dist/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 fi
 LICENSE="LGPL-2"
 
 SLOT="0"
-IUSE="debug test"
+IUSE="debug nls static-libs test"
 
-RDEPEND="
+COMMON_DEPEND="
+	app-crypt/gpgme
 	dev-libs/expat
 	dev-libs/libgcrypt
 	dev-libs/libxml2
 	net-misc/curl[ssl]
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig
-	sys-devel/gettext"
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=app-crypt/gnupg-2
+"
+
+DOCS=( "NEWS" "README" "AUTHORS" "ChangeLog" )
 
 src_prepare() {
 	base_src_prepare
-	eautoreconf
+	[[ ${PV} = 9999* ]] && eautoreconf
 }
 
 src_configure() {
 	econf \
 		--disable-fatalwarnings \
-		$(use_enable test) \
-		$(use_enable debug)
-
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		$(use_enable test)
 }
diff --git a/net-libs/libisds/metadata.xml b/net-libs/libisds/metadata.xml
index 0b14a262fd80..08ee4c90c8b1 100644
--- a/net-libs/libisds/metadata.xml
+++ b/net-libs/libisds/metadata.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<longdescription>
+	A library for accessing ISDS (Informační systém datových schránek
+	/ Data Box Information System) SOAP services as defined in Czech ISDS Act
+	(300/2008 Coll.) and implied documents.
+</longdescription>
 <maintainer>
 	<email>scarabeus@gentoo.org</email>
 	<name>Tomáš Chvátal</name>