New version

(Portage version: 2.0.51.19)

5 files changed, 146 insertions, 14 deletions

diff --git a/media-libs/libpano12/ChangeLog b/media-libs/libpano12/ChangeLog
index b0642f2376d5..761fe417e3be 100644
--- a/media-libs/libpano12/ChangeLog
+++ b/media-libs/libpano12/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libpano12
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpano12/ChangeLog,v 1.3 2005/03/07 16:02:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpano12/ChangeLog,v 1.4 2005/04/20 16:41:41 lu_zero Exp $
+
+*libpano12-2.7.0.9 (20 Apr 2005)
+
+  20 Apr 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/libpano12-2.7.0.9-dejava.patch, +libpano12-2.7.0.9.ebuild:
+  New version with amd64 fixes
 
   07 Mar 2005; Luca Barbato <lu_zero@gentoo.org>
   -.#panotools-2.7.0.8.ebuild.1.3, libpano12-2.7.0.8.ebuild:
diff --git a/media-libs/libpano12/Manifest b/media-libs/libpano12/Manifest
index ef72007d7bef..afce39e4df87 100644
--- a/media-libs/libpano12/Manifest
+++ b/media-libs/libpano12/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7cd676d0d24d076c25bbaa9467b7626d libpano12-2.7.0.8.ebuild 1040
-MD5 c3fb12f680214d842862d39bb5ca372f ChangeLog 1121
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 825822b85e6626200ea237c1276831ad files/digest-libpano12-2.7.0.8 70
+MD5 7cd676d0d24d076c25bbaa9467b7626d libpano12-2.7.0.9.ebuild 1040
+MD5 cb16679ae5b62bb5d02558c109d51829 ChangeLog 1304
+MD5 7cd676d0d24d076c25bbaa9467b7626d libpano12-2.7.0.8.ebuild 1040
+MD5 4b928dad449372138c5e1e6c6e6ac52f files/digest-libpano12-2.7.0.9 70
 MD5 896b7fb7c5462f3b2b76e652ab8c6058 files/libpano12-2.7.0.8-dejava.patch 2164
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCLHsPI1lqEGTUzyQRAlC4AJ96MYPTZhfD8xHV76UsEai0g6QHSgCeJqR/
-HcqfaLORPOJiPWAPiNp05n4=
-=8zXm
------END PGP SIGNATURE-----
+MD5 825822b85e6626200ea237c1276831ad files/digest-libpano12-2.7.0.8 70
+MD5 17789ccb47f8831dd2716c6bb3d18ee4 files/libpano12-2.7.0.9-dejava.patch 2164
diff --git a/media-libs/libpano12/files/digest-libpano12-2.7.0.9 b/media-libs/libpano12/files/digest-libpano12-2.7.0.9
new file mode 100644
index 000000000000..326bb3275e5b
--- /dev/null
+++ b/media-libs/libpano12/files/digest-libpano12-2.7.0.9
@@ -0,0 +1 @@
+MD5 c6addca95a8a8f9a0088bfac94223e3e libpano12-2.7.0.9.tar.bz2 438230
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
new file mode 100644
index 000000000000..d914e23b8299
--- /dev/null
+++ b/media-libs/libpano12/files/libpano12-2.7.0.9-dejava.patch
@@ -0,0 +1,89 @@
+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 <locale.h>
+@@ -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/libpano12-2.7.0.9.ebuild b/media-libs/libpano12/libpano12-2.7.0.9.ebuild
new file mode 100644
index 000000000000..4d23702c2d7d
--- /dev/null
+++ b/media-libs/libpano12/libpano12-2.7.0.9.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpano12/libpano12-2.7.0.9.ebuild,v 1.1 2005/04/20 16:41:41 lu_zero Exp $
+
+inherit eutils
+
+DESCRIPTION="Helmut Dersch's panorama toolbox library"
+HOMEPAGE="http://panotools.sf.net"
+SRC_URI="mirror://sourceforge/panotools/libpano12-${PV}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~ppc-macos"
+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}
+	epatch ${FILESDIR}/${P}-dejava.patch
+	cd ${S}
+	autoconf
+	libtoolize --force --copy
+}
+
+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
+}