Remove old; add current CVS snapshot

(Portage version: 2.1.10.29/cvs/Linux x86_64)

4 files changed, 59 insertions, 64 deletions

diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog
index 360dbf98f5ad..7f8c0be7a228 100644
--- a/app-text/xournal/ChangeLog
+++ b/app-text/xournal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/xournal
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.19 2011/09/20 14:43:13 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.20 2011/10/22 16:20:46 dilfridge Exp $
+
+*xournal-0.4.5_p20111022 (22 Oct 2011)
+
+  22 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -xournal-0.4.2.1-r1.ebuild, -files/xournal-0.4.2.1-pdf-annotation.patch,
+  +xournal-0.4.5_p20111022.ebuild:
+  Remove old; add current CVS snapshot
 
   20 Sep 2011; Andreas Schuerch <nativemad@gentoo.org> xournal-0.4.5-r2.ebuild:
   x86 stable, thanks JD. Bug 348645
diff --git a/app-text/xournal/files/xournal-0.4.2.1-pdf-annotation.patch b/app-text/xournal/files/xournal-0.4.2.1-pdf-annotation.patch
deleted file mode 100644
index 1c16672f176b..000000000000
--- a/app-text/xournal/files/xournal-0.4.2.1-pdf-annotation.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- xournal-0.4.2.1/src/xo-file.c.orig	2008-03-21 17:59:19.000000000 -0500
-+++ xournal-0.4.2.1/src/xo-file.c	2009-01-29 12:07:14.000000000 -0600
-@@ -987,7 +993,18 @@
-   for (npad = 6; npad>0; npad--) {
-      ppm_name = g_strdup_printf("%s/p-%0*d.ppm", bgpdf.tmpdir, npad, req->pageno);
-      if (bgpdf.status != STATUS_ABORTED && bgpdf.status != STATUS_SHUTDOWN)
--       pixbuf = gdk_pixbuf_new_from_file(ppm_name, NULL);
-+     { // workaround for PPM loading issue in recent GTK
-+       gchar *buf;
-+       gsize count;
-+       GdkPixbufLoader *loader = gdk_pixbuf_loader_new_with_type("pnm", NULL);
-+       if (loader!=NULL && g_file_get_contents(ppm_name, &buf, &count, NULL))
-+       {
-+         gdk_pixbuf_loader_write(loader, buf, count, NULL);
-+         pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
-+         gdk_pixbuf_loader_close(loader, NULL);
-+         g_free(buf);
-+       }
-+     }
-      ret = unlink(ppm_name);
-      g_free(ppm_name);
-      if (pixbuf != NULL || ret == 0) break;
diff --git a/app-text/xournal/xournal-0.4.2.1-r1.ebuild b/app-text/xournal/xournal-0.4.2.1-r1.ebuild
deleted file mode 100644
index dd0beff24db9..000000000000
--- a/app-text/xournal/xournal-0.4.2.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.2.1-r1.ebuild,v 1.7 2011/03/27 12:25:04 nirbheek Exp $
-
-EAPI=2
-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"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pdf doc"
-
-DEPEND="${DEPEND}
-	>=x11-libs/gtk+-2.6:2
-	>=gnome-base/libgnomecanvas-2.4
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2"
-RDEPEND="${DEPEND}
-	pdf? ( >=app-text/poppler-0.12.3-r3[utils] app-text/ghostscript-gpl )"
-DEPEND="${DEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-pdf-annotation.patch #bug 257980
-
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	emake DESTDIR="${D}" desktop-install || die "desktop-install failed"
-
-	dodoc ChangeLog AUTHORS README
-	if use doc ; then
-		dohtml -r html-doc/*
-	fi
-}
diff --git a/app-text/xournal/xournal-0.4.5_p20111022.ebuild b/app-text/xournal/xournal-0.4.5_p20111022.ebuild
new file mode 100644
index 000000000000..c081be572964
--- /dev/null
+++ b/app-text/xournal/xournal-0.4.5_p20111022.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5_p20111022.ebuild,v 1.1 2011/10/22 16:20:47 dilfridge Exp $
+
+EAPI=4
+inherit gnome2 eutils 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/${P}-sjg-image-rev7.patch.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+pdf doc"
+
+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}
+	dev-util/pkgconfig
+"
+
+src_prepare() {
+	epatch "${DISTDIR}"/${P}-sjg-image-rev7.patch.gz   # the image patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" desktop-install
+
+	dodoc ChangeLog AUTHORS README
+	if use doc ; then
+		dohtml -r html-doc/*
+	fi
+}