summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2012-12-08 08:37:22 +0000
committerTim Harder <radhermit@gentoo.org>2012-12-08 08:37:22 +0000
commit312380c6175c3bcdc52f81fe76cac8cecdeefbcd (patch)
treee22acfba9663adb302b18e808e496033cdf5fd60 /media-gfx
parentVersion bump. (diff)
downloadhistorical-312380c6175c3bcdc52f81fe76cac8cecdeefbcd.tar.gz
historical-312380c6175c3bcdc52f81fe76cac8cecdeefbcd.tar.bz2
historical-312380c6175c3bcdc52f81fe76cac8cecdeefbcd.zip
Remove old.
Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64 Manifest-Sign-Key: 0x4AB3E85B4F064CA3
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/gmic/ChangeLog8
-rw-r--r--media-gfx/gmic/Manifest24
-rw-r--r--media-gfx/gmic/files/gmic-1.5.0.7-ffmpeg.patch46
-rw-r--r--media-gfx/gmic/files/gmic-1.5.1.7-makefile.patch110
-rw-r--r--media-gfx/gmic/files/gmic-1.5.2.1-makefile.patch110
-rw-r--r--media-gfx/gmic/gmic-1.5.1.9.ebuild77
-rw-r--r--media-gfx/gmic/gmic-1.5.2.1.ebuild77
7 files changed, 15 insertions, 437 deletions
diff --git a/media-gfx/gmic/ChangeLog b/media-gfx/gmic/ChangeLog
index 8708d72a7ec6..a7d1268728b5 100644
--- a/media-gfx/gmic/ChangeLog
+++ b/media-gfx/gmic/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-gfx/gmic
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.27 2012/12/08 08:36:23 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.28 2012/12/08 08:37:20 radhermit Exp $
+
+ 08 Dec 2012; Tim Harder <radhermit@gentoo.org>
+ -files/gmic-1.5.0.7-ffmpeg.patch, -files/gmic-1.5.1.7-makefile.patch,
+ -gmic-1.5.1.9.ebuild, -gmic-1.5.2.1.ebuild,
+ -files/gmic-1.5.2.1-makefile.patch:
+ Remove old.
*gmic-1.5.2.4 (08 Dec 2012)
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index b3ed408c4c0f..e909e9e2c771 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,32 +1,24 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX gmic-1.5.0.7-ffmpeg.patch 1927 SHA256 57e36922ecd33f8b05666ff707ed7f8cba2d9c732ae3bad7bd379a52bf2c0b25 SHA512 9240966708b0aed5bcb04e0e15650f5697c06ab8f7a0bd16529071e4f17562f4a9ab7e28aaf31b8835d1d04876febd1c2883242c1d7279f913ff66cb04a3c27c WHIRLPOOL 97d82dc3300eb4b364f94fa2990d676f60a3ef644cb34a2ff8c5ecc24cff38d25fe3aefe846e316768a1b7a03d9178fd16db9cb0568612f7c7a425de9b22afba
-AUX gmic-1.5.1.7-makefile.patch 5485 SHA256 c3703b0c8e35cfd86a0b851da1a6b8b3da8776789d987ce395e5a772f6112411 SHA512 0e40fd978232680d08c1c36f01a86f9940fc34f7ef88465e67e52f23de821d13efec2dc931ae2bb9ac1daa464391b3784061ded738105ce0def330719a98c963 WHIRLPOOL 4a690fc8959d73209583a4b3a68d2d66854355e4d36564c1393a04396d033c8af4e6a43763739dee66db941b3cdd42b6ece7cafa0e1bfc5456b71f78886d7841
-AUX gmic-1.5.2.1-makefile.patch 5487 SHA256 ffec62289b6d13853a61a3bff389ffbb7c1530fa39c111837349adeb8803099f SHA512 e0c16322ce1b41626e9031a715f7893e0a1ae73cafe1905251219dc091919fe4e41c60384b4f9ece92cb8b6f7e8b2014c0ff65aa1f7c2970f2bb597d4ee0496e WHIRLPOOL 5dc7a731ccd1d113893f9e09b1d7e797b72cf46bd4d43ee1dcdcf132cddf7fad7cea043d2fe929dba257067e14a67973d0f7054cd0d9b430c3b1925d8df142e2
AUX gmic-1.5.2.2-ffmpeg.patch 716 SHA256 068c3bbb808b8e68a8826203e124d8cc86c937b8c77bc998225510abf6080e1a SHA512 9697d41c7f0fb422eb70d9bca38e8822692d95be14c4c337bea3e02cae1ad039a4b1c007536bdda669ff95c30980d13183423504ae70be3da6da53de146b0c1a WHIRLPOOL 3e94e98a0c375573a3a936a281f3b28c0800d331189f21e6afa1d0c2b2b257a7b56e10419c2362eff726d0bdfb93d902d09e14cce76ae41d779b2ae208c80328
AUX gmic-1.5.2.2-makefile.patch 4407 SHA256 db8acb3399e38a72aeee16d537f242d77b03ebd94987f47c9bc9cc3b2cea1c69 SHA512 83aed5494640a7e7e8db7500fe7dd0e46fd29b788caafde9c715c6c0de4f77a0137fed07a2c3606e8845d6cf66dcea9d68e57bbba03d509ec90dd2bb2f41f37e WHIRLPOOL ffefa2fb0187c7b8950e58630a4bd414a46480c037113e4b05ebbae6dfe3a339e2aada3f89065405b117ad876a51b3a2442a8c2c32430b62a8c354a8d74f122a
-DIST gmic_1.5.1.9.tar.gz 2097627 SHA256 dc1f4d92f417b72e25e60fdde092b2c3e783af77c0595329aab471a1cf22d165 SHA512 723aaf092e79243e672d434f62c3fea8d1b723ad732034aa22225619233d76d32a4472b2b88fcee0a07cb468b85a81110fff5097dda32f2278e175fb338f87ba WHIRLPOOL b94b84a6369a647885f9edad21fd98ed1cb70d68d2bdcef479626d5f623d45490547aafe75f5195d68c1f90f201dee4544c1cd36ec6ccb54599a9550b434abb8
-DIST gmic_1.5.2.1.tar.gz 2170700 SHA256 8284ebc215b8fd7c8edca98f5b0c99e1d229d2123f3d1265758dbe80b6350547 SHA512 6629a13cf824ddbcf5ba292dc18a745af6b9b41cb58c81b790866a54f071af9fe47724d73f8979b310256857480032eeeedb2699502106b5d22188032b6ac03e WHIRLPOOL 24bc500567de777705b0bab58bfd8fec0e1eabda6e55c8635c75b27b398a51c50ac37fd29a07fcf262947e89a43d522333cb5aea22d98af34409ee3913623d85
DIST gmic_1.5.2.2.tar.gz 2187885 SHA256 e5e188e169bf9eebf47cd83d901ec2b44b0d5e5a06eadd734d51edce2202886d SHA512 757b331664178d857a241bf7a8ad8f3bafbbcf946000d0fd71cb717aa38210e34f4bf1e0df3c981fda8550722c7b6a2ee28c6a2d5d170d231127d5a0bc4fe6fe WHIRLPOOL c69e60e76ae354c258121461c334f40c34d32f4888bd41f2dfdfca6305b7bbf964a8c53a69fb6c782c51e33d814f5e498690c485bad1f8a10189dbb6c64363f8
DIST gmic_1.5.2.4.tar.gz 2203118 SHA256 489f81653e3a7a00b5fa10d7d59c35de6a24de3ec24b57b4f6e4498743057c49 SHA512 ffa31dd118a847aefa2a9578803bbae1f3bdf65ad62de36ff68b8afc4e8dbe1459178b1552c2b84c4cdfad85c4bad9e3fd6fdb5d5f2bce713db655d69a48da29 WHIRLPOOL 70dbeb5b9e77fed1b191034f5395764914689117a71cd1d938ad78cd15ee00830936296b6c8531c3958b39274f2797135a0bc369d2c21c46e1e425c2d651bba4
-DIST gmic_reference-1.5.1.9.pdf.xz 14713168 SHA256 c9eb3a918616a9f0b49f1584e2d2a13f96cfb5639a3eb651cf25166e10ec23b7 SHA512 c1a1fa1c41c3520c537bd9c0e241e420a0074f45a6766f65f9aad0d91268d3c617c2611bf1af4b27b29aa77fac499e4108547ad9444f20f685263a39986e749f WHIRLPOOL 2b207eb9ce04b60399f20d2f52c81d0e3a45c43cd33ab0645120b117786af76d35e6c40d3aaa79f79e957116ed9b2f473a6d15ac01cfd6957211f1f523ab2ae6
DIST gmic_reference-1.5.2.2.pdf.xz 14980944 SHA256 3d80b11f55f22c2c9b417c1e056c85a85bd5f8f6f322558fd6aaaa145f1a7651 SHA512 f801a37fb149879fd28f2f3939260d76205f226ac47ea86956d57bd8e1dbe079925cdb9a3ce8c60b08f57a9cf7b27462ffbd81803dac6f8276fa03ec7917a5f0 WHIRLPOOL ed612f38e50a9bf9d44ed7c018fdb284eeffabf930ab7e2deb28d9970b016ccdd3ae55c4748adf97f095583fe5bcaaa5d42b5ae951c12e0e6cec548500cddf8f
DIST gmic_reference-1.5.2.4.pdf.xz 15101780 SHA256 b712c8780b3592c50d1bbc52b914b63e08f97b9c647b8c64fd1b9bc3d07fd9a6 SHA512 49f3f1ec744ba5db7c2585d7feb0bfba4d40b00ed0571d02fffc3662480ecc16b4ac7f3ae3392b4307dc470cea1f42913610e6320125e84d2785e9dc9632739e WHIRLPOOL 60571ce67e485608491b02ce12ca12c53a94843745a0e43eb75e1f0f3d73207f685cec5ec0837854826b9625ec7aa736dbb17b533053135c5477b90951514d4c
-EBUILD gmic-1.5.1.9.ebuild 2020 SHA256 d0adb6758626e1f6addc7bbc1b0c969e42e48b887cf09b6d2213b3bad4bb5bf7 SHA512 8c6b2482e90a855dba4ab9b4b36951e61a4b7075f1b169e9c3d62fbf7f27f592178d5d1c5df657584a17f887ac8aefd692c4448f4bb8ddc02e95c007b779a026 WHIRLPOOL 8be57a69b7ac10079130da2aa00f1270d783618b23f0047c93e7844588bf9ab06182333c7d74ebde73191940283df0c039e214751271d1f262ed103492230ccc
-EBUILD gmic-1.5.2.1.ebuild 2001 SHA256 0cc146157a7495a89595da65b4c405f6dc03d43d10732f02aafe56c27d3c683f SHA512 ba6c41de4a6050a4fdf0c9edeecbbd300ad6e1703f783081bd1939f4ca37479123bdb2cdae414111effdb42e28872adf0b1b386d420d2da2f8cad3a4c8a852b3 WHIRLPOOL 22b2640a1f0ff054146483375bd4df21606c00786fbc72378cd8a26b863b6c46ae39f47e81cc1326164a09bb0ad9f832a4559bdf113555995d61726920cf77e2
EBUILD gmic-1.5.2.2.ebuild 1992 SHA256 f258e75cdeac769e3ff0dc06ef4c567a3ae439a2a918e566edbb2e3c88afb956 SHA512 5a3bfe2ab280c918ca6aae091f44172ba8a61aa7d0b296933403979d7602ba08807d97be87ba7ceb41cec80f78bd30e5c563cb19800acf835769ce3777492961 WHIRLPOOL 343eb97ad4766eeea9857332ae78f2107475e7e7878e0b888fd0c3d10cfcef03840f75f666ca294d60e9eca051484833e88c16d6e0fe2d7c840e3cb21be9833a
EBUILD gmic-1.5.2.4.ebuild 2041 SHA256 b1ff9ce2c6ab6f572749f0203039233a9d1baa255e0e71d1d733a4b688209266 SHA512 11ebdcfbe78285a03a47e9bfbdebd32d66a1bbef62692f71d410afba7d5c1d70b4202a430cb3ed38a23f6993ead6f8ec86f3900659506d23973f9ec21ce3a712 WHIRLPOOL 769faf3b2ef78bcfab99b44c1bbae7208e82bfb71e16120294abe3e60db2bab14685e7e8a618246c3a3dbc47948a842452c89a844b687ade3568152c4c41a0e9
-MISC ChangeLog 3786 SHA256 0b0636e7693dcf8906364c7c3b152df2d690c5ec1da8a42ce587ec030cff68e6 SHA512 3669b4b7edd9391661b599214b650e6d55aa701d3f78d1264b6ff262291f09dc211332fe024b3870ce4659ee2183e9ee9656277e5248862f587054f0504f6659 WHIRLPOOL c88c9e480446b5fbe2974d992a16f994469e88893b5ccd96e299fadecc6a20b6a5bcd51c3f67c1a322a1315a418b68f03a18c9443a2ee8f2ea065fd7d3656749
+MISC ChangeLog 4006 SHA256 c4f37b00479f20453f44e71d9696e0e58a2f61e7a0e661c92f7f38e0b12f6101 SHA512 abc59baa0baa6a185d6ae0041ac22c622524fcde9e0816bae44c9d4b8f88fc6f86aa4b0316efb7e543178a698350494255949c723ee240d73a3a4d8341b69b8b WHIRLPOOL e92b42b87b4834759a9123bcdb8b7c20f0f25b3132c168a5bac663066bab949c3c532a5cf0a9ee3469691b4d25312f13de93c69a573acade72cde16775a66d4a
MISC metadata.xml 473 SHA256 def06af4d0283b01f9313231ff05df286129ff57afbcac23fcc7c45d8f735a6c SHA512 4bd720129471c24a6b71e32f11054d96bd2eefb3316489806a06b8deed45e5544fe1c74a73c129ec90fe30c8a4c0646c50e6690717046ad93255771627588f32 WHIRLPOOL 9a356f4c399b7a6fdf217b2dbeaeb4fd40dffc080b86c0ad913690c0b0007aaad52ea79d3b7b5b21591432c99a1e59ed02ead94e2578f1915afe2ee0c9f7d090
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCAAGBQJQwvwLAAoJEEqz6FtPBkyjYN8H/iVtTsc+NuRWD2mRr023xGqo
-ZuPKVhUFFb+ZS0lbg6kbj2XVfODDY4mxRZPSwm4T/V5jWsvo0e/3gQmGB/OpLGnA
-E93+9znCvCkgbVjEpWdTiL7vUYdEl1p7C8Fq2EIGofmwlOas3sCun0g2cnh6uYdG
-2fgyCN+gXaj3CDvACDvm8pQSsBxE5IgnuWbvWxC0w/WacIqrBal/cwXbvFV4QfZX
-PTAP6/oQkISl1SyDJ+35MN8ooMAiBEjeto/jeH2PDsYI9UPlYAKwqFSbttiqBOW8
-4W1i0HBgwfSo7LbD/x91tKmKUcKHIGGJuwYwGAawh9F5VvbpuR0e3ojVdTKFr9U=
-=Yo0O
+iQEcBAEBCAAGBQJQwvxBAAoJEEqz6FtPBkyjfaMIAJM+XsFd4M2d/lINfHYFSl0d
+oS9DSzl7QPIP6I9mESLD/R0ibW2lVD0HzOi17KGHR4o3OAFc6QUSRm/o89zXT12g
+rg/Zs9duKSVS0M4Wr4iywKNUUlaqSQ3Q4C98G+VNnPCFBi/lpHf7WNFjJYwHEFtX
+WL/ftU1LSlH498h7Vh8z71XiSYQIZ894Z6qsui9FKv6PpXZJmMiT2fauSstDMnF0
+bQQxA1Ktd8uHkJAyYKNBx7UcIjIrI4pZrxbKUjBGSEfmOXfhpnqb777cz+IrMdOf
+c1RqbPrNVXflDuvUf/3ITgNr//3FioSCO63ygAv2Knv2r43c4eG6mMGazDc9ko8=
+=kqVk
-----END PGP SIGNATURE-----
diff --git a/media-gfx/gmic/files/gmic-1.5.0.7-ffmpeg.patch b/media-gfx/gmic/files/gmic-1.5.0.7-ffmpeg.patch
deleted file mode 100644
index 7c7e1bf873cb..000000000000
--- a/media-gfx/gmic/files/gmic-1.5.0.7-ffmpeg.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- gmic-1.5.0.7/src/CImg.h.orig
-+++ gmic-1.5.0.7/src/CImg.h
-@@ -310,6 +310,7 @@
- extern "C" {
- #include "avformat.h"
- #include "avcodec.h"
-+#include "libavutil/mathematics.h"
- #include "swscale.h"
- }
- #endif
-@@ -41744,7 +41745,7 @@
- // as a vector 1x4 containing : (nb_frames,width,height,fps).
- if (!first_frame && !last_frame && !step_frame) {
- for (vstream = 0; vstream<(int)(format_ctx->nb_streams); ++vstream)
-- if (format_ctx->streams[vstream]->codec->codec_type==CODEC_TYPE_VIDEO) break;
-+ if (format_ctx->streams[vstream]->codec->codec_type==AVMEDIA_TYPE_VIDEO) break;
- if (vstream==(int)format_ctx->nb_streams) assign();
- else {
- CImgList<doubleT> timestamps;
-@@ -41774,7 +41775,7 @@
- }
-
- for (vstream = 0; vstream<(int)(format_ctx->nb_streams) &&
-- format_ctx->streams[vstream]->codec->codec_type!=CODEC_TYPE_VIDEO; ) ++vstream;
-+ format_ctx->streams[vstream]->codec->codec_type!=AVMEDIA_TYPE_VIDEO; ) ++vstream;
- if (vstream==(int)format_ctx->nb_streams) {
- av_close_input_file(format_ctx); format_ctx = 0;
- return load_ffmpeg_external(filename);
-@@ -42350,7 +42351,7 @@
-
- AVCodecContext *c = video_str->codec;
- c->codec_id = fmt->video_codec;
-- c->codec_type = CODEC_TYPE_VIDEO;
-+ c->codec_type = AVMEDIA_TYPE_VIDEO;
- c->bit_rate = 1024*bitrate;
- c->width = frame_dimx;
- c->height = frame_dimy;
-@@ -42510,7 +42511,7 @@
- AVPacket pkt;
- av_init_packet(&pkt);
- pkt.pts = av_rescale_q(c->coded_frame->pts,c->time_base,video_str->time_base);
-- if (c->coded_frame->key_frame) pkt.flags|=PKT_FLAG_KEY;
-+ if (c->coded_frame->key_frame) pkt.flags|=AV_PKT_FLAG_KEY;
- pkt.stream_index = video_str->index;
- pkt.data = video_outbuf;
- pkt.size = out_size;
diff --git a/media-gfx/gmic/files/gmic-1.5.1.7-makefile.patch b/media-gfx/gmic/files/gmic-1.5.1.7-makefile.patch
deleted file mode 100644
index 505a1fbc20ce..000000000000
--- a/media-gfx/gmic/files/gmic-1.5.1.7-makefile.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- gmic-1.5.1.7/src/Makefile
-+++ gmic-1.5.1.7/src/Makefile
-@@ -89,7 +89,7 @@
-
- # Flags that are mandatory to compile 'gmic'.
- MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/include
--MANDATORY_LDFLAGS += -L$(USR)/lib
-+MANDATORY_LDFLAGS +=
- ifeq ($(IS_GCC),yes)
- MANDATORY_CFLAGS += -Wall -W
- MANDATORY_LDFLAGS += -lm
-@@ -97,15 +97,7 @@
- MANDATORY_CFLAGS+=$(IS_BETA_CFLAGS)
-
- # Flags to enable debugging.
--DEBUG_CFLAGS = -Dcimg_use_vt100 -Dcimg_verbosity=3 -g
--
--# Flags to enable optimizations.
--ifeq ($(IS_GCC),yes)
--OPT_CFLAGS = -O3 -fno-tree-pre # -ffast-math
--endif
--ifeq ($(CC),icc)
--OPT_CFLAGS = -O3 -ipo -no-prec-div -override-limits
--endif
-+DEBUG_CFLAGS = -Dcimg_use_vt100 -Dcimg_verbosity=3
-
- # Flags to enable image display, using X11
- # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
-@@ -164,14 +156,8 @@
- # Flags to enable native support of webcams, using the OpenCV library.
- # This requires the presence of the OpenCV include and library files.
- # (package 'libcv3-2-dev' on Debian).
--ifeq ($(OS),Darwin)
- OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
- OPENCV_LDFLAGS = `pkg-config opencv --libs` #-> Use this for OpenCV 2.2.0 !
--else
--OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
--OPENCV_LDFLAGS = -lcv -lhighgui
--# OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui #-> Use this for OpenCV 2.2.0 !
--endif
-
- # Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library.
- # This requires the presence of the GraphicsMagick++ include and library files.
-@@ -216,11 +202,11 @@
- $(EXR_LDFLAGS) $(FFTW_LDFLAGS) # $(OPENCV_LDFLAGS) $(FFMPEG_LDFLAGS) $(XSHM_LDFLAGS) # $(MAGICK_LDFLAGS)
-
- CUST_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
-- $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(MINC2_CFLAGS) $(ZLIB_CFLAGS) \
-- $(FFTW_CFLAGS) $(BOARD_CFLAGS) $(EXR_CFLAGS) $(MAGICK_CFLAGS) # $(FFMPEG_CFLAGS) $(OPENCV_CFLAGS)
-+ $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \
-+ $(FFTW_CFLAGS) $(EXR_CFLAGS) $(MAGICK_CFLAGS) $(FFMPEG_CFLAGS) $(OPENCV_CFLAGS)
- CUST_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(X11_LDFLAGS) $(XSHM_LDFLAGS) $(PNG_LDFLAGS) \
-- $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(MINC2_LDFLAGS) $(ZLIB_LDFLAGS) \
-- $(FFTW_LDFLAGS) $(BOARD_LDFLAGS) $(EXR_LDFLAGS) $(MAGICK_LDFLAGS) # $(FFMPEG_LDFLAGS) $(OPENCV_LDFLAGS)
-+ $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(ZLIB_LDFLAGS) \
-+ $(FFTW_LDFLAGS) $(EXR_LDFLAGS) $(MAGICK_LDFLAGS) $(FFMPEG_LDFLAGS) $(OPENCV_LDFLAGS)
-
- DEBUG_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
- $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) \
-@@ -246,7 +232,7 @@
- STD_WINDOWS_LDFLAGS = $(MANDATORY_LDFLAGS) $(GDI32_LDFLAGS) $(ZLIB_LDFLAGS) $(PNG_LDFLAGS) $(JPEG_LDFLAGS) $(FFTW_LDFLAGS)
-
- STD_GIMP_CFLAGS = -Dgmic_build -Dcimg_display=0 -Dcimg_use_rng -I$(USR)/include $(FFTW_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) ${IS_BETA_CFLAGS}
--STD_GIMP_LDFLAGS = -L$(USR)/lib -lpthread $(FFTW_LDFLAGS) $(PNG_LDFLAGS) $(ZLIB_LDFLAGS)
-+STD_GIMP_LDFLAGS = -lpthread $(FFTW_LDFLAGS) $(PNG_LDFLAGS) $(ZLIB_LDFLAGS)
- ifeq ($(OS),MINGW32_NT-5.1)
- STD_GIMP_LDFLAGS += -mwindows
- endif
-@@ -289,10 +275,10 @@
- endif
-
- gimp:
-- $(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" "STRIP_EXE=1" gmic_gimp
-+ $(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" gmic_gimp
-
- lib:
-- $(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib
-+ $(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib
-
- zart: lib
- ifneq ($(OS),Darwin)
-@@ -309,10 +295,10 @@
- $(MAKE) "CFLAGS+=$(DEBUG_UNIX_CFLAGS)" "LDFLAGS+=$(DEBUG_UNIX_LDFLAGS)" gmic_minimal
-
- linux:
-- $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
-+ $(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_UNIX_LDFLAGS)" gmic_gmic
-
- custom:
-- $(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
-+ $(MAKE) "CFLAGS+=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(CUST_UNIX_LDFLAGS)" gmic_gmic
-
- solaris:
- $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic_gmic
-@@ -342,7 +328,6 @@
- $(CC) -o gmic_gimp.o -c gmic.cpp -Dgmic_gimp -Dgmic_minimal -Dgmic_float $(CFLAGS)
- gmic_gimp : gmic_gimp.o gmic_gimp.cpp
- $(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LDFLAGS)
-- strip gmic_gimp$(EXE)
-
- gmic_minimal: gmic.cpp
- $(CC) -o gmic gmic.cpp -Dgmic_minimal -Dgmic_float -Dgmic_main $(CFLAGS) $(LDFLAGS)
-@@ -367,7 +352,6 @@
- $(CC) -o gmic_double.o -c gmic.cpp -Dgmic_separate_compilation -Dgmic_double $(CFLAGS)
- gmic_gmic: gmic.cpp gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o gmic_def.h
- $(CC) -o gmic gmic.cpp -Dgmic_separate_compilation -Dgmic_main $(CFLAGS) gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o $(LDFLAGS)
-- strip gmic$(EXE)
-
- def:
- @echo "#ifndef gmic_gimp" > gmic_def.h
diff --git a/media-gfx/gmic/files/gmic-1.5.2.1-makefile.patch b/media-gfx/gmic/files/gmic-1.5.2.1-makefile.patch
deleted file mode 100644
index c5b701344e8c..000000000000
--- a/media-gfx/gmic/files/gmic-1.5.2.1-makefile.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- gmic-1.5.2.1/src/Makefile
-+++ gmic-1.5.2.1/src/Makefile
-@@ -77,7 +77,7 @@
-
- # Flags that are mandatory to compile 'gmic'.
- MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/include
--MANDATORY_LDFLAGS += -L$(USR)/lib
-+MANDATORY_LDFLAGS +=
- ifeq ($(IS_GCC),yes)
- MANDATORY_CFLAGS += -Wall -W
- MANDATORY_LDFLAGS += -lm
-@@ -85,15 +85,7 @@
- MANDATORY_CFLAGS+=$(IS_BETA_CFLAGS)
-
- # Flags to enable debugging.
--DEBUG_CFLAGS = -Dcimg_use_vt100 -Dcimg_verbosity=3 -g
--
--# Flags to enable optimizations.
--ifeq ($(IS_GCC),yes)
--OPT_CFLAGS = -O3 # -fno-tree-pre # -ffast-math
--endif
--ifeq ($(CC),icc)
--OPT_CFLAGS = -O3 -ipo -no-prec-div -override-limits
--endif
-+DEBUG_CFLAGS = -Dcimg_use_vt100 -Dcimg_verbosity=3
-
- # Flags to enable image display, using X11
- # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
-@@ -152,14 +144,8 @@
- # Flags to enable native support of webcams, using the OpenCV library.
- # This requires the presence of the OpenCV include and library files.
- # (package 'libcv3-2-dev' on Debian).
--ifeq ($(OS),Darwin)
- OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
- OPENCV_LDFLAGS = `pkg-config opencv --libs` #-> Use this for OpenCV 2.2.0 !
--else
--OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
--OPENCV_LDFLAGS = -lcv -lhighgui
--# OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui #-> Use this for OpenCV 2.2.0 !
--endif
-
- # Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library.
- # This requires the presence of the GraphicsMagick++ include and library files.
-@@ -204,11 +190,11 @@
- $(EXR_LDFLAGS) $(FFTW_LDFLAGS) # $(OPENCV_LDFLAGS) $(FFMPEG_LDFLAGS) $(XSHM_LDFLAGS) # $(MAGICK_LDFLAGS)
-
- CUST_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
-- $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(MINC2_CFLAGS) $(ZLIB_CFLAGS) \
-- $(FFTW_CFLAGS) $(BOARD_CFLAGS) $(EXR_CFLAGS) $(MAGICK_CFLAGS) # $(FFMPEG_CFLAGS) $(OPENCV_CFLAGS)
-+ $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \
-+ $(FFTW_CFLAGS) $(EXR_CFLAGS) $(MAGICK_CFLAGS) $(FFMPEG_CFLAGS) $(OPENCV_CFLAGS)
- CUST_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(X11_LDFLAGS) $(XSHM_LDFLAGS) $(PNG_LDFLAGS) \
-- $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(MINC2_LDFLAGS) $(ZLIB_LDFLAGS) \
-- $(FFTW_LDFLAGS) $(BOARD_LDFLAGS) $(EXR_LDFLAGS) $(MAGICK_LDFLAGS) # $(FFMPEG_LDFLAGS) $(OPENCV_LDFLAGS)
-+ $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(ZLIB_LDFLAGS) \
-+ $(FFTW_LDFLAGS) $(EXR_LDFLAGS) $(MAGICK_LDFLAGS) $(FFMPEG_LDFLAGS) $(OPENCV_LDFLAGS)
-
- DEBUG_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
- $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) \
-@@ -234,7 +220,7 @@
- STD_WINDOWS_LDFLAGS = $(MANDATORY_LDFLAGS) $(GDI32_LDFLAGS) $(ZLIB_LDFLAGS) $(PNG_LDFLAGS) $(JPEG_LDFLAGS) $(FFTW_LDFLAGS)
-
- STD_GIMP_CFLAGS = -Dgmic_build -Dcimg_display=0 -Dcimg_use_rng -I$(USR)/include $(FFTW_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) ${IS_BETA_CFLAGS}
--STD_GIMP_LDFLAGS = -L$(USR)/lib -lpthread $(FFTW_LDFLAGS) $(PNG_LDFLAGS) $(ZLIB_LDFLAGS)
-+STD_GIMP_LDFLAGS = -lpthread $(FFTW_LDFLAGS) $(PNG_LDFLAGS) $(ZLIB_LDFLAGS)
- ifeq ($(OS),MINGW32_NT-5.1)
- STD_GIMP_LDFLAGS += -mwindows
- endif
-@@ -287,10 +273,10 @@
- endif
-
- gimp:
-- $(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" "STRIP_EXE=1" gmic_gimp
-+ $(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" gmic_gimp
-
- lib:
-- $(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib
-+ $(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib
-
- zart: lib
- ifneq ($(OS),Darwin)
-@@ -313,10 +299,10 @@
- $(MAKE) "CFLAGS+=$(DEBUG_UNIX_CFLAGS)" "LDFLAGS+=$(DEBUG_UNIX_LDFLAGS)" gmic_minimal
-
- linux:
-- $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
-+ $(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_UNIX_LDFLAGS)" gmic_gmic
-
- custom:
-- $(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
-+ $(MAKE) "CFLAGS+=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(CUST_UNIX_LDFLAGS)" gmic_gmic
-
- solaris:
- $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic_gmic
-@@ -346,7 +332,6 @@
- $(CC) -o gmic_gimp.o -c gmic.cpp -Dgmic_gimp -Dgmic_minimal -Dgmic_float $(CFLAGS)
- gmic_gimp : gmic_gimp.o gmic_gimp.cpp
- $(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LDFLAGS)
-- strip gmic_gimp$(EXE)
-
- gmic_minimal: gmic.cpp
- $(CC) -o gmic gmic.cpp -Dgmic_minimal -Dgmic_float -Dgmic_main $(CFLAGS) $(LDFLAGS)
-@@ -371,7 +356,6 @@
- $(CC) -o gmic_double.o -c gmic.cpp -Dgmic_separate_compilation -Dgmic_double $(CFLAGS)
- gmic_gmic: gmic.cpp gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o gmic_def.h
- $(CC) -o gmic gmic.cpp -Dgmic_separate_compilation -Dgmic_main $(CFLAGS) gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o $(LDFLAGS)
-- strip gmic$(EXE)
-
- def:
- @echo "#ifndef gmic_gimp" > gmic_def.h
diff --git a/media-gfx/gmic/gmic-1.5.1.9.ebuild b/media-gfx/gmic/gmic-1.5.1.9.ebuild
deleted file mode 100644
index bfe99291ddaf..000000000000
--- a/media-gfx/gmic/gmic-1.5.1.9.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.1.9.ebuild,v 1.1 2012/08/31 18:46:14 radhermit Exp $
-
-EAPI="4"
-
-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
- doc? ( http://dev.gentoo.org/~radhermit/dist/gmic_reference-${PV}.pdf.xz )"
-
-LICENSE="CeCILL-2 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ffmpeg fftw graphicsmagick jpeg opencv openexr png tiff X zlib"
-
-RDEPEND="
- ffmpeg? ( virtual/ffmpeg )
- fftw? ( sci-libs/fftw:3.0 )
- 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 )"
-DEPEND="${RDEPEND}
- doc? ( app-arch/xz-utils )"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.5.1.7-makefile.patch
- epatch "${FILESDIR}"/${PN}-1.5.0.7-ffmpeg.patch
-
- for i in ffmpeg fftw jpeg opencv png tiff zlib ; do
- use $i || { sed -i -r -e "s/^(${i}_(C|LD)FLAGS =).*/\1/I" Makefile || die ; }
- done
-
- use graphicsmagick || { sed -i -r -e "s/^(MAGICK_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
- use openexr || { sed -i -r -e "s/^(EXR_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-
- if ! use X ; then
- sed -i -r -e "s/^((X11|XSHM)_(C|LD)FLAGS =).*/\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)" custom lib
-}
-
-src_install() {
- dobin gmic
- newlib.so libgmic.so libgmic.so.1
-
- insinto /usr/include
- doins gmic.h
-
- doman ../man/gmic.1.gz
- dodoc ../README
-
- use doc && dodoc "${WORKDIR}"/gmic_reference-${PV}.pdf
-
- newbashcomp gmic_bashcompletion.sh ${PN}
-}
diff --git a/media-gfx/gmic/gmic-1.5.2.1.ebuild b/media-gfx/gmic/gmic-1.5.2.1.ebuild
deleted file mode 100644
index 15eb93be4af8..000000000000
--- a/media-gfx/gmic/gmic-1.5.2.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.2.1.ebuild,v 1.1 2012/11/02 07:22:35 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
- doc? ( http://dev.gentoo.org/~radhermit/dist/gmic_reference-1.5.1.9.pdf.xz )"
-
-LICENSE="CeCILL-2 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ffmpeg fftw graphicsmagick jpeg opencv openexr png tiff X zlib"
-
-RDEPEND="
- ffmpeg? ( virtual/ffmpeg )
- fftw? ( sci-libs/fftw:3.0 )
- 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 )"
-DEPEND="${RDEPEND}
- doc? ( app-arch/xz-utils )"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-makefile.patch
- epatch "${FILESDIR}"/${PN}-1.5.0.7-ffmpeg.patch
-
- for i in ffmpeg fftw jpeg opencv png tiff zlib ; do
- use $i || { sed -i -r "s/^(${i}_(C|LD)FLAGS =).*/\1/I" Makefile || die ; }
- done
-
- use graphicsmagick || { sed -i -r "s/^(MAGICK_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
- use openexr || { sed -i -r "s/^(EXR_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-
- if ! use X ; then
- sed -i -r "s/^((X11|XSHM)_(C|LD)FLAGS =).*/\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)" custom lib
-}
-
-src_install() {
- dobin gmic
- newlib.so libgmic.so libgmic.so.1
-
- insinto /usr/include
- doins gmic.h
-
- doman ../man/gmic.1.gz
- dodoc ../README
-
- use doc && dodoc "${WORKDIR}"/gmic_reference-${PV}.pdf
-
- newbashcomp gmic_bashcompletion.sh ${PN}
-}