From 95189268f1d94f75eeddc94a13e87d825392648c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marcelo=20G=C3=B3es?= Date: Tue, 3 Apr 2007 00:41:18 +0000 Subject: [PATCH] Remove old ebuild, old unused patches. Package-Manager: portage-2.1.2.2 --- media-libs/libpano12/ChangeLog | 8 +- media-libs/libpano12/Manifest | 28 +----- .../libpano12/files/digest-libpano12-2.8.3 | 3 - .../files/libpano12-2.7.0.8-dejava.patch | 89 ------------------- .../files/libpano12-2.7.0.9-dejava.patch | 89 ------------------- .../libpano12-2.8.3-insertfilename.patch | 50 ----------- media-libs/libpano12/libpano12-2.8.3.ebuild | 41 --------- 7 files changed, 11 insertions(+), 297 deletions(-) delete mode 100644 media-libs/libpano12/files/digest-libpano12-2.8.3 delete mode 100644 media-libs/libpano12/files/libpano12-2.7.0.8-dejava.patch delete mode 100644 media-libs/libpano12/files/libpano12-2.7.0.9-dejava.patch delete mode 100644 media-libs/libpano12/files/libpano12-2.8.3-insertfilename.patch delete mode 100644 media-libs/libpano12/libpano12-2.8.3.ebuild diff --git a/media-libs/libpano12/ChangeLog b/media-libs/libpano12/ChangeLog index fb7adf3aa191..8f5455c65e60 100644 --- a/media-libs/libpano12/ChangeLog +++ b/media-libs/libpano12/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/libpano12 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpano12/ChangeLog,v 1.17 2007/03/24 20:35:09 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpano12/ChangeLog,v 1.18 2007/04/03 00:41:18 vanquirius Exp $ + + 03 Apr 2007; Marcelo Goes + -files/libpano12-2.7.0.8-dejava.patch, + -files/libpano12-2.7.0.9-dejava.patch, + -files/libpano12-2.8.3-insertfilename.patch, -libpano12-2.8.3.ebuild: + Remove old ebuild, old unused patches. 24 Mar 2007; Raúl Porcel libpano12-2.8.4.ebuild: x86 stable wrt bug 172086 diff --git a/media-libs/libpano12/Manifest b/media-libs/libpano12/Manifest index 9a2689f2f33c..b4ec676cff03 100644 --- a/media-libs/libpano12/Manifest +++ b/media-libs/libpano12/Manifest @@ -1,34 +1,17 @@ -AUX libpano12-2.7.0.8-dejava.patch 2164 RMD160 44a68b0659e1e1dd8593c93cb624e67a43bc4780 SHA1 df7970c4ba37af2ea3e675e4aa5fcbcc9eac2ae1 SHA256 873ac7628b6b92a32a77f2b23fb49887f4f6e19d9f3f97b791ece530ac166d6d -MD5 896b7fb7c5462f3b2b76e652ab8c6058 files/libpano12-2.7.0.8-dejava.patch 2164 -RMD160 44a68b0659e1e1dd8593c93cb624e67a43bc4780 files/libpano12-2.7.0.8-dejava.patch 2164 -SHA256 873ac7628b6b92a32a77f2b23fb49887f4f6e19d9f3f97b791ece530ac166d6d files/libpano12-2.7.0.8-dejava.patch 2164 -AUX libpano12-2.7.0.9-dejava.patch 2164 RMD160 5f9a4b8ae223ef62707434e58bce0b4ae2d3f24d SHA1 9aaf7e68ecdf6240dda1869b45db7fc8a0b71882 SHA256 f088f226642e36de11d93f91278b65d7dab61f85b6a124800b8e92d3e1fdf1aa -MD5 17789ccb47f8831dd2716c6bb3d18ee4 files/libpano12-2.7.0.9-dejava.patch 2164 -RMD160 5f9a4b8ae223ef62707434e58bce0b4ae2d3f24d files/libpano12-2.7.0.9-dejava.patch 2164 -SHA256 f088f226642e36de11d93f91278b65d7dab61f85b6a124800b8e92d3e1fdf1aa files/libpano12-2.7.0.9-dejava.patch 2164 -AUX libpano12-2.8.3-insertfilename.patch 1230 RMD160 66537d46141253b592816d0d44525829f24e7b28 SHA1 26649554406467b207465477ebe983ec9696075b SHA256 1957d6d681f4a5780661a374c03b847554b4b2d6bb887c24f29c8da86f69ff64 -MD5 f061abc59941331f9c300a684f8c8fd6 files/libpano12-2.8.3-insertfilename.patch 1230 -RMD160 66537d46141253b592816d0d44525829f24e7b28 files/libpano12-2.8.3-insertfilename.patch 1230 -SHA256 1957d6d681f4a5780661a374c03b847554b4b2d6bb887c24f29c8da86f69ff64 files/libpano12-2.8.3-insertfilename.patch 1230 DIST libpano12-2.7.0.14.tar.bz2 487861 RMD160 504392c66a143c78234348192905265d3aeb9f20 SHA1 e2857f3d8cf8e84333f95afebfe6770dd1fd8e87 SHA256 7786d9513ae3beab0afa47c77915582bd72b45065841bc949a63cedad0f9c4f4 -DIST libpano12-2.8.3.tar.gz 692261 RMD160 ff44cbcecdbea0ad9481f6169a7ef6b80b5c3905 SHA1 aa60c4d21ca815ffbe46b3dd82cb5e8ed931e914 SHA256 faf67329e4b79b919d8893488d083c045f0b508f8a91958a433f81fd1fe02cfd DIST libpano12-2.8.4.tar.gz 1933134 RMD160 91c02941910872b5084be69c798d687270052436 SHA1 90584b1629103344b23d25a729cc35f4b5639228 SHA256 b16e6b0863ad2fbc1f28f7a2072b241eb676213e62b37981674d3a5a837b6967 EBUILD libpano12-2.7.0.14.ebuild 1014 RMD160 e363c64aca06b073272ccb03b7472945564e0b45 SHA1 d1ea2f703b0815f07003acfe4d9c91023290024c SHA256 c0ff1894ae07a1507e16dfb2ac4a385a568c484915c288c4355602a42f89b526 MD5 548992a7e4389f9900c173d8a3995b84 libpano12-2.7.0.14.ebuild 1014 RMD160 e363c64aca06b073272ccb03b7472945564e0b45 libpano12-2.7.0.14.ebuild 1014 SHA256 c0ff1894ae07a1507e16dfb2ac4a385a568c484915c288c4355602a42f89b526 libpano12-2.7.0.14.ebuild 1014 -EBUILD libpano12-2.8.3.ebuild 1020 RMD160 63cd88eb72f442b555dd63129233c8a29adfd029 SHA1 3ac4301d8c100f700329e5da3535a2ea77f1e51a SHA256 a08740f1484d2d8ec9cbbf1c4627e1c675b9390166064c5ff50bbd7c2e283d7a -MD5 2fbe61a159d1bbde0d46f7580719a7bd libpano12-2.8.3.ebuild 1020 -RMD160 63cd88eb72f442b555dd63129233c8a29adfd029 libpano12-2.8.3.ebuild 1020 -SHA256 a08740f1484d2d8ec9cbbf1c4627e1c675b9390166064c5ff50bbd7c2e283d7a libpano12-2.8.3.ebuild 1020 EBUILD libpano12-2.8.4.ebuild 929 RMD160 cf83cc36f9354d41e5d8d9518830eed5631bb2de SHA1 7d2d98fe901c9d398208450fce413331afa3c336 SHA256 57a43703e2ec50b3c7485fc6e004e0d85ab8761c96491dc58545031ff82cc06d MD5 3ca974231b522139c2755e64aaffe251 libpano12-2.8.4.ebuild 929 RMD160 cf83cc36f9354d41e5d8d9518830eed5631bb2de libpano12-2.8.4.ebuild 929 SHA256 57a43703e2ec50b3c7485fc6e004e0d85ab8761c96491dc58545031ff82cc06d libpano12-2.8.4.ebuild 929 -MISC ChangeLog 3059 RMD160 0cde0b585da1d71d2b44f97d582992f8cc05c1e2 SHA1 abfa40895556b80673f4ec36e728e7c90f974773 SHA256 0ec5d36516068ff71af3c4817b396ec0e594c95ed28c871bf8ae9939ead1d48d -MD5 5b9b20272ed797c5125517785579cfc2 ChangeLog 3059 -RMD160 0cde0b585da1d71d2b44f97d582992f8cc05c1e2 ChangeLog 3059 -SHA256 0ec5d36516068ff71af3c4817b396ec0e594c95ed28c871bf8ae9939ead1d48d ChangeLog 3059 +MISC ChangeLog 3310 RMD160 f07d84b0c5d42d76fe23975c7abeeec5e3101b19 SHA1 861c1019317797052a22f4cf6ea26573c71755e7 SHA256 c1470f259aedf8ce81b0b48712130188f2e193a897b8554ee2bbda4844983603 +MD5 e9d0fa826456df40ff7ca19fc875e7f7 ChangeLog 3310 +RMD160 f07d84b0c5d42d76fe23975c7abeeec5e3101b19 ChangeLog 3310 +SHA256 c1470f259aedf8ce81b0b48712130188f2e193a897b8554ee2bbda4844983603 ChangeLog 3310 MISC metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce SHA1 620b205b2cddc55f63199267eeb30e9f4c6a817b SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2 MD5 53f0fc0d071a8326b34f15c530a4de4d metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce metadata.xml 162 @@ -36,9 +19,6 @@ SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2 metadata MD5 e66e4d9720801e54e53a865d1ecc4502 files/digest-libpano12-2.7.0.14 259 RMD160 d52e192c2e8f7a8c7e0dbdfe3e12441df7e9e23a files/digest-libpano12-2.7.0.14 259 SHA256 05bf14352c1ac69b255eaab8b9813d919594cfa62fb562d1ec9540c825b0efdd files/digest-libpano12-2.7.0.14 259 -MD5 99cb31fd6db097672222cb161c9f5ae6 files/digest-libpano12-2.8.3 247 -RMD160 09cd7c150a5669da81af81fe7769a1498786f6f1 files/digest-libpano12-2.8.3 247 -SHA256 61b0c7fce1350e03900c3e3ebf41aca3771738d37878dab00dc6a4d8dd8b8fe5 files/digest-libpano12-2.8.3 247 MD5 8069718e16f226053cf1bd040a32aa77 files/digest-libpano12-2.8.4 250 RMD160 16d839af4e046cac01cc2147a14df4c848dc5c33 files/digest-libpano12-2.8.4 250 SHA256 d11cf7f5e675efee3c6c194d06c888318d6241ba2a48127b37d3f9b42e0fe6bc files/digest-libpano12-2.8.4 250 diff --git a/media-libs/libpano12/files/digest-libpano12-2.8.3 b/media-libs/libpano12/files/digest-libpano12-2.8.3 deleted file mode 100644 index 838c01c987f3..000000000000 --- a/media-libs/libpano12/files/digest-libpano12-2.8.3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 0381f0b7cd88a4c1b8d88cfce6afe6c8 libpano12-2.8.3.tar.gz 692261 -RMD160 ff44cbcecdbea0ad9481f6169a7ef6b80b5c3905 libpano12-2.8.3.tar.gz 692261 -SHA256 faf67329e4b79b919d8893488d083c045f0b508f8a91958a433f81fd1fe02cfd libpano12-2.8.3.tar.gz 692261 diff --git a/media-libs/libpano12/files/libpano12-2.7.0.8-dejava.patch b/media-libs/libpano12/files/libpano12-2.7.0.8-dejava.patch deleted file mode 100644 index cafcce11cd86..000000000000 --- a/media-libs/libpano12/files/libpano12-2.7.0.8-dejava.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -ruN libpano12-2.7.0.8.orig/configure.ac libpano12-2.7.0.8/configure.ac ---- libpano12-2.7.0.8.orig/configure.ac 2004-11-16 09:54:46.000000000 +0100 -+++ libpano12-2.7.0.8/configure.ac 2005-03-07 10:14:01.580403000 +0100 -@@ -54,12 +54,6 @@ - # AC_CHECK_LIB([comdlg32], [main]) - - AX_CHECK_JAVA --if test "x$have_java" != xyes; then -- AC_MSG_ERROR([ -- java must be installed on your system -- but configure could not find it. -- ]) --fi - - AX_CHECK_ZLIB - if test "x$have_zlib" != xyes; then -diff -ruN libpano12-2.7.0.8.orig/pteditor.c libpano12-2.7.0.8/pteditor.c ---- libpano12-2.7.0.8.orig/pteditor.c 2003-12-01 22:50:21.000000000 +0100 -+++ libpano12-2.7.0.8/pteditor.c 2005-03-07 10:57:48.650028000 +0100 -@@ -1,3 +1,5 @@ -+#ifdef HasJava -+ - #include "filter.h" - #include "pteditor.h" - -@@ -346,4 +348,4 @@ - #endif - } - -- -+#endif -diff -ruN libpano12-2.7.0.8.orig/ptpicker.c libpano12-2.7.0.8/ptpicker.c ---- libpano12-2.7.0.8.orig/ptpicker.c 2004-07-20 05:52:06.000000000 +0200 -+++ libpano12-2.7.0.8/ptpicker.c 2005-03-07 10:58:00.042296000 +0100 -@@ -1,3 +1,5 @@ -+#ifdef HasJava -+ - #include "filter.h" - #include "ptutils.h" - #include -@@ -1295,8 +1297,4 @@ - - } - -- -- -- -- -- -+#endif -diff -ruN libpano12-2.7.0.8.orig/sys_ansi.c libpano12-2.7.0.8/sys_ansi.c ---- libpano12-2.7.0.8.orig/sys_ansi.c 2003-12-01 22:10:41.000000000 +0100 -+++ libpano12-2.7.0.8/sys_ansi.c 2005-03-07 11:00:12.940093000 +0100 -@@ -43,13 +43,16 @@ - va_start(ap, fmt); - vsprintf(message, fmt, ap); - va_end(ap); -- -+#ifdef HasJava - if( JavaUI ){ - JPrintError( message ); - }else{ -+#endif - printf("%s\n", message); - fflush(stdout); -+#ifdef HasJava - } -+#endif - } - - -diff -ruN libpano12-2.7.0.8.orig/sys_mac.c libpano12-2.7.0.8/sys_mac.c ---- libpano12-2.7.0.8.orig/sys_mac.c 2003-12-13 11:58:43.000000000 +0100 -+++ libpano12-2.7.0.8/sys_mac.c 2005-03-07 10:59:15.635804000 +0100 -@@ -102,12 +102,12 @@ - va_start(ap, fmt); - vsprintf(message, fmt, ap); - va_end(ap); -- -+#ifdef HasJava - if( JavaUI ){ - JPrintError( message ); - return; - } -- -+#endif - ParamText( (unsigned char*) c2pstr( message ), '\0', '\0', '\0'); - StopAlert( kErrorAlertID, nil); - } diff --git a/media-libs/libpano12/files/libpano12-2.7.0.9-dejava.patch b/media-libs/libpano12/files/libpano12-2.7.0.9-dejava.patch deleted file mode 100644 index d914e23b8299..000000000000 --- a/media-libs/libpano12/files/libpano12-2.7.0.9-dejava.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -ruN libpano12-2.7.0.9.orig/configure.ac libpano12-2.7.0.9/configure.ac ---- libpano12-2.7.0.9.orig/configure.ac 2004-11-16 09:54:46.000000000 +0100 -+++ libpano12-2.7.0.9/configure.ac 2005-03-07 10:14:01.580403000 +0100 -@@ -54,12 +54,6 @@ - # AC_CHECK_LIB([comdlg32], [main]) - - AX_CHECK_JAVA --if test "x$have_java" != xyes; then -- AC_MSG_ERROR([ -- java must be installed on your system -- but configure could not find it. -- ]) --fi - - AX_CHECK_ZLIB - if test "x$have_zlib" != xyes; then -diff -ruN libpano12-2.7.0.9.orig/pteditor.c libpano12-2.7.0.9/pteditor.c ---- libpano12-2.7.0.9.orig/pteditor.c 2003-12-01 22:50:21.000000000 +0100 -+++ libpano12-2.7.0.9/pteditor.c 2005-03-07 10:57:48.650028000 +0100 -@@ -1,3 +1,5 @@ -+#ifdef HasJava -+ - #include "filter.h" - #include "pteditor.h" - -@@ -346,4 +348,4 @@ - #endif - } - -- -+#endif -diff -ruN libpano12-2.7.0.9.orig/ptpicker.c libpano12-2.7.0.9/ptpicker.c ---- libpano12-2.7.0.9.orig/ptpicker.c 2004-07-20 05:52:06.000000000 +0200 -+++ libpano12-2.7.0.9/ptpicker.c 2005-03-07 10:58:00.042296000 +0100 -@@ -1,3 +1,5 @@ -+#ifdef HasJava -+ - #include "filter.h" - #include "ptutils.h" - #include -@@ -1295,8 +1297,4 @@ - - } - -- -- -- -- -- -+#endif -diff -ruN libpano12-2.7.0.9.orig/sys_ansi.c libpano12-2.7.0.9/sys_ansi.c ---- libpano12-2.7.0.9.orig/sys_ansi.c 2003-12-01 22:10:41.000000000 +0100 -+++ libpano12-2.7.0.9/sys_ansi.c 2005-03-07 11:00:12.940093000 +0100 -@@ -43,13 +43,16 @@ - va_start(ap, fmt); - vsprintf(message, fmt, ap); - va_end(ap); -- -+#ifdef HasJava - if( JavaUI ){ - JPrintError( message ); - }else{ -+#endif - printf("%s\n", message); - fflush(stdout); -+#ifdef HasJava - } -+#endif - } - - -diff -ruN libpano12-2.7.0.9.orig/sys_mac.c libpano12-2.7.0.9/sys_mac.c ---- libpano12-2.7.0.9.orig/sys_mac.c 2003-12-13 11:58:43.000000000 +0100 -+++ libpano12-2.7.0.9/sys_mac.c 2005-03-07 10:59:15.635804000 +0100 -@@ -102,12 +102,12 @@ - va_start(ap, fmt); - vsprintf(message, fmt, ap); - va_end(ap); -- -+#ifdef HasJava - if( JavaUI ){ - JPrintError( message ); - return; - } -- -+#endif - ParamText( (unsigned char*) c2pstr( message ), '\0', '\0', '\0'); - StopAlert( kErrorAlertID, nil); - } diff --git a/media-libs/libpano12/files/libpano12-2.8.3-insertfilename.patch b/media-libs/libpano12/files/libpano12-2.8.3-insertfilename.patch deleted file mode 100644 index d0cd1eec42b4..000000000000 --- a/media-libs/libpano12/files/libpano12-2.8.3-insertfilename.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- PTcommon.c 2006/06/04 21:43:30 1.17 -+++ PTcommon.c 2006/06/06 19:55:49 1.18 -@@ -52,6 +52,18 @@ - - int ptQuietFlag = 0; - -+void InsertFileName( fullPath *fp, char *fname ){ -+#ifdef __Mac__ -+ strcpy( (char*)(fp->name), fname ); -+ c2pstr( (char*)(fp->name)); -+#else -+ char *c = strrchr((char*)(fp->name), PATH_SEP); -+ if(c != NULL) c++; -+ else c = fp->name; -+ strcpy( c, fname ); -+#endif -+} -+ - void tiffErrorHandler(const char* module, const char* fmt, va_list ap) - { - PrintError("Error in TIFF file (%s) ", module); ---- ptpicker.c 2005/05/07 15:17:07 1.9 -+++ ptpicker.c 2006/06/06 19:55:49 1.10 -@@ -11,7 +11,6 @@ - int loadProject( fullPath *fspec ); - int writeProject( AlignInfo *g, fullPath *pFile); - int jpathTofullPath( const char* jpath, fullPath *fp ); --void InsertFileName( fullPath *fp, char *fname ); - void BackUp(); - void Restore(); - void SetAlignInfoDefaults( AlignInfo *a); -@@ -975,18 +974,6 @@ - return result; - } - --void InsertFileName( fullPath *fp, char *fname ){ --#ifdef __Mac__ -- strcpy( (char*)(fp->name), fname ); -- c2pstr( (char*)(fp->name)); --#else -- char *c = strrchr((char*)(fp->name), PATH_SEP); -- if(c != NULL) c++; -- else c = fp->name; -- strcpy( c, fname ); --#endif --} -- - void BackUp() - { - int i; diff --git a/media-libs/libpano12/libpano12-2.8.3.ebuild b/media-libs/libpano12/libpano12-2.8.3.ebuild deleted file mode 100644 index f7ed6e9e7691..000000000000 --- a/media-libs/libpano12/libpano12-2.8.3.ebuild +++ /dev/null @@ -1,41 +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/libpano12/libpano12-2.8.3.ebuild,v 1.2 2006/06/07 23:55:32 halcy0n Exp $ - -inherit eutils - -DESCRIPTION="Helmut Dersch's panorama toolbox library" -HOMEPAGE="http://panotools.sf.net" -SRC_URI="mirror://sourceforge/panotools/libpano12-${PV}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86" -IUSE="java" -DEPEND="media-libs/libpng - media-libs/tiff - media-libs/jpeg - sys-libs/zlib - java? ( virtual/jdk )" - -S="${WORKDIR}/libpano12-${PV}" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-insertfilename.patch -} - -src_compile() { - local myconf="" - use java \ - && myconf="--with-java=${JAVA_HOME}" - use java \ - || myconf="--without-java" - econf ${myconf} || die "Configure failed" - emake || die "Build failed" -} - -src_install() { - make DESTDIR="${D}" install || die "Install failed" - dodoc README README.linux AUTHORS NEWS doc/*.txt -} -- 2.26.2