Add feature patch for pasting images, from xournal bugtracker

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

4 files changed, 73 insertions, 17 deletions

diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog
index 56201a815c99..9c1970e3fc00 100644
--- a/app-text/xournal/ChangeLog
+++ b/app-text/xournal/ChangeLog
@@ -1,6 +1,12 @@
 # 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.14 2011/03/27 12:25:04 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.15 2011/08/17 21:12:05 dilfridge Exp $
+
+*xournal-0.4.5-r2 (17 Aug 2011)
+
+  17 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +xournal-0.4.5-r2.ebuild, metadata.xml:
+  Add feature patch for pasting images, from xournal bugtracker
 
   27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   xournal-0.4.2.1-r1.ebuild, xournal-0.4.5.ebuild, xournal-0.4.5-r1.ebuild:
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest
index 1ed7c6d38fac..0bc6728d36d1 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -1,29 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+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
 EBUILD xournal-0.4.5-r1.ebuild 1144 RMD160 f9bebc95166778b4e35a77c5438380490473dc6f SHA1 dd9c41c6cb5026c2ca00bf68bf3c415da54c9661 SHA256 8049d50d47be55dfb5d9136f1c816f6b2b2621fc2d594ba79aa4947bc7d1149d
+EBUILD xournal-0.4.5-r2.ebuild 1287 RMD160 2d803676c058eda0272ddb81fd50a247d28a2888 SHA1 e0f4a542d56b34d7165e3e03474432f64c599ce4 SHA256 022e8cc73626dfd073716f332471fc3dafdf1d2f9e8cdc21b0cedabca43b01f4
 EBUILD xournal-0.4.5.ebuild 1058 RMD160 5f0386ee0317fc7454bb2ac75c01794ed3af73c5 SHA1 6ee1745943ba702cc49a4cabc510bd107dae891d SHA256 585e96b108cf1c062c8c95f50d47512bdfb1747eda28ce1d4b21ede98d35c318
