Version bump, cleanup older versions, fix missing die clause.

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

4 files changed, 18 insertions, 44 deletions

diff --git a/dev-libs/libxr/ChangeLog b/dev-libs/libxr/ChangeLog
index f4aa9be83cbd..7ca52e0b7b86 100644
--- a/dev-libs/libxr/ChangeLog
+++ b/dev-libs/libxr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libxr
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxr/ChangeLog,v 1.5 2008/10/18 03:24:23 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxr/ChangeLog,v 1.6 2010/01/04 22:26:12 flameeyes Exp $
+
+*libxr-1.0 (04 Jan 2010)
+
+  04 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -libxr-0.9.96.ebuild, -libxr-0.9.97.ebuild, +libxr-1.0.ebuild:
+  Version bump, cleanup older versions, fix missing die clause.
 
 *libxr-0.9.97 (18 Oct 2008)
 
diff --git a/dev-libs/libxr/Manifest b/dev-libs/libxr/Manifest
index 3fdebbd3ae67..a1c72337dcf9 100644
--- a/dev-libs/libxr/Manifest
+++ b/dev-libs/libxr/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST libxr-0.9.96.tar.bz2 353465 RMD160 b8d9bccefb5addadce3d2d051cf0f9f46253c6f5 SHA1 885c9085895ce7fba715aca81d4464f4dfaf44a3 SHA256 cae42ba944332142185e28ab4bd483934c706b342d42a7fc141dbc66a22ce7b2
-DIST libxr-0.9.97.tar.bz2 341137 RMD160 0de03fbc2e352e8c0b217c50180508182d4aa219 SHA1 71910c3b596cbff9535e53e21c5503adf42bacce SHA256 544e79ae6458cb09a1da9abdf64caae2fb5d67e9c1c39eb1ade4fd284f93cea9
-EBUILD libxr-0.9.96.ebuild 765 RMD160 44ffc95309f0bcd279022d88f3c03c99426cbe17 SHA1 b48bda18b326afca5197337c2e0ba5c627a07d11 SHA256 c4d6585e34fe4680e7b5ab26ff02fd2d538e4f5207c8d7df17c83ceb15a432e0
-EBUILD libxr-0.9.97.ebuild 765 RMD160 9cb3fbd6eed6668fd5cb05e7c52795c27d7c9505 SHA1 195c9be411e3b03b4f1af9c8bd274d3f3e7cc961 SHA256 e9c86b07d747a864ea8072edf6cca6db9bd3e3f537dd88d48ff9169368130381
-MISC ChangeLog 829 RMD160 cf13ba8dc2ae31138ace4688cbef9d320a4b1210 SHA1 89d2ac3cadc3e70e1c5aa46623659034b333e093 SHA256 fe6bc4330234a4820d5708a23ff16bf7e5802eab5c225294f351d22679a8e079
+DIST libxr-1.0.tar.bz2 326812 RMD160 6048159a2335b4b76938a117a78f24138c50026f SHA1 1aba9aa15b0936aa4d1462fedbee933ff0e7a63c SHA256 be3133346e6e616706f4c91523e62e9093e8af59b40376671b95ae0f117e1ad2
+EBUILD libxr-1.0.ebuild 765 RMD160 cd3981a8a6440449fc1ef765b1d3be59f545b765 SHA1 7ed096f251fdaafa3d6f339b7b0ed08241dde19c SHA256 fbe3c181697b4ec3adbb3b00d559bb8133257e0f207effcc22b1fdbbcb2f3a87
+MISC ChangeLog 1041 RMD160 e2e2675d03e8318afa9b26a57dd90cf5ce87a84d SHA1 48ca61104077fec2ee298f6ffaf92a7dd57f11e0 SHA256 eb9155f650b7c884e4309729b2a1cc924e1cbbcae40590ba64f3e00046cb7cdf
 MISC metadata.xml 286 RMD160 e6db101a5a1a5c8bf9c084e1e8c70fa7a0f680fc SHA1 793f0eef959f8547d92d39f939429abd10be0b14 SHA256 35db68a27a362fbf1a00ebf7bcc1075e7b883d8898de4100b0abb6e264521bb9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkj5Vu0ACgkQAiZjviIA2Xjg8ACgq/KGVyzPUsfRA67HDEIiTOvN
-U+8AoN1Y2oY6WiRP2Ab52gDLW+1Pn4Vx
-=dZ16
+iEYEARECAAYFAktCawkACgkQAiZjviIA2XjNhACeIgd6NBOrPk/1UQfwHF+GYTc6
+upQAnRBeBQipOhlpwa2ryfAHwZ+oTlGh
+=8q5v
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libxr/libxr-0.9.96.ebuild b/dev-libs/libxr/libxr-0.9.96.ebuild
deleted file mode 100644
index aac36eb02287..000000000000
--- a/dev-libs/libxr/libxr-0.9.96.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxr/libxr-0.9.96.ebuild,v 1.4 2008/09/22 10:31:12 flameeyes Exp $
-
-DESCRIPTION="Cross-platform XML-RPC client/server library written in C"
-HOMEPAGE="http://oss.zonio.net/libxr.htm"
-SRC_URI="http://oss.zonio.net/releases/libxr/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-# IUSE="json"
-
-RDEPEND=">=dev-libs/glib-2.12
-		 >=dev-libs/libxml2-2.6.20
-		 dev-libs/openssl"
-#		 json? ( >=dev-libs/json-c-0.3 )"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		dev-util/re2c"
-
-src_compile() {
-	econf --disable-json || die
-	emake || die
-}
-
-src_install() {
-	emake -j1 DESTDIR="$D" install
-}
diff --git a/dev-libs/libxr/libxr-0.9.97.ebuild b/dev-libs/libxr/libxr-1.0.ebuild
index b5c98cc85e22..df7d73c20c2d 100644
--- a/dev-libs/libxr/libxr-0.9.97.ebuild
+++ b/dev-libs/libxr/libxr-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxr/libxr-0.9.97.ebuild,v 1.1 2008/10/18 03:24:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxr/libxr-1.0.ebuild,v 1.1 2010/01/04 22:26:12 flameeyes Exp $
 
 DESCRIPTION="Cross-platform XML-RPC client/server library written in C"
 HOMEPAGE="http://oss.zonio.net/libxr.htm"
@@ -26,5 +26,5 @@ src_compile() {
 }
 
 src_install() {
-	emake -j1 DESTDIR="$D" install
+	emake DESTDIR="$D" install || die
 }