Remove overshadowed version of vigra.

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

5 files changed, 20 insertions, 118 deletions

diff --git a/media-libs/vigra/ChangeLog b/media-libs/vigra/ChangeLog
index 2ab0342cf60a..d556bfddeaa5 100644
--- a/media-libs/vigra/ChangeLog
+++ b/media-libs/vigra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/vigra
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.41 2011/10/23 16:10:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.42 2011/10/23 16:18:37 scarabeus Exp $
+
+  23 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> -vigra-1.6.0.ebuild,
+  -files/vigra-1.6.0-gcc44.patch, -files/vigra-1.6.0-ldflags.patch:
+  Remove overshadowed version of vigra.
 
   23 Oct 2011; Raúl Porcel <armin76@gentoo.org> vigra-1.6.0.ebuild:
   Move to ~sparc
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 632fcbb0c40a..ee274595449d 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -8,19 +8,25 @@ AUX 1.7.1-gcc4.6.patch 1296 RMD160 ae867a0c7a38ca256b035eb3473df922fc8d927c SHA1
 AUX 1.7.1-hdf5.patch 1290 RMD160 c9dd4347ce5f289fe0389a0ab1b8f55f102b3d87 SHA1 16d7596331f0a3836e286265377a3907f7cdd9b8 SHA256 ec366d57999b7353fd57c9095c4bf88323639195ba5edd6c67a0ebb7b42a50f0
 AUX 1.7.1-numpy_doc.patch 996 RMD160 a92dadb31c3410bcf5ec29b5edcdfa537e53b98d SHA1 927e95a99f1d156209916b55f049f1c9961af8c8 SHA256 bb764e22b8af92d107e87a36e40e7c287189397adbc8e5de76c69ba3d8aeb555
 AUX 1.7.1-png-1.5.patch 1259 RMD160 782a8a41a8a6bc5433c98ef39a190bfe1eb7d57a SHA1 15370e3151eb84281b35d2bac97054662dc2bab9 SHA256 28e1fa88143bdda03dadde5dfa43e1c86e38e338907e12d0e7cb23d5c6b85c68
-AUX vigra-1.6.0-gcc44.patch 635 RMD160 2d787b30517e501f9eb97f9c83e5b8697f6598c2 SHA1 21600a4fae903e3b34e1c869f01b4de1c1c2bdd3 SHA256 800afef55c0e390f831207c98f047bccd80c3538ad998ff0dc8bc9269e98a277
-AUX vigra-1.6.0-ldflags.patch 543 RMD160 a4ec09c3c4667f67b8b0be48d65fe5ba0e7d3d12 SHA1 3ca172b40f642b0e06fdc00e1f445257dfcfad55 SHA256 d117f57058c569e21a63895a4febd4ed7d1bd5743ee8b2af114d7f6e8b1b6349
 DIST vigra-1.7.1-src.tar.gz 28481160 RMD160 67a27b11f3d844b01fd8f2b0d2fe761099f8170b SHA1 f90f54da31a6544057c25df7dbcc6954604de079 SHA256 4fe9052085330300f8c8564021b67fc2c5d534132ef29e781d839feb5d5c0ec2
-DIST vigra1.6.0.tar.gz 16525605 RMD160 cc9f6626801182a0ee71ec9eb8fa34c38f8777a7 SHA1 9714a0c4efb77726a1140329e98e5db057f9a69f SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f
-EBUILD vigra-1.6.0.ebuild 1791 RMD160 0cf5b010b0cd84c590a7421ac4f7b269f0561115 SHA1 ef0e61606447346ae5e95895e3ae765afa09cf9d SHA256 537b6dd38377c8093e2e847777415b713c2243d3dd3c2e9420417bd4dd47f691
 EBUILD vigra-1.7.1-r1.ebuild 2645 RMD160 aa3195465dd27e0a28e19980fa153d57430a72f9 SHA1 f7dc0a3f787f4eeda962b7160f38b1b98a0806ce SHA256 4cbd8fb290c3222dd50aa26022a461a4e24edb6f195ac79fbc232392a8064a86
 EBUILD vigra-1.7.1.ebuild 2369 RMD160 9e15643e3edec5ea2bdbea0b2c895eeda6673ed3 SHA1 06aba76dd56790502dfe650dba4eebfec9fc30e7 SHA256 1d1b7c569c3de2768c128102ea45d478f6d179065aaf04f5dfe1ebeaff75b80f
