From: Tim Harder Date: Sun, 23 Oct 2011 19:53:22 +0000 (+0000) Subject: Remove old. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=79e03026a9c841263b1d38267430ee559469cad0;p=gentoo.git Remove old. Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64 --- diff --git a/media-libs/libafterimage/Manifest b/media-libs/libafterimage/Manifest index 3f7dd7ea923b..5ef1f918475b 100644 --- a/media-libs/libafterimage/Manifest +++ b/media-libs/libafterimage/Manifest @@ -1,32 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 -AUX libafterimage-1.18-glx.patch 932 RMD160 61f6ddd4f659ffdeff2c4a7abd57ad9d5a97354e SHA1 09183f34a1f4b7737efcc40b36563e2bf84d8964 SHA256 e6fc40d8a0384781d04b82229a7d1a61066cedcf6dbf01427251230a59703b82 -AUX libafterimage-1.18-recmake_bsd.patch 1934 RMD160 cdd484974683aaea096c893d842b3693362e4a39 SHA1 030a4173e798e764dfbca64a60f2640af489236e SHA256 3628b28d09a119133b1235215454a8e7f664bdf9969445c267fa8648497e75a3 AUX libafterimage-config.patch 369 RMD160 e209d20413373694cd4b4cf16cc1927fbb8437f6 SHA1 030143afcdece5802511b51899c221d48e421ebf SHA256 75a7683211f8d65a6cb1a6ed99b013d7bcc5b3cb3a241e36748a2c0b5ff960c6 AUX libafterimage-gif.patch 1436 RMD160 8656affb37559f0cee1fd8143e8c29f78ec4dd42 SHA1 a80433320c5c22c9ffb754a3952aada7df6760a9 SHA256 d9e681e5fae08dd6e648ee699e3feb617a924ec5c011fdab81a75d4c3949ea9a AUX libafterimage-libpng15.patch 1076 RMD160 21ad676cbcbd2651463520da9cc2108a1b2f2893 SHA1 2e08a6c833ef39ada0a07ca6150f279230debf6b SHA256 bbf95bcddc4c48dcde88745dc9cb772ca53b625e8e466b9d565e4183ce71dbe3 AUX libafterimage-makefile.in.patch 2168 RMD160 4b6340f3845774de82fb612de0e94f0841ae869a SHA1 f707ad8a850eafacdac780a727f936b8cf8673de SHA256 44b2f80b7e5f9bef3852d179e247592f3d5a0983de105082d1b5d1667eb4ced8 -DIST libAfterImage-1.18.tar.bz2 1050328 RMD160 dcf921660e15bb31908c90fcfe00b58d58754fc3 SHA1 d177c63067f5d0053e02f92879fe59764e421f25 SHA256 f1562240f1dd3a180e07436ee28a993a707654a339d997ad0512692d3fc32312 DIST libAfterImage-1.20.tar.bz2 1017055 RMD160 b02332fc598a6f141d103c38974e34fc559e1eb4 SHA1 c214ac89a1e61d9c8834ccc9210d0f7952305737 SHA256 6e233253f4d1dd22dfce9f9a245cc036d814fc99ba7f6732f4e345de62cfe458 -EBUILD libafterimage-1.18-r1.ebuild 2057 RMD160 071d40441ef17db71a74137ac9309289c7c74e8d SHA1 bdbff0028d48ff776c416548c6cff1db3c276678 SHA256 3f1c3aad8643465bc4ecf812d73a936490bfc7cbed9e5ef35b48cf4be4e5f9f1 EBUILD libafterimage-1.20.ebuild 2270 RMD160 94734ff25cb8657c303c799bd7b2432f00ba56ad SHA1 74709babc9c2b33161c6ecbb4fb6df739d5f0ac6 SHA256 61c5f11fa8d97d67b550316078e6829e0369708ed5d100b3c9f7174e576e1a44 -MISC ChangeLog 5481 RMD160 0d65ef00c2f43c1566de2c7ce8ea5f32e4449d2a SHA1 f9398262ebf14f51eacb4f3ac9a02e9471b31201 SHA256 343b6200a57978e9323f4140192c79f5607aadafbca841fef8c2fb5ef91ed7ef +MISC ChangeLog 5658 RMD160 0fc561ea4f9e3e81d92c3a59d43abd36f0d51c7a SHA1 d1777811f38b4d6374d3b9834830da40f6132170 SHA256 a02e3e417a5fc7ae7a052cc3e1f54a4dbce0d275667e0f1e86a412e3b1d94740 MISC metadata.xml 803 RMD160 5a20a7d1e910ee66f7bb5fd53aad8341a1f0b653 SHA1 bfee50707db93a6a62978caf711b15be6446c67c SHA256 5f1fc597d0da18541c30e568f47ec9d1937f277dc34130101e8e605924a4d444 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCAAGBQJOmXDdAAoJEF0huFKJUZL5hyoP/i+Sozl4cT4EBAuMgw3KFCR2 -p+WyrLG5UIK2ri+TxQGVqEiIlwVfr/cKSsSAFEkf/EyjzzxvkKN1jCTCTCXoPYAx -WkHCk0OETNGRyMF/RKUcCcc4KD/HPjimB7abomtu0u+3ANLyU4dWZOUHk4JJKw8Q -MBaWXcp1SSncZlrX9I1Uhw0H4j//r7Gwn2HmEm4g1iJd5zQ1UGMuK6waAypbzQID -+iZQOdlZdirWe7LZ3g49Xwaf8qCeCK+JK4a5qNlX+bjU0MxHWrMKmX91vwnn5GDR -6KpIk+PCznCUbniTdlgabhuKfZ1q/M0G8W6ZzT0lqwk2moRyBBB0YjjvTX/0fnl0 -Qjez9k30kznGw3jawxSj2NhiPHG9dEgwUx4M1YPgZKGiBVOWpe/Fzgv7l+XHbR3A -5ugBRJ1D41bm0WqMxWXBE4hNUX/aEo6KMuujhRj0c0JeBLgoiUDB+lU62q6HShuD -MI0RM6nKntF6/30LnSWO2eaANCYk95plR5ic6qnZuOPrn23lvTgHOOejWXmFM6yt -DP/hk2djl5648vVjnk5tw79H/iRgQs1FfKH1f14z7KEkVPgy1YMiM3ZwgN7XiaHD -HkHRW4LvTD0LWPGYcuGZsVN9kbj0amTZ7ss2wUka2cQrxMS1gc1OXo4vJLLL2ckK -WCyNb6JI/5erD/sJNw2d -=IUpn +iQEcBAEBAgAGBQJOpHF6AAoJEEdUh39IaPFNslEH/0QaFk6JjMrNNaIrZSEmFhdV +ER7eXPWqNcrTNfYsgLqWaicFGMkA9C3IWTBmt+xh4pCRy8L/swZK/BTSTVb5B7UO +yN+QmYK00VFoAQOeRFkrBKxsGM1KAKz5AzLeP0fnBfzA55yJ8i3aG2sRI5P4cyvx +CUxOrhnv5mMd1b+xCet690iuovtZSHc4vi+4U5km6CqUTXzrY/FsMguHkvmNV3l8 +4fQqTm7+qIyiJwIkKodKYZR9Cby8GQldlcLVV6AWeMEE73Cx1uaX+9EFJ/URER6t +RwrP065UEd2kjhqSLQ0D/qVUuxUCTjLtGqZJiKdSMGnVmKIsdLQqlO65ssHxihc= +=sQtW -----END PGP SIGNATURE----- diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog index 34995d9b74bf..20c33c71140a 100644 --- a/media-libs/netpbm/ChangeLog +++ b/media-libs/netpbm/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-libs/netpbm # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.258 2011/10/23 16:07:11 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.259 2011/10/23 19:53:21 radhermit Exp $ + + 23 Oct 2011; Tim Harder + -files/netpbm-10.35.0-pnmtopng-zlib.patch, -files/netpbm-10.35.0-xml2.patch, + -files/netpbm-10.42.0-gcc43.patch, + -files/netpbm-10.46.00-min_DCT_v_scaled_size.patch, + -files/netpbm-10.48.00-pngx.patch, + -files/netpbm-10.48.00-pnmtopng-zlib.patch, -netpbm-10.49.00.ebuild, + -files/netpbm-10.49.00-sigpower.patch, -netpbm-10.51.00-r1.ebuild: + Remove old. 23 Oct 2011; Raúl Porcel netpbm-10.51.00-r2.ebuild: alpha/sparc stable wrt #383753 diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index ceec20855f5e..717551f09192 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -1,30 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX netpbm-10.31-build.patch 1629 RMD160 4226692b199871b3bfb27a9e6fec97d8ac1a4bf6 SHA1 574bd4443c6dbd8a2508bc2d2e3096cfcc815710 SHA256 eaf363941337718390856c318c8e69114c8fb9dbcea8b07755350dbdabce6323 -AUX netpbm-10.35.0-pnmtopng-zlib.patch 412 RMD160 fbef74327c74badad288454090b79627e2fde0d6 SHA1 08fd7b8e17c0f272cf628582b22f9ecde0d35cc9 SHA256 577a6b5a49c8773ca29adb045132ee71034e3b6f4abf29ff92126adb1ba83a17 -AUX netpbm-10.35.0-xml2.patch 850 RMD160 426cc33a622b8641bdbff8e60a8418318cdee682 SHA1 ce767bd1a0fe861cc9d1a47fa0bb53b12b4a58cc SHA256 b36d159a7e3ec7377760f30e835b8b2bed6c00a9aa992562d50de5ddb6937847 -AUX netpbm-10.42.0-gcc43.patch 541 RMD160 4162fc8f0020941d9072ce595a4586a8a9f2159e SHA1 aebb30f5196d88acd8156f6954bf2c2903700aa3 SHA256 259f194d7d55742d2d7d0915f57814642e059890157eef1eeb3c5c2ba511ef86 -AUX netpbm-10.46.00-min_DCT_v_scaled_size.patch 1022 RMD160 8b3370958c504c9330dc47c77ab579e021bc03f8 SHA1 71cf92f4143c7831a42de7c503045b7a23bc5997 SHA256 42c21d97f73523c9668ed8700ec33fd4d44e445429d61bd65218711d8ca02135 -AUX netpbm-10.48.00-pngx.patch 1149 RMD160 387a1f7df51b457eb2a87c32b7ac60a499249c82 SHA1 0823541f93d804f17d6e7512c5f7e9facc4558d6 SHA256 86ffe862542e882db61d4e32ae49c78e1f6056df42eaa44ffe8e43867c27ce74 -AUX netpbm-10.48.00-pnmtopng-zlib.patch 419 RMD160 d4e51baf414ee3ca3ed2c1e8ba186bfa3be7a9dd SHA1 0cc0892bde1384b34d37fe1085866e4b919c0cb3 SHA256 29031875887a03adc503a2f6d5965a8b4eb1e82a1def98d9e3a6fb4250285897 -AUX netpbm-10.49.00-sigpower.patch 719 RMD160 ef830e01c14424a8b1d2f8e149d12a601c397c83 SHA1 b765c7e1d8a3148557dcbc49c26d77a8a6ec05d8 SHA256 b4a5304f36384a2f96e5c208089230c7190dc06cb99beccfe826520234f9c6fe AUX netpbm-10.51.00-pnmconvol-nooffset.patch 3930 RMD160 c54357f13fc1147b8020b523b9c28c5ffd381647 SHA1 e3bf297d209783bfe15d2257b47dc3ed9b492826 SHA256 d9c7f70e58d50dac4998157021ac2fef92822d1abd9b9d060384b195e4f1cabb AUX netpbm-10.51.00-ppmtompeg-free.patch 1199 RMD160 3e3594fc27166423904ec56c0d17e427811614cd SHA1 ebe9561fd836c930ebd417cb81f507e502b36d57 SHA256 45c0229b035e8b50f759a5aae646a60ef07f4c0fb156b4aee1dc52aa0c1cbc75 AUX netpbm-10.51.00-underlinking.patch 657 RMD160 c95af06e30622d8eeab0138001357da44314a062 SHA1 ae55ffd420c4a3d9d1c2f6a3e255438c09535572 SHA256 f933003b9c50717d76abaf3272b9bef66b328629a8791144fd0038e692989b95 -DIST netpbm-10.33-manpages.tar.bz2 236722 RMD160 5e43836a5f4d16f1ba5ece21e9996dbe60b252ae SHA1 6c0372f540ad040771beae15a8c2015252679e5f SHA256 aa18adee4a187ad5df243cb1a7c51097dc6a7d6a8072cf6da09972b74ac5454a -DIST netpbm-10.49.00.tar.lzma 1917909 RMD160 26ce43d25a1e7319627d82bfa9a8e73d3c87d1fa SHA1 72db0cff9f805a3f84766dd8add82eaa30685ed3 SHA256 4414fe9b64c695e5d750670aa6e2b03828877d653bc8806e778c1352553c7c8e DIST netpbm-10.51.00-libpng-1.5.patch.bz2 8120 RMD160 49ee4fe57f170ffc1fb5470440dc840f0fb5387e SHA1 a6f0c2e37a5cb051e3c9275918c7e5b34c396aa9 SHA256 260a5f0e9834e7e1aa5c2dcc292695aa43b5aa198af1cb33e5705f7cac10da7b DIST netpbm-10.51.00.tar.xz 1834148 RMD160 71593d33e102de72230fbc306165ecc67bbb4c4f SHA1 ae5f9393ebcc75b0914f40c93a837de98a0a71c8 SHA256 6d7bb30d1d0e7f6a23b55c6f03bbb20b539909ad84281dc944b1072656dc1d0e -EBUILD netpbm-10.49.00.ebuild 4297 RMD160 b7475816a192cb9355abc7cda9a99f39ae96a5c0 SHA1 c45cb174fa91abe8294ea70dfd400d2fe0980672 SHA256 975cbcceef470fc8c68f47009919804f08c319f819a621204263d3de7e904d80 -EBUILD netpbm-10.51.00-r1.ebuild 4821 RMD160 6226c886386e6a98c28c80e1e79ed5e705febde0 SHA1 d55929d0f5fbdb629c72268c884b1ccd13b35bed SHA256 397230bf0c67ecdd3f3b6cf41235618eb382d0403a3e7863c71a2a8c2ea7e0a7 EBUILD netpbm-10.51.00-r2.ebuild 4867 RMD160 be56d9a322dd4152c60d2d5ddf468576a617f152 SHA1 b77c63fbcef27f06b7730523dc5afee9eeed35bc SHA256 b33209607ed2b3a7af589588581a89ee966286d8e9501bcd6e6b109d489f2b00 -MISC ChangeLog 35811 RMD160 b1758646b84a4a971b2eae09f4815b5c6fda2583 SHA1 c0c79a779c4c94278211a9517c803d19f8e55df8 SHA256 7982983a80fee5d3502d3ab9a3dccb6198caa3875e0105ad1afb3d793601eb75 +MISC ChangeLog 36224 RMD160 6a1d34b849cd90f275202482326760d041c5bb63 SHA1 4b2c6503f70d459fa258e9cee74e4f554155ebf5 SHA256 9a09a224361b7b15ae83ba16ce82f7fc518bafdf5639440def5651230026e2b4 MISC metadata.xml 261 RMD160 1d652dbebb408b61de2afc2d49c8356a8eebee4c SHA1 c977c691e58d2ecbf5222ecde5ba6bf9a86ad84c SHA256 e04079912e263782a8c0e4f115e49ff3694535ff2efef7b7fff85cf8d100102b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk6kO7UACgkQuQc30/atMkC5cACgrkYqbb+UNLmmL9zhxyv1krr5 -ck8An2X0kqEjzk9quKQJS73NMFpIAkTB -=mu6V +iQEcBAEBCgAGBQJOpHC3AAoJEEqz6FtPBkyjvuIH/iIljqgdQJ0uiXpP+0+EOdOX +qrykNil2dXCokb2SpxIBB+09hREN9ynjSonOBBgCCYdA77/bSC3bQBCiYoRbm/US +pDlVErXE13bzfmC6yPQ9i4NjVggsMPPCr6UO+IIRKtI8GZ5I83k1QAxaAG7Kiof0 +j1djtqeFd84frrx9HPgGnJYSmgUTB5jOthoH/8fpay9AyoWhNbMXbEz2lYZoIMIg +8AIekIJ0dg3G5dB6bnfJhQSPQ+qXv7qbRHC4uOlRZqp+qBMvnPM4bcLwXS5fKASH ++WMQJWjvFBDlje7gqaoL7QAXbmTRDV5r+9ADMaAqEg55mjRWhD1FGADLEsp6nFo= +=TVGH -----END PGP SIGNATURE----- diff --git a/media-libs/netpbm/files/netpbm-10.35.0-pnmtopng-zlib.patch b/media-libs/netpbm/files/netpbm-10.35.0-pnmtopng-zlib.patch deleted file mode 100644 index ff66768744cc..000000000000 --- a/media-libs/netpbm/files/netpbm-10.35.0-pnmtopng-zlib.patch +++ /dev/null @@ -1,12 +0,0 @@ -http://bugs.gentoo.org/291987 - ---- netpbm/converter/other/Makefile -+++ netbpm/converter/other/Makefile -@@ -159,6 +156,7 @@ - $(shell $(LIBOPT) $(NETPBMLIB)) \ - $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) - -+pnmtopng: LADD += -lz # pnmtopng calls zlib_version itself - pnmtopng: %: %.o pngtxt.o $(NETPBMLIB) $(LIBOPT) - $(LD) -o $@ $@.o pngtxt.o \ - $(shell $(LIBOPT) $(NETPBMLIB)) \ diff --git a/media-libs/netpbm/files/netpbm-10.35.0-xml2.patch b/media-libs/netpbm/files/netpbm-10.35.0-xml2.patch deleted file mode 100644 index 2dcc74fc6bab..000000000000 --- a/media-libs/netpbm/files/netpbm-10.35.0-xml2.patch +++ /dev/null @@ -1,38 +0,0 @@ -http://bugs.gentoo.org/137871 - ---- converter/other/Makefile -+++ converter/other/Makefile -@@ -7,14 +7,6 @@ - - include $(BUILDDIR)/Makefile.config - --ifeq ($(shell xml2-config --version),) -- XML2_LIBS=NONE -- XML2_CFLAGS=NONE --else -- XML2_LIBS=$(shell xml2-config --libs) -- XML2_CFLAGS=$(shell xml2-config --cflags) --endif -- - SUBDIRS = jbig pnmtopalm jpeg2000 cameratopam pamtosvg - ifneq ($(BUILD_FIASCO), N) - SUBDIRS += fiasco ---- Makefile.config.in -+++ Makefile.config.in -@@ -419,6 +419,16 @@ - ZHDR_DIR = - #ZLIB = libz.so - -+# The XML2 library -+ -+ifeq ($(shell xml2-config --version),) -+ XML2_LIBS=NONE -+ XML2_CFLAGS=NONE -+else -+ XML2_LIBS=$(shell xml2-config --libs) -+ XML2_CFLAGS=$(shell xml2-config --cflags) -+endif -+ - # The JBIG lossless image compression library (aka JBIG-KIT): - - JBIGLIB = $(BUILDDIR)/converter/other/jbig/libjbig.a diff --git a/media-libs/netpbm/files/netpbm-10.42.0-gcc43.patch b/media-libs/netpbm/files/netpbm-10.42.0-gcc43.patch deleted file mode 100644 index 1e61de8decb3..000000000000 --- a/media-libs/netpbm/files/netpbm-10.42.0-gcc43.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: trunk/lib/libpbm3.c -=================================================================== ---- trunk/lib/libpbm3.c (revision 608) -+++ trunk/lib/libpbm3.c (revision 609) -@@ -116,7 +116,11 @@ packBitsWithMmxSse(FILE * const - ) ]; - */ - -+#if (__GNUC__ * 100 + __GNUC_MINOR__ >= 403) -+ typedef char v8qi __attribute__ ((vector_size(8))); -+#else - typedef int v8qi __attribute__ ((mode(V8QI))); -+#endif - typedef int di __attribute__ ((mode(DI))); - - di const zero64 = 0; /* to clear with PXOR */ diff --git a/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch b/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch deleted file mode 100644 index 89948dceb432..000000000000 --- a/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch +++ /dev/null @@ -1,35 +0,0 @@ -support for jpeg-7 - ---- netpbm-10.46.00/converter/ppm/ppmtompeg/jpeg.c -+++ netpbm-10.48.00/converter/ppm/ppmtompeg/jpeg.c -@@ -53,6 +53,17 @@ - #define HEADER_SIZE 607 /*JFIF header size used on output images*/ - - -+static int -+minDctVScaledSize(struct jpeg_decompress_struct const cinfo) { -+ -+#if JPEG_LIB_VERSION >= 70 -+ return cinfo.min_DCT_v_scaled_size; -+#else -+ return cinfo.min_DCT_scaled_size; -+#endif -+} -+ -+ - - /*=======================================================================* - * * -@@ -467,11 +474,7 @@ - /* Make an 8-row-high sample array that will go away when done - with image - */ --#ifdef JPEG4 -- buffer_height = 8; /* could be 2, 4,8 rows high */ --#else -- buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size; --#endif -+ buffer_height = cinfo.max_v_samp_factor * minDctVScaledSize(cinfo); - - for(cp=0,compptr = cinfo.comp_info;cprw = rw; - } - } - -@@ -77,7 +78,14 @@ - void - pngx_destroy(struct pngx * const pngxP) { - -- png_destroy_write_struct(&pngxP->png_ptr, &pngxP->info_ptr); -+ switch(pngxP->rw) { -+ case PNGX_READ: -+ png_destroy_read_struct(&pngxP->png_ptr, &pngxP->info_ptr, NULL); -+ break; -+ case PNGX_WRITE: -+ png_destroy_write_struct(&pngxP->png_ptr, &pngxP->info_ptr); -+ break; -+ } - - free(pngxP); - } ---- netpbm/converter/other/pngx.h (revision 1021) -+++ netpbm/converter/other/pngx.h (revision 1022) -@@ -5,14 +5,14 @@ - the PNG library easier and cleaner. - */ - -+typedef enum {PNGX_READ, PNGX_WRITE} pngx_rw; -+ - struct pngx { - png_structp png_ptr; -- png_infop info_ptr; -+ png_infop info_ptr; -+ pngx_rw rw; - }; - --typedef enum {PNGX_READ, PNGX_WRITE} pngx_rw; -- -- - void - pngx_create(struct pngx ** const pngxPP, - pngx_rw const rw, diff --git a/media-libs/netpbm/files/netpbm-10.48.00-pnmtopng-zlib.patch b/media-libs/netpbm/files/netpbm-10.48.00-pnmtopng-zlib.patch deleted file mode 100644 index 100c33f9ea34..000000000000 --- a/media-libs/netpbm/files/netpbm-10.48.00-pnmtopng-zlib.patch +++ /dev/null @@ -1,12 +0,0 @@ -http://bugs.gentoo.org/291987 - ---- netpbm/converter/other/Makefile -+++ netbpm/converter/other/Makefile -@@ -159,6 +156,7 @@ - $(shell $(LIBOPT) $(NETPBMLIB)) \ - $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) - -+pnmtopng: LADD += -lz # pnmtopng calls zlib_version itself - pnmtopng: %: %.o pngx.o pngtxt.o $(NETPBMLIB) $(LIBOPT) - $(LD) -o $@ $@.o pngtxt.o \ - $(shell $(LIBOPT) $(NETPBMLIB)) \ diff --git a/media-libs/netpbm/files/netpbm-10.49.00-sigpower.patch b/media-libs/netpbm/files/netpbm-10.49.00-sigpower.patch deleted file mode 100644 index dae1b867e086..000000000000 --- a/media-libs/netpbm/files/netpbm-10.49.00-sigpower.patch +++ /dev/null @@ -1,23 +0,0 @@ -fix from upstream for systems that lack SIGPWR - -http://bugs.gentoo.org/310179 - ---- trunk/lib/libsystem.c 2010/02/23 15:56:42 1129 -+++ trunk/lib/libsystem.c 2010/03/17 01:57:18 1149 -@@ -278,12 +278,14 @@ - return "SIGWINCH"; - case SIGIO: - return "SIGIO"; -- case SIGPWR: -- return "SIGPWR"; - case SIGSYS: - return "SIGSYS"; - default: - return "???"; -+ -+ /* There are various other signal classes on some systems, but -+ not defined by POSIX, including: SIGPWR, SIGLOST, SIGINFO -+ */ - } - } else if ((int)signalClass >= SIGRTMIN && (int)signalClass <= SIGRTMAX) - return "SIGRTxxx"; diff --git a/media-libs/netpbm/netpbm-10.49.00.ebuild b/media-libs/netpbm/netpbm-10.49.00.ebuild deleted file mode 100644 index bb610c8f623b..000000000000 --- a/media-libs/netpbm/netpbm-10.49.00.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.49.00.ebuild,v 1.11 2011/09/24 23:24:33 robbat2 Exp $ - -EAPI=1 -inherit toolchain-funcs eutils multilib - -MAN_VER=10.33 -DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" -HOMEPAGE="http://netpbm.sourceforge.net/" -SRC_URI="mirror://gentoo/${P}.tar.lzma - mirror://gentoo/${PN}-${MAN_VER}-manpages.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="jbig jpeg jpeg2k png rle svga tiff X xml zlib" - -RDEPEND="jpeg? ( virtual/jpeg ) - jpeg2k? ( media-libs/jasper ) - tiff? ( >=media-libs/tiff-3.5.5 ) - png? ( >=media-libs/libpng-1.4 ) - xml? ( dev-libs/libxml2 ) - zlib? ( sys-libs/zlib ) - svga? ( media-libs/svgalib ) - jbig? ( media-libs/jbigkit ) - rle? ( media-libs/urt ) - X? ( x11-libs/libX11 )" -DEPEND="${RDEPEND} - sys-devel/flex - app-arch/xz-utils" - -maint_pkg_create() { - local base="/usr/local/src" - local srcdir="${base}/netpbm/release_number" - if [[ -d ${srcdir} ]] ; then - cd "${T}" || die - - ebegin "Exporting ${srcdir}/${PV} to netpbm-${PV}" - svn export -q ${srcdir}/${PV} netpbm-${PV} - eend $? || return 1 - - ebegin "Creating netpbm-${PV}.tar.lzma" - tar cf - netpbm-${PV} | lzma > netpbm-${PV}.tar.lzma - eend $? - - einfo "Tarball now ready at: ${T}/netpbm-${PV}.tar.lzma" - else - einfo "You need to run:" - einfo " cd ${base}" - einfo " svn co https://netpbm.svn.sourceforge.net/svnroot/netpbm" - die "need svn checkout dir" - fi -} -pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} && ! -e ${DISTDIR}/${P}.tar.lzma ]] && maint_pkg_create ; } - -netpbm_libtype() { - case ${CHOST} in - *-darwin*) echo dylib;; - *) echo unixshared;; - esac -} -netpbm_libsuffix() { - local suffix=$(get_libname) - echo ${suffix//\.} -} -netpbm_ldshlib() { - case ${CHOST} in - *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; - *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; - esac -} -netpbm_config() { - if use $1 ; then - [[ $2 != "!" ]] && echo -l${2:-$1} - else - echo NONE - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/netpbm-10.31-build.patch - epatch "${FILESDIR}"/netpbm-10.48.00-pnmtopng-zlib.patch #291987 - epatch "${FILESDIR}"/${P}-sigpower.patch #310179 - - # avoid ugly depend.mk warnings - touch $(find . -name Makefile | sed s:Makefile:depend.mk:g) - - cat config.mk.in - >> config.mk <<-EOF - # Misc crap - BUILD_FIASCO = N - SYMLINK = ln -sf - - # Toolchain options - CC = $(tc-getCC) -Wall - LD = \$(CC) - CC_FOR_BUILD = $(tc-getBUILD_CC) - LD_FOR_BUILD = \$(CC_FOR_BUILD) - AR = $(tc-getAR) - RANLIB = $(tc-getRANLIB) - - STRIPFLAG = - CFLAGS_SHLIB = -fPIC - - LDRELOC = \$(LD) -r - LDSHLIB = $(netpbm_ldshlib) - LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to - LINKERISCOMPILER = Y - NETPBMLIBSUFFIX = $(netpbm_libsuffix) - NETPBMLIBTYPE = $(netpbm_libtype) - - # Gentoo build options - TIFFLIB = $(netpbm_config tiff) - JPEGLIB = $(netpbm_config jpeg) - PNGLIB = $(netpbm_config png) - ZLIB = $(netpbm_config zlib z) - LINUXSVGALIB = $(netpbm_config svga vga) - XML2_LIBS = $(netpbm_config xml xml2) - JBIGLIB = -ljbig - JBIGHDR_DIR = $(netpbm_config jbig "!") - JASPERLIB = -ljasper - JASPERHDR_DIR = $(netpbm_config jpeg2k "!") - URTLIB = $(netpbm_config rle) - URTHDR_DIR = - X11LIB = $(netpbm_config X X11) - X11HDR_DIR = - EOF - # cannot chain the die with the heredoc above as bash-3 - # has a parser bug in that setup #282902 - [ $? -eq 0 ] || die "writing config.mk failed" -} - -src_compile() { - emake -j1 || die -} - -src_install() { - emake -j1 package pkgdir="${D}"/usr || die "make package failed" - - [[ $(get_libdir) != "lib" ]] && mv "${D}"/usr/lib "${D}"/usr/$(get_libdir) - - # Remove cruft that we don't need, and move around stuff we want - rm -f "${D}"/usr/bin/{doc.url,manweb} || die - rm -r "${D}"/usr/man/web || die - rm -r "${D}"/usr/link || die - rm -f "${D}"/usr/{README,VERSION,config_template,pkginfo} || die - dodir /usr/share - mv "${D}"/usr/man "${D}"/usr/share/ || die - mv "${D}"/usr/misc "${D}"/usr/share/netpbm || die - - dodoc README - cd doc - GLOBIGNORE='*.html:.*' dodoc * - dohtml -r . - - cd "${WORKDIR}"/${PN}-${MAN_VER}-manpages || die - doman *.[0-9] - dodoc README* gen-netpbm-manpages -} diff --git a/media-libs/netpbm/netpbm-10.51.00-r1.ebuild b/media-libs/netpbm/netpbm-10.51.00-r1.ebuild deleted file mode 100644 index d95d4fdb442e..000000000000 --- a/media-libs/netpbm/netpbm-10.51.00-r1.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.51.00-r1.ebuild,v 1.9 2011/10/11 19:44:48 ssuominen Exp $ - -EAPI="3" - -inherit toolchain-funcs eutils multilib - -DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" -HOMEPAGE="http://netpbm.sourceforge.net/" -SRC_URI="mirror://gentoo/${P}.tar.xz - mirror://gentoo/${P}-libpng-1.5.patch.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" -IUSE="jbig jpeg jpeg2k png rle svga tiff X xml zlib" - -RDEPEND="jpeg? ( virtual/jpeg ) - jpeg2k? ( media-libs/jasper ) - tiff? ( >=media-libs/tiff-3.5.5 ) - png? ( >=media-libs/libpng-1.4 ) - xml? ( dev-libs/libxml2 ) - zlib? ( sys-libs/zlib ) - svga? ( media-libs/svgalib ) - jbig? ( media-libs/jbigkit ) - rle? ( media-libs/urt ) - X? ( x11-libs/libX11 )" -DEPEND="${RDEPEND} - sys-devel/flex - app-arch/xz-utils" - -maint_pkg_create() { - local base="/usr/local/src" - local srcdir="${base}/netpbm/release_number" - if [[ -d ${srcdir} ]] ; then - cd "${T}" || die - - ebegin "Exporting ${srcdir}/${PV} to netpbm-${PV}" - svn export -q ${srcdir}/${PV} netpbm-${PV} - eend $? || return 1 - - ebegin "Creating netpbm-${PV}.tar.xz" - tar cf - netpbm-${PV} | xz > netpbm-${PV}.tar.xz - eend $? - - einfo "Tarball now ready at: ${T}/netpbm-${PV}.tar.xz" - else - einfo "You need to run:" - einfo " cd ${base}" - einfo " svn co https://netpbm.svn.sourceforge.net/svnroot/netpbm" - die "need svn checkout dir" - fi -} -pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} && ! -e ${DISTDIR}/${P}.tar.xz ]] && maint_pkg_create ; } - -netpbm_libtype() { - case ${CHOST} in - *-darwin*) echo dylib;; - *) echo unixshared;; - esac -} -netpbm_libsuffix() { - local suffix=$(get_libname) - echo ${suffix//\.} -} -netpbm_ldshlib() { - case ${CHOST} in - *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; - *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; - esac -} -netpbm_config() { - if use $1 ; then - [[ $2 != "!" ]] && echo -l${2:-$1} - else - echo NONE - fi -} - -src_prepare() { - epatch "${FILESDIR}"/netpbm-10.31-build.patch - epatch "${FILESDIR}"/${P}-ppmtompeg-free.patch - epatch "${FILESDIR}"/${P}-pnmconvol-nooffset.patch #338230 - epatch "${WORKDIR}"/${P}-libpng-1.5.patch #355025 - - # make sure we use system urt - sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die - rm -rf urt - - # take care of the importinc stuff ourselves by only doing it once - # at the top level and having all subdirs use that one set #149843 - sed -i \ - -e '/^importinc:/s|^|importinc:\nmanual_|' \ - -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ - common.mk || die - sed -i \ - -e '/%.c/s: importinc$::' \ - common.mk lib/Makefile lib/util/Makefile || die - - # avoid ugly depend.mk warnings - touch $(find . -name Makefile | sed s:Makefile:depend.mk:g) -} - -src_configure() { - cat config.mk.in - >> config.mk <<-EOF - # Misc crap - BUILD_FIASCO = N - SYMLINK = ln -sf - - # Toolchain options - CC = $(tc-getCC) -Wall - LD = \$(CC) - CC_FOR_BUILD = $(tc-getBUILD_CC) - LD_FOR_BUILD = \$(CC_FOR_BUILD) - AR = $(tc-getAR) - RANLIB = $(tc-getRANLIB) - - STRIPFLAG = - CFLAGS_SHLIB = -fPIC - - LDRELOC = \$(LD) -r - LDSHLIB = $(netpbm_ldshlib) - LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to - LINKERISCOMPILER = Y - NETPBMLIBSUFFIX = $(netpbm_libsuffix) - NETPBMLIBTYPE = $(netpbm_libtype) - - # Gentoo build options - TIFFLIB = $(netpbm_config tiff) - JPEGLIB = $(netpbm_config jpeg) - PNGLIB = $(netpbm_config png) - ZLIB = $(netpbm_config zlib z) - LINUXSVGALIB = $(netpbm_config svga vga) - XML2_LIBS = $(netpbm_config xml xml2) - JBIGLIB = -ljbig - JBIGHDR_DIR = $(netpbm_config jbig "!") - JASPERLIB = -ljasper - JASPERHDR_DIR = $(netpbm_config jpeg2k "!") - URTLIB = $(netpbm_config rle) - URTHDR_DIR = - X11LIB = $(netpbm_config X X11) - X11HDR_DIR = - EOF - # cannot chain the die with the heredoc above as bash-3 - # has a parser bug in that setup #282902 - [ $? -eq 0 ] || die "writing config.mk failed" -} - -src_compile() { - emake -j1 pm_config.h version.h manual_importinc || die #149843 - emake || die -} - -src_install() { - # Subdir make targets like to use `mkdir` all over the place - # without any actual dependencies, thus the -j1. - emake -j1 package pkgdir="${D}"/usr || die - - [[ $(get_libdir) != "lib" ]] && mv "${D}"/usr/lib "${D}"/usr/$(get_libdir) - - # Remove cruft that we don't need, and move around stuff we want - rm "${D}"/usr/bin/{doc.url,manweb} || die - rm -r "${D}"/usr/man/web || die - rm -r "${D}"/usr/link || die - rm "${D}"/usr/{README,VERSION,config_template,pkginfo} || die - dodir /usr/share - mv "${D}"/usr/man "${D}"/usr/share/ || die - mv "${D}"/usr/misc "${D}"/usr/share/netpbm || die - - dodoc README - cd doc - dodoc HISTORY Netpbm.programming USERDOC - dohtml -r . -}