From 73e2164f35f6081013ff9cb4a411508a29563015 Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Mon, 25 Dec 2017 18:09:16 +0100
Subject: app-text/xournal: [QA] Port to git-r3

Package-Manager: Portage-2.3.19, Repoman-2.3.6
---
 app-text/xournal/xournal-0.4.8-r1.ebuild | 24 +++++++++++-------------
 app-text/xournal/xournal-0.4.8.ebuild    | 24 +++++++++++-------------
 app-text/xournal/xournal-9999.ebuild     | 24 +++++++++++-------------
 3 files changed, 33 insertions(+), 39 deletions(-)

(limited to 'app-text/xournal')

diff --git a/app-text/xournal/xournal-0.4.8-r1.ebuild b/app-text/xournal/xournal-0.4.8-r1.ebuild
index 2d7a90544031..b30ab3a5467f 100644
--- a/app-text/xournal/xournal-0.4.8-r1.ebuild
+++ b/app-text/xournal/xournal-0.4.8-r1.ebuild
@@ -5,28 +5,26 @@ EAPI=5
 
 GCONF_DEBUG=no
 
+[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes
+
 inherit gnome2
 
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
+	unset SRC_URI
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+fi
+
 DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus"
 HOMEPAGE="http://xournal.sourceforge.net/"
 
 LICENSE="GPL-2"
-
 SLOT="0"
 IUSE="+pdf vanilla"
 
-if [[ "${PV}" != "9999" ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	inherit git-2 autotools
-	SRC_URI=""
-	KEYWORDS=""
-	EGIT_REPO_URI="git://git.code.sf.net/p/xournal/code"
-	EGIT_PROJECT="${PN}"
-	EGIT_BOOTSTRAP="autogen.sh"
-fi
-
 COMMONDEPEND="
 	app-text/poppler:=[cairo]
 	dev-libs/atk
diff --git a/app-text/xournal/xournal-0.4.8.ebuild b/app-text/xournal/xournal-0.4.8.ebuild
index 9405f5279cc5..1b5655d9ad20 100644
--- a/app-text/xournal/xournal-0.4.8.ebuild
+++ b/app-text/xournal/xournal-0.4.8.ebuild
@@ -5,28 +5,26 @@ EAPI=5
 
 GCONF_DEBUG=no
 
+[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes
+
 inherit gnome2
 
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
+	unset SRC_URI
+else
+	KEYWORDS="amd64 x86"
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+fi
+
 DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus"
 HOMEPAGE="http://xournal.sourceforge.net/"
 
 LICENSE="GPL-2"
-
 SLOT="0"
 IUSE="+pdf"
 
-if [[ "${PV}" != "9999" ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-else
-	inherit git-2 autotools
-	SRC_URI=""
-	KEYWORDS=""
-	EGIT_REPO_URI="git://git.code.sf.net/p/xournal/code"
-	EGIT_PROJECT="${PN}"
-	EGIT_BOOTSTRAP="autogen.sh"
-fi
-
 COMMONDEPEND="
 	app-text/poppler:=[cairo]
 	dev-libs/atk
diff --git a/app-text/xournal/xournal-9999.ebuild b/app-text/xournal/xournal-9999.ebuild
index 9472f5a2e3ad..61353ac0307f 100644
--- a/app-text/xournal/xournal-9999.ebuild
+++ b/app-text/xournal/xournal-9999.ebuild
@@ -5,28 +5,26 @@ EAPI=5
 
 GCONF_DEBUG=no
 
+[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes
+
 inherit gnome2
 
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
+	unset SRC_URI
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+fi
+
 DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus"
 HOMEPAGE="http://xournal.sourceforge.net/"
 
 LICENSE="GPL-2"
-
 SLOT="0"
 IUSE="+pdf"
 
-if [[ "${PV}" != "9999" ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	inherit git-2 autotools
-	SRC_URI=""
-	KEYWORDS=""
-	EGIT_REPO_URI="git://git.code.sf.net/p/xournal/code"
-	EGIT_PROJECT="${PN}"
-	EGIT_BOOTSTRAP="autogen.sh"
-fi
-
 COMMONDEPEND="
 	app-text/poppler:=[cairo]
 	dev-libs/atk
-- 
cgit v1.2.3-65-gdbad