Rebase on upstreamed image patch

Package-Manager: portage-2.2.0_alpha113/cvs/Linux x86_64

3 files changed, 77 insertions, 16 deletions

diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog
index c30e0e00332d..59e04dfd084d 100644
--- a/app-text/xournal/ChangeLog
+++ b/app-text/xournal/ChangeLog
@@ -1,6 +1,12 @@
 # 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.36 2012/06/24 11:08:44 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.37 2012/06/28 23:34:04 dilfridge Exp $
+
+*xournal-0.4.6-r2 (28 Jun 2012)
+
+  28 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +xournal-0.4.6-r2.ebuild:
+  Rebase on upstreamed image patch
 
 *xournal-0.4.6-r1 (24 Jun 2012)
 
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest
index b9bf9ed14ac1..06b1a1faadbc 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -6,26 +6,28 @@ DIST xournal-0.4.5_p20111022-r2-patchset.tar.xz 35776 RMD160 a166eb7d6ba7aecce81
 DIST xournal-0.4.5_p20111022.tar.xz 332700 RMD160 6578c037ad536c0173c533758c5f86ffc046dfbe SHA1 69f66e1125ba3de3deea14be1eb6d7e8f07abe61 SHA256 46573706645a78f1cbdd9e3eed0b2409ab61947eb5f78be9c1b7d7e4535f721f
 DIST xournal-0.4.6-gentoo.patch.xz 32720 RMD160 4cab7d7580d98ae9186fa39ab7ced7b9975ca15a SHA1 349acbf691b3c72a64defbffb2fb2f9baf203a7f SHA256 e8f03410cb1e31b50cac3b646fc5670f349f7ebc68854a481e2046de71ce38bf
 DIST xournal-0.4.6-r1-gentoo.patch.xz 40772 RMD160 a67ef0dc0118ee96e7876bc35fa6c8d7c58906b9 SHA1 bd1b53601dc8a5da3cc34b76746daa06a0a41a64 SHA256 96eb1cab0c6f18aaec0d90acb91c3a50e9c6a97c50f33c455ef11d9582b16f17
+DIST xournal-0.4.6-r2-gentoo.patch.xz 39392 RMD160 71cee497d68131a79afec120465388d7d95fa358 SHA1 703fdeeda8a3774792d9ee4c0fd61c852db19ffa SHA256 aa044d149d4c035ca0d9fa97765f6ee5b13a845e218e98f2156f4d6fe2501694
 DIST xournal-0.4.6.tar.xz 335128 RMD160 76ce8b2ac642c8a61dc22d821c0830b86c85cdb7 SHA1 7ad0654ed0c96ee874d6bcbb04c66413066a8a2e SHA256 4310fe579b8e99a66c40ba923fe0dce2e8543ad69c7660a01a675637970057d3
 EBUILD xournal-0.4.5_p20111022-r2.ebuild 1382 RMD160 3fd523cd1efd23f34cacf5774739270f6b79254e SHA1 290573311d46d03cdb4f6109ebfca3935ca11ef1 SHA256 8f0e2bdad9bc0f009d4062fec2f4364ebc2de71d67574bb76486b4a94d0492d8
 EBUILD xournal-0.4.6-r1.ebuild 1304 RMD160 4c5ede44b23a8ea28e7a8c4d0edb159d44223389 SHA1 91a04ee5451fa706f4ca0cddba9ebc1ef9ad8773 SHA256 37f149181b1557b31e466bb3565b695bdc9d3b91c4454f1a4582e72a072da4de
+EBUILD xournal-0.4.6-r2.ebuild 1293 RMD160 e1d6e8dc6159f0e117f7f83c18fe09a7834574e2 SHA1 b273f331d4a5aa1e9c1c7a47997de14e18888473 SHA256 c12c1437fe4cec0c6bc46cd6200b4caae32b8d3cb3784c58530afe977a6ab810
 EBUILD xournal-0.4.6.ebuild 1285 RMD160 16a425fbea060b1490030f6a91b57c20b4eb6ca5 SHA1 5fb65840ed5e78099fdfdffcc5de44e45ee0dd7a SHA256 349216a1e6d17a36c8338e94751cfbccd47f13f4b0ec120bde6fe8cff4ece3eb
