[net-libs/jreen] Drop pre-release now that there was a release and update $S instead of adding a custom SRC_UNPACK.

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

5 files changed, 29 insertions, 64 deletions

diff --git a/net-libs/jreen/ChangeLog b/net-libs/jreen/ChangeLog
index c8b00bd5a88a..71de9b98911d 100644
--- a/net-libs/jreen/ChangeLog
+++ b/net-libs/jreen/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/jreen
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/jreen/ChangeLog,v 1.2 2011/11/21 05:25:02 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/jreen/ChangeLog,v 1.3 2011/11/21 19:13:29 jmbsvicetto Exp $
+
+  21 Nov 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  -jreen-0_p20110709.ebuild, jreen-1.0.1.ebuild, jreen-9999.ebuild:
+  [net-libs/jreen] Drop pre-release now that there was a release and update $S
+  instead of adding a custom SRC_UNPACK.
 
 *jreen-1.0.1 (21 Nov 2011)
 
diff --git a/net-libs/jreen/Manifest b/net-libs/jreen/Manifest
index 452a02962fb2..159f9e70a5fb 100644
--- a/net-libs/jreen/Manifest
+++ b/net-libs/jreen/Manifest
@@ -1,27 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST jreen-0_p20110709.tar.bz2 139693 RMD160 663e3a7524eec1035ead3efb600e7b99f18c115e SHA1 b82af2395e855b4774b326517126242cb42a9493 SHA256 c55ef48e311236d657030ef0747ce8435db77f9b1dc59124a27cc33dbeb03186
 DIST jreen-1.0.1.tar.bz2 150536 RMD160 fa5c4cbc45c8c931ec57b672907f6b17adf5dad2 SHA1 b423f8b4cbe1fb40799f234ec2fb5590584d5493 SHA256 e47adcfbe870ebb39e879ae4aef395eb40f3f3beaffd91b118e038c8dbb4567b
-EBUILD jreen-0_p20110709.ebuild 777 RMD160 91a3852ecdd4ebed97c2827e9c9bde2ffac93088 SHA1 c8e002a1a1f9fea2fd47d37d2cf075653940b765 SHA256 9d4f9eb764602d5d0be6c141d9ef89d51ce9a542731a4904ae09d9a8454e2a4f
-EBUILD jreen-1.0.1.ebuild 894 RMD160 cecccd231bfeaad14b854fecc418bd3875e278bf SHA1 20cb47708a44566254dfa256f2eb5cd93bdb4a02 SHA256 071a677f5e6ba4b5fbc216e2ec0b3f1beb12b0cae7fa03bf7972105329950dbc
-EBUILD jreen-9999.ebuild 770 RMD160 00d15f707bb6346d81622d4fa6689fdda06fcfd8 SHA1 95d65fa84f62f856fb9cd52c6f8313927a0aa9b0 SHA256 b67d9f94708bbe3aac4f9d08db1c4d7d1241bc6b77c6bc2ab69750f7bfc21c67
-MISC ChangeLog 679 RMD160 913a92645489a2d977c4c05ebde63e97145c7474 SHA1 416455d2b6044035894d055996a813f15d9b2f35 SHA256 ec9e92f11e975d23edf4f1c999d2831f76373cca2ec17d64ce8e644ab680610d
+EBUILD jreen-1.0.1.ebuild 786 RMD160 243239a9d6730a41c3efa20215bfa4ec211ef28d SHA1 1f39f997a5b47d8aa5d7629150ffd759baf4cc64 SHA256 657ec52dcee3c6cb6a66f816a6fc825098cd18c5c05dd47b5747a03e36f4359d
+EBUILD jreen-9999.ebuild 785 RMD160 856b8f6d161d8a1d74da4679e4e6ba77daf3304c SHA1 75fecfdd345af1c714b9b9fbc55966afb9d35c59 SHA256 c21fc7124534a18e26b3df2451bc79f90c8401ff81a0ac7c6440e7f23c7673e4
+MISC ChangeLog 935 RMD160 b2e618cc6a67401c0ba66746a264175c640af762 SHA1 a1b83d1f75c7b0f02a6ba9e30ca6925e98875054 SHA256 15673871a3297a77a57f91204bd421afbf76139ecd33ca4002ad4dc7efb49261
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOyeCFAAoJEC8ZTXQF1qEPiWMP/1lQFQ3Dpj0dNAxFul6mfqmV
-IS9g/56g6w2dPMEXceqU6Z+6mc/gPkP4Ivm8IgLf6Hn6c2m48MYqmSurerQbi/S5
-g2vndn8GLnrU9ThGtiAjO/ywKvJkwNLCgxkuTDLiIIb0CDljmpHCRjw9nVcOn/Q3
-Ekzcl6Eg/PCwuTMV2L53+tihaROOw7W/G6+jyM4eBA7F9uWQWnApZ6W0i4HxuG3E
-vAxNXt87gOADd5Tb6441RWauqS351bLa/ZfraLzFhgfMe7m/mfzSj01VzPZwwhxk
-zKSzlY1l/zgqZxEsYH9nw3afGfjSuARrSEiraffd5Lb/qxUOtZ+CciyDbT+S8sKV
-PGOEzgZd0dx0tfUfICqn7ZaOmDl2PGjP3J8istfZa0Nlvy2VQCnjuMEMSd8yI/hm
-C6byOJA/QaCAc4mzrIgxzdqjyKy6XwwQ9W6rFCQP5EY+yD/c1i6O0VJlieh2X6NA
-GuHjBR52F6jAC6MHhBNiNNXA3Y7BUFWkZJkGr4Lh6KwToiMdyvyH0C5qB9zehsH3
-txkoeO2/gkaWPFI6DjGKsk2FrCUTG3SsbvUf2HryjBbYT3QOHHeZL/qmsHi6+/NG
-42kRGza7hCT1wJI52ng+low+jMESTL/j0FFa0+2M81+Yl0bteBf6D6HZ6snXRFwc
-S62cxKjHWye0GYUZJD7f
-=V9gF
+iQIcBAEBAgAGBQJOyqKpAAoJEC8ZTXQF1qEPIdcP/jQI8v+kD3qgLo+y1O0JlCJv
+snZ1Jf1+yaXvCfwElCmhKcJcwEq8574JxPvjR0F9Yw1HDC4MAfm3vTF/OXvZoSnt
+EWOQ/6SQ6GHvvi52w+OHQXoz1tLR5xYh1DXIO7DLB1Ir2WIwu4nvcuUo+B1B74GI
+3+3aWcd3d7vwB1ptBqzIN8WUlJkCz30cC95sbg7oKrQMSAEXGZjOwKKrk0jQqcqC
+tJoUaQG8vGWfFa7XECJ9Ycb03p/mdjYZSTwafA7sxLKdH8vcvv2peZQJASjxpxo0
+gSwSQ+SICarqcvSLBAKWr7xMugEF242IusnZV+di53/apu8EuXY27J2hsRGv7epA
+GcWzSxdCE4t9i1DC5F59WhH9nIxY4zXPM/OwRNFBbKhkuZFWMN6i5K/GXQz4rF9R
+BbuTAiyLyIFob/j6g2YSn3v8cAPvTAOg3Gaztbb4V6Tb+QCIN2wOBmFrQ8OE+EQU
+PoUw8epcKZR/GSoXO0lu4zAjJoiCpAtl3oXy8ES4RSUKR+Endq1QmWOKYdap8gK8
+nkhAzAa03M3llHC/fu1psB+i9y1gWJwZhDa4v0bh3lQbla1XQRsXO/yYXZoespZt
+DpF0hGLqvlYXAuNOH4m7IOZTGmdaoMycLrdCRdYF6fYuNNX5x9cMYN3civxIAXxm
+iKWOqESA+gObStVWvguI
+=oWU7
 -----END PGP SIGNATURE-----
