Version bump (bug #516012). Add openmp flag and drop to ffmpeg only since the externa...

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

diff --git a/media-gfx/gmic/ChangeLog b/media-gfx/gmic/ChangeLog
index f6e804d2a4be3a42fed7259d85dab2b9fe91411d..f72f00143be1355b43207116c9c39dfc5e2ad5bf 100644 (file)
--- a/media-gfx/gmic/ChangeLog
+++ b/media-gfx/gmic/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/gmic
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.53 2014/06/16 07:51:42 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.54 2014/12/03 08:04:56 radhermit Exp $
+
+*gmic-1.6.0.2 (03 Dec 2014)
+
+  03 Dec 2014; Tim Harder <radhermit@gentoo.org> +gmic-1.6.0.2.ebuild,
+  +files/gmic-1.6.0.2-makefile.patch:
+  Version bump (bug #516012). Add openmp flag and drop to ffmpeg only since the
+  external binary is called instead of linking against the library.
 
   16 Jun 2014; Tim Harder <radhermit@gentoo.org> -gmic-1.5.8.0.ebuild,
   -gmic-1.5.8.1.ebuild, -gmic-1.5.8.2.ebuild, -gmic-1.5.8.3.ebuild,

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 6961bf1c6e7c90eb31725c7b20a196200b1b6f87..a6e66e5d1945b5df4956cca50087ab1bbf2d8b8e 100644 (file)
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -5,22 +5,25 @@ AUX gmic-1.5.8.2-ffmpeg.patch 750 SHA256 14eff8233639c8e3384b9abf4acfa08af72595f
 AUX gmic-1.5.8.4-makefile.patch 5384 SHA256 48cd18f8e8086a21b62b59788d34185521dddfa9f42ec228f069d44aac2d7af0 SHA512 009cc63ce747ee0acd917795ff093d9aec4545105cb9a96f837d885d68f420b919557d569e2492cd016b96a723a932f8e7b19cf89f12b8ecb153b96dcf1e49b1 WHIRLPOOL 752c7849074e70f3bf10b5aa144917d9e18276c4d99a0a4b4139b217a1e8edd8036df0c95b9f7a3f3b12f03abc99e8c67666fab8365d5259e1e788096f512998
 AUX gmic-1.5.9.1-makefile.patch 5285 SHA256 75c0faee9e1fa0796ecd3583de9b81a7281be7fd80d46fede525d385f5c449c3 SHA512 71ffc20d5bc94766ed86012a3f720ab3c43fe229822ecd1325217713fcce4f4305ad34b6bb0a3fc07c1949bf0a1c581a22307b0f49a4302a58de7b3d0261de00 WHIRLPOOL df3b4b59b959e2a56ad829e2446295f6434a13c210d7c83b9dd173e54baf495dddbd71bfe3531670737ebe0769239e1a873635a11439f7cdf94b71ed3029aede
 AUX gmic-1.5.9.2-makefile.patch 16211 SHA256 222a8d530aab275b376b4272fc2f7a43fdfddf51a33fa70bd031ca05899b6bb7 SHA512 2e00b93ccc980823641a1704b2684e617ca64c44c00fb4aac0373f0338192b6c768356c806cef3b9baf86d299f492eb0414b7e7f42eb3bcae5e9ab04d8fe1013 WHIRLPOOL acb02abac8d6174afdbb982c29243b0a7e723b83b2d2c538fa9c77c99e1f09400960e0e8b108a770c75c9317ada029d6f8dea7ffe8de5dd14471262a7ccded21
+AUX gmic-1.6.0.2-makefile.patch 6480 SHA256 b4b0b8834d784f8464bf0e836d10cd3f1c86fb6bf5d73f129222e3c824c05bc4 SHA512 7f69f20a8fa73e4b9bdfc9c4e222d80d8a87a0d18acded10af254806464c4b45280a596722859926d7b64b560f484501335f950c6dac7eb76b7b3f7d1a3a8a8c WHIRLPOOL 5f600fe95c3b1d2a61bc7b1f4b2c65f25f0648b44ee3fe40735c6f20ecbda2e57a2f88c19577841983499d19685b3902adb5b2d4ae1006ecdc50474b172660a2
 DIST gmic_1.5.8.6.tar.gz 2691672 SHA256 21f90a37f2b63070c3d31ad19139c90d3241e62c3b1cca04eb1a5ca45838ad91 SHA512 1687fac247b922cc1d4c42821d3d79eb25e5ab6be0bf6b9b5bf026edec71ba39d2a627cfa604ae9779c49b66e12c56dae2dfdae163e5a3c13d2cf21b2ad5f3a6 WHIRLPOOL c106a7780ef1c542974a78ae2208dcd7dbf8ec714746264ee124876651b7bf3590d75c8c0fef27b3e2fd63627644da52b5572be9935209958a8aa3b5eae7edb8
 DIST gmic_1.5.9.1.tar.gz 2780328 SHA256 6ef0f700a34398c550ec8c44c53393ef222c0bf6dc998fe14b6e434069158cc9 SHA512 a0298925fca007fc95a4d892e41785050bddff4d891e996217af5110c34d550f935cdd1033338e30495fbcb27b76f16a9f201b7b4ce5eb6af2e030c61a040e85 WHIRLPOOL 7b3e9ec6a38369feea423ebf9e76787e8135a8985a164789e45493b98448f97524508d18d2ae9dd784e5b53f94e22702d0c48f871d283c5544c4f4fcd4a42a08
 DIST gmic_1.5.9.2.tar.gz 2784355 SHA256 8fffca4cf2964f75961f165e507101444da593da8a525551bc359a3e7542d3dc SHA512 f451baabfc3a4e51a9e882a970bb26551c72f3802d3c6bdf76ffe37be9dd69eeada75e02457572037124f914fbed6f96ddf0620771b6c71901a4478f38ad3e53 WHIRLPOOL 9760484589e1e84949e6059d0b681644773259ed9242dfcc43440a6bfedec75fa8e969b4e7eb74c6208b0d21a9d311a6751916850dccfd903593c4b78cc7d659
+DIST gmic_1.6.0.2.tar.gz 3013936 SHA256 ec9fa41bb8c27f883b9f845258d41f8024936c80bdec723a1c67cfe05ef9b900 SHA512 9d754cc2c72835bd139a39f72863f5315bebc25716efadb023f54661a4bb3fbf29066ddcd258ab8f084164edc9bd02f77a5a801b5c0753322f959205ce0adaf1 WHIRLPOOL 1d8e7126901b7a269f0aae9bdc1bd05a859efa3269de892e712892aa0c06eeb856c27cf05564bac30abcacf27f3e11d2bcc8f179fc29a675960d6640567cdc0c
 EBUILD gmic-1.5.8.6.ebuild 2021 SHA256 ab9535da9cac4aee07f2611903b29a0d7422f44d801c04f6dc6546d0f4f30171 SHA512 39f750fd7313ff1a12acdb031fda95c559844d36f1e90d124fb9aedce830b028da0da0b3275a08649c13bbc1a0c45cd52ae5ef8c295c523b9b0f6d0c1c4ed2d3 WHIRLPOOL 711186da5d60281273b1368438d86f022884cfe5827dc8f4eabcb21ba17d117f99655584216774df18a75d2528cd2efd910945c8f64b041b3900d9f2c328b475
 EBUILD gmic-1.5.9.1.ebuild 1900 SHA256 c14987c386db5af951cab7c0b090c4f0ff1e7c9f6cf33d6a9fbf02e208df9cf1 SHA512 bf8b3a56ac3a4b2f79b52da03dba5568aaedfdaabd8a73e3b2b44d4dfb539c82f203629724bc5b53e5179a2e5be06a7b725fdabb2f3c9ca7a123aefec7f94c24 WHIRLPOOL c706d64909e6831ab30ad4ef81a0c774a8c5c4df1027258f77230ca73cf914f9e32de09b59748ffbd6a45badb973fc878d0e5a7c8db2582cf366b28ae8940a80
 EBUILD gmic-1.5.9.2-r1.ebuild 1911 SHA256 6370dee1e51c1e299c1a503966eddc857e8fb33c8f5270f960035011f95faad7 SHA512 5905eb47378d61fe0eafec3d834ba0232e17f8097351a5c44487019a08c0c3c860a6c6766cd6d62dc7d08755b4f2ca45467f408dbd0b95d4f89bead93a84ead4 WHIRLPOOL 589162076161c3e95adffe0e56c82970542531a33d7dcd0f789429d84524c69263479bea2358774f3a631decbb4be2ed72dddaf46cc78c1b8036c2d579b2d653
-MISC ChangeLog 7767 SHA256 8be8405e736a229a16c528b4cff21cfc1cfdd88580d1e436912107374376ce30 SHA512 449063e57068e02039be42bf18d359da788b493bf918dfde661fbae89a51e59f8abbb1edd78e70037a45795d9fcfb39496fbacf4a29775831a79befce4957d5c WHIRLPOOL 4a11b86bac7fb6f4ab30aa03bb80fb84343b0fcf7afb31b598601709a8fb7d1e168d09f7366171076e8c175571e60350ce11b321f70cbf1684098a36a6c9f558
+EBUILD gmic-1.6.0.2.ebuild 2094 SHA256 5c51f2a55e9476d746ca9ad0d724055f540f08cfde3c0052c616a067a77c3e63 SHA512 5c74e01048fe575a7416eb7b0a79e3eb9eedcbca7ed746c3f0f0eec5acfded90d99e9cf2a1e27f12772d7da08d8b803f2d88366fe7f6b3d58391b05e2f19f5e5 WHIRLPOOL 978d5137111a2350c34bde7ddf83032315f5383a8ed9e796855edf304ccf13a8cf561d0ac0a68805afc5983cbf2719cc4c0a30614aa165533c7d892d47e54f27
+MISC ChangeLog 8054 SHA256 91977a9c193b91932a24c1b4f5ae45640dfb9b994e70191e7daa75712127cf95 SHA512 a5e78902d7244e97dead79ef9b705f21b496a4822993d75e614b5ab5790bcbc16bb47d20d8f91721242fd9677c36c4d5d4571317e0ed6109ec87cbf4bf95d6ce WHIRLPOOL 6e3f7127697b6f30d4eb3437aae5068e220ab41f4341bb19b67c99e76711173f04f0894994d6fce7536b2bb898a469b567a3e0a2cd056ababec18cfe1023ea23
 MISC metadata.xml 473 SHA256 def06af4d0283b01f9313231ff05df286129ff57afbcac23fcc7c45d8f735a6c SHA512 4bd720129471c24a6b71e32f11054d96bd2eefb3316489806a06b8deed45e5544fe1c74a73c129ec90fe30c8a4c0646c50e6690717046ad93255771627588f32 WHIRLPOOL 9a356f4c399b7a6fdf217b2dbeaeb4fd40dffc080b86c0ad913690c0b0007aaad52ea79d3b7b5b21591432c99a1e59ed02ead94e2578f1915afe2ee0c9f7d090
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTnqIPAAoJEEqz6FtPBkyjumcH/jlvogBncVfyy8H21OTpo2sA
-ObOymIeAKFKgdIXDPRkOhQnpPxW1W5xmJuVYdO44HQTOUxS5tf5KX6i8F1x9oPII
-0VzBCb0zRpUUoPHeun+s3DprYYLJtNyWBpjGMxgmvcagI5WcGg24lOE7mgLIc9gu
-uwPBs7Qk1IAGihGjgvZuOvAUzVA+LKOjdgmxP53lkSyNgxySIYIaxQKKtcuKNbGI
-aRaOgurX+xMdELBYdPCWzGuYyBxt7wkKKuTfkYOvwOgctnD1+HeQHXaCjgCbxIF+
-+yJFD5CGg/HMUSV0FxE8wCZ+pvewnblPH/WAmfAg4oEFKCppWYV7hMw3sGln54Y=
-=FdSX
+iQEcBAEBCAAGBQJUfsQxAAoJEEqz6FtPBkyj3QgH/2P+G7yi8p9wjZtqDcliPv41
+9v5YG6xd9FG/2U2p/p3MsvCS1IWkDxit8NVjMHjx5pOqG/5eUUSvCn8Y2NykNFv9
+7ODhJrsM892uajcbONXUkZ9AOFHGn9mPMojmoXkw2SYidtbyizUuSwITfO7twy8J
+ZNSu5Oxmc60kI6+EQvfqCbOMhWSV5VjRXWLixftkuKI+pcV+P1/Oqj0l/sY000dm
+X345AVB3AdrMNj/a0HR1hbu/lIncBZ74TDhbtgVOLyq6TaZEoNk5eO6gmjITOS4V
+mXyHNYubM8WVa3TuijLLYFdd7WzpR3a5JP/6AvdnvDVmcZjanEWC/1daokZu3Kg=
+=jKnm
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/gmic/files/gmic-1.6.0.2-makefile.patch b/media-gfx/gmic/files/gmic-1.6.0.2-makefile.patch
new file mode 100644 (file)
index 0000000..2ec9047
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-1.6.0.2-makefile.patch
@@ -0,0 +1,155 @@
+--- gmic-1.6.0.2/src/Makefile
++++ gmic-1.6.0.2/src/Makefile
+@@ -85,7 +85,6 @@
+ else\r
+ MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/$(INCLUDE)\r
+ endif\r
+-MANDATORY_LIBS += -L$(USR)/$(LIB)\r
+ ifeq ($(notdir $(CC)),g++)\r
+ MANDATORY_CFLAGS += -Wall -W\r
+ MANDATORY_LIBS += -lm\r
+@@ -142,14 +141,14 @@
+ # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).\r
+ # This requires the presence of the X11 include and library files.\r
+ # (package 'libx11-dev' on Debian).\r
+-X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr\r
+-X11_LIBS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr\r
++X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr\r
++X11_LIBS = -lX11 -lpthread #-lXrandr\r
+ \r
+ # Flags to enable fast display, using XShm.\r
+ # This requires the presence of the X11 extension include and library files.\r
+ # (package 'libx11-dev' on Debian).\r
+ XSHM_CFLAGS = -Dcimg_use_xshm\r
+-XSHM_LIBS = -L$(USR)/X11R6/lib -lXext\r
++XSHM_LIBS = -lXext\r
+ \r
+ # Flags to enable image display, using GDI32.\r
+ # This requires the presence of the GDI32 include and library files.\r
+@@ -177,8 +176,8 @@
+ # Flags to enable native support for MINC2 image files, using the MINC2 library.\r
+ # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )\r
+ # (package 'libminc-dev' on Debian).\r
+-MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include\r
+-MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib\r
++MINC2_CFLAGS = -Dcimg_use_minc2\r
++MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz\r
+ \r
+ # Flags to enable native support for compressed .cimgz files, using the Zlib library.\r
+ # This requires the presence of the Zlib include and library files.\r
+@@ -345,10 +344,10 @@
+ endif\r
+ \r
+ gimp:\r
+-      $(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS) $(OPT_LIBS)" "STRIP_EXE=1" gmic_gimp\r
++      $(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS) $(OPT_LIBS)" gmic_gimp\r
+ \r
+ lib:\r
+-      $(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_LIB_LIBS) $(OPT_LIBS)" gmic_lib\r
++      $(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_LIB_LIBS) $(OPT_LIBS)" gmic_lib\r
+ \r
+ zart: lib\r
+ ifneq ($(OS),Darwin)\r
+@@ -359,7 +358,7 @@
+ \r
+ # Entries for other configurations.\r
+ linux:\r
+-      $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS)" "STRIP_EXE=1" gmic\r
++      $(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS)" gmic\r
+ \r
+ solaris:\r
+       $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic\r
+@@ -386,28 +385,27 @@
+       $(MAKE) "CFLAGS+=$(MINIMAL_MACOSX_CFLAGS)" "LIBS+=$(MINIMAL_MACOSX_LIBS)" gmic\r
+ \r
+ custom:\r
+-      $(MAKE) "CFLAGS=$(CUSTOM_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(CUSTOM_UNIX_LIBS)" "STRIP_EXE=1" gmic\r
++      $(MAKE) "CFLAGS+=$(CUSTOM_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(CUSTOM_UNIX_LIBS)" gmic\r
+ \r
+ # Internal rules to build compilation modules.\r
+ gmic_lib.o: gmic.cpp\r
+       $(CC) -o gmic_lib.o -c gmic.cpp -fPIC $(CFLAGS)\r
+ gmic_lib: gmic_lib.o\r
+-      ar rcs libgmic.a gmic_lib.o\r
++      $(AR) rcs libgmic.a gmic_lib.o\r
+ ifneq ($(OS),Darwin)\r
+-      $(CC) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so gmic_lib.o $(LIBS)\r
++      $(CC) $(LDFLAGS) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so gmic_lib.o $(LIBS)\r
+       $(CC) -o gmic_use_lib gmic_use_lib.cpp -L. -lgmic $(FFTW_LIBS)\r
+ else\r
+-      $(CC) -shared -o libgmic.so gmic_lib.o $(LIBS)\r
++      $(CC) $(LDFLAGS) -shared -o libgmic.so gmic_lib.o $(LIBS)\r
+ endif\r
+ \r
+ gmic_gimp.o: gmic.cpp CImg.h\r
+       $(CC) -o gmic_gimp.o -c gmic.cpp $(CFLAGS) -Dgmic_gimp\r
+ gmic_gimp : gmic_gimp.o gmic_gimp.cpp\r
+-      $(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS)\r
+-      strip gmic_gimp$(EXE)\r
++      $(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0$(EXE) --cflags` $(CFLAGS) $(LDFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS)\r
+ \r
+ gmic: gmic.cpp gmic.h CImg.h\r
+-      $(CC) -o gmic gmic.cpp $(CFLAGS) -Dgmic_main $(LIBS)\r
++      $(CC) -o gmic gmic.cpp $(CFLAGS) $(LDFLAGS) -Dgmic_main $(LIBS)\r
+ \r
+ gmic_def.h: gmic_def.gmic\r
+       @echo "#ifndef gmic_gimp" > gmic_def.h\r
+@@ -422,20 +420,25 @@
+ # Generate bash completion script.\r
+ bashcompletion:\r
+       @mkdir -p ../resources\r
+-      @\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh\r
++      @./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh\r
+ \r
+ # Generate man page.\r
+ man:\r
+       @mkdir -p ../man\r
+-      @\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1\r
+-      @gzip -f ../man/gmic.1\r
++      @./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1\r
++\r
++install: install-gimp install-bin install-lib install-man install-bash\r
+ \r
+ # Install/uninstall/clean procedures.\r
+-install:\r
++install-gimp:\r
+       mkdir -p $(DESTDIR)$(PLUGINDIR)/\r
+       cp -f gmic_gimp $(DESTDIR)$(PLUGINDIR)/\r
++\r
++install-bin:\r
+       mkdir -p $(DESTDIR)$(USR)/$(BIN)/\r
+       cp -f gmic $(DESTDIR)$(USR)/$(BIN)/\r
++\r
++install-lib:\r
+       mkdir -p $(DESTDIR)$(USR)/$(INCLUDE)/\r
+       cp -f gmic.h $(DESTDIR)$(USR)/$(INCLUDE)/\r
+ ifneq ($(OS),Darwin)\r
+@@ -445,13 +448,14 @@
+       ln -s libgmic.so.1.6.0 $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1\r
+       ln -s libgmic.so.1 $(DESTDIR)$(USR)/$(LIB)/libgmic.so\r
+ endif\r
++\r
++install-man:\r
+       mkdir -p $(DESTDIR)$(USR)/share/man/\r
+       mkdir -p $(DESTDIR)$(USR)/share/man/man1/\r
+-      mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/\r
+-      cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz\r
+-      cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz\r
++      cp -f ../man/gmic.1 $(DESTDIR)$(USR)/share/man/man1/gmic.1\r
++\r
++install-bash:\r
+       if [ -d /etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi\r
+-      if [ -d /opt/local/etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi\r
+ \r
+ uninstall:\r
+       rm -f $(DESTDIR)$(USR)/$(BIN)/gmic\r
+@@ -460,8 +464,7 @@
+       rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1\r
+       rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so\r
+       rm -rf $(DESTDIR)$(USR)/share/doc/gmic/\r
+-      rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz\r
+-      rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz\r
++      rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1\r
+ \r
+ distclean: clean\r
+ \r

diff --git a/media-gfx/gmic/gmic-1.6.0.2.ebuild b/media-gfx/gmic/gmic-1.6.0.2.ebuild
new file mode 100644 (file)
index 0000000..0b08974
--- /dev/null
+++ b/media-gfx/gmic/gmic-1.6.0.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.6.0.2.ebuild,v 1.1 2014/12/03 08:04:56 radhermit Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs bash-completion-r1 flag-o-matic
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="http://gmic.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="CeCILL-2 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ffmpeg fftw graphicsmagick jpeg opencv openexr openmp png tiff X zlib"
+
+DEPEND="
+       fftw? ( sci-libs/fftw:3.0[threads] )
+       graphicsmagick? ( media-gfx/graphicsmagick )
+       jpeg? ( virtual/jpeg )
+       opencv? ( >=media-libs/opencv-2.3.1a-r1 )
+       openexr? (
+               media-libs/ilmbase
+               media-libs/openexr
+       )
+       png? ( media-libs/libpng )
+       tiff? ( media-libs/tiff )
+       X? (
+               x11-libs/libX11
+               x11-libs/libXext
+       )
+       zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+       ffmpeg? ( media-video/ffmpeg:0 )
+"
+
+S=${WORKDIR}/${P}/src
+
+pkg_pretend() {
+       if use openmp ; then
+               tc-has-openmp || die "Please switch to an openmp compatible compiler"
+       fi
+
+       if ! test-flag-CXX -std=c++11 ; then
+               die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+       fi
+}
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-makefile.patch
+
+       for i in fftw jpeg opencv openmp png tiff zlib ; do
+               use $i || { sed -i -r "s/^(${i}_(CFLAGS|LIBS) =).*/\1/I" Makefile || die ; }
+       done
+
+       use graphicsmagick || { sed -i -r "s/^(MAGICK_(CFLAGS|LIBS) =).*/\1/" Makefile || die ; }
+       use openexr || { sed -i -r "s/^(EXR_(CFLAGS|LIBS) =).*/\1/" Makefile || die ; }
+
+       if ! use X ; then
+               sed -i -r "s/^((X11|XSHM)_(CFLAGS|LIBS) =).*/\1/" Makefile || die
+
+               # disable display capabilities when X support is disabled
+               append-cppflags -Dcimg_display=0
+       fi
+}
+
+src_compile() {
+       emake AR="$(tc-getAR)" CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" \
+               LIB="$(get_libdir)" OPT_CFLAGS= DEBUG_CFLAGS= linux lib
+       emake man bashcompletion
+}
+
+src_install() {
+       emake DESTDIR="${D}" LIB="$(get_libdir)" install-bin install-lib install-man install-bash
+       dodoc ../README
+}