Remove overshadowed version of vigra.

(Portage version: 2.2.0_alpha70/cvs/Linux x86_64)

4 files changed, 5 insertions, 109 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/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
-}