[gentoo-commits] gentoo-x86 commit in dev-db/monetdb: ChangeLog metadata.xml monetdb-4.20.0.ebuild monetdb-5.2.0.ebuild monetdb-4.10.2.ebuild monetdb-4.12.0.ebuild

[Fabian Groffen (grobian)]

grobian     07/11/06 10:44:07

  Modified:             ChangeLog metadata.xml
  Added:                monetdb-4.20.0.ebuild monetdb-5.2.0.ebuild
  Removed:              monetdb-4.10.2.ebuild monetdb-4.12.0.ebuild
  Log:
  Backport latest release from Gentoo/Alt:Prefix overlay.  Keep it still masked as it needs to be tested non-prefix first.  Remove old non-compiling cruft.
  (Portage version: 2.1.3.9)

Revision  Changes    Path
1.15                 dev-db/monetdb/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/monetdb/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/monetdb/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/monetdb/ChangeLog?r1=1.14&r2=1.15

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/monetdb/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog	28 Apr 2007 22:07:02 -0000	1.14
+++ ChangeLog	6 Nov 2007 10:44:06 -0000	1.15
@@ -1,6 +1,35 @@
 # ChangeLog for dev-db/monetdb
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/ChangeLog,v 1.14 2007/04/28 22:07:02 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/ChangeLog,v 1.15 2007/11/06 10:44:06 grobian Exp $
+
+*monetdb-5.2.0 (06 Nov 2007)
+
+  06 Nov 2007; Fabian Groffen <grobian@g.o>
+  +files/xquery-0.20.0-bool-undeclared.patch, -files/monetdb.conf-4.8.2,
+  -files/monetdb.init-4.8.2, -files/monetdb-4.8.2-startup.mil,
+  -files/monetdb.JdbcClient-4.10.0,
+  -files/monetdb-4.10.2-gentoo-MapiClient.patch,
+  -files/monetdb-4.10.2-gentoo-conf.patch,
+  -files/monetdb-4.12.0-gentoo-MapiClient.patch,
+  -files/monetdb-4.12.0-gentoo-conf.patch,
+  -files/monetdb-4.12.0-startup.mil, +files/monetdb.conf-5.2.0,
+  +files/monetdb.init-5.2.0, -files/monetdb-start.sh,
+  -files/monetdb-stop.sh, -files/monetdb_config.sh, metadata.xml,
+  -monetdb-4.10.2.ebuild, -monetdb-4.12.0.ebuild, +monetdb-4.20.0.ebuild,
+  +monetdb-5.2.0.ebuild:
+  Backport latest release from Gentoo/Alt:Prefix overlay. Keep it still masked
+  as it needs to be tested non-prefix first.  Remove old non-compiling
+  cruft.
+
+  06 Nov 2007; Fabian Groffen <grobian@g.o> monetdb-5.2.0.ebuild,
+  monetdb-5.2.0.ebuild:
+  Create dbfarm, as upstream doesn't do that for us
+
+*monetdb-4.20.0 (05 Nov 2007)
+
+  05 Nov 2007; Fabian Groffen <fabian@g.o>
+  +files/xquery-0.20.0-bool-undeclared.patch, +monetdb-4.20.0.ebuild:
+  Latest release, completely rewritten ebuilds.  M5/SQL and M4/XQuery
 
   28 Apr 2007; Torsten Veller <tove@g.o> monetdb-4.10.2.ebuild,
   monetdb-4.12.0.ebuild:



1.2                  dev-db/monetdb/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/monetdb/metadata.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/monetdb/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/monetdb/metadata.xml?r1=1.1&r2=1.2

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/monetdb/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml	7 Aug 2005 13:23:17 -0000	1.1
+++ metadata.xml	6 Nov 2007 10:44:06 -0000	1.2
@@ -4,17 +4,13 @@
 	<herd>no-herd</herd>
 	<maintainer>
 		<email>grobian@g.o</email>
-		<name>Fabian Groffen</name>
 	</maintainer>
 	<longdescription>
-		MonetDB is a main-memory database developed at CWI the
+		MonetDB is a main-memory database developed at CWI, the
 		Netherlands.  The main-memory focus of the database has resulted
 		in a column based way of dealing with relational tables.  Due to
 		this unconventional approach, MonetDB can be a very fast
 		database for complex queries, and as such in use (and perfectly
 		suitable) for intensive data-mining tasks.
-		MonetDB 4 supports its own kernel language, MIL, the
-		conventional SQL query language and the relatively new XML
-		querying language, XQuery.
 	</longdescription>
 </pkgmetadata>



1.1                  dev-db/monetdb/monetdb-4.20.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/monetdb/monetdb-4.20.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/monetdb/monetdb-4.20.0.ebuild?rev=1.1&content-type=text/plain

