Remove old.

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

4 files changed, 7 insertions, 193 deletions

diff --git a/media-plugins/gimp-gmic/ChangeLog b/media-plugins/gimp-gmic/ChangeLog
index d489dfdb8799..9f9adb9dffcc 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.6 2011/12/29 17:23:11 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.7 2012/01/01 01:19:35 radhermit Exp $
+
+  01 Jan 2012; Tim Harder <radhermit@gentoo.org>
+  -files/gmic-1.5.0.4-makefile.patch, -gimp-gmic-1.5.0.6.ebuild:
+  Remove old.
 
 *gimp-gmic-1.5.0.8 (29 Dec 2011)
 
diff --git a/media-plugins/gimp-gmic/Manifest b/media-plugins/gimp-gmic/Manifest
index 55dffdeae96a..ea267df9d59b 100644
--- a/media-plugins/gimp-gmic/Manifest
+++ b/media-plugins/gimp-gmic/Manifest
@@ -1,24 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX gmic-1.5.0.4-makefile.patch 6103 RMD160 20467bf823bdde29e554f29d18cc64328ccb5079 SHA1 6ea32fef37a2b2971bf23cf7f17ef9c408fe79c5 SHA256 98e27d448764fe3704ae38d0eba08b19be3fdd7c9356e02b7f580f513b2ac5b3
 AUX gmic-1.5.0.7-makefile.patch 6120 RMD160 83e29d43ad174a478efe89e6c455dccdafd451e5 SHA1 2ab0ea1e0c1f2da6c4ab3a41328ad3e62c548afa SHA256 5a6954258f0ed7ec82fa85ad548fb6df6fc4540bbb4c75908bc58a49aacddea0
-DIST gmic_1.5.0.6.tar.gz 1219169 RMD160 dc994f0abb6110ee4aa98e0beb8ac1da49f1d716 SHA1 618fa03c88f470790c341d82461db2d23c0443fa SHA256 6eb4370242637854f806bb8fb9b69781e2f75d066e795cad8b450b9ce5154c68
 DIST gmic_1.5.0.7.tar.gz 1228525 RMD160 c1fadcb904b25c8b0056204a9124ab461212c5f6 SHA1 45c85e0ed09caf6c2a41bd3d01747fcc5b5bf284 SHA256 b74d873d5d57947ae7848fb926faa73d98a0aea6fc7b5a305b3b824a67762f54
 DIST gmic_1.5.0.8.tar.gz 1250904 RMD160 99532589dab47f0e1b493e8b07853eac8543ae70 SHA1 f81c982686d6e434cce853366aec6e47a5a30ed1 SHA256 ded93e9b45513359d51512d547237bedfbc3f26a2e042b62e8ac8b44d0e5f2aa
-EBUILD gimp-gmic-1.5.0.6.ebuild 957 RMD160 1a512523d9f1f7f03b4c7c25db1477bd43894016 SHA1 63b6a414a16b24b93a6fe8ff5c75e7375fef3b14 SHA256 8f9546331fd7240b7928e220262c41f8035efd6a3080cdb336a02fc855f51ec3
 EBUILD gimp-gmic-1.5.0.7.ebuild 938 RMD160 35b9c8125b2a89201a4cb6877870e1b8653fa027 SHA1 b3c99321776c04c37f12024ff3eced4bab73f116 SHA256 b673888476a703b4f2b66eeefa761b864ff1a17bd550d782f9c323c9220688f8
 EBUILD gimp-gmic-1.5.0.8.ebuild 940 RMD160 9e4e9c969c6d74cdef49591d69b623f471fb7cc5 SHA1 6316b9f06faa44d8046ec4d8c13ef3572b1818c5 SHA256 978e1d10ceb2c5c230437b2ba25f6fd56fbc84dc0da010f716f4d27f76da065d
-MISC ChangeLog 1114 RMD160 b2b2657d2294edcb4f79e75a4f5c3cc751abea65 SHA1 5f97bb505f1bdaa551aac2b91d576cb1cc19fb5e SHA256 a382f72544e31240f1df087b1afe044774d93f428e8150706c3da72f0d790610
+MISC ChangeLog 1243 RMD160 073d50a737e20faf8be4c1a41c33e5ff6bf215fe SHA1 7f3af8785f433ae47633f32c8931cb5e0f417e14 SHA256 3ae8bc4a2392e62730d52a5983b10b5ff3dbf3a58afa5524041e764849b885fe
 MISC metadata.xml 232 RMD160 9725fc18735b1d8d4079f25759ee0823a0c6795d SHA1 ec75efe30e67f74a4f315324afc75ed2a8d30bb4 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQEcBAEBCgAGBQJO/KIIAAoJEEqz6FtPBkyjENMIAJ2LBOcqTZRn27pNYTivytSY
