5 files changed, 72 insertions, 21 deletions
diff --git a/media-gfx/gimp-cmyk-plugin/ChangeLog b/media-gfx/gimp-cmyk-plugin/ChangeLog
index 5a355f3fa..798cf2904 100644
--- a/media-gfx/gimp-cmyk-plugin/ChangeLog
+++ b/media-gfx/gimp-cmyk-plugin/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Aug 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  +files/0.5.4-Makefile.patch, -gimp-cmyk-plugin-0.5.3.ebuild,
+  +gimp-cmyk-plugin-0.5.4.ebuild, -files/installer.patch:
+  version bump, CC, LDFLAGS and CFLAGS are respected now, keyworded for
+  ~amd64, make use of base.eclass
+
   12 Jul 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   gimp-cmyk-plugin-0.5.3.ebuild:
   Whitespace, simplify
diff --git a/media-gfx/gimp-cmyk-plugin/Manifest b/media-gfx/gimp-cmyk-plugin/Manifest
index 6e46810af..ca0396e4c 100644
--- a/media-gfx/gimp-cmyk-plugin/Manifest
+++ b/media-gfx/gimp-cmyk-plugin/Manifest
@@ -1,6 +1,6 @@
-AUX installer.patch 314 RMD160 ab3eebf42aceced434fd81777c9fb37b1cd3dab3 SHA1 422b37622575d1c5aa7ce1c1f689e19f0f4a4f1d SHA256 820e35d6725d9bd86042c496e99a338c730ec87060f4bc9fc0cbf12a70f8450b
+AUX 0.5.4-Makefile.patch 1737 RMD160 7e632190f881c5db16d3e8b0fd4858801031691e SHA1 36f619188116456cb2e7059a89440b50222a9aed SHA256 23b0368e24e8febfadaa9ebc2a3df395e20b4269be5af12a2acf35cd195bfaeb
 DIST AdobeICCProfilesCS4Win_end-user.zip 6475520 RMD160 859b4156d1d384eeba4bc696cbba73c3d8716053 SHA1 88f0c594caf1c657ce25c2b97895e40f93d463b4 SHA256 92043b7c3ca5a25a0f6975d0cdc57db60a67dcb9ebdfb15b16267311beb58f94
