Fix docdir. Fix desktop file.

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 103 insertions, 5 deletions

diff --git a/app-office/passepartout/ChangeLog b/app-office/passepartout/ChangeLog
index 6a692a4a56b2..eef70b8b0ef6 100644
--- a/app-office/passepartout/ChangeLog
+++ b/app-office/passepartout/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/passepartout
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/ChangeLog,v 1.21 2013/07/24 01:32:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/ChangeLog,v 1.22 2013/07/24 02:04:23 jer Exp $
+
+*passepartout-0.7.0-r1 (24 Jul 2013)
+
+  24 Jul 2013; Jeroen Roovers <jer@gentoo.org> +passepartout-0.7.0-r1.ebuild:
+  Fix docdir. Fix desktop file.
 
   24 Jul 2013; Jeroen Roovers <jer@gentoo.org>
   +files/passepartout-0.7.0-automake-1.13.patch, passepartout-0.7.0.ebuild:
diff --git a/app-office/passepartout/Manifest b/app-office/passepartout/Manifest
index 3a6a22eff15e..0b7239496055 100644
--- a/app-office/passepartout/Manifest
+++ b/app-office/passepartout/Manifest
@@ -11,13 +11,14 @@ AUX passepartout-0.7.0-libtoolization.patch 11344 SHA256 c90451db70cb627f0182f6c
 AUX passepartout-0.7.0-libxmlpp-2.6-depend.patch 341 SHA256 b1c78a59bc6e73e3ed75a481b041cee71b5a3671953d9424cd7e7e6dc7fe671f SHA512 a2abdda16254ca27bd4fd73cf4211d9cf7a9ca5be334d1c4c3f3e4c418c3481d9c1cfeaf243890af0d1dc62f44f873b16979e12121e6a27e40fe5a70a3f04130 WHIRLPOOL 75e3c362787be0839643ca85e568eaa44401751ff1b85f62295dcee12a1de465f5fe29c864e12f102e4e2d6524fcc5e06104b711144826393f3ba8d083eff451
 AUX passepartout-0.7.0-safer.patch 506 SHA256 33a98d600b9c1c229cc4aa423e54719c256a658d0c7fd5ecbd57a1b1a4c868bf SHA512 008c8848e1bafa4a713029841eb6c5dfc0affff265f135a6b219a0dc958e97bc0fde5263cce0e0f8db9bbb85d5d0c5711d3c1e4adb8d74aef24217ed2fc543ee WHIRLPOOL 1aa8e92e19ea6e32cfab1474705dc2abf1fcc0a29d7730b214ffee53bffa9363f89d4582983eebe1535b831968de22fd2f00782f6a06c88de055acad32d42ff5
 DIST passepartout-0.7.0.tar.bz2 369232 SHA256 709890fb1530217e2678b710e996e9e3ee41c969088193711f119fc456f67d0b SHA512 41b8ed3905ee5332a89bc8512a5481bc52bdf58871254137e48150ad0d00a561aa9483d2accd41672f34bc37bea645f2a5ad40435cfd45490c3ff5542032ab8f WHIRLPOOL 2da483041be06eb2d8f268bd291d8105a0840c4e73ee61abb36fd4394310657e673979092b155718a8dc48c74b645529774e27a265f683daa73a8fa7752693ec
+EBUILD passepartout-0.7.0-r1.ebuild 2101 SHA256 c708b3bfb884d6866f1cd8dfaa697ddadc00cc442ff43a88b080790676a19803 SHA512 db0757c4a391bb343f8425d5709a1099202f4672c5126f567e1de3cda21de818ab22e20709db73388a10b37b6073853b56938bc35d8451740d427259a4491532 WHIRLPOOL 469fdadf12301ec90fccdcf1cf745e44932209b841c76beccd9aefe5e3f127ce291778ad80c9eb590edb2bc96b4d4e6bbcbd8278901dda794bacbff07d7bf080
 EBUILD passepartout-0.7.0.ebuild 1924 SHA256 62164154ab9f06774ccbdb42a283850c10f2f69f060df60b38011560bbcc648e SHA512 99f3614bfc961aaeacb6143209a8d694caf6cd75b5c462c75c80c7d8b2e19060b7566eec4feda0be6130f92bf7491798c450f413fd8250d47e5a5488126ac024 WHIRLPOOL 0902646eb501b9c6333718ddaa6a29189ad3089876e6a0ac923efd874f521cf444715ce243f3d00fefbd2a2faa8404060dd4f2cca636ce85d75d4648f45ea855