Index: monetdb-4.20.0.ebuild
===================================================================
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/monetdb-4.20.0.ebuild,v 1.1 2007/11/06 10:44:06 grobian Exp $

inherit eutils flag-o-matic

M4_PV=4.20.0
XQ_PV=0.20.0

DESCRIPTION="MonetDB/SQL is a main-memory column-store database"
HOMEPAGE="http://monetdb.cwi.nl/"
SRC_URI="mirror://sourceforge/monetdb/MonetDB4-${M4_PV}.tar.gz
	mirror://sourceforge/monetdb/pathfinder-${XQ_PV}.tar.gz"

LICENSE="MonetDBPL-1.1 PathfinderPL-1.1"
SLOT="4"
KEYWORDS="~amd64 ~x86"
IUSE="java boehmgc"

S=${WORKDIR}

DEPEND="dev-libs/libpcre
	dev-libs/openssl
	sys-libs/readline
	dev-libs/libxml2
	java? ( dev-java/ant >=virtual/jdk-1.5 )
	boehmgc? ( dev-libs/boehm-gc )
	>=dev-db/monetdb-5"
RDEPEND="${DEPEND}"

pkg_preinst() {
	# should already exist, but for completeness here
	enewgroup monetdb
	enewuser monetdb
}

src_unpack() {
	unpack ${A}
	cd "${S}"
	epatch "${FILESDIR}"/xquery-0.20.0-bool-undeclared.patch
}

src_compile() {
	local myconf=
	# Upstream likes to stick things like -O6 and what more in CFLAGS
	myconf="${myconf} --disable-strict --disable-optimize --disable-assert"
	myconf="${myconf} $(use_with java)"
	myconf="${myconf} --without-php"
	myconf="${myconf} $(use_with boehmgc gc)"

	cd "${S}"/MonetDB4-${M4_PV} || die
	econf --with-monetdb="${EPREFIX}" ${myconf} || die
	emake || die "MonetDB4"

	mkdir "${T}"/bin
	cp conf/monetdb4-config "${T}"/bin/monetdb4-config
	chmod 755 "${T}"/bin/monetdb4-config

	append-flags -I"${S}"/MonetDB4-${M4_PV}
	append-flags -I"${S}"/MonetDB4-${M4_PV}/src/monet
	append-ldflags -L"${S}"/MonetDB4-${M4_PV}/src/monet/.libs
	append-flags -I"${S}"/MonetDB4-${M4_PV}/src
	append-ldflags -L"${S}"/MonetDB4-${M4_PV}/src/mapi/.libs
	append-flags -I"${S}"/MonetDB4-${M4_PV}/src/modules/plain
	append-ldflags -L"${S}"/MonetDB4-${M4_PV}/src/modules/plain/.libs
	append-flags -I"${S}"/MonetDB4-${M4_PV}/src/modules/contrib
	append-ldflags -L"${S}"/MonetDB4-${M4_PV}/src/modules/contrib/.libs
	cd "${S}"/pathfinder-${XQ_PV} || die
	econf --with-monetdb="${EPREFIX}" --with-monetdb4="${T}" ${myconf} || die
	emake || die "xquery"
}

src_install() {
	cd "${S}"/MonetDB4-${M4_PV} || die
	emake DESTDIR="${D}" install || die "MonetDB4"

	cd "${S}"/pathfinder-${XQ_PV} || die
	emake DESTDIR="${D}" install || die "xquery"

	# remove windows cruft
	find "${D}" -name "*.bat" | xargs rm -f || die "removing windows stuff"
}



1.1                  dev-db/monetdb/monetdb-5.2.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/monetdb/monetdb-5.2.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/monetdb/monetdb-5.2.0.ebuild?rev=1.1&content-type=text/plain

Index: monetdb-5.2.0.ebuild
===================================================================
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/monetdb-5.2.0.ebuild,v 1.1 2007/11/06 10:44:06 grobian Exp $

inherit flag-o-matic

COMMON_PV=1.20.0
CLIENTS_PV=1.20.0
M5_PV=5.2.0
SQL_PV=2.20.0

DESCRIPTION="MonetDB/SQL is a main-memory column-store database"
HOMEPAGE="http://monetdb.cwi.nl/"
SRC_URI="mirror://sourceforge/monetdb/MonetDB-${COMMON_PV}.tar.gz
	mirror://sourceforge/monetdb/clients-${CLIENTS_PV}.tar.gz
	mirror://sourceforge/monetdb/MonetDB5-${M5_PV}.tar.gz
	mirror://sourceforge/monetdb/sql-${SQL_PV}.tar.gz"

LICENSE="MonetDBPL-1.1"
SLOT="5"
KEYWORDS="~amd64 ~x86"
IUSE="python perl php java"

S=${WORKDIR}

DEPEND="dev-libs/libpcre
	dev-libs/openssl
	sys-libs/readline
	python? ( dev-lang/python )
	perl? ( dev-lang/perl )
	php? ( dev-lang/php )
	java? ( dev-java/ant >=virtual/jdk-1.4 <=virtual/jdk-1.6 )"
