Ebuild cleanup, ~amd64 added, thanks to Joshua Saddler <nightmorph@gentoo.org>

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 20 insertions, 23 deletions

diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog
index 55369706aba3..b5a2ff52537b 100644
--- a/media-gfx/fotoxx/ChangeLog
+++ b/media-gfx/fotoxx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/fotoxx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.2 2010/07/19 15:31:31 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.3 2010/07/20 03:57:01 grozin Exp $
+
+  20 Jul 2010; Andrey Grozin <grozin@gentoo.org> fotoxx-10.7.ebuild,
+  files/fotoxx-makefile.patch:
+  Ebuild cleanup, ~amd64 added, thanks to Joshua Saddler
+  <nightmorph@gentoo.org>
 
   19 Jul 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml:
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index 16eda222f7d0..5cfcdfb46bc5 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,5 +1,5 @@
-AUX fotoxx-makefile.patch 605 RMD160 376d453e43eefaf02f531894a3d2aabb1cbdb504 SHA1 9c20623f16a6d9c13701ca5b62756b28147b4f48 SHA256 cdf63f27899b0671198abc64dbac98073cf9bd3ccc3866e5bb0a4f38f85a92df
+AUX fotoxx-makefile.patch 400 RMD160 743e85c85fd32b35de4952df51c12a7c3a5a49aa SHA1 92e4042890b2027d5000fd6a6a0ecfaf48d8325f SHA256 4b1f298a94d58e1976a0dcd11ece83ebd2e1a19290302695fe9307740f62ca80
 DIST fotoxx-10.7.tar.gz 1161960 RMD160 708cb9a2667dd032d5fe30ffed5f4469208fa6ea SHA1 8516fe96196c361d5e2c1f7443372bdff446220a SHA256 9bb69be15bdbacc797c782221038b030b9bee68a421cc27f271b8c8ac138bc81
-EBUILD fotoxx-10.7.ebuild 1134 RMD160 47a3ccad7950db896341c2cb65f19952cefcb7e5 SHA1 ccb4a7d12d9824a83ca81b2f88fff5c889daab7e SHA256 3bbfbd165acf7d1e26104b8331813b391fc9901522890734c435dce20e7f5dc7
-MISC ChangeLog 525 RMD160 56386dcd44e80624d9f20c2657638e865b892c8a SHA1 7b30caa645606b55cdcd1ba1100f7e7bf42a6126 SHA256 3cee09861491881627286188cec1758abc2b44e82cb39452464fe6e405c0e195
+EBUILD fotoxx-10.7.ebuild 1059 RMD160 d4bb8969b2c567d0a75bd965b0664d11db2c2ce2 SHA1 3ebe6ea4fa2a768b9faffa29506eccd7b067ae06 SHA256 591f629025c887fdc1bdd1408dba78bf27ad08790018e57416835e2766aa2a5e
+MISC ChangeLog 704 RMD160 ea5b12da3c5431e771c2e893eace91a43a37a056 SHA1 00d1547fa3463743086c26a396ff94704b320128 SHA256 48d9b671d3d212a7998fedb1ea603351c3764c9843e4224573367314b2806a54
 MISC metadata.xml 868 RMD160 8264b2cc211f3c453ab9d2e119d18e543133bee9 SHA1 bf7bf564db831fb3e8474e19ddbde50631808167 SHA256 b705d0b873a5a64e431884d3d975e3634a47b3a8c5a6e1d1392d4195a4e1e219
diff --git a/media-gfx/fotoxx/files/fotoxx-makefile.patch b/media-gfx/fotoxx/files/fotoxx-makefile.patch
index 61619e933648..2b7985802a0e 100644
--- a/media-gfx/fotoxx/files/fotoxx-makefile.patch
+++ b/media-gfx/fotoxx/files/fotoxx-makefile.patch
@@ -8,9 +8,3 @@ diff -U2 -r fotoxx-10.7.orig//Makefile fotoxx-10.7//Makefile
 +DOCDIR = $(PREFIX)/share/doc/$(PF)
  MANDIR = $(PREFIX)/share/man/man1
  
-@@ -39,5 +39,4 @@
- 	mkdir -p $(DESTDIR)$(DATADIR)/locales
- 	mkdir -p $(DESTDIR)$(MANDIR) 
--	cp -R doc/* $(DESTDIR)$(DOCDIR)
- 	cp icons/* $(DESTDIR)$(ICONDIR)
- 	cp -R locales/* $(DESTDIR)$(DATADIR)/locales
diff --git a/media-gfx/fotoxx/fotoxx-10.7.ebuild b/media-gfx/fotoxx/fotoxx-10.7.ebuild
index 88cb953be5d4..c85eedbb44d7 100644
--- a/media-gfx/fotoxx/fotoxx-10.7.ebuild
+++ b/media-gfx/fotoxx/fotoxx-10.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-10.7.ebuild,v 1.1 2010/07/16 04:47:16 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-10.7.ebuild,v 1.2 2010/07/20 03:57:01 grozin Exp $
 EAPI=3
 inherit eutils
 
@@ -10,10 +10,11 @@ SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="x11-libs/gtk+"
+DEPEND="x11-libs/gtk+:2
+	media-libs/tiff"
 RDEPEND="${DEPEND}
 	media-libs/exiftool
 	media-gfx/ufraw
@@ -28,16 +29,13 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install || die "emake install failed"
-	make_desktop_entry ${PN} "Fotoxx" /usr/share/${PN}/icons/${PN}.png "Application;Graphics;2DGraphics;"
-
-	# Documentation
-	cd doc
+	pushd doc > /dev/null
 	mv ${PN}.man ${PN}.1
 	doman ${PN}.1
-	dodoc userguide-changes
-	insinto /usr/share/doc/${PF}
-	doins README CHANGES TRANSLATIONS userguide-*.html
-	insinto /usr/share/doc/${PF}/images
-	doins images/*.jpeg
+	rm COPYING ${PN}.1
+	bzip2 -9 userguide-changes
+	popd > /dev/null
+
+	emake DESTDIR="${D}" PREFIX=/usr install || die "emake install failed"
+	make_desktop_entry ${PN} "Fotoxx" /usr/share/${PN}/icons/${PN}.png "Application;Graphics;2DGraphics;"
 }