Cleanup, EAPI bump, dependencies checked

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

3 files changed, 48 insertions, 34 deletions

diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog
index 9c1970e3fc00..53b8793b0fea 100644
--- a/app-text/xournal/ChangeLog
+++ b/app-text/xournal/ChangeLog
@@ -1,6 +1,10 @@
 # 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.15 2011/08/17 21:12:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.16 2011/09/17 11:28:24 dilfridge Exp $
+
+  17 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  xournal-0.4.5-r2.ebuild:
+  Cleanup, EAPI bump, dependencies checked
 
 *xournal-0.4.5-r2 (17 Aug 2011)
 
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest
index 0bc6728d36d1..d97e91d246ce 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -8,24 +8,24 @@ DIST xournal-0.4.5-sjg-image-rev7.patch.gz 24137 RMD160 9a389ecf98dfc2b709555b8e
 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-r2.ebuild 1296 RMD160 72af8a541d9375196d7178825f7377acaa4effc4 SHA1 f4f7a35559ddc4ffef542b89305701c12504e475 SHA256 c6e196875cfbc1c8056ad26a95275cee4dfffd4e73a51f06bb864cf8f01862cd
 EBUILD xournal-0.4.5.ebuild 1058 RMD160 5f0386ee0317fc7454bb2ac75c01794ed3af73c5 SHA1 6ee1745943ba702cc49a4cabc510bd107dae891d SHA256 585e96b108cf1c062c8c95f50d47512bdfb1747eda28ce1d4b21ede98d35c318
-MISC ChangeLog 2761 RMD160 2de1c86065b8e234bdb155224177cadb77d54537 SHA1 f31aad7d11f6fccbc61e94d2c77477cf83c4345b SHA256 69509ddd4eb49fbb657844153a991d746fb2ee70262fa02b6c8756753e6ec035
+MISC ChangeLog 2889 RMD160 84058b5921ac51a605c11e06afce721a634ea463 SHA1 463f9d5891f85840283dda44547699104566ee49 SHA256 fd74cfc7b6e05a5d175352545d4162ed653db0b8abe71e722b65f901f4c240f0
 MISC metadata.xml 675 RMD160 a92cb2e61000ad3e96198616f6fb346cbd1f7f79 SHA1 e9c1abaf388cb78c8a30e5122546f31f4893d6b9 SHA256 12e5d7f364880cfa8b7ab71713eed1907982f284b42cfbd717efade3d2ea4a30
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-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
+iQIcBAEBCgAGBQJOdISYAAoJEEb+UGWnxTyHNZwP/jpZT3ZxuEhHER22e6kTekGm
+NkKlzfvnirkIbE3YAmZ/EBT1vcn9w8TbZ7egc1d49I+r/pTIHOWwVsIkvKJRhr9u
+4rhTh3YKqIDtMG0yRoG05ynK3AwbUZ7uVGmU+d77JA8DJpGR7luwnc1ZR2psir4b
+TpSbfgl32WMxBLU4DgrUsSskAN8tPgKz+Ajkc8UlctubeoMY/PvvJ6aEVryaOyhA
+ncAERzHr9rccsTFSVy8JJb5G1CctsbVltAazVSfQzZ2kpQsJ9k0vQ/7jep6+8pOG
+Tk23pVLrZz37VSogTvwA9t66EYC1Ddfxf9rPY9lXOUQkke8gjCcDUT2y4XegYuxj
+uEqhHij8rX33zOLK7jVEg85DELVL7btoSBOAMZeDwDp5oSDMx5GtsGhKCUlKVIQF
+ssIWKYCqUSmm+zNcPxo3qlbzRTj+wbptDJRVfZqpU2OR9hth/ksbu9wNyyDnVNWg
+wopb0AS4b0dp5jgaqYb9e2rZgtOs/n4DNuPGMfUNjuAgeD8nFrFpUKMBuZlVImjy
+Usvn7kWCqCEWX6XDGdPdJQ5hW239f1FCLA0rgjFXxCCbHfwbS2D9P5imvLgW2kNm
+NEk3CfgLmSJFTge4oHCg7ZqSDYLpnlsB8DGdhRmOKcShd8nKS0/FsA43JFnoCgSt
+d+tyo9zqibhtZfrQ9zaq
+=dode
 -----END PGP SIGNATURE-----
diff --git a/app-text/xournal/xournal-0.4.5-r2.ebuild b/app-text/xournal/xournal-0.4.5-r2.ebuild
index 89552aa9e7c1..f3a5e406b3d6 100644
--- a/app-text/xournal/xournal-0.4.5-r2.ebuild
+++ b/app-text/xournal/xournal-0.4.5-r2.ebuild
@@ -1,8 +1,8 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5-r2.ebuild,v 1.2 2011/09/17 11:28:24 dilfridge Exp $
 
-EAPI=2
+EAPI=4
 inherit gnome2 eutils
 
 DESCRIPTION="Xournal is an application for notetaking, sketching, and keeping a journal using a stylus."
@@ -13,30 +13,40 @@ 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"
+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 "${FILESDIR}"/${P}-xoprint-len.patch #bug 287701
 	epatch "${DISTDIR}"/${P}-sjg-image-rev7.patch.gz   # the image patch
 }
 
-src_configure() {
-	default
-}
+#src_configure() {
+#	default
+#}
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	emake DESTDIR="${D}" desktop-install || die "desktop-install failed"
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" desktop-install
 
 	dodoc ChangeLog AUTHORS README
 	if use doc ; then