Remove old.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 13 insertions, 164 deletions

diff --git a/media-plugins/gimp-gmic/ChangeLog b/media-plugins/gimp-gmic/ChangeLog
index 01b98cbfb302..89e14f5fc9e4 100644
--- a/media-plugins/gimp-gmic/ChangeLog
+++ b/media-plugins/gimp-gmic/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/gimp-gmic
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.17 2012/08/17 04:59:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.18 2012/08/17 05:00:36 radhermit Exp $
+
+  17 Aug 2012; Tim Harder <radhermit@gentoo.org> -gimp-gmic-1.5.1.6.ebuild,
+  -files/gmic-1.5.1.6-makefile.patch:
+  Remove old.
 
 *gimp-gmic-1.5.1.8 (17 Aug 2012)
 
diff --git a/media-plugins/gimp-gmic/Manifest b/media-plugins/gimp-gmic/Manifest
index 6c668797c6f6..6d30379e94aa 100644
--- a/media-plugins/gimp-gmic/Manifest
+++ b/media-plugins/gimp-gmic/Manifest
@@ -1,24 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gmic-1.5.1.6-makefile.patch 5517 SHA256 66ecf6cded9f8404c7ff075cd8d37b3e4861b61ec6bf2c0d50d548635e2c2a66 SHA512 eaa8e8d1f1ef0e73834771b956d23e6ea33ab3202da9997d0ad45ffb2ffbd3a46b70690de3513944a9cb50171344bec5a89064e314789acfb84c60d97f553a18 WHIRLPOOL b7caa7391e2a9c348e13cf9eda5a556d4cacf1966241764548054435757ee839698b8875bc05926343abd9f47e4cb28857be4963b435a4ef920ab7a676fc092a
 AUX gmic-1.5.1.7-makefile.patch 5485 SHA256 c3703b0c8e35cfd86a0b851da1a6b8b3da8776789d987ce395e5a772f6112411 SHA512 0e40fd978232680d08c1c36f01a86f9940fc34f7ef88465e67e52f23de821d13efec2dc931ae2bb9ac1daa464391b3784061ded738105ce0def330719a98c963 WHIRLPOOL 4a690fc8959d73209583a4b3a68d2d66854355e4d36564c1393a04396d033c8af4e6a43763739dee66db941b3cdd42b6ece7cafa0e1bfc5456b71f78886d7841
-DIST gmic_1.5.1.6.tar.gz 1957144 SHA256 e3db47c8a3102f0e22620991c0ecfec82ad46dd11449d7c85aed3d4607c458b9 SHA512 fb399f9e64328c0dba680599828f4ad5a517c9b872dd6c46c5a3769014805710929f7503d17c2c830258d49651e9e0c2b59135565b241c165f5dbb9a799342b3 WHIRLPOOL 47aa7faf5d04242288f4e954215fce8b9cfcda36f5e9062561b0edd63f4938f7d35e35e5c60ed74cae60b2515726cfaa623e9f9c86f71f15735a0eed1cb5454a
 DIST gmic_1.5.1.7.tar.gz 2090431 SHA256 13d7030099f5a485a11b178d19a882ee776c40d6029a7351bfc2bdc7dcb9e665 SHA512 2ae3fbefc8fe865f7ece6e93008650bad946019da3fd6cf50ab61d3895dbddc2ff89cdb35d2bf65c76aa5d188341c25a5c34978414a7635291b2a4d5d0a52740 WHIRLPOOL 1d293b334743ba901ff151e0dcb3d631b72c5298e7ef77d402223c003a5972c06f1f2c844e35116815b2a4857046aaf8c91dbee248367ddc6bbfea9e34e11ac7
 DIST gmic_1.5.1.8.tar.gz 2096945 SHA256 d31bccb40eaf70ab8a2ca3b6f317ba0559641cb92fef0e49b1ccbb089a7aa13e SHA512 4332e5b0dea364d6ebd46ab4946bf47fa7039b0befe1ae24b60e173e0f7132ff8cd9a9438d6a71e21f5b209e034703595fa76c7fd18b06e92dc8d0c78de45d7e WHIRLPOOL 190ddb297b210a8d77bdae847cc79462a8272bdbe84fa9cb0f283575f16fc9103f4838e3780a53cf27ba22e9ae9220501a7d47d1b6ef699fa812b209ee2ac1a0
-EBUILD gimp-gmic-1.5.1.6.ebuild 926 SHA256 dce617077e04286d78cdac1c15e4503847c2e07f4f6ee8504b24453b6298a3ea SHA512 1ada87c3ca41e85e9b87fe6bb981585598f30e23a0f7b34b9e31ff584c58dcf4bf37f9531f3391f1133285e3b8974a8e0edc9a3537d4bc98db659104febde612 WHIRLPOOL 1946a7229411f9b95c770eec78bfa443e222b62d3d85bcdb1f5fb64916494c4d1aa49f4a8a0d64694499cd0c564cb6e15bf2b8eb91fae8bca576807adc8ae3b8
 EBUILD gimp-gmic-1.5.1.7.ebuild 926 SHA256 f010d7c04b15e4ee29cbe64636964ffabe59801a1c223220388e2cf02b33e5b3 SHA512 253fe9ce843472068a0dec7e42a5f51ced655d79a7d9eea9cdfdbab015f584b194adcdf33dcb3176b44297fad6912fe245c4bcafc35246d6ec89dcffc51a89ee WHIRLPOOL 445366bf1ca3a646c13b9cee191ea79ef0ff13dcb69d8954f2b0f03bbbad363c103d7a248dfe1bc4a94becf6f56a5e52310015f4b126446d54b31b5034d49422
 EBUILD gimp-gmic-1.5.1.8.ebuild 928 SHA256 e0cc3fdda19d4c8b7feb18b0c3375180266a77c4dc5f0aaab9a40cfef5c64ac5 SHA512 f9d3bb82a74256ea068b3484ce7f6ec957128c05e598596018fedfdd10e0a7230cade62acb983b1fc45ca5ac7c5e9b914437359971c11512f784b42cb8af1305 WHIRLPOOL 9c97c3bab73c9acae56ad1bf6a2ed1bfaf3b4b3b0c611e31f04446b4f6bd578dc8af868c84bd9edb97990bcf3ca3455384811fcc4070fab23f90111bedeed025
