media-gfx/gimp-cmyk-plugin: Version bump, including jpeg support

svn path=/sunrise/; revision=9750

5 files changed, 44 insertions, 57 deletions

diff --git a/media-gfx/gimp-cmyk-plugin/ChangeLog b/media-gfx/gimp-cmyk-plugin/ChangeLog
index 798cf2904..fdd403f00 100644
--- a/media-gfx/gimp-cmyk-plugin/ChangeLog
+++ b/media-gfx/gimp-cmyk-plugin/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Dec 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  +gimp-cmyk-plugin-0.5.5.ebuild, -files/0.5.4-Makefile.patch,
+  +files/0.5.5-Makefile.patch, -gimp-cmyk-plugin-0.5.4.ebuild:
+  Version bump, including jpeg support
+
   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:
diff --git a/media-gfx/gimp-cmyk-plugin/Manifest b/media-gfx/gimp-cmyk-plugin/Manifest
index ca0396e4c..889d788e3 100644
--- a/media-gfx/gimp-cmyk-plugin/Manifest
+++ b/media-gfx/gimp-cmyk-plugin/Manifest
@@ -1,6 +1,6 @@
-AUX 0.5.4-Makefile.patch 1737 RMD160 7e632190f881c5db16d3e8b0fd4858801031691e SHA1 36f619188116456cb2e7059a89440b50222a9aed SHA256 23b0368e24e8febfadaa9ebc2a3df395e20b4269be5af12a2acf35cd195bfaeb
+AUX 0.5.5-Makefile.patch 559 RMD160 46fb761245d7d17510d8c67a1ef5c39ccfd93869 SHA1 e39b14d1c3bbde35b5612338311c4f791f2f9090 SHA256 fd05762fd729847798bf96a297c54027950a76241769ca14428e50bc6a4c47a2
 DIST AdobeICCProfilesCS4Win_end-user.zip 6475520 RMD160 859b4156d1d384eeba4bc696cbba73c3d8716053 SHA1 88f0c594caf1c657ce25c2b97895e40f93d463b4 SHA256 92043b7c3ca5a25a0f6975d0cdc57db60a67dcb9ebdfb15b16267311beb58f94
-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
+DIST separate+-0.5.5.zip 215044 RMD160 7ec591158276b63689dd48f666417f9a7756bcc6 SHA1 d30b24b1a0a2e02e536ad59591b94f3ac1bfeeb7 SHA256 eb9dae765c072b8e5bc72feac95535e9012ee813690baebc7fd0f6bd450802b3
+EBUILD gimp-cmyk-plugin-0.5.5.ebuild 1183 RMD160 99045ed7ccfb357898f2124d935e8e08fb0b158a SHA1 8a462c172ef664cedf36e556277c8b96a2aea983 SHA256 99fcf441cc5aa0f5562b2d9f45e917963d3e7222b6d97fbfd2f34b1733dac5f8
+MISC ChangeLog 965 RMD160 58e6cbaa4426d065ec871753eceda59ad7de6b26 SHA1 6757e20f35103f8bdfeda9772533f34e37d9eb5f SHA256 d8e8825e9957e53d312d8271e9e8d4902263bb8e0430ca741961271e7cbca5e7
 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
deleted file mode 100644
index 4a3dc86e1..000000000
--- a/media-gfx/gimp-cmyk-plugin/files/0.5.4-Makefile.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- 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/0.5.5-Makefile.patch b/media-gfx/gimp-cmyk-plugin/files/0.5.5-Makefile.patch
new file mode 100644
index 000000000..07afc8bde
--- /dev/null
+++ b/media-gfx/gimp-cmyk-plugin/files/0.5.5-Makefile.patch
@@ -0,0 +1,22 @@
+diff --git a/Makefile b/Makefile
+index 8a99981..46940a7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ GIMP_VER = 2.4
+ 
+ PREFIX      = /usr
+-INSTALLDIR  = $(PREFIX)/lib/gimp/2.0/plug-ins
++INSTALLDIR  = $(PREFIX)/GENTOOLIBDIR/gimp/2.0/plug-ins
+ #INSTALLDIR = $(HOME)/.gimp-$(GIMP_VER)/plug-ins
+ 
+ GTK_INCLUDE  = `pkg-config gtk+-2.0 --cflags`
+@@ -87,7 +87,7 @@ install-catalogs:
+ 
+ install-plugins: $(TARGETS)
+ 	install -d "$(INSTALLDIR)"
+-	install -c -s $^ "$(INSTALLDIR)"
++	install -c $^ "$(INSTALLDIR)"
+ 
+ install: install-plugins install-catalogs
+ 
diff --git a/media-gfx/gimp-cmyk-plugin/gimp-cmyk-plugin-0.5.4.ebuild b/media-gfx/gimp-cmyk-plugin/gimp-cmyk-plugin-0.5.5.ebuild
index b51b373b6..1ae924f79 100644
--- a/media-gfx/gimp-cmyk-plugin/gimp-cmyk-plugin-0.5.4.ebuild
+++ b/media-gfx/gimp-cmyk-plugin/gimp-cmyk-plugin-0.5.5.ebuild
@@ -2,13 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit base toolchain-funcs
+EAPI="2"
+
+inherit base multilib toolchain-funcs
 
 MY_P="separate+-${PV}"
+SFNUM="42977"
 
 DESCRIPTION="Gimp CMYK plug-in."
 HOMEPAGE="http://cue.yellowmagic.info/softwares/separate.html"
-SRC_URI="mirror://sourceforge.jp/separate-plus/41810/${MY_P}.zip
+SRC_URI="mirror://sourceforge.jp/separate-plus/${SFNUM}/${MY_P}.zip
 	 http://download.adobe.com/pub/adobe/iccprofiles/win/AdobeICCProfilesCS4Win_end-user.zip"
 
 LICENSE="GPL-2 Adobe"
@@ -17,6 +20,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/lcms
+	media-libs/jpeg
 	media-libs/tiff
 	media-gfx/gimp"
 DEPEND="${RDEPEND}"
@@ -27,6 +31,13 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-Makefile.patch
 	)
 
+src_prepare() {
+	base_src_prepare
+	sed \
+		-e "s:GENTOOLIBDIR:$(get_libdir):g" \
+		-i Makefile
+}
+
 src_compile() {
 	emake \
 		CC="$(tc-getCC)" \