Dejavafied

Package-Manager: portage-2.0.51.19

4 files changed, 27 insertions, 53 deletions

diff --git a/media-libs/libpano12/.#panotools-2.7.0.8.ebuild.1.3 b/media-libs/libpano12/.#panotools-2.7.0.8.ebuild.1.3
deleted file mode 100644
index 4fb23a2c37fa..000000000000
--- a/media-libs/libpano12/.#panotools-2.7.0.8.ebuild.1.3
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpano12/.#panotools-2.7.0.8.ebuild.1.3,v 1.1 2005/03/07 12:37:29 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"
-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
-}
diff --git a/media-libs/libpano12/ChangeLog b/media-libs/libpano12/ChangeLog
index 817b80d875ee..87a72c07b7f4 100644
--- a/media-libs/libpano12/ChangeLog
+++ b/media-libs/libpano12/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/panotools
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpano12/ChangeLog,v 1.1 2005/03/07 12:37:29 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpano12/ChangeLog,v 1.2 2005/03/07 12:50:44 lu_zero Exp $
+
+  07 Mar 2005; Luca Barbato <lu_zero@gentoo.org>
+  -.#panotools-2.7.0.8.ebuild.1.3, libpano12-2.7.0.8.ebuild:
+  Made java bindings optional
 
 *libpano12-2.7.0.8 (07 Mar 2005)
 
diff --git a/media-libs/libpano12/Manifest b/media-libs/libpano12/Manifest
index baed0415c278..af962ac5d912 100644
--- a/media-libs/libpano12/Manifest
+++ b/media-libs/libpano12/Manifest
@@ -1,5 +1,5 @@
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 36ba3c7c544f7e915944e150b6abf3d7 ChangeLog 979
-MD5 dd9d2ccf4c23fadc118a8b8d6ade30ab libpano12-2.7.0.8.ebuild 742
+MD5 d2f7311b51c5b24ae5d00c2a0f4642a1 ChangeLog 1120
+MD5 0a3cdaab664659fdf6046781946ebc95 libpano12-2.7.0.8.ebuild 1040
 MD5 896b7fb7c5462f3b2b76e652ab8c6058 files/libpano12-2.7.0.8-dejava.patch 2164
 MD5 825822b85e6626200ea237c1276831ad files/digest-libpano12-2.7.0.8 70
diff --git a/media-libs/libpano12/libpano12-2.7.0.8.ebuild b/media-libs/libpano12/libpano12-2.7.0.8.ebuild
index a138feed5ad1..92e0e95ba76a 100644
--- a/media-libs/libpano12/libpano12-2.7.0.8.ebuild
+++ b/media-libs/libpano12/libpano12-2.7.0.8.ebuild
@@ -1,6 +1,6 @@
 # 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.8.ebuild,v 1.1 2005/03/07 12:37:29 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpano12/libpano12-2.7.0.8.ebuild,v 1.2 2005/03/07 12:50:44 lu_zero Exp $
 
 inherit eutils
 
@@ -9,22 +9,35 @@ HOMEPAGE="http://panotools.sf.net"
 SRC_URI="mirror://sourceforge/panotools/libpano12-${PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
+KEYWORDS="~x86 ~ppc ~ppc-macos"
+IUSE="java"
 DEPEND="media-libs/libpng
 		media-libs/tiff
 		media-libs/jpeg
 		sys-libs/zlib
-		virtual/jdk"
+		java? ( virtual/jdk )"
 
 S="${WORKDIR}/libpano12-${PV}"
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-dejava.patch
+	cd ${S}
+	autoconf
+	libtoolize --force --copy
+}
+
 src_compile() {
-	econf "--with-java=${JAVA_HOME}"
-	emake
+	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
+	make DESTDIR=${D} install || die "Install failed"
 	dodoc README README.linux AUTHORS NEWS doc/*.txt
 }