diff options
| -rw-r--r-- | app-text/xournal/ChangeLog | 9 | ||||
| -rw-r--r-- | app-text/xournal/xournal-0.4.6-r3.ebuild (renamed from app-text/xournal/xournal-0.4.6-r2.ebuild) | 4 | ||||
| -rw-r--r-- | app-text/xournal/xournal-9999.ebuild | 66 |
3 files changed, 76 insertions, 3 deletions
diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog index 59e04dfd084d..067a53c94877 100644 --- a/app-text/xournal/ChangeLog +++ b/app-text/xournal/ChangeLog @@ -1,6 +1,13 @@ # 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.37 2012/06/28 23:34:04 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.38 2012/07/01 18:20:54 dilfridge Exp $ + +*xournal-9999 (01 Jul 2012) +*xournal-0.4.6-r3 (01 Jul 2012) + + 01 Jul 2012; Andreas K. Huettel <dilfridge@gentoo.org> + -xournal-0.4.6-r2.ebuild, +xournal-0.4.6-r3.ebuild, +xournal-9999.ebuild: + Rebase on new upstream repo, add live ebuild *xournal-0.4.6-r2 (28 Jun 2012) diff --git a/app-text/xournal/xournal-0.4.6-r2.ebuild b/app-text/xournal/xournal-0.4.6-r3.ebuild index fcdc8f01595c..4ab9d98792c0 100644 --- a/app-text/xournal/xournal-0.4.6-r2.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-r2.ebuild,v 1.1 2012/06/28 23:34:04 dilfridge Exp $ +# $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 $ EAPI=4 @@ -11,7 +11,7 @@ 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="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}-gentoo.patch.xz" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz http://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}-gentoo.patch.xz" LICENSE="GPL-2" SLOT="0" diff --git a/app-text/xournal/xournal-9999.ebuild b/app-text/xournal/xournal-9999.ebuild new file mode 100644 index 000000000000..b528a09efde2 --- /dev/null +++ b/app-text/xournal/xournal-9999.ebuild @@ -0,0 +1,66 @@ +# 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-9999.ebuild,v 1.1 2012/07/01 18:20:54 dilfridge Exp $ + +EAPI=4 + +GCONF_DEBUG=no + +inherit gnome2 autotools + +DESCRIPTION="Xournal is 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 !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] + dev-libs/atk + dev-libs/glib + gnome-base/libgnomecanvas + media-libs/freetype + media-libs/fontconfig + sys-libs/zlib + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + x11-libs/pango +" +RDEPEND="${COMMONDEPEND} + pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl ) +" +DEPEND="${COMMONDEPEND} + virtual/pkgconfig +" + +src_prepare() { + [[ "${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 +} + +src_install() { + emake DESTDIR="${D}" install + emake DESTDIR="${D}" desktop-install + + dodoc ChangeLog AUTHORS README + dohtml -r html-doc/* +} |