[gentoo-commits] gentoo-x86 commit in app-text/xournal: ChangeLog xournal-0.4.6-r3.ebuild

[gentoo-commits] gentoo-x86 commit in app-text/xournal: ChangeLog xournal-0.4.6-r3.ebuild

[Andreas HAttel (dilfridge)]

dilfridge    12/07/01 18:35:53

  Modified:             ChangeLog xournal-0.4.6-r3.ebuild
  Log:
  Sync with live ebuild and thereby add keywords
  
  (Portage version: 2.2.0_alpha114/cvs/Linux x86_64)

Revision  Changes    Path
1.39                 app-text/xournal/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/ChangeLog?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/ChangeLog?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/ChangeLog?r1=1.38&r2=1.39

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ChangeLog	1 Jul 2012 18:20:54 -0000	1.38
+++ ChangeLog	1 Jul 2012 18:35:53 -0000	1.39
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/xournal
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.38 2012/07/01 18:20:54 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.39 2012/07/01 18:35:53 dilfridge Exp $
+
+  01 Jul 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  xournal-0.4.6-r3.ebuild:
+  Sync with live ebuild and thereby add keywords
 
 *xournal-9999 (01 Jul 2012)
 *xournal-0.4.6-r3 (01 Jul 2012)



1.2                  app-text/xournal/xournal-0.4.6-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/xournal-0.4.6-r3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/xournal-0.4.6-r3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/xournal-0.4.6-r3.ebuild?r1=1.1&r2=1.2

Index: xournal-0.4.6-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.6-r3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xournal-0.4.6-r3.ebuild	1 Jul 2012 18:20:54 -0000	1.1
+++ xournal-0.4.6-r3.ebuild	1 Jul 2012 18:35:53 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.6-r3.ebuild,v 1.1 2012/07/01 18:20:54 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.6-r3.ebuild,v 1.2 2012/07/01 18:35:53 dilfridge Exp $
 
 EAPI=4
 
@@ -11,12 +11,25 @@
 DESCRIPTION="Xournal is an application for notetaking, sketching, and keeping a journal using a stylus."
 HOMEPAGE="http://xournal.sourceforge.net/"
 
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz http://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}-gentoo.patch.xz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS=""
-IUSE="+pdf"
+IUSE="+pdf vanilla"
+
+if [[ "${PV}" != "9999" ]]; then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz !vanilla? ( http://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}-gentoo.patch.xz )"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-2
+	SRC_URI=""
+	KEYWORDS=""
+	if use vanilla; then
+		EGIT_REPO_URI="git://xournal.git.sourceforge.net/gitroot/xournal/xournal"
+	else
+		EGIT_REPO_URI="git://gitorious.org/gentoo-stuff/xournal-gentoo.git"
+		EGIT_BRANCH="gentoo"
+	fi
+fi
 
 COMMONDEPEND="
 	app-text/poppler[cairo]
@@ -39,7 +52,7 @@
 "
 
 src_prepare() {
-	epatch "${WORKDIR}"/${PN}-${PVR}-gentoo.patch
+	[[ "${PV}" != "9999" ]] && epatch "${WORKDIR}"/${PN}-${PVR}-gentoo.patch
 	sed -e "s:n       http:n       Gentoo release ${PVR}\\\\n       http:" -i "${S}"/src/xo-interface.c
 	eautoreconf
 }