-MISC ChangeLog 2563 RMD160 6504356dd4b79fd269ca95e727c1006317ff09ce SHA1 9d072cede201a33475c2dd02c3409c712df7251e SHA256 674586d979385001c8aa0f3aea18408ba420195b880a76efc4a22afda4a72ea2
-MISC metadata.xml 608 RMD160 3a4dfac1c981219f56ff49aae0e1f0a18ca5a439 SHA1 a06f91dfa4bfd4d99e8175378c2b72f5912c6833 SHA256 f6691d5ca74e6fed04ae9cf84888def47bd29b3df5626d6d33b412bd9bde04aa
+MISC ChangeLog 2761 RMD160 2de1c86065b8e234bdb155224177cadb77d54537 SHA1 f31aad7d11f6fccbc61e94d2c77477cf83c4345b SHA256 69509ddd4eb49fbb657844153a991d746fb2ee70262fa02b6c8756753e6ec035
+MISC metadata.xml 675 RMD160 a92cb2e61000ad3e96198616f6fb346cbd1f7f79 SHA1 e9c1abaf388cb78c8a30e5122546f31f4893d6b9 SHA256 12e5d7f364880cfa8b7ab71713eed1907982f284b42cfbd717efade3d2ea4a30
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNjyyoAAoJEO/kOhxWD91kFOsP/j7Sn9r9CTyXvPTv0Mzk1Go4
-/x0UYBN6bMCiRSDqjrXqhbXoNYiMxz8NNSqYtGPFP2OGcMSHNS/b9fd/XiqK1cN1
-wn+N8+JrEABoel56l8R3SSAvmdNVhLLjJDxRxdbTUS/6F87k2AEurSMU3ztHgq5H
-jxQUcYdVJC9mRoGuzYyLEmDnUAAF6eAx7FDQ/gRoh+qySNcNfjKimjVZsecQO3ga
-SPGytJL/lSLcOSyvYQJwvGCc8po9qny61ww2eXErgK4dOPocYaCA9Fp8IZ79XWKm
-mxDlBFx1eGQ3NBctpQUkKlT2gNBpLEqfVx6/cdHO5V2tPwFa91l2HS+RyzoEE69C
-3gNugJt54+YJm1mwfy0KSG50rbIWI9/eYxjSe/kWQHkIOuFN8Bf24Q6D+dqCoFVh
-GT77jbwfVadCuh142A6IWs4e4uy0goQm4CcnHUoaaEHV+arWugjJct4es6O874yE
-GZMXawKQiNDOi9GqGLjkOrDU4B0Q9lpito3c4w049gRmrl+E+C8IbiIjJNzmr/cE
-38feN4Ka6oi/k6g0vM1DtqXRFuEx/PmHDGNIx50EeSG3Fd8TInqvhHP+65teEFsH
-vDP+Fzc+FNA/35fdKhkoJGkpibOZjbSjvbs1n9esDVjCzuckkmAWIg7k/Xs3Xuf5
-AcdgPxpb+Y1U2hLN1lxZ
-=RKpc
+iQIcBAEBCgAGBQJOTC6zAAoJENwGBM22xffeVmgQAKM3yuwd7V14FRHLSw0MY/eH
+XAgXF1MTH9UYnqrfe1NvAXSe/OmKuqGotZEHX2IcyI/xihVfW9/iPLsvg//As0Jr
+a9CVc8SHZeBWIwijHnOBHmHl2+hNCtic3HOL2iF6UbbJBz/fPVIbKVV66OzJHQpK
+RVp4aBuLt2GeTZB5rvfhV0KZt2X2ygrAkmvO673Ht+jhxOL1EessBPPOoZDp2gqk
+wFZqUkhLiKqgP50jYAHv/mKPYVRPyODyD12au7YYvU00PqLVbx0BMPovt5JSkg/K
+0z6xFHVJC+EMb3ZNmIZlQjvOTuBlzG1mIoW97cx6a1mc64Khucl3efiw1paifyiS
+fqb+FwNAzMMRUqWzpJkcF9xtfl0GS9ZGQCkx1DvRUKbC73w3NKN0xV8FZH+eADL+
+Lzq6u+NAgsP0gmatuDsWBJTbEwVPpw9qAILqgl3ifrJcDwqIsd/Wdsiw53le1VnN
+++OEFq0QHmWz8lU+4t5qwi7SGucWt0EOIjJh1CrCM3ZUv/SE+A4mQFitQ/NKPyY9
++JqXJNi2+vksHTP88P11fpjFWNcl9ZYiepAs1T2AIrO6iwBCpydvrt3y5jYQL7RS
++RcqDUIxTefi+mViOr9xpqvJQH3prlS8Gsnf8X2IXDuxQGJmLXY7RuYcjQ9iolsU
+mMWTJAaEAhZE94+1wo5z
+=NNx5
 -----END PGP SIGNATURE-----
diff --git a/app-text/xournal/metadata.xml b/app-text/xournal/metadata.xml
index 4ae301ebbde8..858ee67a2158 100644
--- a/app-text/xournal/metadata.xml
+++ b/app-text/xournal/metadata.xml
@@ -6,6 +6,9 @@
 		<email>rbu@gentoo.org</email>
 		<name>Robert Buchholz</name>
 	</maintainer>
+	<maintainer>
+		<email>dilfridge@gentoo.org</email>
+	</maintainer>
 	<longdescription lang="en">
 		Xournal is an application for notetaking, sketching, keeping
 		a journal using a stylus. It is free software (GNU GPL)
diff --git a/app-text/xournal/xournal-0.4.5-r2.ebuild b/app-text/xournal/xournal-0.4.5-r2.ebuild
new file mode 100644
index 000000000000..89552aa9e7c1
--- /dev/null
+++ b/app-text/xournal/xournal-0.4.5-r2.ebuild
@@ -0,0 +1,45 @@
+# 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-r2.ebuild,v 1.1 2011/08/17 21:12:05 dilfridge Exp $
+
+EAPI=2
+inherit gnome2 eutils
+
+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 http://dev.gentoo.org/~dilfridge/distfiles/${P}-sjg-image-rev7.patch.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pdf doc"
+
+DEPEND=">=x11-libs/gtk+-2.10:2
+	>=gnome-base/libgnomecanvas-2.4
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2
+	>=app-text/poppler-0.12.3-r3[cairo]"
+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}-xoprint-len.patch #bug 287701
+	epatch "${DISTDIR}"/${P}-sjg-image-rev7.patch.gz   # the image patch
+}
+
+src_configure() {
+	default
+}
+
+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
+}