[gentoo-commits] proj/kde:master commit in: dev-db/virtuoso-jdbc/files/, dev-db/virtuoso-jdbc/

[gentoo-commits] proj/kde:master commit in: dev-db/virtuoso-jdbc/files/, dev-db/virtuoso-jdbc/

[Chris Reffett]

commit:     1322e8860b9fe4f0013436b5a34e598ecbd68473
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 26 00:42:07 2013 +0000
Commit:     Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Fri Apr 26 00:42:07 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1322e886

[dev-db/virtuoso-jdbc] Add patch for automake-1.13 build wrt bug 466954

Package-Manager: portage-2.2.0_alpha173

---
 .../virtuoso-jdbc-6.1.6-am_config_header.patch     |   12 ++++++++++++
 dev-db/virtuoso-jdbc/virtuoso-jdbc-6.1.6.ebuild    |    2 ++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/dev-db/virtuoso-jdbc/files/virtuoso-jdbc-6.1.6-am_config_header.patch b/dev-db/virtuoso-jdbc/files/virtuoso-jdbc-6.1.6-am_config_header.patch
new file mode 100644
index 0000000..5f84b49
--- /dev/null
+++ b/dev-db/virtuoso-jdbc/files/virtuoso-jdbc-6.1.6-am_config_header.patch
@@ -0,0 +1,12 @@
++++ a/configure.in
+--- b/configure.in
+@@ -36,7 +36,7 @@ 
+ AC_INIT([Virtuoso Open Source Edition],
+ AC_CONFIG_SRCDIR([libsrc/Dk.h])
+ AC_CONFIG_AUX_DIR([binsrc/config])
+ AC_CONFIG_MACRO_DIR([binsrc/config])
+-AM_CONFIG_HEADER([libsrc/Dk/config.h])
++AC_CONFIG_HEADER([libsrc/Dk/config.h])
+ 
+ dnl
+ dnl You may need to change the next macro for older versions of automake: 

diff --git a/dev-db/virtuoso-jdbc/virtuoso-jdbc-6.1.6.ebuild b/dev-db/virtuoso-jdbc/virtuoso-jdbc-6.1.6.ebuild
index 715f850..57fbd72 100644
--- a/dev-db/virtuoso-jdbc/virtuoso-jdbc-6.1.6.ebuild
+++ b/dev-db/virtuoso-jdbc/virtuoso-jdbc-6.1.6.ebuild
@@ -22,6 +22,8 @@ VOS_EXTRACT="
 	libsrc/JDBCDriverType4
 "
 
+PATCHES=( "${FILESDIR}/${PN}-6.1.6-am_config_header.patch" )
+
 pkg_pretend() {
 	java-pkg_ensure-vm-version-eq 1.6
 }

[gentoo-commits] proj/kde:master commit in: dev-db/virtuoso-jdbc/files/, dev-db/virtuoso-jdbc/

[Chris Reffett]

commit:     4fcd1d7024daa679de4ea65e0394defaf536a8e9
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 25 21:42:22 2013 +0000
Commit:     Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Sun Aug 25 21:42:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4fcd1d70

[dev-db/virtuoso-jdbc] Bump to 1.6.7 for testing

Package-Manager: portage-2.2.0

---
 .../virtuoso-jdbc-6.1.6-am_config_header.patch     | 12 -------
 dev-db/virtuoso-jdbc/virtuoso-jdbc-6.1.7.ebuild    | 42 ++++++++++++++++++++++
 2 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/dev-db/virtuoso-jdbc/files/virtuoso-jdbc-6.1.6-am_config_header.patch b/dev-db/virtuoso-jdbc/files/virtuoso-jdbc-6.1.6-am_config_header.patch
deleted file mode 100644
index 5f84b49..0000000
--- a/dev-db/virtuoso-jdbc/files/virtuoso-jdbc-6.1.6-am_config_header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-+++ a/configure.in
---- b/configure.in
-@@ -36,7 +36,7 @@ 
- AC_INIT([Virtuoso Open Source Edition],
- AC_CONFIG_SRCDIR([libsrc/Dk.h])
- AC_CONFIG_AUX_DIR([binsrc/config])
- AC_CONFIG_MACRO_DIR([binsrc/config])
--AM_CONFIG_HEADER([libsrc/Dk/config.h])
-+AC_CONFIG_HEADER([libsrc/Dk/config.h])
- 
- dnl
- dnl You may need to change the next macro for older versions of automake: 

diff --git a/dev-db/virtuoso-jdbc/virtuoso-jdbc-6.1.7.ebuild b/dev-db/virtuoso-jdbc/virtuoso-jdbc-6.1.7.ebuild
new file mode 100644
index 0000000..9caae98
--- /dev/null
+++ b/dev-db/virtuoso-jdbc/virtuoso-jdbc-6.1.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit virtuoso java-pkg-2
+
+DESCRIPTION="JDBC driver for OpenLink Virtuoso Open-Source Edition"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+#Force 1.7 until we decide on how to handle multiple versions at once
+DEPEND="
+	>=virtual/jdk-1.7.0
+"
+RDEPEND="
+	>=virtual/jre-1.7.0
+"
+
+VOS_EXTRACT="
+	libsrc/JDBCDriverType4
+"
+
+pkg_pretend() {
+	java-pkg_ensure-vm-version-eq 1.7
+}
+src_prepare() {
+	java-pkg-2_src_prepare
+	virtuoso_src_prepare
+}
+
+src_configure() {
+	myconf+="
+		--with-jdk4_1=$(java-config-2 -O)
+	"
+
+	MAKEOPTS=-j1
+
+	virtuoso_src_configure
+}