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

(Portage version: 2.2.0_alpha76/cvs/Linux x86_64)

4 files changed, 13 insertions, 46 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/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}"