diff options
author | Mike Frysinger <vapier@gentoo.org> | 2006-09-09 10:09:57 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2006-09-09 10:09:57 +0000 |
commit | 24d1098ebac2a73add7586a65b82768358b56313 (patch) | |
tree | c1a7b01e1a30e4cca5880c5312dc46ec42fe8271 /media-libs | |
parent | punt old files and update manifest for #146921 (diff) | |
download | gentoo-2-24d1098ebac2a73add7586a65b82768358b56313.tar.gz gentoo-2-24d1098ebac2a73add7586a65b82768358b56313.tar.bz2 gentoo-2-24d1098ebac2a73add7586a65b82768358b56313.zip |
punt old files and update manifest for #146921
(Portage version: 2.1.1_rc1-r6)
(Signed Manifest commit)
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/libpng/Manifest | 54 | ||||
-rw-r--r-- | media-libs/libpng/files/digest-libpng-1.2.10 | 6 | ||||
-rw-r--r-- | media-libs/libpng/files/digest-libpng-1.2.8-r1 | 6 | ||||
-rw-r--r-- | media-libs/libpng/files/libpng-1.2.8-build.patch | 157 | ||||
-rw-r--r-- | media-libs/libpng/files/libpng-1.2.8-strnlen.patch | 21 | ||||
-rw-r--r-- | media-libs/libpng/libpng-1.2.10.ebuild | 38 | ||||
-rw-r--r-- | media-libs/libpng/libpng-1.2.8-r1.ebuild | 64 |
7 files changed, 15 insertions, 331 deletions
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest index 27b6c4b6d7af..d039dd3b7d36 100644 --- a/media-libs/libpng/Manifest +++ b/media-libs/libpng/Manifest @@ -9,34 +9,16 @@ AUX libpng-1.2.12-no-asm.patch 1885 RMD160 19da2d7ad292c01b120dbb8d5c817b1db8537 MD5 c0960ea4127d955b2767930f001007be files/libpng-1.2.12-no-asm.patch 1885 RMD160 19da2d7ad292c01b120dbb8d5c817b1db8537d57 files/libpng-1.2.12-no-asm.patch 1885 SHA256 293b782f43787a57f0f60aae3198efead8099df67652fe9026a2ff3266e2bbfc files/libpng-1.2.12-no-asm.patch 1885 -AUX libpng-1.2.8-build.patch 3845 RMD160 e99732989a4c41980340cd8564c6e10e31b07501 SHA1 749ca740d8cfcdadffc85e49f92a33fd87831a4c SHA256 50d4375bc56b5923793893554ef64d9727c9651df672ac4f0beec2463034b105 -MD5 c13ed05aceb450c805e01fd39d16ae45 files/libpng-1.2.8-build.patch 3845 -RMD160 e99732989a4c41980340cd8564c6e10e31b07501 files/libpng-1.2.8-build.patch 3845 -SHA256 50d4375bc56b5923793893554ef64d9727c9651df672ac4f0beec2463034b105 files/libpng-1.2.8-build.patch 3845 -AUX libpng-1.2.8-strnlen.patch 580 RMD160 ec0791a765010160a18d6ec9c8f47e589aa4c79d SHA1 c2c594a6a45e496bc215b30cb4bf827b367f982f SHA256 1b44de20e24aebaf27623d0948b9d6cc7d60109315d0bc22f072cf55953ad304 -MD5 029ec280f20678b76004c1a0a0270111 files/libpng-1.2.8-strnlen.patch 580 -RMD160 ec0791a765010160a18d6ec9c8f47e589aa4c79d files/libpng-1.2.8-strnlen.patch 580 -SHA256 1b44de20e24aebaf27623d0948b9d6cc7d60109315d0bc22f072cf55953ad304 files/libpng-1.2.8-strnlen.patch 580 -DIST libpng-1.2.10.tar.bz2 625176 RMD160 8dbbf8ef709e6b35cc715302a7d3a50bef1a88c8 SHA1 075fe05e25012470d0351187b57e8256b95d2e89 SHA256 f3e8363d23ed1a3bc82317dbf3d75f76a708bbe9b0a2d23bd617160106d02ca8 DIST libpng-1.2.12.tar.bz2 621295 RMD160 c5c702869d73732d5e91e53a9e380fcbf89f3ae2 SHA1 44bd6821607ba09ac500279363871ad5974a01b5 SHA256 7d06103ce32bffa39730d1c12c4b4dcfd50a8f1c18d2462807cfe7c0c3ca0e64 -DIST libpng-1.2.8.tar.bz2 384970 RMD160 7de7456faaa4e4361b6b7ed74c87f0702f9cc88c SHA1 b6d73493eea4095166118b298efecb54a8e3d2f5 SHA256 9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b -DIST libpng-manual.txt 127770 RMD160 e46eeef8a202a9775ed2e5394eae2ce44466349c SHA1 7770625fdbb4d47f9e2a54aa000d8b678248ec34 SHA256 2775c77d00f1eac5555013b8448e45624745fd692d1cb58f5c6b57408dfdd4d5 -EBUILD libpng-1.2.10.ebuild 1131 RMD160 79d87279292eef7e616e00de1b9ce4e5456f168c SHA1 d29ec11806547b800d98418c43e98124df00b352 SHA256 0e589707defe6db3b4ec21da94660078f207cc64af63b92d3326a345a6f8afd6 -MD5 ddc622257d53311ee9c7ac37a47606b8 libpng-1.2.10.ebuild 1131 -RMD160 79d87279292eef7e616e00de1b9ce4e5456f168c libpng-1.2.10.ebuild 1131 -SHA256 0e589707defe6db3b4ec21da94660078f207cc64af63b92d3326a345a6f8afd6 libpng-1.2.10.ebuild 1131 -EBUILD libpng-1.2.12-r1.ebuild 1277 RMD160 809eb53033ed85ca4bf294fe6999f81df6be49e1 SHA1 8716d12794abed2cd72cfa5f5ee74e7a1cda299e SHA256 e5f6faba6143fb3a72340c2f0f583df28010a430d42bb0d0eb9ce391a75de848 -MD5 6f3d275d6adc39a07234e5b1f986593f libpng-1.2.12-r1.ebuild 1277 -RMD160 809eb53033ed85ca4bf294fe6999f81df6be49e1 libpng-1.2.12-r1.ebuild 1277 -SHA256 e5f6faba6143fb3a72340c2f0f583df28010a430d42bb0d0eb9ce391a75de848 libpng-1.2.12-r1.ebuild 1277 +DIST libpng-manual.txt 128275 RMD160 1941bffe2cdef3d51c0a62f9c63a1846b53294cc SHA1 b4ce09b50c45815dee504fa202ba0c71d33544b5 SHA256 354493aa927da6cbc8a01195724e04e04d1c353b715dc0b60c1c4cca3fcbcd25 +EBUILD libpng-1.2.12-r1.ebuild 1302 RMD160 9e0bf5f619d4881c4145f49498208b9df815d430 SHA1 b872536ed06fa95b5e4b0901fbff774c5e9aac6d SHA256 4300a254a898de2a2cc28cb0385a06a336e0e8bcb2292cf22b87a29474c31205 +MD5 2f47668963f8e2bcf3a3ae4798fffa26 libpng-1.2.12-r1.ebuild 1302 +RMD160 9e0bf5f619d4881c4145f49498208b9df815d430 libpng-1.2.12-r1.ebuild 1302 +SHA256 4300a254a898de2a2cc28cb0385a06a336e0e8bcb2292cf22b87a29474c31205 libpng-1.2.12-r1.ebuild 1302 EBUILD libpng-1.2.12.ebuild 1120 RMD160 79cfc0f2de6b63afc4196e67520e60fb1a6d5b00 SHA1 c9b826ab543291093a1a4e3b1d94ff86d864bf31 SHA256 c6d099a581f677e5f62ce1b0dfb6469f3304380136c97a02ec831ed1d5b98cb3 MD5 7b8e920d1b19512ecd9b6a2294b5af26 libpng-1.2.12.ebuild 1120 RMD160 79cfc0f2de6b63afc4196e67520e60fb1a6d5b00 libpng-1.2.12.ebuild 1120 SHA256 c6d099a581f677e5f62ce1b0dfb6469f3304380136c97a02ec831ed1d5b98cb3 libpng-1.2.12.ebuild 1120 -EBUILD libpng-1.2.8-r1.ebuild 1838 RMD160 acd1d6bf78aec399321901615e4f4d0c8e0846f4 SHA1 b3869781e697d495a6d59ecb98ac829ebff37405 SHA256 8d3103e31521e4abdc5432bd591e490e4e4167f16c6230a3a3857c687a27b39e -MD5 a7fb6a341c48dee3484730bc531b5a44 libpng-1.2.8-r1.ebuild 1838 -RMD160 acd1d6bf78aec399321901615e4f4d0c8e0846f4 libpng-1.2.8-r1.ebuild 1838 -SHA256 8d3103e31521e4abdc5432bd591e490e4e4167f16c6230a3a3857c687a27b39e libpng-1.2.8-r1.ebuild 1838 MISC ChangeLog 14391 RMD160 fafcc52835a224dc7eaf199266f2867104d08a2a SHA1 9e33604702b3036a571e4ae66fba7e6277c53518 SHA256 825d4319af4e032c66adf8862badecaa38e168dcc8a74b52b6a70d10c0fa7602 MD5 99439842fc8a6e927b9a1dbb0c2b0677 ChangeLog 14391 RMD160 fafcc52835a224dc7eaf199266f2867104d08a2a ChangeLog 14391 @@ -45,22 +27,16 @@ MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164 -MD5 1a4e82354abd5b429f318c3f3260145c files/digest-libpng-1.2.10 476 -RMD160 1b634b3fd0f42fa7a95a001393a319c362449e1b files/digest-libpng-1.2.10 476 -SHA256 9b2654b04a6f551bf5a763454f32ba642edebe8cded342b08bb506e32a6150c5 files/digest-libpng-1.2.10 476 -MD5 039c9ad31482d4f4754c0218af9789c2 files/digest-libpng-1.2.12 476 -RMD160 9c20793ffa9971a8e2bb51ac79d77c876bfc0e52 files/digest-libpng-1.2.12 476 -SHA256 39f77f6d9126d1f3281661d4df1a0c01c09e561bb991b6de662c33520ff4bed7 files/digest-libpng-1.2.12 476 -MD5 039c9ad31482d4f4754c0218af9789c2 files/digest-libpng-1.2.12-r1 476 -RMD160 9c20793ffa9971a8e2bb51ac79d77c876bfc0e52 files/digest-libpng-1.2.12-r1 476 -SHA256 39f77f6d9126d1f3281661d4df1a0c01c09e561bb991b6de662c33520ff4bed7 files/digest-libpng-1.2.12-r1 476 -MD5 450583e117bedc111dfea542fbedcf2e files/digest-libpng-1.2.8-r1 473 -RMD160 bd86c066d684b55974c4f8cc91807561aeb66087 files/digest-libpng-1.2.8-r1 473 -SHA256 46e116e6c09015633bfd094400672f1ab2980a2b90753bb6ba257e66a9ce472f files/digest-libpng-1.2.8-r1 473 +MD5 770b04cba54db5c3d533268d0a06abad files/digest-libpng-1.2.12 476 +RMD160 c91f1ccb71090bad44f3cbc01bcaed8f90da28f3 files/digest-libpng-1.2.12 476 +SHA256 740bdf9de20d5d8f070fff8fce042b40606189e2277290026549cbeead4d2dff files/digest-libpng-1.2.12 476 +MD5 770b04cba54db5c3d533268d0a06abad files/digest-libpng-1.2.12-r1 476 +RMD160 c91f1ccb71090bad44f3cbc01bcaed8f90da28f3 files/digest-libpng-1.2.12-r1 476 +SHA256 740bdf9de20d5d8f070fff8fce042b40606189e2277290026549cbeead4d2dff files/digest-libpng-1.2.12-r1 476 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux) +Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFE9ZqMKRy60XGEcJIRAtPfAJ9rofX2UJIYAFSxd4ZeGb9UCrTegACaAwfj -UfFdPH1ZTlYQy0xgn2BmwM4= -=J6g6 +iD8DBQFFApL3amhnQswr0vIRAqekAJ0a5uUisF0SkVitINBpNuGOJuiM0gCghDzd +ofUKM3amxbZI/Hy/p3GlEf0= +=hv9y -----END PGP SIGNATURE----- diff --git a/media-libs/libpng/files/digest-libpng-1.2.10 b/media-libs/libpng/files/digest-libpng-1.2.10 deleted file mode 100644 index 1de1d5b97737..000000000000 --- a/media-libs/libpng/files/digest-libpng-1.2.10 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 4f23eebd59ddd01a8f91ff8c823dd7d6 libpng-1.2.10.tar.bz2 625176 -RMD160 8dbbf8ef709e6b35cc715302a7d3a50bef1a88c8 libpng-1.2.10.tar.bz2 625176 -SHA256 f3e8363d23ed1a3bc82317dbf3d75f76a708bbe9b0a2d23bd617160106d02ca8 libpng-1.2.10.tar.bz2 625176 -MD5 3c9069aa836541dc0e075187dcb21899 libpng-manual.txt 127770 -RMD160 e46eeef8a202a9775ed2e5394eae2ce44466349c libpng-manual.txt 127770 -SHA256 2775c77d00f1eac5555013b8448e45624745fd692d1cb58f5c6b57408dfdd4d5 libpng-manual.txt 127770 diff --git a/media-libs/libpng/files/digest-libpng-1.2.8-r1 b/media-libs/libpng/files/digest-libpng-1.2.8-r1 deleted file mode 100644 index 85b14bf3ba93..000000000000 --- a/media-libs/libpng/files/digest-libpng-1.2.8-r1 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 00cea4539bea4bd34cbf8b82ff9589cd libpng-1.2.8.tar.bz2 384970 -RMD160 7de7456faaa4e4361b6b7ed74c87f0702f9cc88c libpng-1.2.8.tar.bz2 384970 -SHA256 9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b libpng-1.2.8.tar.bz2 384970 -MD5 3c9069aa836541dc0e075187dcb21899 libpng-manual.txt 127770 -RMD160 e46eeef8a202a9775ed2e5394eae2ce44466349c libpng-manual.txt 127770 -SHA256 2775c77d00f1eac5555013b8448e45624745fd692d1cb58f5c6b57408dfdd4d5 libpng-manual.txt 127770 diff --git a/media-libs/libpng/files/libpng-1.2.8-build.patch b/media-libs/libpng/files/libpng-1.2.8-build.patch deleted file mode 100644 index ff72b0bf57fb..000000000000 --- a/media-libs/libpng/files/libpng-1.2.8-build.patch +++ /dev/null @@ -1,157 +0,0 @@ -Clean up build system to make cross-compiling easy - ---- scripts/makefile.linux -+++ scripts/makefile.linux -@@ -8,12 +8,12 @@ - PNGMIN = 1.2.8 - PNGVER = $(PNGMAJ).$(PNGMIN) - --CC=gcc -+CC?=gcc - - # where "make install" puts libpng12.a, libpng12.so*, - # libpng12/png.h and libpng12/pngconf.h - # Prefix must be a full pathname. --prefix=/usr/local -+prefix=/usr - - # Where the zlib library and include files are located. - #ZLIBLIB=/usr/local/lib -@@ -31,18 +31,25 @@ - - # for pgcc version 2.95.1, -O3 is buggy; don't use it. - --CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \ -- $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 -+CFLAGS += -Wall $(ALIGN) -+ifneq ($(ZLIBINC),) -+CFLAGS += -I$(ZLIBINC) -+endif -+ -+ifneq ($(ZLIBLIB),) -+LDFLAGS += -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -+endif -+LDFLAGS += -lz -lm -+LDFLAGS_A = libpng.a $(LDFLAGS) -+LDFLAGS_SO = -L. -Wl,-rpath,. -lpng12 $(LDFLAGS) - --LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm --LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm -- --RANLIB=ranlib -+AR?=ar -+RANLIB?=ranlib - #RANLIB=echo - - INCPATH=$(prefix)/include - LIBPATH=$(prefix)/lib --MANPATH=$(prefix)/man -+MANPATH=$(prefix)/share/man - BINPATH=$(prefix)/bin - - # override DESTDIR= on the make install command line to easily support -@@ -74,7 +81,7 @@ - all: libpng.a $(LIBNAME).so pngtest pngtest-static libpng.pc libpng-config - - libpng.a: $(OBJS) -- ar rc $@ $(OBJS) -+ $(AR) rc $@ $(OBJS) - $(RANLIB) $@ - - libpng.pc: -@@ -99,15 +106,15 @@ - $(LIBNAME).so.$(PNGVER): $(OBJSDLL) - $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \ - -o $(LIBNAME).so.$(PNGVER) \ -- $(OBJSDLL) -+ $(OBJSDLL) $(LDFLAGS) - - libpng.so.3.$(PNGMIN): $(OBJSDLL) - $(CC) -shared -Wl,-soname,libpng.so.3 \ - -o libpng.so.3.$(PNGMIN) \ -- $(OBJSDLL) -+ $(OBJSDLL) $(LDFLAGS) - - pngtest: pngtest.o $(LIBNAME).so -- $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) -+ $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS_SO) - - pngtest-static: pngtest.o libpng.a - $(CC) -o pngtest-static $(CFLAGS) pngtest.o $(LDFLAGS_A) ---- scripts/makefile.darwin -+++ scripts/makefile.darwin -@@ -7,20 +7,30 @@ - # For conditions of distribution and use, see copyright notice in png.h - - # where "make install" puts libpng.a, libpng12.dylib, png.h and pngconf.h --prefix=/usr/local -+prefix=/usr - - # Where the zlib library and include files are located - #ZLIBLIB=/usr/local/lib - #ZLIBINC=/usr/local/include - ZLIBLIB=../zlib - ZLIBINC=../zlib - --CC=cc --CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops --LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -+CC?=gcc -+ -+CFLAGS += -Wall $(ALIGN) -+ifneq ($(ZLIBINC),) -+CFLAGS += -I$(ZLIBINC) -+endif -+ -+ifneq ($(ZLIBLIB),) -+LDFLAGS += -L$(ZLIBLIB) -+endif -+LDFLAGS += -lz -+LDFLAGS_DYLIB = $(LDFLAGS) -L. -lpng12 - - #RANLIB=echo --RANLIB=ranlib -+AR?=ar -+RANLIB?=ranlib - - PNGMAJ = 0 - PNGMIN = 1.2.8 -@@ -29,7 +39,7 @@ - - INCPATH=$(prefix)/include - LIBPATH=$(prefix)/lib --MANPATH=$(prefix)/man -+MANPATH=$(prefix)/share/man - BINPATH=$(prefix)/bin - - # override DESTDIR= on the make install command line to easily support -@@ -61,7 +71,7 @@ - all: libpng.a $(LIBNAME).dylib pngtest libpng.pc libpng-config - - libpng.a: $(OBJS) -- ar rc $@ $(OBJS) -+ $(AR) rc $@ $(OBJS) - $(RANLIB) $@ - - libpng.pc: -@@ -88,17 +98,17 @@ - -install_name $(LIBPATH)/$(LIBNAME).$(PNGMAJ).dylib \ - -current_version $(PNGVER) -compatibility_version $(PNGVER) \ - -o $(LIBNAME).$(PNGVER).dylib \ -- $(OBJSDLL) -L$(ZLIBLIB) -lz -+ $(OBJSDLL) $(LDFLAGS) - - libpng.3.$(PNGMIN).dylib: $(OBJSDLL) - $(CC) -dynamiclib \ - -install_name $(LIBPATH)/libpng.3.dylib \ - -current_version 3 -compatibility_version 3 \ - -o libpng.3.$(PNGMIN).dylib \ -- $(OBJSDLL) -L$(ZLIBLIB) -lz -+ $(OBJSDLL) $(LDFLAGS) - - pngtest: pngtest.o $(LIBNAME).dylib -- $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) -+ $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS_DYLIB) - - test: pngtest - ./pngtest diff --git a/media-libs/libpng/files/libpng-1.2.8-strnlen.patch b/media-libs/libpng/files/libpng-1.2.8-strnlen.patch deleted file mode 100644 index aed2610539cc..000000000000 --- a/media-libs/libpng/files/libpng-1.2.8-strnlen.patch +++ /dev/null @@ -1,21 +0,0 @@ -strnlen is a GNU extension - ---- libpng/pngerror.c -+++ libpng/pngerror.c -@@ -23,6 +23,16 @@ - png_default_warning PNGARG((png_structp png_ptr, - png_const_charp warning_message)); - -+#ifndef _GNU_SOURCE -+size_t strnlen(const char *s, size_t limit) -+{ -+ size_t len = 0; -+ while ((len < limit) && (*s++)) -+ len++; -+ return len; -+} -+#endif -+ - /* This function is called whenever there is a fatal error. This function - * should not be changed. If there is a need to handle errors differently, - * you should supply a replacement error function and use png_set_error_fn() diff --git a/media-libs/libpng/libpng-1.2.10.ebuild b/media-libs/libpng/libpng-1.2.10.ebuild deleted file mode 100644 index 6bfec50c03e4..000000000000 --- a/media-libs/libpng/libpng-1.2.10.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.10.ebuild,v 1.1 2006/06/10 11:12:30 vapier Exp $ - -inherit flag-o-matic eutils toolchain-funcs multilib - -DESCRIPTION="Portable Network Graphics library" -HOMEPAGE="http://www.libpng.org/" -SRC_URI="mirror://sourceforge/libpng/${P}.tar.bz2 - doc? ( http://www.libpng.org/pub/png/libpng-manual.txt )" - -LICENSE="as-is" -SLOT="1.2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="doc" - -DEPEND="sys-libs/zlib" - -src_unpack() { - unpack ${P}.tar.bz2 - cd "${S}" - use doc && cp "${DISTDIR}"/libpng-manual.txt . - - epatch "${FILESDIR}"/1.2.7-gentoo.diff -} - -src_install() { - make DESTDIR="${D}" install || die - dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO - use doc && dodoc libpng-manual.txt -} - -pkg_postinst() { - # the libpng authors really screwed around between 1.2.1 and 1.2.3 - if [[ -f ${ROOT}/usr/$(get_libdir)/libpng.so.3.1.2.1 ]] ; then - rm -f "${ROOT}"/usr/$(get_libdir)/libpng.so.3.1.2.1 - fi -} diff --git a/media-libs/libpng/libpng-1.2.8-r1.ebuild b/media-libs/libpng/libpng-1.2.8-r1.ebuild deleted file mode 100644 index 48e71c6cd089..000000000000 --- a/media-libs/libpng/libpng-1.2.8-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.8-r1.ebuild,v 1.14 2006/04/24 02:21:19 kumba Exp $ - -inherit flag-o-matic eutils toolchain-funcs multilib - -DESCRIPTION="Portable Network Graphics library" -HOMEPAGE="http://www.libpng.org/" -SRC_URI="mirror://sourceforge/libpng/${P}.tar.bz2 - doc? ( http://www.libpng.org/pub/png/libpng-manual.txt )" - -LICENSE="as-is" -SLOT="1.2" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc-macos ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="doc" - -DEPEND="sys-libs/zlib" - -src_unpack() { - unpack ${P}.tar.bz2 - cd "${S}" - use doc && cp "${DISTDIR}"/libpng-manual.txt . - - epatch "${FILESDIR}"/1.2.7-gentoo.diff - cp scripts/makefile.linux{,.orig} - epatch "${FILESDIR}"/${PN}-1.2.8-strnlen.patch - epatch "${FILESDIR}"/${PN}-1.2.8-build.patch - - [[ $(gcc-version) == "3.3" || $(gcc-version) == "3.2" ]] \ - && replace-cpu-flags k6 k6-2 k6-3 i586 - - local makefilein - case ${CHOST} in - *-darwin*) makefilein="scripts/makefile.darwin";; - *) makefilein="scripts/makefile.linux";; - esac - sed \ - -e "/^ZLIBLIB=/s:=.*:=:" \ - -e "/^ZLIBINC=/s:=.*:=:" \ - -e "/^LIBPATH=/s:/lib:/$(get_libdir):" \ - -e 's:mkdir:mkdir -p:' \ - ${makefilein} > Makefile || die - - sed -i -e "s:libdir=\${exec_prefix}/lib:libdir=/usr/$(get_libdir):" \ - scripts/${PN}.pc.in || die -} - -src_compile() { - tc-export CC RANLIB AR - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die - dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO - use doc && dodoc libpng-manual.txt -} - -pkg_postinst() { - # the libpng authors really screwed around between 1.2.1 and 1.2.3 - if [[ -f ${ROOT}/usr/$(get_libdir)/libpng.so.3.1.2.1 ]] ; then - rm -f "${ROOT}"/usr/$(get_libdir)/libpng.so.3.1.2.1 - fi -} |