Bump, bug #235421. Adding myself as maintainer, punt old ebuild.

(Portage version: 2.2_rc8/cvs/Linux 2.6.25.8 i686)

4 files changed, 52 insertions, 37 deletions

diff --git a/media-libs/vigra/ChangeLog b/media-libs/vigra/ChangeLog
index 83a209b78782..0fd937548258 100644
--- a/media-libs/vigra/ChangeLog
+++ b/media-libs/vigra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/vigra
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.16 2008/08/11 18:45:37 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.17 2008/09/11 20:41:49 loki_val Exp $
+
+*vigra-1.6.0 (11 Sep 2008)
+
+  11 Sep 2008; Peter Alfredsen <loki_val@gentoo.org> metadata.xml,
+  -vigra-1.3.2.ebuild, +vigra-1.6.0.ebuild:
+  Bump, bug #235421. Adding myself as maintainer, punt old ebuild.
 
   11 Aug 2008; Friedrich Oslage <bluebird@gentoo.org> vigra-1.5.0-r1.ebuild:
   Add ~sparc keyword, required for openoffice
diff --git a/media-libs/vigra/metadata.xml b/media-libs/vigra/metadata.xml
index fae7d74a9aee..2ab4251a080c 100644
--- a/media-libs/vigra/metadata.xml
+++ b/media-libs/vigra/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
+		<email>loki_val@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/vigra/vigra-1.3.2.ebuild b/media-libs/vigra/vigra-1.3.2.ebuild
deleted file mode 100644
index a7448c4d0b62..000000000000
--- a/media-libs/vigra/vigra-1.3.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.3.2.ebuild,v 1.6 2007/07/12 03:10:24 mr_bones_ Exp $
-
-inherit multilib
-
-DESCRIPTION="Vision with Generic Algorithms"
-HOMEPAGE="http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra"
-SRC_URI="http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${P/-}.tar.gz"
-
-LICENSE="VIGRA"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="sys-devel/gcc
-		media-libs/libpng
-		media-libs/tiff
-		media-libs/jpeg
-		sys-libs/zlib
-		sci-libs/fftw"
-
-S=${WORKDIR}/${P/-}
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr || die "./configure failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} libdir="${D}/usr/$(get_libdir) " prefix=${D}/usr install || die
-}
diff --git a/media-libs/vigra/vigra-1.6.0.ebuild b/media-libs/vigra/vigra-1.6.0.ebuild
new file mode 100644
index 000000000000..307baaf2240b
--- /dev/null
+++ b/media-libs/vigra/vigra-1.6.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.6.0.ebuild,v 1.1 2008/09/11 20:41:49 loki_val Exp $
+
+inherit multilib
+
+DESCRIPTION="C++ computer vision library with emphasize on customizable algorithms and data structures"
+HOMEPAGE="http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/"
+SRC_URI="http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${P/-}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc fftw jpeg png tiff zlib"
+
+RDEPEND="png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+	jpeg? ( media-libs/jpeg )
+	fftw? ( >=sci-libs/fftw-3 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${P/-}"
+
+MY_DOCDIR="usr/share/doc/${PF}"
+
+src_compile() {
+	./configure \
+		--prefix="/usr/" \
+		--docdir="${D}/${MY_DOCDIR}" \
+		$(use_with png) \
+		$(use_with tiff) \
+		$(use_with jpeg) \
+		$(use_with zlib) \
+		$(use_with fftw) \
+	|| die "configure failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake libdir="${D}/usr/$(get_libdir)" prefix="${D}/usr" install || die "emake install failed"
+	use doc || rm -Rf "${D}/${MY_DOCDIR}"
+	dodoc README.txt
+}