-MISC ChangeLog 5684 RMD160 d6c7013c52c1036f005b73db57507b6b6532039e SHA1 b674f547240d11d853758a360cef992813466bc4 SHA256 89761ff1a6c2063ec32ee208f1a8cfcf65e96906cf6c8f08bb64580f6f8b6a87
+MISC ChangeLog 5871 RMD160 7273bc80e55d7022e0954458c04b0ac0ddacc5cf SHA1 55a529be6d40a208f29c6bbad06e74a9074eeb42 SHA256 033e57d6a95fc0f150d66ff129b0a387614db4275958120d5c588cddfd9cdf50
 MISC metadata.xml 187 RMD160 9c8b8edd91cb93979173540d1df3d264539f1f94 SHA1 c1f16177a9daf628b0fe0dcc6f8e694111d2a578 SHA256 6f9a63412850ecb6e6c0d6989f6ebe6dffe84bbb1bf3038cf8a0491b7c819161
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6kPJQACgkQuQc30/atMkDpFgCfVSBRlpE6WoFJvb45mpmDGaEa
-kDQAnA/VWXX4FmRm+ABbeCfya2hP0mXh
-=5sGX
+iQIcBAEBAgAGBQJOpD4OAAoJEOSiRoyO7jvoVYEP/jyJaVgkaXYo6lu1t6IGNJU8
+z117dmxNLbu7bmc9Ahksr0D1EmIxJL1ebO5UpyetFbMgmltbdGhZ73xQo35Ymdh6
+Tjf1KxEklM47eTm8kMJZPH4AInGD4YS1Ojt1YSpGVZAcRiBcH3spNGkV2LP8mGcg
+LeSstn2VVMTBBGhRGLeviFET7hyLSc3sSLbmm5sH9x8QvnJyD/wgqYonZqFWWoMP
+aqv4m8t96bc22Rlo2H5HGw9Ip/uG6gcJdlP/hln5vfxyYl8iXJhtGpLp7UUhfLaj
+NHfLydnYOoiYhPMqntb/C6kCeZ5ctJn4aQ1iv9jHZQoN67cj8ic0fwFlZDOn1k4x
+5NbNaItOgvlMLLToeIzdoGXaFOppkErCjM5f7wCgOfp5IvWEtm0HWu6NZauwu0w+
+fgkwEmnObU/EOpdO9/ChHI/T6+8OEab/Ar+qdODZ48ZkN0r3rd4s0xysXOlpQZWT
+bQhherkIq55JV99/JC+eDDA1/OCfHsK7amMxfWME4NRR6CaMe5EEwq4lrjpdIdlb
+CoxLEDAjprCLz1PfiZYyu9XdadSDYeeZj659qGqXhv13o/RtZ1yNVgsEXQtNNkln
+ARQK0X9/I9TZ2g5nsIyRsDuLUUPOYK/8kOWfNecHzTXJcY7FHC4DY/uqRcZ7xryW
+VBelq/NcIOsvdZLk7J4p
+=fyyA
 -----END PGP SIGNATURE-----
diff --git a/media-libs/vigra/files/vigra-1.6.0-gcc44.patch b/media-libs/vigra/files/vigra-1.6.0-gcc44.patch
deleted file mode 100644
index 72c7fee3fd97..000000000000
--- a/media-libs/vigra/files/vigra-1.6.0-gcc44.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -NrU5 vigra1.6.0.orig/test/convolution/test.cxx vigra1.6.0/test/convolution/test.cxx
---- vigra1.6.0.orig/test/convolution/test.cxx	2009-05-17 14:30:10.674673754 +0200
-+++ vigra1.6.0/test/convolution/test.cxx	2009-05-17 14:31:45.388542661 +0200
-@@ -35,10 +35,11 @@
- /*                                                                      */
- /************************************************************************/
- 
- #include <iostream>
- #include <cmath>
-+#include <cstdio>
- #include "vigra/convolution.hxx"
- #include "unittest.hxx"
- #include "vigra/stdimage.hxx"
- #include "vigra/impex.hxx"
- #include "vigra/combineimages.hxx"
diff --git a/media-libs/vigra/files/vigra-1.6.0-ldflags.patch b/media-libs/vigra/files/vigra-1.6.0-ldflags.patch
deleted file mode 100644
index 20d957d19b88..000000000000
--- a/media-libs/vigra/files/vigra-1.6.0-ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=289922
-
---- config/Makefile.include.in
-+++ config/Makefile.include.in
-@@ -40,9 +40,9 @@
- LIBTOOL = @LIBTOOL@
- LIBCC = $(LIBTOOL) --mode=compile $(CC)
- LIBCXX = $(LIBTOOL) --tag=CXX --mode=compile $(CXX)
--LINKC = $(LIBTOOL) --mode=link $(CC)
--LINKCXX = $(LIBTOOL) --tag=CXX --mode=link $(CXX)
-+LINKC = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
-+LINKCXX = $(LIBTOOL) --tag=CXX --mode=link $(CXX) $(LDFLAGS)
- LINKCLIB = $(LINKC) -rpath $(libdir)
- LINKCXXLIB = $(LINKCXX) -rpath $(libdir)
- INSTALL = @INSTALL@
diff --git a/media-libs/vigra/vigra-1.6.0.ebuild b/media-libs/vigra/vigra-1.6.0.ebuild
deleted file mode 100644
index 884013755d36..000000000000
--- a/media-libs/vigra/vigra-1.6.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2011 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.10 2011/10/23 16:10:54 armin76 Exp $
-
-EAPI=2
-
-inherit eutils 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 ppc64 ~sparc x86"
-IUSE="doc fftw jpeg png tiff zlib test"
-
-RDEPEND="png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	jpeg? ( virtual/jpeg )
-	fftw? ( >=sci-libs/fftw-3 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${P/-}"
-
-MY_DOCDIR="usr/share/doc/${PF}"
-
-pkg_setup() {
-	local flag
-	export usefail=""
-	if use test
-	then
-		for flag in png tiff jpeg fftw
-		do
-			use $flag || usefail="$usefail $flag"
-		done
-
-		if [[ -n "$usefail" ]]
-		then
-			elog "USE=test enabled but the following use-flags are disabled:"
-			elog "${usefail# }"
-			elog "Tests will be skipped, please enable the other use-flags."
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc44.patch"
-	sed -i \
-		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:g' \
-		src/impex/png.cxx || die
-}
-
-src_configure() {
-	./configure \
-		--docdir="${D}/${MY_DOCDIR}" \
-		--prefix=/usr \
-		$(use_with png) \
-		$(use_with tiff) \
-		$(use_with jpeg) \
-		$(use_with zlib) \
-		$(use_with fftw) \
-		|| die "configure failed"
-}
-
-src_test() {
-	if [[ -z "${usefail}" ]]
-	then
-		default
-	fi
-}
-
-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
-}