-MISC ChangeLog 3364 SHA256 0855a744ba82b4f2b11cddf6d81df1b6300e5ae753910e1f83d8e4978dd5164b SHA512 352f4f49779736e49ac533bea79ea595251fdc43f5aa4b54484c76eff638b31c4781e4a185a60fe4d4ac1dd7ffe630525c6bfe05fe9281cfd4dab313196d602a WHIRLPOOL 6a72d31953fad89a1aab2e120158a4a9fcafd7bf0ffc8b301bab0a7d4a5552c9490d5b2292985e698e562ccb983cedad01d31600db12a29076726a672c3cfb94
+MISC ChangeLog 3513 SHA256 8aefe80762c9409081c1762ef93d75ae5e7e10ead7ecd424df9fa4f6d7dc9456 SHA512 5adb02c9704a149a976129c114bdfb1eac0718be2599bfc28f093d274d25f084e34aeea97ecf8484cfb14a879ef39d8687a3785917a99e06dbc296fb8e2bfdd4 WHIRLPOOL 6dbb0dee32fe9562cfc4ff2c2ea92c4f20e80508dcb47d57d79591d78b5da54feb3bb0a1682d051df1187206a638e6e8e59a52e3b453e2d96f3e5beaf63e6c6b
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHvLpYACgkQVWmRsqeSphMmXgCfT5z8NNjU7mqqqxhUt7GPNtBh
-EegAn20mXTlPaKCUqy0k2MzkkAMUyhAY
-=DsYi
+iEYEAREIAAYFAlHvNigACgkQVWmRsqeSphN/cQCfSoG1GpqkIfyOPBqo4pV5nuN1
+MCQAnidDpTHUG13dUJ8hM90+qCWlA1QR
+=1IeS
 -----END PGP SIGNATURE-----
diff --git a/app-office/passepartout/passepartout-0.7.0-r1.ebuild b/app-office/passepartout/passepartout-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..51c59c9dedcc
--- /dev/null
+++ b/app-office/passepartout/passepartout-0.7.0-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/passepartout-0.7.0-r1.ebuild,v 1.1 2013/07/24 02:04:23 jer Exp $
+
+EAPI=5
+inherit autotools base eutils gnome2 libtool
+
+DESCRIPTION="A DTP application for the X Window System"
+HOMEPAGE="http://www.stacken.kth.se/project/pptout/"
+SRC_URI="mirror://gnome/sources/passepartout/0.7/passepartout-0.7.0.tar.bz2"
+
+IUSE="gnome"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPS="dev-cpp/libxmlpp:2.6
+	>=dev-libs/libxml2-2
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm:2.6
+	dev-libs/glib:2
+	dev-libs/libsigc++:2
+	media-libs/freetype:2
+	virtual/fam
+	gnome? (
+			gnome-base/libgnome
+			gnome-base/gnome-vfs
+	)
+	"
+
+RDEPEND="${COMMON_DEPS}
+	dev-libs/libxslt
+	app-text/ghostscript-gpl"
+
+DEPEND="${COMMON_DEPS}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS BUGS NEWS README"
+
+# GCC-4.2 patch:
+# http://bugzilla.gnome.org/477017
+# GCC-4.3 patch:
+# Snatched from Debian
+# http://bugzilla.gnome.org/565131
+# include-flags:
+# http://bugzilla.gnome.org/464517
+# libtoolization:
+# http://bugzilla.gnome.org/464567
+# libxml-2.6:
+# http://bugzilla.gnome.org/449596
+
+# The include and libtoolization patches are needed for
+# forced as-needed to work.
+
+PATCHES=(
+		"${FILESDIR}/${P}-gcc42.patch"
+		"${FILESDIR}/${P}-gcc43.patch"
+		"${FILESDIR}/${P}-gcc44.patch"
+		"${FILESDIR}/${P}-include-flags.patch"
+		"${FILESDIR}/${P}-libtoolization.patch"
+		"${FILESDIR}/${P}-safer.patch"
+		"${FILESDIR}/${P}-libxmlpp-2.6-depend.patch"
+		"${FILESDIR}/${P}-automake-1.13.patch"
+	)
+
+src_unpack() {
+	base_src_unpack
+}
+
+src_prepare() {
+	gnome2_omf_fix
+	base_src_prepare
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	# Bug 367867: Broken AC_ARG_WITH
+	use gnome && G2CONF="--with-gnome"
+	gnome2_src_configure
+}
+
+src_compile() {
+	base_src_compile
+}
+
+src_install() {
+	gnome2_src_install
+	mv "${D}"/usr/share/doc/${PN}/* "${D}/usr/share/doc/${PF}" || die
+	rmdir "${D}"/usr/share/doc/${PN}/ || die
+	make_desktop_entry "/usr/bin/passepartout" "Passepartout DTP" "" "GNOME;Graphics"
+}