Remove old.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux i686

5 files changed, 10 insertions, 217 deletions

diff --git a/dev-db/virtuoso-odbc/ChangeLog b/dev-db/virtuoso-odbc/ChangeLog
index c41e7f4fbd45..71c0e1a66863 100644
--- a/dev-db/virtuoso-odbc/ChangeLog
+++ b/dev-db/virtuoso-odbc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/virtuoso-odbc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-odbc/ChangeLog,v 1.25 2012/01/13 19:59:12 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-odbc/ChangeLog,v 1.26 2012/04/26 09:28:09 johu Exp $
+
+  26 Apr 2012; Johannes Huber <johu@gentoo.org> -virtuoso-odbc-6.1.2.ebuild:
+  Remove old.
 
   13 Jan 2012; Johannes Huber <johu@gentoo.org> virtuoso-odbc-6.1.4.ebuild:
   Revert x86, wrong version marked stable see bug #375171.
diff --git a/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.2.ebuild b/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.2.ebuild
deleted file mode 100644
index ed007075ee7d..000000000000
--- a/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.2.ebuild,v 1.5 2011/05/01 02:30:28 halcy0n Exp $
-
-EAPI="3"
-
-inherit virtuoso
-
-DESCRIPTION="ODBC driver for OpenLink Virtuoso Open-Source Edition"
-
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="
-	>=dev-libs/openssl-0.9.7i:0
-"
-DEPEND="${RDEPEND}"
-
-VOS_EXTRACT="
-	libsrc/Dk
-	libsrc/Thread
-	libsrc/odbcsdk
-	libsrc/util
-	binsrc/driver
-"
-
-src_configure() {
-	myconf+="
-		$(use_enable static-libs static)
-		--without-iodbc
-	"
-
-	virtuoso_src_configure
-}
-
-src_install() {
-	virtuoso_src_install
-
-	# Remove libtool files
-	if ! use static-libs; then
-		local libdir
-		for libdir in $(get_all_libdirs); do
-			rm -f "${ED}/usr/${libdir}"/*.la || die
-		done
-	fi
-}
diff --git a/dev-db/virtuoso-server/ChangeLog b/dev-db/virtuoso-server/ChangeLog
index 1a8fe4a45f14..87b445708948 100644
--- a/dev-db/virtuoso-server/ChangeLog
+++ b/dev-db/virtuoso-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/virtuoso-server
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/ChangeLog,v 1.29 2011/12/28 18:46:21 halcy0n Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/ChangeLog,v 1.30 2012/04/26 09:25:15 johu Exp $
+
+  26 Apr 2012; Johannes Huber <johu@gentoo.org> -virtuoso-server-6.1.2.ebuild,
+  -virtuoso-server-6.1.3.ebuild:
+  Remove old.
 
   28 Dec 2011; Mark Loeser <halcy0n@gentoo.org>
   virtuoso-server-6.1.3-r2.ebuild:
diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.2.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.2.ebuild
deleted file mode 100644
index 8b55b864e35f..000000000000
--- a/dev-db/virtuoso-server/virtuoso-server-6.1.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/virtuoso-server-6.1.2.ebuild,v 1.7 2011/11/24 00:53:23 reavertm Exp $
-
-EAPI="3"
-
-inherit virtuoso
-
-DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database"
-
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="kerberos ldap readline"
-
-# Bug 305077
-RESTRICT="test"
-
-# Version restriction on sys-libs/zlib, bug #383349
-
-# zeroconf support looks like broken - disabling - last checked around 5.0.12
-# mono support fetches mono source and compiles it manually - disabling for now
-# mono? ( dev-lang/mono )
-COMMON_DEPEND="
-	dev-libs/libxml2:2
-	>=dev-libs/openssl-0.9.7i:0
-	<sys-libs/zlib-1.2.5.1-r1:0
-	kerberos? ( app-crypt/mit-krb5 )
-	ldap? ( net-nds/openldap )
-	readline? ( sys-libs/readline:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	<sys-apps/gawk-4.0.0
-	>=sys-devel/bison-2.3
-	>=sys-devel/flex-2.5.33
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-db/virtuoso-odbc-${PV}:${SLOT}
-"
-
-VOS_EXTRACT="
-	libsrc/Dk
-	libsrc/Thread
-	libsrc/Tidy
-	libsrc/Wi
-	libsrc/Xml.new
-	libsrc/langfunc
-	libsrc/odbcsdk
-	libsrc/plugin
-	libsrc/util
-	binsrc/virtuoso
-	binsrc/tests
-"
-
-DOCS=(AUTHORS ChangeLog CREDITS INSTALL NEWS README)
-
-src_prepare() {
-	sed -e '/^lib_LTLIBRARIES\s*=.*/s/lib_/noinst_/' -i binsrc/virtuoso/Makefile.am \
-		|| die "failed to disable installation of static lib"
-
-	virtuoso_src_prepare
-}
-
-src_configure() {
-	myconf+="
-		$(use_enable kerberos krb)
-		$(use_enable ldap openldap)
-		$(use_with readline)
-		--disable-static
-		--disable-hslookup
-		--disable-rendezvous
-		--without-iodbc
-	"
-
-	virtuoso_src_configure
-}
-
-src_install() {
-	virtuoso_src_install
-
-	# Rename isql executables (conflicts with unixODBC)
-	mv "${ED}/usr/bin/isql" "${ED}/usr/bin/isql-v" || die
-	mv "${ED}/usr/bin/isqlw" "${ED}/usr/bin/isqlw-v" || die
-
-	keepdir /var/lib/virtuoso/db
-}
diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.3.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.3.ebuild
deleted file mode 100644
index 326a74f0e51c..000000000000
--- a/dev-db/virtuoso-server/virtuoso-server-6.1.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/virtuoso-server-6.1.3.ebuild,v 1.6 2011/11/24 00:53:23 reavertm Exp $
-
-EAPI=4
-
-inherit virtuoso
-
-DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database"
-
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="kerberos ldap readline"
-
-# Bug 305077
-#RESTRICT="test"
-
-# Version restriction on sys-libs/zlib, bug #383349
-
-# zeroconf support looks like broken - disabling - last checked around 5.0.12
-# mono support fetches mono source and compiles it manually - disabling for now
-# mono? ( dev-lang/mono )
-COMMON_DEPEND="
-	dev-libs/libxml2:2
-	>=dev-libs/openssl-0.9.7i:0
-	<sys-libs/zlib-1.2.5.1-r1:0
-	kerberos? ( app-crypt/mit-krb5 )
-	ldap? ( net-nds/openldap )
-	readline? ( sys-libs/readline:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	<sys-apps/gawk-4.0.0
-	>=sys-devel/bison-2.3
-	>=sys-devel/flex-2.5.33
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-db/virtuoso-odbc-${PV}:${SLOT}
-"
-
-VOS_EXTRACT="
-	libsrc/Dk
-	libsrc/Thread
-	libsrc/Tidy
-	libsrc/Wi
-	libsrc/Xml.new
-	libsrc/langfunc
-	libsrc/odbcsdk
-	libsrc/plugin
-	libsrc/util
-	binsrc/virtuoso
-	binsrc/tests
-"
-
-DOCS=(AUTHORS ChangeLog CREDITS INSTALL NEWS README)
-
-src_prepare() {
-	sed -e '/^lib_LTLIBRARIES\s*=.*/s/lib_/noinst_/' -i binsrc/virtuoso/Makefile.am \
-		|| die "failed to disable installation of static lib"
-
-	virtuoso_src_prepare
-}
-
-src_configure() {
-	myconf+="
-		$(use_enable kerberos krb)
-		$(use_enable ldap openldap)
-		$(use_with readline)
-		--disable-static
-		--disable-hslookup
-		--disable-rendezvous
-		--without-iodbc
-	"
-
-	virtuoso_src_configure
-}
-
-src_install() {
-	virtuoso_src_install
-
-	# Rename isql executables (conflicts with unixODBC)
-	mv "${ED}/usr/bin/isql" "${ED}/usr/bin/isql-v" || die
-	mv "${ED}/usr/bin/isqlw" "${ED}/usr/bin/isqlw-v" || die
-
-	keepdir /var/lib/virtuoso/db
-}