Add some more handpicked feature patches: page scrolling, buffer length, localized paper (Timo Kluck)

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

3 files changed, 77 insertions, 15 deletions

diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog
index c01edc986c5f..5fd19bb5343a 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.27 2011/12/07 20:24:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.28 2011/12/07 21:09:49 dilfridge Exp $
+
+*xournal-0.4.5_p20111022-r2 (07 Dec 2011)
+
+  07 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +xournal-0.4.5_p20111022-r2.ebuild:
+  Add some more handpicked feature patches: page scrolling, buffer length,
+  localized paper (Timo Kluck)
 
   07 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -xournal-0.4.5-r2.ebuild, -files/xournal-0.4.5-xoprint-len.patch:
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest
index f1969b70ec16..dc4ea4c1fbca 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -4,26 +4,28 @@ Hash: SHA512
 AUX xournal-0.4.5_p20111022-aspectratio.patch 3547 RMD160 fc53a86e58b7f5c0de3d3e31c43506d88b120a11 SHA1 fdb8fdaeeb4cfb8022c1a0c899a5bf024e2c29e1 SHA256 27791e240551c2987088d8d979a9389a9dbbb9fda836d537f3637e7966af52ac
 AUX xournal-0.4.5_p20111022-gtk-recent.patch 11391 RMD160 411e88bbe51468cb58ff0debe999d46b53ad79a6 SHA1 8bde995a0757ee691afbca0afa3efc5ddab76339 SHA256 d9b8bf35b527e4283554b804acd0a455f66a8e08fa753370bca34ae543d1f58c
 AUX xournal-0.4.5_p20111022-underlinking.patch 792 RMD160 6516d38a26159f63f2a2daae8a1f24448ce0a06d SHA1 583ead6936d06b9c07e57920f93e9d40fe3f1f05 SHA256 2e44dc7deafd62dcd01d1aca848a7bcb5bf93d648625e76715f0be03c45386c5
+DIST xournal-0.4.5_p20111022-r2-patchset.tar.xz 35776 RMD160 a166eb7d6ba7aecce8161d3c9c5d7566d9c3dede SHA1 29cab6debcd2228a70adcffa4c920db50c8ba9db SHA256 4375f116ff82cae1e9497f1b76797a519319bf4012d4aa1262caee75406aeea4
 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_p20111022-r1.ebuild 1360 RMD160 33e40e6641ea97887e1a3b56dec378a36de80b7a SHA1 14675cd3f91f560e1709773230d5189e20d10714 SHA256 05dce04e141c22faa3986afd954ee3187cc643a8c06ce1b6f04d494e37ff2b8b
+EBUILD xournal-0.4.5_p20111022-r2.ebuild 1298 RMD160 8844d673fe7ac3ab63758673625e840f7c886994 SHA1 236adbf392356708bff98cb1836dcf83da545227 SHA256 0dc435d1c69213a9a0a0e46911557b88875b335dac35a7078c708b41fe276bf2
 EBUILD xournal-0.4.5_p20111022.ebuild 1240 RMD160 fa82fb5c1ac4033dcd30e0853378e9f781a9df10 SHA1 d4abe9a92b5bd4998dda91e45ef75b60d0e6c84b SHA256 6156e93806823a09b4c9f66a50d656faff1e69954dfab7af37c79efc76434320
-MISC ChangeLog 4818 RMD160 f2832d94e4d940a5c9a37064cb5252d3b0c78a5e SHA1 fb4877bc8715515e94a4f1c6fd79c74ad0d0359b SHA256 ee1624cfcad924315c5ac13563680cec9db49fe5b8525b4188e2175381a320d2
+MISC ChangeLog 5063 RMD160 14b3beab593246753047888147e48ce3e07aa727 SHA1 695cf6095835bc9ac8eb77b36e89ee7eae896bbc SHA256 47c849ba7a03c68cf1f5dcc2560257fbed468299f577bb9fa46be6bcb183a766
 MISC metadata.xml 561 RMD160 994fde5a7482cd84910d37246072d1fd848da7c5 SHA1 cc77d272a12b97e7e08a2764086c78746fc919e4 SHA256 e0c14d0d41505ee0ff810d8bfd6f6ac751b287e84d171d114f5a48becf91b7c1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO38uGAAoJENwGBM22xffez14P/2E5pjsk8T4u7ANlX0YlFvAs
