Remove old; add current CVS snapshot

Package-Manager: portage-2.1.10.29/cvs/Linux x86_64

5 files changed, 78 insertions, 75 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/Manifest b/app-text/xournal/Manifest
index 07515c8d95ea..2966e4909347 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -1,21 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX xournal-0.4.2.1-pdf-annotation.patch 997 RMD160 e03546e87d39d18af2e93c8d2f62a51d38c5a0a4 SHA1 6fc1bbdd695c485416069dd96d5f734ad60aa458 SHA256 ce4654a3449af65422c1a5002934e0c847613c42f4f971656111ae49fab9bf9d
 AUX xournal-0.4.5-xoprint-len.patch 4299 RMD160 e1fe28debea0d010494aa79f3a6eaf47853dd0b2 SHA1 2b642dc6d01a8c89095e150323ca755276000636 SHA256 0b2bb739e2719658186df82379f083daf71f0a6883aeb7f93f97312cf4cdb96e
-DIST xournal-0.4.2.1.tar.gz 516147 RMD160 8daf2deac1f4e07284ba8818eec2968bdbd9baea SHA1 e401675154afd207f7b345c2191714f351837251 SHA256 2eea4c3d455b54020af738467ac026c632bb509ebc9d7f0d4b019ea66163b8ff
 DIST xournal-0.4.5-sjg-image-rev7.patch.gz 24137 RMD160 9a389ecf98dfc2b709555b8efc0c0f440fe4fa00 SHA1 96a2d88e5ff2b9452a1acf46592e650eb5088c8d SHA256 ac89ceb35941d9a13804fd6650f1a6b84474b3f50c89682611f2f9e66af96705
 DIST xournal-0.4.5.tar.gz 425062 RMD160 a4228e6874482bd381c59cd8e3db1100361c1d40 SHA1 390cb275774469ed1b04b7268dd625bd456c895e SHA256 a7d7c2cb544451939779276e6e5ee5acc756bd0efb5253de15dc00bfe07755d1
-EBUILD xournal-0.4.2.1-r1.ebuild 1106 RMD160 f40c8c303195dc00eb5c422e8e5ec089e97d1c61 SHA1 f3bccad02c842b474d4e9081ee2b4c41b8696e4c SHA256 a9a708f3b54d81ca46d8e1aed26567c1b1decca7865515d43ba9c3a460aca6b7
+DIST xournal-0.4.5_p20111022-sjg-image-rev7.patch.gz 21551 RMD160 6048a996fdb7b43e05beff67cf5ae0da53cff840 SHA1 0ff950726a7ad5b0012421c158406d6d49d2c38d SHA256 88b050483fc27f37f307adb358b3e5c4bfc0b600b7d3427599dea4c1ffe87fc2
+DIST xournal-0.4.5_p20111022.tar.xz 332700 RMD160 6578c037ad536c0173c533758c5f86ffc046dfbe SHA1 69f66e1125ba3de3deea14be1eb6d7e8f07abe61 SHA256 46573706645a78f1cbdd9e3eed0b2409ab61947eb5f78be9c1b7d7e4535f721f
 EBUILD xournal-0.4.5-r2.ebuild 1294 RMD160 d123c46f65d0c25e1c134d0e99c15f2f6503f6e5 SHA1 1c50cdbc98773a000e87ad8eee2d720513d21040 SHA256 6e9e1dd61017407aa6c734c15510a98de913f2a5637e0210e3a9b9f9da8cc38a
-MISC ChangeLog 3326 RMD160 060401063b5b33b77411f2aa91543c5e97391e2a SHA1 caecb254945a5bb23ecda0d5a1e01e470b47f491 SHA256 8cefeea409bdcd877ba880adb43f6cafc9a90b0c95a0fc53018429b9b4e11b00
+EBUILD xournal-0.4.5_p20111022.ebuild 1252 RMD160 fd9af62f9c4f22e9ff26d27b8fd3a65e9fdc449f SHA1 188fe5124bce80003eaa179f93b4f523d7ea7729 SHA256 5be5460466e207ff9a2b192827ba811f499190fe6191925a2814ccb97a9e82c2
+MISC ChangeLog 3573 RMD160 6f4ea332e71e0039509b577b0b58394213dcf742 SHA1 7e639c40684c0198dc520c00e4759e9ffc8590b1 SHA256 470d2f7f87209a38501fd49d26327decd5e3e38a1454fc6ccbde8e0d7c487bef
 MISC metadata.xml 653 RMD160 f0e7b38b207db6082a6b845ceb8b293668e52bb4 SHA1 f6aac8c9078d20955f92e08ffaa8e2b1c737e7c8 SHA256 a44dc37c1edd247b527b1d5658c0a48e14c56eceab7156611f9bd224c416fbf5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk5/GKYACgkQfXuS5UK5QB1I6gP+Nr6wj2wTW7hXnIL9MHKaryg2
-RP5+oMSnHr7RaB7onQNisrfJPbb7rv9CCIRQZ88/l1vLTdcuRdn/1yxQZU/ZSxR1
-35NseqoImN1DGqS50320IkBjtTQLDzcHLX/nt51zZfHn4ZlIrKGKwu9YqPgkvoi7
-PbAic7GHDmlMua4MGwM=
-=NSFh
+iQIcBAEBCgAGBQJOou1uAAoJENwGBM22xffe8kMP/06A+gcuJLHqL1hjkFcpjYSz
+W/lp7wMqBhGVgX3midU9GreZsuMAtppqGPRPdkMtu/TtXEZODfwU567QDWnrPRD1
+m7MaoeCqs2mS/Vjk5NYxQ2NjB5L/lZ32VYGKYdTrQcOy5I9AQa5q7v+4r4qcy2qb
+EUNcMRVESMH7VRznxAhZnETw3aFWYCJt2kC6PT8yZ+tYQcTHwtv0ra7KLrYXAqRy
+cIoQbCl3PzQdnLzXcSwCGsf7Ghw+4bLXDTgsuoQSQSCCVWtur2GfLIhFyJx2y+1H
+aWgMV2LAKb0ckcQ7aC356Er6dCl+zeg6sWLKvSvlHvmmS5gjM1dYdzfkKSjQo1Mz
+SCxvaKVZywwTTzGvwNaFcRyfVHC2U+I/VLFJEwD1R2twt+rS46NPNvqS/iV6C4lw
+vP2UUXEie0GbBdvqRyHkiHA5oAkNAWg4mpRCD24//ktEpKOGnCd3KbNPlo8Aaw39
+NNrlybrY1ASC8Z9zdfBo89FqI3+f1/B7+RInU30uQqh+vZBKNVP7Q8uQ2XQTuDYd
+z+LqfmOOvPkkV/N/K3BTX4UpPxoL97Eaf9AjXaG96IKoXp6JCNpbDonU8F+4Mh2E
+ap2xMsdNBWDbY/YlufOySsT0nKaM6kdUpvROywSEVEzMhJOhuiRE5SSgx8npLkU2
+bVHDUA8uncQ9LpxuVIoo
+=gje5
 -----END PGP SIGNATURE-----
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
+}