-/uUw9mKqKKWmNdwlitr9S1exLgQc+YjPQqpIjBrGLorJ/xX1BoQKupb0S9viDzp0
-bPyTnvNRUCk0eBtYMh+36bePV+LhxHJDfcBQ+mVSyNkIvKpmBrrfwOfieh66ihwD
-8DBbqdmEAd3vyLKd+fy7He+8PjBydgfPRbzDXHyteWfEyQYTV1dRZiIXPFGQ4pmD
-lZheQY9HL34pWTc/iAqQvOph3J1+S0hKifxfqJnVOycvmkz77cNG7hl1HNsvUo+f
-q+CCqt0iPX2RLlA2qeF9TC66xrojQ1Gyo/B6xT5JAXYMA9osY8BAH12BghA5d7M=
-=PCjE
------END PGP SIGNATURE-----
diff --git a/media-plugins/gimp-gmic/files/gmic-1.5.0.4-makefile.patch b/media-plugins/gimp-gmic/files/gmic-1.5.0.4-makefile.patch
deleted file mode 100644
index 047c6124a162..000000000000
--- a/media-plugins/gimp-gmic/files/gmic-1.5.0.4-makefile.patch
+++ /dev/null
@@ -1,130 +0,0 @@
---- gmic-1.5.0.4/src/Makefile.orig
-+++ gmic-1.5.0.4/src/Makefile
-@@ -87,7 +87,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
-@@ -98,21 +98,21 @@
- 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
-+#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
- 
- # Flags to enable image display, using X11
- # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
- X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
--X11_LDFLAGS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr
-+X11_LDFLAGS = -lX11 -lpthread #-lXrandr
- 
- # Flags to enable fast display, using XShm.
- XSHM_CFLAGS = -Dcimg_use_xshm
--XSHM_LDFLAGS = -L$(USR)/X11R6/lib -lXext
-+XSHM_LDFLAGS = -lXext
- 
- # Flags to enable image display, using GDI32.
- GDI32_CFLAGS = -Dcimg_display=2 -Dcimg_appname=\\\"gmic\\\"
-@@ -144,12 +144,7 @@
- 
- # Flags to enable native support of webcams, using the OpenCV library.
- OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include/opencv
--ifeq ($(OS),Darwin)
- OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui   # Use this for OpenCV 2.2.0 !
--else
--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.
- MAGICK_CFLAGS = -Dcimg_use_magick -I$(USR)/include/GraphicsMagick
-@@ -183,11 +178,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) $(OPENCV_CFLAGS) \
--	           $(FFTW_CFLAGS) $(FFMPEG_CFLAGS) $(BOARD_CFLAGS) $(EXR_CFLAGS) $(MAGICK_CFLAGS) 
-+                   $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) $(OPENCV_CFLAGS) \
-+	           $(FFTW_CFLAGS) $(FFMPEG_CFLAGS) $(EXR_CFLAGS) $(MAGICK_CFLAGS) 
- CUST_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(X11_LDFLAGS) $(XSHM_LDFLAGS) $(PNG_LDFLAGS) \
--                    $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(MINC2_LDFLAGS) $(ZLIB_LDFLAGS) $(OPENCV_LDFLAGS) \
--	    	    $(FFTW_LDFLAGS) $(FFMPEG_LDFLAGS) $(BOARD_LDFLAGS) $(EXR_LDFLAGS) $(MAGICK_LDFLAGS) 
-+                    $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(ZLIB_LDFLAGS) $(OPENCV_LDFLAGS) \
-+	    	    $(FFTW_LDFLAGS) $(FFMPEG_LDFLAGS) $(EXR_LDFLAGS) $(MAGICK_LDFLAGS) 
- 
- DEBUG_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
-                     $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) \
-@@ -213,7 +208,7 @@
- STD_WINDOWS_LDFLAGS = $(MANDATORY_LDFLAGS) $(GDI32_LDFLAGS) $(ZLIB_LDFLAGS) $(PNG_LDFLAGS) $(JPEG_LDFLAGS) $(FFTW_LDFLAGS)
- 
- STD_GIMP_CFLAGS = -Dgmic_build -Dcimg_display=0 -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
-@@ -254,10 +249,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)" gmic_lib
-+	$(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS)" gmic_lib
- 
- # Entries for non-default configurations.
- minimal:
-@@ -267,10 +262,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
-@@ -288,7 +283,7 @@
- gmic_lib.o: gmic.cpp gmic_def.h
- 	$(CC) -o gmic_lib.o -c gmic.cpp -fPIC -Dgmic_minimal -Dgmic_float $(CFLAGS)
- gmic_lib: gmic_lib.o
--	ar rcs libgmic.a gmic_lib.o
-+	$(AR) rcs libgmic.a gmic_lib.o
- 	$(CC) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so gmic_lib.o $(LDFLAGS)
- 	$(CC) -o gmic_use_lib gmic_use_lib.cpp -L. -lgmic $(FFTW_LDFLAGS)
- 
-@@ -296,7 +291,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)
-@@ -321,7 +315,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.0.6.ebuild b/media-plugins/gimp-gmic/gimp-gmic-1.5.0.6.ebuild
deleted file mode 100644
index 1bccfae21148..000000000000
--- a/media-plugins/gimp-gmic/gimp-gmic-1.5.0.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 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.0.6.ebuild,v 1.1 2011/11/07 06:01:25 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_OPTS="-l" epatch "${FILESDIR}"/gmic-1.5.0.4-makefile.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCXX)" gimp
-}
-
-src_install() {
-	exeinto $(gimptool-2.0 --gimpplugindir)/plug-ins
-	doexe gmic_gimp
-	dodoc ../{AUTHORS,README}
-}
-
-pkg_postinst() {
-	elog "The G'MIC plugin is accessible from the menu:"
-	elog "Filters -> G'MIC"
-}