dilfridge 14/10/15 15:01:59 Modified: xournal-9999.ebuild ChangeLog Added: xournal-0.4.8.ebuild Log: Version bump (Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 94BFDF4484AD142F)
Revision Changes Path 1.9 app-text/xournal/xournal-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/xournal-9999.ebuild?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/xournal-9999.ebuild?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/xournal-9999.ebuild?r1=1.8&r2=1.9 Index: xournal-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-9999.ebuild,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xournal-9999.ebuild 10 Aug 2014 18:38:21 -0000 1.8 +++ xournal-9999.ebuild 15 Oct 2014 15:01:59 -0000 1.9 @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.8 2014/08/10 18:38:21 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-9999.ebuild,v 1.9 2014/10/15 15:01:59 dilfridge Exp $ EAPI=5 @@ -14,21 +14,16 @@ LICENSE="GPL-2" SLOT="0" -IUSE="+pdf vanilla" +IUSE="+pdf" if [[ "${PV}" != "9999" ]]; then - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz !vanilla? ( http://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}-gentoo.patch.xz )" + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" 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 + EGIT_REPO_URI="git://xournal.git.sourceforge.net/gitroot/xournal/xournal" fi COMMONDEPEND=" @@ -51,19 +46,6 @@ virtual/pkgconfig " -src_prepare() { - if ! use vanilla && [[ "${PV}" != "9999" ]]; then - epatch "${WORKDIR}"/${PN}-${PVR}-gentoo.patch - fi - if ! use vanilla; then - sed -e "s:n http:n Gentoo release ${PVR}\\\\n http:" -i "${S}"/src/xo-interface.c - fi - epatch "${FILESDIR}/${PN}-0.4.7-am113.patch" - epatch "${FILESDIR}/${PN}-0.4.7-am113-2.patch" - epatch "${FILESDIR}/${PN}-0.4.7-ar.patch" - eautoreconf -} - src_install() { emake DESTDIR="${D}" install emake DESTDIR="${D}" desktop-install 1.49 app-text/xournal/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/ChangeLog?rev=1.49&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/ChangeLog?rev=1.49&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/ChangeLog?r1=1.48&r2=1.49 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- ChangeLog 10 Aug 2014 18:38:21 -0000 1.48 +++ ChangeLog 15 Oct 2014 15:01:59 -0000 1.49 @@ -1,6 +1,12 @@ # ChangeLog for app-text/xournal # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.48 2014/08/10 18:38:21 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.49 2014/10/15 15:01:59 dilfridge Exp $ + +*xournal-0.4.8 (15 Oct 2014) + + 15 Oct 2014; Andreas K. Huettel <[email protected]> +xournal-0.4.8.ebuild, + xournal-9999.ebuild: + Version bump 10 Aug 2014; Sergei Trofimovich <[email protected]> xournal-0.4.7.ebuild, xournal-9999.ebuild: 1.1 app-text/xournal/xournal-0.4.8.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/xournal-0.4.8.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/xournal-0.4.8.ebuild?rev=1.1&content-type=text/plain Index: xournal-0.4.8.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.8.ebuild,v 1.1 2014/10/15 15:01:59 dilfridge Exp $ EAPI=5 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" if [[ "${PV}" != "9999" ]]; then SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" KEYWORDS="~amd64 ~x86" else inherit git-2 SRC_URI="" KEYWORDS="" EGIT_REPO_URI="git://xournal.git.sourceforge.net/gitroot/xournal/xournal" 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_install() { emake DESTDIR="${D}" install emake DESTDIR="${D}" desktop-install dodoc ChangeLog AUTHORS README dohtml -r html-doc/* }