diff --git a/net-libs/jreen/jreen-0_p20110709.ebuild b/net-libs/jreen/jreen-0_p20110709.ebuild
deleted file mode 100644
index 496b51176c7f..000000000000
--- a/net-libs/jreen/jreen-0_p20110709.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/jreen/jreen-0_p20110709.ebuild,v 1.1 2011/11/12 19:18:02 dilfridge Exp $
-
-EAPI=4
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://dev.gentoo.org/~jmbsvicetto/distfiles/snapshots/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	GIT_ECLASS="git-2"
-	EGIT_REPO_URI="git://github.com/euroelessar/jreen.git"
-	KEYWORDS=""
-fi
-
-inherit qt4-r2 cmake-utils ${GIT_ECLASS}
-
-DESCRIPTION="Qt XMPP library"
-HOMEPAGE="https://github.com/euroelessar/jreen"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug"
-
-DEPEND="
-	>=app-crypt/qca-2.0.3
-	>=net-dns/libidn-1.20
-	>=x11-libs/qt-core-4.6.0
-	>=x11-libs/qt-gui-4.6.0
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/"${PN}"
diff --git a/net-libs/jreen/jreen-1.0.1.ebuild b/net-libs/jreen/jreen-1.0.1.ebuild
index c12a350050ba..d8589eae7569 100644
--- a/net-libs/jreen/jreen-1.0.1.ebuild
+++ b/net-libs/jreen/jreen-1.0.1.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/net-libs/jreen/jreen-1.0.1.ebuild,v 1.1 2011/11/21 05:25:02 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/jreen/jreen-1.0.1.ebuild,v 1.2 2011/11/21 19:13:29 jmbsvicetto Exp $
 
 EAPI=4
 
@@ -32,11 +32,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	if [[ ${PV} != *9999* ]]; then
-		unpack ${A}
-		mv ${MY_P} "${S}" || die move failed
-	else
-		git-2_src_unpack
-	fi
-}
+S="${WORKDIR}/${MY_P}"
diff --git a/net-libs/jreen/jreen-9999.ebuild b/net-libs/jreen/jreen-9999.ebuild
index 7a6e9faf7ee3..fd0e5b137774 100644
--- a/net-libs/jreen/jreen-9999.ebuild
+++ b/net-libs/jreen/jreen-9999.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/jreen/jreen-9999.ebuild,v 1.1 2011/11/12 19:18:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/jreen/jreen-9999.ebuild,v 1.2 2011/11/21 19:13:29 jmbsvicetto Exp $
 
 EAPI=4
 
+MY_P=lib${PN}\-${PV}
+
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://dev.gentoo.org/~jmbsvicetto/distfiles/snapshots/${P}.tar.bz2"
+	SRC_URI="http://qutim.org/downloads/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
 	GIT_ECLASS="git-2"
@@ -30,4 +32,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"/"${PN}"
+S="${WORKDIR}/${MY_P}"