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

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25.8 i686

5 files changed, 56 insertions, 41 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/Manifest b/media-libs/vigra/Manifest
index 1d33204c3755..96c940ad86d8 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,6 +1,6 @@
-DIST vigra1.3.2.tar.gz 3150473 RMD160 d270dd2467bf056aee056557a652318c26487fc9 SHA1 716b962d6ceae19a4e456df0a1ebc12803081232 SHA256 308d5b9531ae132812978f1fdf4ad0cf88f675b5c10aa1b5b94ba6ca70db325f
 DIST vigra1.5.0.tar.gz 12854465 RMD160 8d8cadc7f20586ec3336d0f6581ddfafc93fff73 SHA1 26fca97f1b3b97d9f4d3b4e775c841894e492143 SHA256 2ac6416bc1da1be8e6c308985566be93d3e210582c2a83a8e2e55077c457d6b6
-EBUILD vigra-1.3.2.ebuild 837 RMD160 bb3dcc5eb3666dfb47a2d04f57e9f87366e64f1c SHA1 e235d6004004028d61a68075f85d05ca1a6441f5 SHA256 6e64e08b911ed52740fd08262db8e1f871380fbe76e690b7feb42380b8da455c
+DIST vigra1.6.0.tar.gz 16525605 RMD160 cc9f6626801182a0ee71ec9eb8fa34c38f8777a7 SHA1 9714a0c4efb77726a1140329e98e5db057f9a69f SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f
 EBUILD vigra-1.5.0-r1.ebuild 1220 RMD160 d7e63171cacb49c54c3b6da2e5700dfb4ff9597b SHA1 8b8d78d759005ab889dc989df17dc125436792d0 SHA256 36caf1b51a27c6eb6727969d89b6c39f063062f4aba04ac0a2c1683ea2fcaad2
-MISC ChangeLog 2056 RMD160 dbedd486b71cbb4e39369672497088fb6e2175c5 SHA1 2fd55fe525450fd7c28cebc719bdab7641b5870b SHA256 cbeff0d0aa095406ed74eb569f38abcfc9f7b160977174f9ddf915553aece1aa
-MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
+EBUILD vigra-1.6.0.ebuild 1220 RMD160 2c3b7a842a9c067c255a0d505884066d8007dd63 SHA1 6d50dd1e534ef47cb176f8180e26e7e1516a5ccc SHA256 e33e22621f206b5a05077f991a3f9f99cfd0fede89f6fa99eb5cee5259a7aaaf
+MISC ChangeLog 2263 RMD160 6287c3df78427afc7c22c84e535751510f1ddcf7 SHA1 41a66f4a29a3ee4f6908c91c06cba3a0f0056b45 SHA256 2749fb9d0b09b2ac76a74c69a4b9da1387c2b54042e25d272d53e4606ca86c4d
+MISC metadata.xml 227 RMD160 4551a81d2a3e6c24cd1b69ac01cdaa0e386928da SHA1 9f924e786861e44c3829474e923490a2edd632b6 SHA256 eaa9fad22834ebdd28bc584d0ccbca855170280655afdccb7c6174de49c95cec
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
+}