RDEPEND="${DEPEND}"

pkg_preinst() {
	enewgroup monetdb
	enewuser monetdb
}

src_compile() {
	local myconf=
	# Upstream likes to stick things like -O6 and what more in CFLAGS
	myconf="${myconf} --disable-strict --disable-optimize --disable-assert"
	# Deal with auto-dependencies
	myconf="${myconf} $(use_with python)"
	myconf="${myconf} $(use_with perl)"
	myconf="${myconf} $(use_with php)"
	myconf="${myconf} $(use_with java)"

	cd "${S}"/MonetDB-${COMMON_PV} || die
	econf ${myconf} || die
	emake || die "common"

	mkdir "${T}"/bin
	cp conf/monetdb-config "${T}"/bin/monetdb-config
	chmod 755 "${T}"/bin/monetdb-config

	append-flags -I"${S}"/MonetDB-${COMMON_PV}/src/common
	append-ldflags -L"${S}"/MonetDB-${COMMON_PV}/src/common/.libs
	cd "${S}"/clients-${CLIENTS_PV} || die
	econf --with-monetdb="${T}" ${myconf} || die
	emake || die "clients"

	append-flags -I"${S}"/MonetDB-${COMMON_PV}/src/gdk
	append-ldflags -L"${S}"/MonetDB-${COMMON_PV}/src/gdk/.libs
	append-flags -I"${S}"/clients-${CLIENTS_PV}/src
	append-ldflags -L"${S}"/clients-${CLIENTS_PV}/src/mapilib/.libs
	cd "${S}"/MonetDB5-${M5_PV} || die
	econf --with-monetdb="${T}" ${myconf} || die
	emake || die "MonetDB5"

	cp conf/monetdb5-config "${T}"/bin/monetdb5-config
	chmod 755 "${T}"/bin/monetdb5-config

	append-flags -I"${S}"/MonetDB5-${M5_PV}
	append-flags -I"${S}"/MonetDB5-${M5_PV}/src/{mal,optimizer,scheduler}
	append-ldflags -L"${S}"/MonetDB5-${M5_PV}/src/{mal,optimizer,scheduler}/.libs
	append-flags -I"${S}"/MonetDB5-${M5_PV}/src/modules/{atoms,kernel,mal}
	append-ldflags -L"${S}"/MonetDB5-${M5_PV}/src/modules/{atoms,kernel,mal}/.libs
	cd "${S}"/sql-${SQL_PV} || die
	econf --with-monetdb="${T}" --with-monetdb5="${T}" ${myconf} || die
	emake || die "sql"
}

src_install() {
	cd "${S}"/MonetDB-${COMMON_PV} || die
	emake DESTDIR="${D}" install || die "common"

	cd "${S}"/clients-${CLIENTS_PV} || die
	emake DESTDIR="${D}" install || die "clients"

	cd "${S}"/MonetDB5-${M5_PV} || die
	# parallel is broken here
	emake -j1 DESTDIR="${D}" install || die "MonetDB5"

	cd "${S}"/sql-${SQL_PV} || die
	emake DESTDIR="${D}" install || die "sql"

	# remove testing framework and compiled tests
	rm -f \
		"${D}/usr/bin/Mapprove.py" \
		"${D}/usr/bin/Mdiff" \
		"${D}/usr/bin/Mfilter.py" \
		"${D}/usr/bin/MkillUsers" \
		"${D}/usr/bin/Mlog" \
		"${D}/usr/bin/Mprofile.py" \
		"${D}/usr/bin/Mtest.py" \
		"${D}/usr/bin/Mtimeout" \
		"${D}/usr/bin/prof.py" \
		"${D}/usr/share/MonetDB/Mprofile-commands.lst" \
		"${D}/usr/MonetDB/subprocess26.py" \
		"${D}/usr/MonetDB/trace.py" \
		"${D}/usr/MonetDB/__init__.py" \
		"${D}/usr/MonetDB/monet_options.py" \
		|| die "removing testing tools"
	rm -Rf \
		"${D}/usr/lib/MonetDB/Tests" \
		"${D}/usr/lib/sql/Tests" \
		"${D}/usr/share/MonetDB/Tests" \
		"${D}/usr/share/sql/Tests" \
		|| die "removing tests"
	# remove windows cruft
	find "${D}" -name "*.bat" | xargs rm -f || die "removing windows stuff"

	newinitd "${FILESDIR}/${PN}.init-5.2.0" monetdb || die "init.d script"
	newconfd "${FILESDIR}/${PN}.conf-5.2.0" monetdb || die "conf.d file"

	# merovingian needs this
	keepdir /var/lib/MonetDB5/dbfarm
}



-- 
gentoo-commits@g.o mailing list