-MISC ChangeLog 6549 RMD160 0a8c33ecc7ae32ea297f983ac65a869e3c1f717c SHA1 c29abb45e097377741df9cdf5fcf7a72669a4611 SHA256 7777f935dadd9e46f73e270f0da46a834e68a18afcfeb3c4b9c66363c6a77fbf
+MISC ChangeLog 6703 RMD160 8045aa81091d7c897c85910b5ae89c3454375e4a SHA1 20d2672635cfaa103cb193eef0a570eec821b10e SHA256 68e9a0bfeb95d452106ec747e6ef619217351bb1233dd5f20148ef9997e2843b
 MISC metadata.xml 561 RMD160 994fde5a7482cd84910d37246072d1fd848da7c5 SHA1 cc77d272a12b97e7e08a2764086c78746fc919e4 SHA256 e0c14d0d41505ee0ff810d8bfd6f6ac751b287e84d171d114f5a48becf91b7c1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJP5vWBAAoJEEb+UGWnxTyHAJcP/216zdbJq4RqGOHBHN2G98/b
-sF1rb4yqU5BZ9TNjrSPbV6A4TluGcPU/aAWRi3o3ewQ/eEPpShHVmVrJZsNDPNBg
-sEMKRzAZg0d3kcxy4EKkcWSFEl9u/hnL1f39KjPyNdI35x8WU0EWStPYfAl8HTJ9
-HLwM/6DteCpEJUsPZpuRAkzB1UwpfWicsa7Yzs5WHpTF93960/9xSsexM7VcLJ6p
-eBoGKl94LABMQw1JBHNHXwZ0ES48/+Z1bIr+oNqLIBoHQu37E02Nvgazh2fpuJK9
-3ng9c+OiWoxu374WVztoTp9ktwkua0oUq411UhpE5VuUhoH/D2to2yyCWIefF1cC
-rnyvd71Uq5QM/TJ0cLI5nZFPHIKlfNoETXRUBbpfYMAPVxikZtcY0DkkhD52263K
-pyqkFxgZctjgw6zWBtPGF24iU+aEeTbEX3aDNLoeQnxZhOnyt5IY6/BpqkOlYPRq
-9z+dy/Hbr7upb1l5DsIGC12i5CMw9WqWX9AKy3Mao8ZOqjJ+XvSR5O/ZyLKj4Qz+
-9w5DabTk3zFOZlCQ4dufahanZnN45lAswuoc2eop/6eGW59NzKYCNSXdEkhA/pbC
-xfqkIYRut1N7Muez+SEsF05IfoNiKnfo4Ev2X0R5T16E9zFb4dAOJ0vq/+SmKijn
-FHS7nE5Dm0o6zEVOPthU
-=qVeC
+iQIcBAEBCgAGBQJP7Oo/AAoJENwGBM22xffeBd0P/0z2NdROm5CfUz9Xtvpd05oo
+QlWzRUNHIXvP8UMUP2TflFawQ/FptsDtCpOPnrtxoOzx0gq8m+XUXjPVHRKzT3zB
+y8aDF2iiewp7HZYymkpgCCVRE7G74TXwPUbHWW+eTl7flD3h2lzJfHh5jl7sFHOc
+wawX7VCQG00L98QYWIpbKGy8tVHYCRmJYeo3Ps1j87JLh+DTeo7js6N+blg8kZJ3
+q5n0SInFH9YVSTpTIu85cyT8/pY0MIm81mlDGZArGNmJttKxNHdNVf9Frughe4mO
+thEKWLGcHHZN2DVStS+2quo1hZkZEgJNRtHvrNIvMTVpIwLqBRnuwAebb+01ttTR
+zQHGIKrQcgHSJk61qIKcViBhuHwJM+194j6C/WGGKc+g+L3R77VVQhNBh3FFQc5o
+yAyt0TN5Hg6GDiHmL7rFVWhkU7SY/ch+0/zcEtPkLlNCPX2HD7U+GcJrgS1DOVbr
+mtas1Enagbx33mb60pNZR8lHAFWzgKtnES3ft4tCyMCIdJnZJe+Z1NoLw73xAOne
+64OJfaM6SjB9Rs/2DAwHLAojdS8we5crK6Bhj06aUGdVkrVTuYxa8LmXmu4oncD6
+M4qOjEU6yE7zog+IvseqrCRoKrs15ktXYYxisG2esN+msK+FDvsOILj/84jNPUCf
+Iwjps+tq+tVpTw/LSb+j
+=BfXl
 -----END PGP SIGNATURE-----
diff --git a/app-text/xournal/xournal-0.4.6-r2.ebuild b/app-text/xournal/xournal-0.4.6-r2.ebuild
new file mode 100644
index 000000000000..fcdc8f01595c
--- /dev/null
+++ b/app-text/xournal/xournal-0.4.6-r2.ebuild
@@ -0,0 +1,53 @@
+# 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 $
+
+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/"
+
+SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}-gentoo.patch.xz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS=""
+IUSE="+pdf"
+
+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() {
+	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/*
+}