-MISC ChangeLog 2663 SHA256 64b5204b0b6fd4265c5e2efebb219351a38b5de8466c02f70125139a2aa175d8 SHA512 014f2e2de043746a4f09fd115a66c0976a1efb5a1236709a7d0ed0c20f402148aee1d906d8545344437409c5c0dae1b983db7a4a2754a25ac1f5e889d777b032 WHIRLPOOL 8131259b72c226e6a89e98c97068ea1abbd8a29479b177390c6d5df1063a0751023711bfce1fe990083e6ecd1a5deae02aec2c090cb9851daf95420d7ef6efa5
+MISC ChangeLog 2792 SHA256 cc80f0e220d4c181190850b73e1265037b5f72d9c1d02d2ca29c8e913028fb94 SHA512 85dbee6861ab754f64ad6817e3e196f089cf510166cb485bc987768828e20e11738e1dd436477f7469056d7ed987871775d900670e1d71c44761880bf761bcf1 WHIRLPOOL f0909e96308e76e9b8a91208092e19151ae9a0f4944ee49a90e325b10c35e7f3e8459c15f9a0aa1a0e51b7758739dd9557cadc50c3aadba442064ca4c8a04f5a
 MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQLc+8AAoJEEqz6FtPBkyjzFEH/2iP1+55RMw8KmI5AkKmI6vH
-W2OfgVHXG5ee/TUEiXW4JXs4t4dOy929oSpcVVvHEv4YFIu7KLE1VQPa0Rqzc877
-aTRjhxrrmRMA1kJjunXVkPjfFhmT5UdohZtpORKC+4Vc5TqKxN+6kgIJ+F6U2EVl
-WuwUN+mYFROr0fyfZgWWk3VHP21IfWBY7mFRi98fDPm5+bLc3TYBgKb+oIgxu1zy
-/8jxtpdRbjq/yrK2VmKmpPFlYptsNxv8O9NxevuYKHktUO1i+NlLL1xF3jbrsLtX
-O52ioBdQAa1J0zA34njGNJ6MFsPqjoJOL12CmP2Lmgcf7+5DK+nCUsOmQpDhOkM=
-=Y4TI
+iQEcBAEBCAAGBQJQLc/6AAoJEEqz6FtPBkyjJIwH/3LMaJqg4PolyvNcFeeNrj1y
+hp/H1umr0SIKgwJm6JNzeDyAO/5e5z9JicOL3YBL+o4Jtzh7iCA06cS4ccrF9z8I
+m601ExYnDefUC78sexOAwPjlmt+dxp4eYDKU6Q79yvSzHoOHxottqfdQMDh1MJ9v
+XJXg1ZmTZBxOvaauNN5XT7egRw1VhCJkrso0PU1zw5ni9gTDboDaxGYUCE3K/MMg
+7jwt5/w2fZ2qFD/gBgP9HtacnsiUrmcz5YpBkRnRqHnvHTtuOAOTNSBO1YCmQz5u
+EFWDd4aXZbvnv2/QlLz4swOBMEnaAvcnV9rd0kiS0+HYMj/XSBwh49ol921v2oE=
+=jsJ3
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gimp-gmic/files/gmic-1.5.1.6-makefile.patch b/media-plugins/gimp-gmic/files/gmic-1.5.1.6-makefile.patch
deleted file mode 100644
index 4a8c52323833..000000000000
--- a/media-plugins/gimp-gmic/files/gmic-1.5.1.6-makefile.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- gmic-1.5.1.6/src/Makefile
-+++ gmic-1.5.1.6/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
-@@ -99,14 +98,6 @@
- # 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).
- # This requires the presence of the X11 include and library files.
-@@ -164,14 +155,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 +201,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 +231,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
-@@ -292,10 +277,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)
-@@ -312,10 +297,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
-@@ -345,7 +330,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)
-@@ -370,7 +354,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-plugins/gimp-gmic/gimp-gmic-1.5.1.6.ebuild b/media-plugins/gimp-gmic/gimp-gmic-1.5.1.6.ebuild
deleted file mode 100644
index 22cc1495768e..000000000000
--- a/media-plugins/gimp-gmic/gimp-gmic-1.5.1.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/gimp-gmic-1.5.1.6.ebuild,v 1.1 2012/06/21 21:10:48 radhermit Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="G'MIC GIMP plugin"
-HOMEPAGE="http://gmic.sourceforge.net/gimp.shtml"
-SRC_URI="mirror://sourceforge/gmic/gmic_${PV}.tar.gz"
-
-LICENSE="CeCILL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=media-gfx/gimp-2.4.0
-	media-libs/libpng
-	sci-libs/fftw:3.0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/gmic-${PV}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/gmic-${PV}-makefile.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCXX)" gimp
-}
-
-src_install() {
-	exeinto $(gimptool-2.0 --gimpplugindir)/plug-ins
-	doexe gmic_gimp
-	dodoc ../README
-}
-
-pkg_postinst() {
-	elog "The G'MIC plugin is accessible from the menu:"
-	elog "Filters -> G'MIC"
-}