[dev-db/virtuoso-server] Remove 6.1.7 (moved to tree as 6.1.8), bump to 7.1.0. Update to reflect changes to virtuoso.eclass.

Package-Manager: portage-2.2.8-r1

3 files changed, 3 insertions, 90 deletions

diff --git a/dev-db/virtuoso-server/Manifest b/dev-db/virtuoso-server/Manifest
index a7bbe7ebdc6..c7ecc2d5b05 100644
--- a/dev-db/virtuoso-server/Manifest
+++ b/dev-db/virtuoso-server/Manifest
@@ -1,4 +1,2 @@
-DIST VOS-genpatches-6.1.7.tar.bz2 1224 SHA256 005d960017363d7f0c9807da6f706ec991e48d2c479f92798ee7df9003b7848a SHA512 f99429da6fd4c92252d183b6d1b8caae4910ac93d775c120d67c12925a0eb6ef2ce13a77b27944a2203047965431682a392a2731fc1690cb3f223a65823471c5 WHIRLPOOL 985ad05b55c7ebd1859e1233cb0546247b2ceca0f85b0ffc9212cc8393fbdd4c94af05b521beae08f3c11a838f64bc5b802c5f46dade8568de651929595cdf21
-DIST VOS-genpatches-7.0.0.tar.bz2 1224 SHA256 005d960017363d7f0c9807da6f706ec991e48d2c479f92798ee7df9003b7848a SHA512 f99429da6fd4c92252d183b6d1b8caae4910ac93d775c120d67c12925a0eb6ef2ce13a77b27944a2203047965431682a392a2731fc1690cb3f223a65823471c5 WHIRLPOOL 985ad05b55c7ebd1859e1233cb0546247b2ceca0f85b0ffc9212cc8393fbdd4c94af05b521beae08f3c11a838f64bc5b802c5f46dade8568de651929595cdf21
-DIST virtuoso-opensource-6.1.7.tar.gz 116643533 SHA256 c82c1ee90810db5ccd725f7d0d68b42aa6db9a1c8bf6fe2a4dd0ca91a271aa7f SHA512 51dcd299be5d43c0f7de27d1668de0a28cc656b531ea14b61762c5e735d3ae8ec623d616013a1f1cb82c4cd0ecc8e213aeca064e78d95f3e5b435109d9129645 WHIRLPOOL 318f8ae396a433b21e84d91ecfb2c7b8d915e4f5fbaf98812aa8ce693e7ef174f43efe02d71f73f90d55f9cd37fce9acbd425a23894b0f9dfc99d514e09d2286
-DIST virtuoso-opensource-7.0.0.tar.gz 118036277 SHA256 7459ff8cefa42c051dc6790a8d34e31a4a873533314e24e529be90edd56f12fc SHA512 75d945f9a66d33f97337d266bc3ce5c0b859b80b1f362abc4ea23e9f0ffa7b52cf2d11003f9a694835188ea049071a64b4f8c568a7d80613b47ad6e5d848301a WHIRLPOOL 8b889752c44d85f52e336b6b82a7a99f9fc68ccc831aee6082988705b8d52f1be96c46018d1f7b52db04c66698644f5b0e020ec732bedff361a7e82ffd6fb8d6
+DIST VOS-genpatches-7.1.0.tar.bz2 1224 SHA256 005d960017363d7f0c9807da6f706ec991e48d2c479f92798ee7df9003b7848a SHA512 f99429da6fd4c92252d183b6d1b8caae4910ac93d775c120d67c12925a0eb6ef2ce13a77b27944a2203047965431682a392a2731fc1690cb3f223a65823471c5 WHIRLPOOL 985ad05b55c7ebd1859e1233cb0546247b2ceca0f85b0ffc9212cc8393fbdd4c94af05b521beae08f3c11a838f64bc5b802c5f46dade8568de651929595cdf21
+DIST virtuoso-opensource-7.1.0.tar.gz 118144492 SHA256 07105a144ffa01891d1b2f40d4902bf992e8babc283089dde45edcf6c332ad96 SHA512 0a0f0e01f7607a033781404482957f50672fd25b9ffcea33a91f98ff637620f07b994b38ffc71a2b3201e7fbd037f46c84e01d094456a740a014221bf6420ad3 WHIRLPOOL 1dbfc3a29a92bd3e737f45abfe49880c2b87834906949fc1135968af46ebe689040a3b4f0ac317f0600cc1c2be85e9421e28a24c1261d25672c5ce4fcba2b7c7
diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.7.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.7.ebuild
deleted file mode 100644
index a7563d5e1f1..00000000000
--- a/dev-db/virtuoso-server/virtuoso-server-6.1.7.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit virtuoso
-
-DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="kerberos ldap readline"
-
-# Bug 305077
-RESTRICT="test"
-
-# 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-r2:0[minizip]
-	kerberos? ( app-crypt/mit-krb5 )
-	ldap? ( net-nds/openldap )
-	readline? ( sys-libs/readline:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gperf-2.7.2
-	sys-apps/gawk
-	>=sys-devel/bison-2.3
-	>=sys-devel/flex-2.5.33
-	virtual/pkgconfig
-"
-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 )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.1.4-unbundle-minizip.patch"
-)
-
-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
-		--program-transform-name="s/isql/isql-v/"
-	"
-
-	virtuoso_src_configure
-}
-
-src_install() {
-	virtuoso_src_install
-
-	keepdir /var/lib/virtuoso/db
-}
diff --git a/dev-db/virtuoso-server/virtuoso-server-7.0.0.ebuild b/dev-db/virtuoso-server/virtuoso-server-7.1.0.ebuild
index 2b46b6d1244..5b6124b1297 100644
--- a/dev-db/virtuoso-server/virtuoso-server-7.0.0.ebuild
+++ b/dev-db/virtuoso-server/virtuoso-server-7.1.0.ebuild
@@ -80,7 +80,7 @@ src_configure() {
 }
 
 src_install() {
-	virtuoso_src_install
+	default_src_install
 
 	keepdir /var/lib/virtuoso/db
 }