diff options
| -rw-r--r-- | app-text/xournal/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/xournal/xournal-0.4.6-r3.ebuild | 23 |
2 files changed, 23 insertions, 6 deletions
diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog index 067a53c94877..88b36365a0b5 100644 --- a/app-text/xournal/ChangeLog +++ b/app-text/xournal/ChangeLog @@ -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) diff --git a/app-text/xournal/xournal-0.4.6-r3.ebuild b/app-text/xournal/xournal-0.4.6-r3.ebuild index 4ab9d98792c0..da87c33654ea 100644 --- a/app-text/xournal/xournal-0.4.6-r3.ebuild +++ b/app-text/xournal/xournal-0.4.6-r3.ebuild @@ -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 @@ inherit gnome2 autotools 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 @@ DEPEND="${COMMONDEPEND} " 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 } |