summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorMaciej Mrozowski (reavertm) <reavertm@poczta.fm>2009-02-26 22:35:48 +0100
committerMaciej Mrozowski (reavertm) <reavertm@poczta.fm>2009-02-26 22:35:48 +0100
commitd4e478254f9305f21afb1b53c7d84057ec6b42e8 (patch)
tree6d62315b50b519f5771f4a15a357feb0db05be18 /dev-db
parent5edb1050c00c743e4cb4b3769acb4984912bc11b (diff)
downloadkde-d4e478254f9305f21afb1b53c7d84057ec6b42e8.tar.gz
kde-d4e478254f9305f21afb1b53c7d84057ec6b42e8.tar.bz2
kde-d4e478254f9305f21afb1b53c7d84057ec6b42e8.zip
virtuoso - deps adjusted, using eautoreconf (so that we have recent libtool and aclocal
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/virtuoso/ChangeLog5
-rw-r--r--dev-db/virtuoso/Manifest4
-rw-r--r--dev-db/virtuoso/virtuoso-5.0.10.ebuild28
3 files changed, 25 insertions, 12 deletions
diff --git a/dev-db/virtuoso/ChangeLog b/dev-db/virtuoso/ChangeLog
index 4d1f38ca193..6f2a9fd8906 100644
--- a/dev-db/virtuoso/ChangeLog
+++ b/dev-db/virtuoso/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 26 Feb 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+ virtuoso-5.0.10.ebuild:
+ virtuoso - deps adjusted, using eautoreconf (so that we have recent
+ libtool and aclocal)
+
*virtuoso-5.0.10 (26 Feb 2009)
26 Feb 2009; <wired@gentoo.org> +metadata.xml, +virtuoso-5.0.10.ebuild:
diff --git a/dev-db/virtuoso/Manifest b/dev-db/virtuoso/Manifest
index fa935accb10..b4c410516f6 100644
--- a/dev-db/virtuoso/Manifest
+++ b/dev-db/virtuoso/Manifest
@@ -1,4 +1,4 @@
DIST virtuoso-opensource-5.0.10.tar.gz 59714802 RMD160 c91a516f67ea9f62545c60741b87616e445afa76 SHA1 e6756fdac5262b7a81ee74083c9b47eda9795dab SHA256 aacf68af4936e776cb241529b905489e46ddd0d9354983303d1b316701e44eb9
-EBUILD virtuoso-5.0.10.ebuild 2279 RMD160 0e3078f3463a53763d4a51f27139c42ce0675742 SHA1 847a9b9ef876a89dbe9bb08b8d80f357526c50a7 SHA256 53b4f2ac6563de428f0f15cbeec232698101869061b27fcb7cbf9f00a071b368
-MISC ChangeLog 473 RMD160 626336a5fa0ece3eceda527e9bf0450ddb341aea SHA1 3ca30e7c3e60e5b5f57d3fde464ae81ff1fdc284 SHA256 da9c9fccd7f25efa3c3d603ecbdd69ae3d0e0d1de2f2af970983881a3eac4fba
+EBUILD virtuoso-5.0.10.ebuild 2409 RMD160 62d3c3822cb418921b9ba0ab2611053239b8ac2a SHA1 fbbe0d26ac87d1c48950ebd8129ab81c28d070cc SHA256 bfb36940bd61fa7f1b24f8abc203d8c8334ad41204ffba348053ecfea1f3e008
+MISC ChangeLog 657 RMD160 b280bafbee608a6e486fe2ec3fe0bad73e6f23d7 SHA1 12acf431719ecaead753b286267e4684c0b0e374 SHA256 10e9b407f56872ef62be9a40c9d37997d475d04ed094524974e038542e2eb608
MISC metadata.xml 1121 RMD160 dd8d25abb0bf108b92e4a08524daeb2d2c1d70df SHA1 218dc3130a2ace228212454302ea1f6006e18d88 SHA256 7a0e6dbfa485159965fa3827fa24aeb11266310600db6563da37bb1811875ddd
diff --git a/dev-db/virtuoso/virtuoso-5.0.10.ebuild b/dev-db/virtuoso/virtuoso-5.0.10.ebuild
index 42cf2d28eb8..e65df360464 100644
--- a/dev-db/virtuoso/virtuoso-5.0.10.ebuild
+++ b/dev-db/virtuoso/virtuoso-5.0.10.ebuild
@@ -2,9 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="1"
+EAPI="2"
-inherit base eutils flag-o-matic java-pkg-opt-2 multilib
+inherit base autotools flag-o-matic java-pkg-opt-2 multilib
DESCRIPTION="Virtuoso is a high-performance object-relational SQL database"
HOMEPAGE="http://virtuoso.openlinksw.com/wiki/main/Main/"
@@ -18,12 +18,11 @@ wbxml"
DOCS="AUTHORS ChangeLog CREDITS INSTALL NEWS README"
-# zeroconf support looks like broken - disabled
-RDEPEND="
+# zeroconf support looks like broken - disabling
+COMMON_DEPEND="
dev-libs/libxml2
>=dev-libs/openssl-0.9.7i
imagemagick? ( media-gfx/imagemagick )
- java? ( virtual/jdk:1.6 )
kerberos? ( app-crypt/mit-krb5 )
ldap? ( net-nds/openldap )
mono? ( dev-lang/mono )
@@ -34,18 +33,30 @@ RDEPEND="
ruby? ( dev-lang/ruby )
wbxml? ( dev-libs/libwbxml )
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
>=sys-devel/bison-2.3
>=sys-devel/flex-2.5.33
+ java? ( virtual/jdk:1.6 )
+"
+RDEPEND="${COMMON_DEPEND}
+ java? ( virtual/jre:1.6 )
"
S="${WORKDIR}/virtuoso-opensource-${PV}"
-src_compile() {
+src_prepare() {
+ base_src_prepare
+ eautoreconf
+}
+
+src_configure() {
use amd64 && append-flags "-m64"
local myconf=""
+ # workaround random build failures
+ MAKEOPTS="${MAKEOPTS} -j1"
+
use java && myconf="--with-jdk4=$(java-config-2 -O)"
econf \
@@ -67,9 +78,6 @@ src_compile() {
--disable-hslookup \
${myconf} \
|| die "configure failed"
-
- # -j1: avoid weird random flex errors
- emake -j1 || die
}
src_install() {