Moved from printoxx to mashup, Fix deps for gnome3

svn path=/sunrise/; revision=11976

6 files changed, 26 insertions, 19 deletions

diff --git a/media-gfx/printoxx/ChangeLog b/media-gfx/mashup/ChangeLog
index fae0f1b0b..7a45b401e 100644
--- a/media-gfx/printoxx/ChangeLog
+++ b/media-gfx/mashup/ChangeLog
@@ -1,7 +1,14 @@
-# ChangeLog for media-gfx/printoxx
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# ChangeLog for media-gfx/mashup
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mashup-2.9 (30 Apr 2011)
+
+  30 Apr 2011; Justin Lecher <jlec@gentoo.org> -printoxx-2.7.ebuild,
+  -files/printoxx-2.7-Makefile-ldflags-fix.diff, +mashup-2.9.ebuild,
+  +files/mashup-2.9-ldflags.patch:
+  Moved from printoxx to mashup, Fix deps for gnome3
+
 *printoxx-2.7 (04 Jul 2010)
 
   04 Jul 2010; Michał Górny (sedzimir) <mgorny.3ehbo@mailnull.com>
diff --git a/media-gfx/mashup/Manifest b/media-gfx/mashup/Manifest
new file mode 100644
index 000000000..f24a92796
--- /dev/null
+++ b/media-gfx/mashup/Manifest
@@ -0,0 +1,5 @@
+AUX mashup-2.9-ldflags.patch 820 RMD160 1a71b69a806aa92d0fefada0484c082447edc358 SHA1 dc1ff7bbd7b59f0e60f4f4228c3c04e4f1e282ec SHA256 3b8d91c2bc4c38c029f96d9da480f8449fd61b5d3b5377bb4290c4362b204819
+DIST mashup-2.9.tar.gz 395313 RMD160 78b311f763ee66c07e9953dedbac5608f581a880 SHA1 175e46011611257c0f64dd76e296cbc9a484f7e6 SHA256 70216df660ae36850660030a850743a22fabecf8bfcef96c76f3f29d5c69cd7c
+EBUILD mashup-2.9.ebuild 1141 RMD160 71009e1cc19b6d71d1cd6006c5ecbffe01fdea7f SHA1 1035a36b0c181eb15570aeefe6f0bec50c4e7d55 SHA256 daa39275667bd9254658081b833fc887c032a1f23d962f93cade0ebc1bb2c60d
+MISC ChangeLog 3167 RMD160 4a472e41448461694e2cda222518c1e415c41f5c SHA1 12774e7cfdb43c765b5153e0947680366ea9c4d7 SHA256 5e95482bc89d3d6fb7601f9315607aacb1fbb019f3b6adaf98b96823f6c5543c
+MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/media-gfx/printoxx/files/printoxx-2.7-Makefile-ldflags-fix.diff b/media-gfx/mashup/files/mashup-2.9-ldflags.patch
index cddd06a16..cddd06a16 100644
--- a/media-gfx/printoxx/files/printoxx-2.7-Makefile-ldflags-fix.diff
+++ b/media-gfx/mashup/files/mashup-2.9-ldflags.patch
diff --git a/media-gfx/printoxx/printoxx-2.7.ebuild b/media-gfx/mashup/mashup-2.9.ebuild
index 7199a999a..cd81bc047 100644
--- a/media-gfx/printoxx/printoxx-2.7.ebuild
+++ b/media-gfx/mashup/mashup-2.9.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=4
+
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Program for printing one or more image files with a user-defined page layout"
-HOMEPAGE="http://kornelix.squarespace.com/printoxx"
+HOMEPAGE="http://kornelix.squarespace.com/mashup"
 SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -14,11 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=x11-libs/gtk+-2.8"
+DEPEND="x11-libs/gtk+:2"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile-ldflags-fix.diff
+	epatch "${FILESDIR}"/${P}-ldflags.patch
 }
 
 src_compile() {
@@ -28,13 +29,12 @@ src_compile() {
 }
 
 src_install() {
-	# emake install installs many junk-files (including the manpage) into DOCDIR
-	# emake menu creates .desktop entry with DESTDIR-paths inside
-	# emake manpage compresses the manpage
-	# and they fail together with parallel make
-	# - thus we call only install and pass a nice DOCDIR for easy removal
-
-	emake DESTDIR="${D}" PREFIX=/usr DOCDIR=/tmp/${P}-doc install || die
+	dobin ${PN}
+	insinto /usr/share/${PN}
+	doins data/*
+	doicon icons/*
+	insinto /usr/share/
+	doins -r locales/*
 
 	make_desktop_entry ${PN} "Printoxx" /usr/share/${PN}/icons/${PN}.png "Application;Graphics;2DGraphics;"
 	newman doc/${PN}.man ${PN}.1 || die
diff --git a/media-gfx/printoxx/metadata.xml b/media-gfx/mashup/metadata.xml
index e6233b5dc..e6233b5dc 100644
--- a/media-gfx/printoxx/metadata.xml
+++ b/media-gfx/mashup/metadata.xml
diff --git a/media-gfx/printoxx/Manifest b/media-gfx/printoxx/Manifest
deleted file mode 100644
index 3ccd09b3c..000000000
--- a/media-gfx/printoxx/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX printoxx-2.7-Makefile-ldflags-fix.diff 820 RMD160 1a71b69a806aa92d0fefada0484c082447edc358 SHA1 dc1ff7bbd7b59f0e60f4f4228c3c04e4f1e282ec SHA256 3b8d91c2bc4c38c029f96d9da480f8449fd61b5d3b5377bb4290c4362b204819
-DIST printoxx-2.7.tar.gz 513585 RMD160 700d0dfee53a207280e46609033a92e6022ad5bf SHA1 893bf2c545ab5451628f1d19b698293cdf585049 SHA256 ad269cf32ad334673ae233119c838881f81929ceeef83a4bed1602f34a9c77f2
-EBUILD printoxx-2.7.ebuild 1416 RMD160 72a7418c6578d272ca8630b992ecee1baeef28de SHA1 2f5ddeb106f426c60e447b7cfc8cf7e74f1896e3 SHA256 e4bc0ac6cf722d7d84474598e01765c31cef37bc42f439d644b329111f592f15
-MISC ChangeLog 2915 RMD160 fd2af49042ae0e1b8637472e211512bcf6c8592f SHA1 b096ca3ef76e60ba2e1512b038d1694600387ffe SHA256 56ac05d36820ed9ff1389256e55b09333daca2879da94243bec09af247e47f99
-MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f