[gentoo-commits] dev/dilfridge:master commit in: app-text/xournal/files/, app-text/xournal/

["Andreas Hüttel" <dilfridge@gentoo.org>]

commit:     e4deb610db76cc2ce9cd1d9f9e11742ecd104998
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Wed Aug 17 21:13:39 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 21:15:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=e4deb610

Resync with main tree

(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 app-text/xournal/ChangeLog                         |    4 ++
 app-text/xournal/Manifest                          |   32 ++++++++++----------
 .../files/xournal-0.4.5-sjg-image-rev7.patch.gz    |  Bin 24137 -> 0 bytes
 app-text/xournal/xournal-0.4.5-r2.ebuild           |    6 ++--
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog
index fbbce15..d2e36b4 100644
--- a/app-text/xournal/ChangeLog
+++ b/app-text/xournal/ChangeLog
@@ -2,6 +2,10 @@
 # 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 $
 
+  17 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  xournal-0.4.5-r2.ebuild, -files/xournal-0.4.5-sjg-image-rev7.patch.gz:
+  Resync with main tree
+
 *xournal-0.4.5-r2 (16 Jun 2011)
 
   16 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>

diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest
index df221d5..4ce2288 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -2,28 +2,28 @@
 Hash: SHA512
 
 AUX xournal-0.4.2.1-pdf-annotation.patch 997 RMD160 e03546e87d39d18af2e93c8d2f62a51d38c5a0a4 SHA1 6fc1bbdd695c485416069dd96d5f734ad60aa458 SHA256 ce4654a3449af65422c1a5002934e0c847613c42f4f971656111ae49fab9bf9d
-AUX xournal-0.4.5-sjg-image-rev7.patch.gz 24137 RMD160 9a389ecf98dfc2b709555b8efc0c0f440fe4fa00 SHA1 96a2d88e5ff2b9452a1acf46592e650eb5088c8d SHA256 ac89ceb35941d9a13804fd6650f1a6b84474b3f50c89682611f2f9e66af96705
 AUX xournal-0.4.5-xoprint-len.patch 4299 RMD160 e1fe28debea0d010494aa79f3a6eaf47853dd0b2 SHA1 2b642dc6d01a8c89095e150323ca755276000636 SHA256 0b2bb739e2719658186df82379f083daf71f0a6883aeb7f93f97312cf4cdb96e
+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.5-r1.ebuild 1144 RMD160 f9bebc95166778b4e35a77c5438380490473dc6f SHA1 dd9c41c6cb5026c2ca00bf68bf3c415da54c9661 SHA256 8049d50d47be55dfb5d9136f1c816f6b2b2621fc2d594ba79aa4947bc7d1149d
-EBUILD xournal-0.4.5-r2.ebuild 1215 RMD160 a3bb41d5f14219576cbf8145934f0c9a8bb6a8a2 SHA1 b1b4cacf7ccce7b77b760568283d2f7b51a9e37a SHA256 acd6bb06034e697d242710a435382bf419bcaf66be1d129cd82aca23e0b49c4a
+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 3117 RMD160 abd2821ed19c5a122bbd076b6b8354de6dba8620 SHA1 0895304cb76f444533ca8eca56f343fc3bc439b8 SHA256 58309960172e825b9282e8036098d9f99eaf3972ef00311641a20cffa7e4f9a5
+MISC ChangeLog 3272 RMD160 8e01f6780260510e8dbe3bedc5e3d4cea957587d SHA1 a598a879923a11ed04f0f37058baac7116a57a18 SHA256 5789bb91508fcd939dfc44c1a8c552369e6483be77ad8cafe6fd13bf1dba5e1e
 MISC metadata.xml 608 RMD160 3a4dfac1c981219f56ff49aae0e1f0a18ca5a439 SHA1 a06f91dfa4bfd4d99e8175378c2b72f5912c6833 SHA256 f6691d5ca74e6fed04ae9cf84888def47bd29b3df5626d6d33b412bd9bde04aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN+lp0AAoJEEb+UGWnxTyHOAoP/RXk4HTslpaABj1rO2UHqckY
-SbIRsFq4wbLOHOMGk7js8844jvP1SoJtsyCAgy4zbmbnjMt6IeMm9q2T4md+NUX+
-SdMVrupdwOLaOG1492UxZ8KebtP0x9eIQc/PnKTMgUiAfzuPfiUIVipthqaZmQDb
-QYhZ/5aSEhwO6K58ZiHDxL+8MTNfz1ehUeyiL9yYV3r/BPjagGTvFIKSGN2ot+EV
-MxqbRhHjBk1oXdNDKqRZt3bDOYvCgz1CB4j30RUpGur2OLGs7o2SdIclU+qMmdOR
-SSpmKjLqSGxrIHbHsdXkw0T04mWx52xJrAPPoT3eEdHoIrsyF5vXyP07CIg7EfD8
-SZdntBeDIE24sBnilB12/07QL/GF2vbxbAYQinCrwbJAH9IUVycJxsNzdViu/MSK
-ATZIkF1Cg6hud0M1GV8hGh+b5Q8kFcO4S85ugMAedlG1UDgXlzJ/TKaSap/LQ8CF
-nUfXEr4cdMHTCmxBsLcSTuHQRC67hbZgBzgL6z5HhnK2TpCDe265k+yaQy8OOMgs
-9LfqPxBrEXGwbBTXwOdTunif5F1DJxpsM+TYFARZ5TBcTb7fVYMcV/OyshWnUSHL
-4mI6gZGcsQRWStkx5e9A46DHbqq2K3jWEXkPPqLHgGdTyUAhBouUp8Xp70LyCJOD
-lMGt+3CLWpRqU/gPmHiB
-=+e+y
+iQIcBAEBCgAGBQJOTC8DAAoJENwGBM22xffeIakP/AqhSqQH0fCC0yr3q/RbTha+
+shkMTqFA+dBw7TuoWq2n/hj2Gi3WZsVQHSyNKpYxuakrjAy6SbE/SAEQ9q9A2+8r
+FNBRQxttt9uXcxA5ZrewvCv82rN2GWDSB3iQRxD41O3JoEfdD0k6Or1LeqQRtyzX
+qfm1ZdrgyacFF8A74XMs3UY7y+yb0tfiNYiOf0HDoypBgyLidvRTxBy3HM7fQ9te
+GS6+KLqA34PAxt0fogtzI7BxM06f2MbPv/HqNl48bUaBiO3VBaA1U4Bib+vSdHG9
+x/B9UsA6dgBgsLdQwiFWro/R7mtTpM8gkpV+xhxAukhAyioKTpoxrIN+xpze046I
+pKG0sC7DmrFnXN6pUOhuFUtvoVjTQfKNvNSoIzTbE7mTUSh5zHYbc7a1PpNMIMZ7
+szpB3Nq6bxybbf8QAGAPxB2jC3u8bbKrpvpBod5fUtcR/jLo6V/OowFvmH+97Ppd
+VqHzg4hPtHB+9sajfvo/mIxMYWbARzP6lo8+20Yd9+E10krH2QRwR/iupimHn13/
+LZ7rtf+ZPDwz/hSo7TePGlZ8E1TLsCmobrYzgmSh8MP6UNrgMRQ2bUyMdW4DNAfL
+1fZWp0DNOE0BCCINBSjmL0/6NXcL99Zza8flZbLODCSBqsXf15ByKshZCraZAWn+
+vDs8LL6uWT9lWWNc8OxC
+=0QNi
 -----END PGP SIGNATURE-----

diff --git a/app-text/xournal/files/xournal-0.4.5-sjg-image-rev7.patch.gz b/app-text/xournal/files/xournal-0.4.5-sjg-image-rev7.patch.gz
deleted file mode 100644
index 597ba07..0000000
Binary files a/app-text/xournal/files/xournal-0.4.5-sjg-image-rev7.patch.gz and /dev/null differ

diff --git a/app-text/xournal/xournal-0.4.5-r2.ebuild b/app-text/xournal/xournal-0.4.5-r2.ebuild
index 97424d0..89552aa 100644
--- a/app-text/xournal/xournal-0.4.5-r2.ebuild
+++ b/app-text/xournal/xournal-0.4.5-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.4 2011/03/27 12:25:04 nirbheek Exp $
+# $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
@@ -8,7 +8,7 @@ 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"
+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"
@@ -27,7 +27,7 @@ DEPEND="${DEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-xoprint-len.patch #bug 287701
-	epatch "${FILESDIR}"/${P}-sjg-image-rev7.patch.gz   # the image patch
+	epatch "${DISTDIR}"/${P}-sjg-image-rev7.patch.gz   # the image patch
 }
 
 src_configure() {