[gentoo-commits] proj/kde:master commit in: net-libs/qtweetlib/

["Johannes Huber" <johu@gmx.de>]

commit:     aee059e234558a1957329ef88c3424a754079658
Author:     Johannes Huber <johu <AT> gmx <DOT> de>
AuthorDate: Wed Oct 26 19:04:08 2011 +0000
Commit:     Johannes Huber <johu <AT> gmx <DOT> de>
CommitDate: Wed Oct 26 19:04:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=aee059e2

[net-libs/qtweetlib] Bump 0.3

Switched back to official repo

(Portage version: 2.2.0_alpha71/git/Linux i686, signed Manifest commit with key DF018462)

---
 ...lib-0_p20110524.ebuild => qtweetlib-0.3.ebuild} |   19 ++++++++++++-------
 net-libs/qtweetlib/qtweetlib-9999.ebuild           |   19 ++++++++++++-------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/net-libs/qtweetlib/qtweetlib-0_p20110524.ebuild b/net-libs/qtweetlib/qtweetlib-0.3.ebuild
similarity index 55%
rename from net-libs/qtweetlib/qtweetlib-0_p20110524.ebuild
rename to net-libs/qtweetlib/qtweetlib-0.3.ebuild
index 2adea8c..4f7a4e0 100644
--- a/net-libs/qtweetlib/qtweetlib-0_p20110524.ebuild
+++ b/net-libs/qtweetlib/qtweetlib-0.3.ebuild
@@ -4,16 +4,14 @@
 
 EAPI=4
 
-# use domme's/dschmidt's clone for now, until the CMake support is merge
-# back to minimoog's original repository. See also:
-# https://github.com/minimoog/QTweetLib/network
-#EGIT_REPO_URI="git://github.com/minimoog/QTweetLib.git"
+MY_PN=QTweetLib
+
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://dev.gentoo.org/~jmbsvicetto/distfiles/snapshots/${P}.tar.bz2"
+	SRC_URI="https://github.com/minimoog/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 else
 	GIT_ECLASS="git-2"
-	EGIT_REPO_URI="git://github.com/dschmidt/QTweetLib.git"
+	EGIT_REPO_URI="git://github.com/minimoog/QTweetLib.git"
 	KEYWORDS=""
 fi
 
@@ -32,4 +30,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"/"${PN}"
+src_unpack() {
+	if [[ ${PV} != *9999* ]]; then
+		unpack ${A}
+		mv *-${MY_PN}-* "${S}"
+	else
+		git-2_src_unpack
+	fi
+}

diff --git a/net-libs/qtweetlib/qtweetlib-9999.ebuild b/net-libs/qtweetlib/qtweetlib-9999.ebuild
index 2adea8c..4f7a4e0 100644
--- a/net-libs/qtweetlib/qtweetlib-9999.ebuild
+++ b/net-libs/qtweetlib/qtweetlib-9999.ebuild
@@ -4,16 +4,14 @@
 
 EAPI=4
 
-# use domme's/dschmidt's clone for now, until the CMake support is merge
-# back to minimoog's original repository. See also:
-# https://github.com/minimoog/QTweetLib/network
-#EGIT_REPO_URI="git://github.com/minimoog/QTweetLib.git"
+MY_PN=QTweetLib
+
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://dev.gentoo.org/~jmbsvicetto/distfiles/snapshots/${P}.tar.bz2"
+	SRC_URI="https://github.com/minimoog/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 else
 	GIT_ECLASS="git-2"
-	EGIT_REPO_URI="git://github.com/dschmidt/QTweetLib.git"
+	EGIT_REPO_URI="git://github.com/minimoog/QTweetLib.git"
 	KEYWORDS=""
 fi
 
@@ -32,4 +30,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"/"${PN}"
+src_unpack() {
+	if [[ ${PV} != *9999* ]]; then
+		unpack ${A}
+		mv *-${MY_PN}-* "${S}"
+	else
+		git-2_src_unpack
+	fi
+}