-DIST separate+-0.5.3.zip 201919 RMD160 578c8a5159aefd6649ffe2947b5dfbe94579495d SHA1 d3355e2c6acb3dda6d74dc3360e625ac9b6346da SHA256 e43a778a7f54cf1a524984463bc4fe6d38bd22cfa9b985e086fb25085abdf123
-EBUILD gimp-cmyk-plugin-0.5.3.ebuild 949 RMD160 0bc979fef9d4d700cab7b72b6c3c69fb83631913 SHA1 103ebe13ee469fd8c22ab90bb8f55c3862a98b95 SHA256 26c02d9f7a1a7ee5accab26777a39242c05b52ad8032dbdb9fae1b2e93fc72d7
-MISC ChangeLog 457 RMD160 ea93eacd4301096be03ede58966915f7cd966c3a SHA1 1982eb15d5d9e3681c4d34e5e3c878f2b53ecc4c SHA256 f6ed7383b30a31c4cfea87827cf2fc01d9f57ece8fc146a7a981e0799c41089a
+DIST separate+-0.5.4.zip 214417 RMD160 9216f37f63c635bb93c7f27a12c81784000b7f83 SHA1 ef4c2683342688c5c3f5bababde8baea8472f00f SHA256 a179b745c9683b87e6e0e4ba681d019d9161c1d0eede915a8f567c1f00be87d2
+EBUILD gimp-cmyk-plugin-0.5.4.ebuild 1032 RMD160 9417b1aaa61ede70b6a43a1f488ce2febbafb61a SHA1 ed31ad967af9ed756eb6df93afd327e0e1543e64 SHA256 8a3adcd0f41f8effb037bb5a5ce20e85f207cbdd0ee731eed6231d5afae78ce8
+MISC ChangeLog 742 RMD160 423dadeb6bc80ac8c54723917e8645f65282bd19 SHA1 e7922cac51a8f691a185ea337cfdcb0bf86c77cc SHA256 d275cabe079aaf6e504c46868a0055654ab9bcf81cf60d4b3bb69706883fc87c
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/media-gfx/gimp-cmyk-plugin/files/0.5.4-Makefile.patch b/media-gfx/gimp-cmyk-plugin/files/0.5.4-Makefile.patch
new file mode 100644
index 000000000..4a3dc86e1
--- /dev/null
+++ b/media-gfx/gimp-cmyk-plugin/files/0.5.4-Makefile.patch
@@ -0,0 +1,51 @@
+--- separate+-0.5.4/Makefile	2009-07-20 02:42:00.000000000 +0200
++++ separate+-0.5.4/Makefile.new	2009-08-12 16:20:56.000000000 +0200
+@@ -27,9 +27,9 @@
+ #                                            remove "-DSEPARATE_SEPARATE".
+ CM = -DENABLE_COLOR_MANAGEMENT
+ NLS = -DENABLE_NLS -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""
+-CFLAGS = $(GIMP_INCLUDE) $(GTK_INCLUDE) $(LCMS_INCLUDE) -O3 -Wall $(CM) $(NLS) \
++CFLAGS += $(GIMP_INCLUDE) $(GTK_INCLUDE) $(LCMS_INCLUDE) $(CM) $(NLS) \
+          -DSEPARATE_SEPARATE -DUSE_ICC_BUTTON
+-LDFLAGS = $(GIMP_LIB) $(GTK_LIB) $(LCMS_LIB) $(TIFF_LIB)
++LIBS = $(GIMP_LIB) $(GTK_LIB) $(LCMS_LIB) $(TIFF_LIB)
+ 
+ SOURCES = $(SEPARATE_SOURCES) $(IMPORT_SOURCES) \
+           $(ICC_COLORSPACE_SOURCES) $(EXTRA_SOURCES)
+@@ -68,21 +68,21 @@
+ clean: clean-plugins clean-catalogs
+ 
+ catalogs:
+-	cd po && $(MAKE)
++	$(MAKE) -C po
+ 
+ plugins: $(TARGETS)
+ 
+ separate: $(SEPARATE_OBJECTS)
+-	$(CC) $(SEPARATE_OBJECTS) -o $@ $(LDFLAGS)
++	$(CC) $(LDFLAGS) $(SEPARATE_OBJECTS) -o $@ $(LIBS)
+ 
+ separate_import: $(IMPORT_OBJECTS)
+-	$(CC) $(IMPORT_OBJECTS) -o $@ $(LDFLAGS)
++	$(CC) $(LDFLAGS) $(IMPORT_OBJECTS) -o $@ $(LIBS)
+ 
+ icc_colorspace: $(ICC_COLORSPACE_OBJECTS)
+-	$(CC) $(ICC_COLORSPACE_OBJECTS) -o $@ $(LDFLAGS)
++	$(CC) $(LDFLAGS) $(ICC_COLORSPACE_OBJECTS) -o $@ $(LIBS)
+ 
+ install-catalogs:
+-	cd po && $(MAKE) install
++	$(MAKE) -C po install
+ 
+ install-plugins: $(TARGETS)
+ 	install -c $^ "$(INSTALLDIR)"
+--- separate+-0.5.4/Makefile	2009-08-12 16:21:22.000000000 +0200
++++ separate+-0.5.4/Makefile.new	2009-08-12 16:22:16.000000000 +0200
+@@ -85,6 +85,7 @@
+ 	$(MAKE) -C po install
+ 
+ install-plugins: $(TARGETS)
++	mkdir -p "$(INSTALLDIR)"
+ 	install -c $^ "$(INSTALLDIR)"
+ 
+ install: install-plugins install-catalogs
diff --git a/media-gfx/gimp-cmyk-plugin/files/installer.patch b/media-gfx/gimp-cmyk-plugin/files/installer.patch
deleted file mode 100644
index 2f33f6260..000000000
--- a/media-gfx/gimp-cmyk-plugin/files/installer.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- separate+-0.5.3/Makefile	2008-08-11 05:00:08.000000000 -0400
-+++ separate+-0.5.3.new/Makefile	2009-05-26 12:52:22.000000000 -0400
-@@ -85,6 +85,7 @@
- 	cd po && $(MAKE) install
- 
- install-plugins: $(TARGETS)
-+	mkdir -p "$(INSTALLDIR)"
- 	install -c $^ "$(INSTALLDIR)"
- 
- install: install-plugins install-catalogs
diff --git a/media-gfx/gimp-cmyk-plugin/gimp-cmyk-plugin-0.5.3.ebuild b/media-gfx/gimp-cmyk-plugin/gimp-cmyk-plugin-0.5.4.ebuild
index ac759724f..b51b373b6 100644
--- a/media-gfx/gimp-cmyk-plugin/gimp-cmyk-plugin-0.5.3.ebuild
+++ b/media-gfx/gimp-cmyk-plugin/gimp-cmyk-plugin-0.5.4.ebuild
@@ -2,18 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
+inherit base toolchain-funcs
 
 MY_P="separate+-${PV}"
 
 DESCRIPTION="Gimp CMYK plug-in."
 HOMEPAGE="http://cue.yellowmagic.info/softwares/separate.html"
-SRC_URI="http://registry.gimp.org/files/${MY_P}.zip
+SRC_URI="mirror://sourceforge.jp/separate-plus/41810/${MY_P}.zip
 	 http://download.adobe.com/pub/adobe/iccprofiles/win/AdobeICCProfilesCS4Win_end-user.zip"
 
 LICENSE="GPL-2 Adobe"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/lcms
@@ -23,10 +23,14 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/installer.patch"
+PATCHES=(
+	"${FILESDIR}"/${PV}-Makefile.patch
+	)
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		|| die "compilation failed"
 }
 
 src_install() {