From 66b289d76876b8a9e21d0f0a80b19af222495649 Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Sat, 31 Dec 2011 22:32:36 +0000 Subject: [PATCH] Remove old. Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- media-gfx/gmic/ChangeLog | 6 +- media-gfx/gmic/Manifest | 19 ++- .../gmic/files/gmic-1.5.0.4-makefile.patch | 130 ------------------ media-gfx/gmic/gmic-1.5.0.6.ebuild | 63 --------- 4 files changed, 13 insertions(+), 205 deletions(-) delete mode 100644 media-gfx/gmic/files/gmic-1.5.0.4-makefile.patch delete mode 100644 media-gfx/gmic/gmic-1.5.0.6.ebuild diff --git a/media-gfx/gmic/ChangeLog b/media-gfx/gmic/ChangeLog index 6d5913449cbc..3adcc5207f1b 100644 --- a/media-gfx/gmic/ChangeLog +++ b/media-gfx/gmic/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/gmic # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.8 2011/12/31 22:31:19 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.9 2011/12/31 22:32:36 radhermit Exp $ + + 31 Dec 2011; Tim Harder + -files/gmic-1.5.0.4-makefile.patch, -gmic-1.5.0.6.ebuild: + Remove old. 31 Dec 2011; Tim Harder gmic-1.5.0.7.ebuild, gmic-1.5.0.8.ebuild: diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest index 181fd3122111..ef9d92e11eed 100644 --- a/media-gfx/gmic/Manifest +++ b/media-gfx/gmic/Manifest @@ -1,25 +1,22 @@ -----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-ffmpeg.patch 1927 RMD160 bb0d018a362b84d9b9ecea1a82f5c46c9f620206 SHA1 075a441d8f9f0e62f7d507ad8d785462642c2d8e SHA256 57e36922ecd33f8b05666ff707ed7f8cba2d9c732ae3bad7bd379a52bf2c0b25 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 gmic-1.5.0.6.ebuild 1708 RMD160 0d02d975655bf03c1f298a0cba813b7dd0ada9b2 SHA1 bacc70e1d74e331025fd9c6cdebabf0bd895d7f7 SHA256 8057d394d1cf804547e2b1a391f820c3af8e1430276d7482735787d66322b8d4 EBUILD gmic-1.5.0.7.ebuild 1734 RMD160 30c0c89537d1b3865d9812e4a1d55bb96d08e700 SHA1 fd895cd386ad616693c8bd72fda0d3f1456bf80b SHA256 e47370b3bc19c29ed4201c1fd1ac55a1f42931e51eccb65ed115938c3cec6ff6 EBUILD gmic-1.5.0.8.ebuild 1752 RMD160 28f89bd20c78ce8fb69c76d3a1c3f6c5f52ece2c SHA1 a066e2137814ceff76cb8af4eba3999065525ce9 SHA256 5ce8f4b25671fb856e44f5665ed1a33248bc2ad9440a58a4c6704292831fe435 -MISC ChangeLog 1316 RMD160 e83df92e6abb7fb872ad761456219cb12a10aabc SHA1 e18a2d5bebc74824408fb56f2ff358fd40ef62df SHA256 d862f435eb8c7abec9cdc644676282b1d3c2d70ea21152b3d5ac7ec492e95893 +MISC ChangeLog 1440 RMD160 18081f648ae9f194b13af486e23d98d5e01fe417 SHA1 ba56cda8b8529d8324c2111f8b5d0f07f34f2274 SHA256 f598c90a7df8ce5002596314cdbb87538c77f3b1f506d9cf952d4e63d071bc0c MISC metadata.xml 473 RMD160 680f8739786ae6d9221c0f6d2734cb16682c1b7c SHA1 1ce57e832b27b5e349e070cdeaf37ff11f500b18 SHA256 def06af4d0283b01f9313231ff05df286129ff57afbcac23fcc7c45d8f735a6c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJO/409AAoJEEqz6FtPBkyjBJIH/RTxMQrJJtCLXLg0W2FEOtY7 -BCAGY5f/C1Y69XupXGxJuhpiqi0jbmO76j4x9hQvL7wEaDfZrSYXTrS04Tb1JmYk -t6kN0JZFn7sxwfiED3nTh/dzy1Bdaq6daVqG77QzG25e3Kt5S0mNx3bWyyg49VQs -v3hmRDYwfWPHso6CRzgHm03yg+zJysZIpXg2JFxJxV2cwJ35N4HhrXVT7894gjAr -IavHBDyOI1k/OYJ5D26T59id+3WWoET8KoU+Sa7JTYVOGBIDlwpS0YZdO+QE1Ud2 -zgmwPTYVVpyZ8enYK4zZPxgHyYXRPDBjffN2IsrXYfnYYk9jVsTt8LhsfzREO6U= -=OJte +iQEcBAEBCgAGBQJO/42JAAoJEEqz6FtPBkyjMv4IAKqZb6/yvVn3ma4U5PaQ44an +atPGpBrXpCDmz+R0XhwUZDKx1guWipewu1IZE+xnXjew9m6tH0RgC/m42sjJibd4 +RWoo5bmezZBwmjRzCspSW4SyJV3EhLcTxNZQC1ufSpYkZZuiE7pZKw2xCOXq51Vp +R/5echXzRt/Atva/vXwHbqsMpkKHHmVTBz1ed7mcG1kSQMaikZ2WYjfw5WS8xKTP +V4Uz+5z+h4FQFOR16bZwdrK8SdlJFaKbcJtVP9Stjfd+Fhqp6nHwDo719ow6actb ++uqWvAeWp0WM98QfsST2a/ViW1nDtj1kwwC4qbapzwunntAfpmv6d5DQZfxuc9g= +=cPW/ -----END PGP SIGNATURE----- diff --git a/media-gfx/gmic/files/gmic-1.5.0.4-makefile.patch b/media-gfx/gmic/files/gmic-1.5.0.4-makefile.patch deleted file mode 100644 index 047c6124a162..000000000000 --- a/media-gfx/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-gfx/gmic/gmic-1.5.0.6.ebuild b/media-gfx/gmic/gmic-1.5.0.6.ebuild deleted file mode 100644 index 1df1ba0a84a9..000000000000 --- a/media-gfx/gmic/gmic-1.5.0.6.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.0.6.ebuild,v 1.1 2011/11/07 05:57:36 radhermit Exp $ - -EAPI="4" - -inherit eutils toolchain-funcs bash-completion-r1 - -DESCRIPTION="GREYC's Magic Image Converter" -HOMEPAGE="http://gmic.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz" - -LICENSE="CeCILL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="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 ) - 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}" - -S="${WORKDIR}/${P}/src" - -src_prepare() { - EPATCH_OPTS="-l" epatch "${FILESDIR}"/${PN}-1.5.0.4-makefile.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 ; } - use X || { sed -i -r -e "s/^((X11|XSHM)_(C|LD)FLAGS =).*/\1/" Makefile || die ; } -} - -src_compile() { - emake AR="$(tc-getAR)" CC="$(tc-getCXX)" custom bashcompletion lib -} - -src_install() { - dobin gmic - newlib.so libgmic.so libgmic.so.1 - insinto /usr/include - doins gmic.h - doman ../man/gmic.1.gz - dodoc ../{AUTHORS,README} - newbashcomp gmic_bashcompletion.sh ${PN} -} -- 2.26.2