app-text/xournal: [QA] Port to git-r3

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/app-text/xournal/xournal-0.4.8-r1.ebuild b/app-text/xournal/xournal-0.4.8-r1.ebuild
index 2d7a905440312b9fe1fef4fa01960b571eab341c..b30ab3a5467f64a40d9af137c26bee32bb725e6f 100644 (file)
--- 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 9405f5279cc5b9055b407ef0f554387c3e38a072..1b5655d9ad20fdf25188776b6e90f8f21bd06788 100644 (file)
--- 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 9472f5a2e3ad36156d2b90241d9eec79bff09cef..61353ac0307f5bff2185b149469f51c2434b8604 100644 (file)
--- 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