-9osNxkQLXzkYsZjEd3sBKgqB+ksFq25C3RFTMnq3xx44DnDfmFnlQ7zmSXPpWShC
-wcNtDneovrh8zC08ORGMB4sp6aKriifkmFgeUm0/dTl8MSzbi0LdGMjaWMmX5TNJ
-r/3ECD7xwvR18z3g1NJRhV58XXza8M4/hH7itnozgXOVyxsHO1JO9nIGXcz8IcOg
-mO31P/VDFkzLPfRpxFWovQCiVvHcTXG1xBy2mD3MPuBtPsgEksVZnJyuM55V7F1X
-M7fTXrGPo1TMq5aWvW2jnyKoGFf4UMGIMlvafQQ2ywH6S5VSFlJlFEvBUvPyNQfU
-Bs7tj6LId2ENXkKgloL+rsseDrxSStyvAYq7RMtYGBITJ3ot5o19Ka4Wf/9PxH16
-26MGFx1BEXudS73pgbiTXH81i3IA1Uw0MKiKf1na20VM51M9ZGbFs/yNSmLpJG23
-Vt2gSsfFGqWc/IviYN5nMKXCxJNyoY7AYGfTSYJgAKvn+hApL9f2Z+4OBT0CQWp4
-CYUTY49Nbdaf/CK9bdKOcdIfUXOlyjiArQIeg4abskE1uhVUJlyn/dEhgx3KJfDV
-xeKrJxQ/hO1XEOpxLRAuh/7fJg8AE+18OKnkAyhymrRSukEVhObJ35f6O09g8GCw
-+TxYUnECGvfTYH8pOHqd
-=OLbM
+iQIcBAEBCgAGBQJO39YkAAoJENwGBM22xffeRzUP/A/5kaU9vWZKdUihjRK4kMGz
+wohZKgxYQBPV3oQU6MGUKdBwabWfkHnpSbO7aqSuDAEoYr2Ey9sXAgCvbma8QnU7
+mNup7BBI1/f3oT2YC9JF2z600Gk5VL2kaYwOjYocW+tmqVAHz3E8ifWGKtdljdsa
+NhaDUBe2jgfHxUAqIPPEteGw6Z7NiUmkPrbKRIv6OCzOhm5FhbeFECV7M2tTeI3/
+2hHkdXiabYZku8cScEkPNMfS769yMpSC+TPeD4Hb+fTLzUf6mDOyY+OeGtkuQtAx
+0agOpp0tUcDEh1fJOrN47r7FNWxEo7daMYRYzXFKzIadbCAYLtFdAlkGW5TPjZCi
+Km9dBVldJiJ2Mdj2QbQZRDuHGl50tjMXbYiPjpB40CS1eIoQ8VYLbxK55gAg9fVP
+roFnOMwqxAZBGvXxopAdupVkMIzkN12DfRm4j7gznLmHfl1bHwZD9sOTE5A1S3Qs
+Ymv+8xe38bb1apC+PZXrki8U2YnEB2dz+YAzdVZ+R9tcunxGLGcYI5gqUfN7e2q7
+kUwqQlonYi8iC1zGCo1/ucpEvRo/A24FYpDbNfd9PWISOEXpeUVgy9Ax9eMoxw64
+g1yKFligWhysQBzaTjof6+0GYRe3++3/thL8uLJMimtJCWGmX87Kt8ZcTWWgGkdW
+XDym2HAOkeDFlECdnGyV
+=3Tlf
 -----END PGP SIGNATURE-----
diff --git a/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild b/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild
new file mode 100644
index 000000000000..9580ba723bb8
--- /dev/null
+++ b/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild
@@ -0,0 +1,53 @@
+# 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-r2.ebuild,v 1.1 2011/12/07 21:09:49 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}-patchset.tar.xz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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}
+	dev-util/pkgconfig
+"
+
+src_prepare() {
+	epatch "${WORKDIR}"/0*.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/*
+}