Remove not needed mirror statement, drop not anymore used patches with permission by gengor

(Portage version: 2.2_rc31/cvs/Linux x86_64)

5 files changed, 10 insertions, 38 deletions

diff --git a/dev-libs/xapian/ChangeLog b/dev-libs/xapian/ChangeLog
index 4ac88447f5ee..6d0687e87f42 100644
--- a/dev-libs/xapian/ChangeLog
+++ b/dev-libs/xapian/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/xapian
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.31 2009/05/01 19:25:00 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.32 2009/05/01 20:33:44 tommy Exp $
+
+  01 May 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -files/xapian-0.9.2-config.patch, -files/xapian-0.9.3-config.patch,
+  xapian-1.0.10.ebuild, xapian-1.0.12.ebuild:
+  Remove not needed mirror statement, drop not anymore used patches
 
 *xapian-1.0.12 (01 May 2009)
 
diff --git a/dev-libs/xapian/files/xapian-0.9.2-config.patch b/dev-libs/xapian/files/xapian-0.9.2-config.patch
deleted file mode 100644
index 2cb181a34c85..000000000000
--- a/dev-libs/xapian/files/xapian-0.9.2-config.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- xapian-config.in.orig
-+++ xapian-config.in
-@@ -132,6 +132,14 @@
- 	test /usr/lib != "$libdir" && L="-L$libdir "
- 	D=
- 	eval `grep ^dependency_libs= "$libdir/libxapian.la"`
-+	# Replace "/path/to/libfoo.la" with "-L/path/to -lfoo" which doesn't
-+	# take into account any dependency_libs which libfoo.la may pull in
-+	# but the only .la that we're likely to see is libstdc++.la and it'll
-+	# hopefully work there as any dependency libs will probably be pulled
-+	# in by the compiler for us.  Recursively pulling in dependency_libs
-+	# is probably too hard to do in sh - we'd need to reimplement
-+	# xapian-config in C or C++.
-+	dependency_libs=`echo " $dependency_libs "|sed 's![     ][      ]*!  !g;s! \(/[^ ]*\)/lib\([^ ]*\).la ! -L\1 -l\2 !g;s!  ! !g;s!^ !!;s! $!!'`
- 	test -n "$dependency_libs" && D=" $dependency_libs"
- 	echo "$F$L-lxapian$D"
- 	;;
diff --git a/dev-libs/xapian/files/xapian-0.9.3-config.patch b/dev-libs/xapian/files/xapian-0.9.3-config.patch
deleted file mode 100644
index 2e81e0f5ef11..000000000000
--- a/dev-libs/xapian/files/xapian-0.9.3-config.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- xapian-core-0.9.3/xapian-config.in.orig	2006-02-18 13:21:33.000000000 +1100
-+++ xapian-core-0.9.3/xapian-config.in	2006-02-18 13:22:16.000000000 +1100
-@@ -18,6 +18,11 @@
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
- # USA
- 
-+# ${prefix} and ${exec_prefix} are used in some @-substitutions, and
-+# ${prefix} is usually used in the exec_prefix @-substitution.
-+prefix="@prefix@"
-+exec_prefix="@exec_prefix@"
-+
- # Show usage information and exit with the specified exit status.
- show_usage() {
-     cat <<EOF
diff --git a/dev-libs/xapian/xapian-1.0.10.ebuild b/dev-libs/xapian/xapian-1.0.10.ebuild
index 8bb6828878b3..340ea8052837 100644
--- a/dev-libs/xapian/xapian-1.0.10.ebuild
+++ b/dev-libs/xapian/xapian-1.0.10.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.0.10.ebuild,v 1.2 2009/05/01 19:25:00 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.0.10.ebuild,v 1.3 2009/05/01 20:33:44 tommy Exp $
 
 MY_P="${PN}-core-${PV}"
 
 DESCRIPTION="Xapian Probabilistic Information Retrieval library"
 HOMEPAGE="http://www.xapian.org/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz
-	http://www.oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.gz"
+SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/dev-libs/xapian/xapian-1.0.12.ebuild b/dev-libs/xapian/xapian-1.0.12.ebuild
index c12d2bb91558..6e7fb5e9b903 100644
--- a/dev-libs/xapian/xapian-1.0.12.ebuild
+++ b/dev-libs/xapian/xapian-1.0.12.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.0.12.ebuild,v 1.1 2009/05/01 19:25:00 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.0.12.ebuild,v 1.2 2009/05/01 20:33:44 tommy Exp $
 
 MY_P="${PN}-core-${PV}"
 
 DESCRIPTION="Xapian Probabilistic Information Retrieval library"
 HOMEPAGE="http://www.xapian.org/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz
-	http://www.oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.gz"
+SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"