Bump, fixes #278205

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

3 files changed, 353 insertions, 2 deletions

diff --git a/dev-util/gambas/ChangeLog b/dev-util/gambas/ChangeLog
index 2025ae9096e8..a9a3406c9d0f 100644
--- a/dev-util/gambas/ChangeLog
+++ b/dev-util/gambas/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/gambas
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gambas/ChangeLog,v 1.57 2009/09/06 17:27:34 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gambas/ChangeLog,v 1.58 2009/10/23 00:50:53 patrick Exp $
+
+*gambas-2.16.0 (23 Oct 2009)
+
+  23 Oct 2009; Patrick Lauer <patrick@gentoo.org> +gambas-2.16.0.ebuild:
+  Bump, fixes #278205
 
   06 Sep 2009; Christian Ruppert <idl0r@gentoo.org>
   -files/gambas-2.5.0-mimetype-registration.patch,
diff --git a/dev-util/gambas/Manifest b/dev-util/gambas/Manifest
index d9ea59d6670c..c15e72f3d4cd 100644
--- a/dev-util/gambas/Manifest
+++ b/dev-util/gambas/Manifest
@@ -9,6 +9,8 @@ AUX gambas-2.9.0-help_Makefile.am.patch 976 RMD160 201a33d53059b27ec9cd4f3d69fce
 AUX gambas-2.9.0-main_Makefile.am.patch 1244 RMD160 885ed8f6aa10d1ba74476c091893eafdc28af54a SHA1 ded1378bbdb697a13a846357c4b3d4ecf0015553 SHA256 dfee7b37cde0e9a829fd01f8201c6b7aa3f14962c0a01784f82012ea7f541e54
 AUX svn-r1636-xdg-utils.patch 1037 RMD160 f08399b653c59317467804a0082e618b0c673a6e SHA1 fbee2e3202a168dc3fa3642e5bf77cfa7792ea73 SHA256 e8f5f03d5122fed388c9379b6a5edd49dbafb4d8e6025ac95db64fab9668a268
 DIST gambas2-2.11.1.tar.bz2 12739013 RMD160 5c7f43d6252516e2a9aaa2341a2e1f0699b73bdc SHA1 843beb9e7a8491132500a2709e46b6761b97bef5 SHA256 c40f4c49ed7af5689c66077e4dc3e34f3627cfb99e7ae64f7bbc39162fc2ecd5
+DIST gambas2-2.16.0.tar.bz2 13546282 RMD160 b9d52c50fe5de7e105ad27cf47532f900603fbdb SHA1 e19bb06ede9601cf2d62df45eb9914f173435ce6 SHA256 513d6faf0c176fc4c136e0210b44bb918bcdfb4ab9c5583d19b5a5d9f3d7563b
 EBUILD gambas-2.11.1.ebuild 10148 RMD160 a1564c2cf177f749268287d8a2e0579fc9975af2 SHA1 5b0ddc3398acc0ec3342b18a5e80c691dbfe6cfa SHA256 a8afff3bfdf28e08a360365faccb5badfa29332934a5aa757ca1dff42fee5955
-MISC ChangeLog 11606 RMD160 b99270db58eb3fe6d289c7e421c7b1a501620414 SHA1 2107f172a725dca5f03750caee1ccb86fad95d58 SHA256 8b77da53487cedb5f0621d44cbfd983a252c73c7c8160db749b7b940c7f2a55f
+EBUILD gambas-2.16.0.ebuild 10120 RMD160 6a8cfe45507b630f2e8f7aec08ada81696864e01 SHA1 aba9353cf1ee608093c39c07f369cfae201877b1 SHA256 ea76ae8a2cf88b0bdd92ed92061cfc38e4aba3aec33dd4cc393ffd5a228381d5
+MISC ChangeLog 11734 RMD160 8cab2b1d7ebcf8f5b6feaac38393649ea9127c4d SHA1 1a6ed72e4adaae7e0f63b7cb80f4a8f1f264e248 SHA256 781ea0941cfee1e3203edbdfc22b3e280801ab8ee9b28e3d5450418afec14b6a
 MISC metadata.xml 387 RMD160 853bcfba2413158ab1e8e1067b04b85fdf80745d SHA1 107b0ee68139f955029d12ac7c6101ab52d9ffce SHA256 704a6b0d9e9b4e814b76161d11bb1669d85493e6a358537fd1f1c7682e440998
diff --git a/dev-util/gambas/gambas-2.16.0.ebuild b/dev-util/gambas/gambas-2.16.0.ebuild
new file mode 100644
index 000000000000..1adae2ccd296
--- /dev/null
+++ b/dev-util/gambas/gambas-2.16.0.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gambas/gambas-2.16.0.ebuild,v 1.1 2009/10/23 00:50:53 patrick Exp $
+
+EAPI="2"
+
+inherit autotools eutils fdo-mime qt3 multilib toolchain-funcs
+
+DESCRIPTION="Gambas is a free development environment based on a Basic interpreter with object extensions"
+HOMEPAGE="http://gambas.sourceforge.net/"
+
+SLOT="2"
+MY_PN="${PN}${SLOT}"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="
+	bzip2 corba curl debug doc examples firebird gtk kde mysql odbc opengl pcre
+	pdf postgres qt3 sdl smtp sqlite sqlite3 svg v4l xml zlib
+"
+
+COMMON_DEPEND="
+	bzip2?	( >=app-arch/bzip2-1.0.5 )
+	corba?	( >=net-misc/omniORB-4.1.0 )
+	curl?	( >=net-misc/curl-7.15.5-r1 )
+	firebird?	( >=dev-libs/ibpp-2.5.3.1 )
+	gtk?	(
+		>=x11-libs/gtk+-2.10.14
+		svg?	( >=gnome-base/librsvg-2.16.1-r2 )
+	)
+	mysql?	( >=virtual/mysql-5.0 )
+	odbc?	( >=dev-db/unixODBC-2.2.12 )
+	opengl?	( >=media-libs/mesa-7.0.2 )
+	pcre?	( >=dev-libs/libpcre-7.6-r1 )
+	pdf?	( >=virtual/poppler-0.5.3 )
+	postgres?	( >=virtual/postgresql-base-8.2 )
+	qt3?	(
+		>=x11-libs/qt-3.2:3
+		kde?	( >=kde-base/kdelibs-3.5.9-r1:3.5 )
+	)
+	sdl?	(
+		>=media-libs/sdl-image-1.2.6-r1
+		>=media-libs/sdl-mixer-1.2.7
+	)
+	smtp?	( >=dev-libs/glib-2.16.2 )
+	sqlite?	( =dev-db/sqlite-2* )
+	sqlite3?	( >=dev-db/sqlite-3.5.6 )
+	v4l?	(
+		>=media-libs/libpng-1.2.26
+		>=media-libs/jpeg-6b-r8
+	)
+	xml?	(
+		>=dev-libs/libxml2-2.6.31
+		>=dev-libs/libxslt-1.1.22
+	)
+	zlib?	( >=sys-libs/zlib-1.2.3-r1 )
+	virtual/libffi
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	# ImageProvider implementers, see .component files for more info
+	if ! { use qt3 || use gtk || use sdl; } ; then
+		use pdf && die "PDF support depends on Qt, GTK or SDL being enabled"
+		use v4l && die "V4L support depends on Qt, GTK or SDL being enabled"
+	fi
+
+	# OpenGLViewer implementers, see .component files for more info
+	if ! { use qt3 || use sdl; } ; then
+		use opengl && die "OpenGL support depends on Qt or SDL being enabled"
+	fi
+
+	if ! use gtk; then
+		use svg && die "SVG support depends on GTK being enabled"
+	fi
+
+	if ! use qt3; then
+		use kde && die "KDE support depends on Qt being enabled"
+
+		einfo
+		ewarn "The Gambas IDE currently cannot be be build without Qt being enabled."
+		if use gtk; then
+			einfo
+			ewarn "You are using the USE flag gtk, but not qt3.  Attempting to use GTK instead"
+			ewarn "of Qt for certain components.  This is considered EXPERIMENTAL and the"
+			ewarn "resulting components may not function."
+		fi
+		einfo
+		ebeep 3
+	fi
+}
+
+my_reduce_eautoreconf() {
+	sed -i -e "/^\(AC\|GB\)_CONFIG_SUBDIRS(${1}[,)]/d" \
+	configure.ac \
+	|| die "my_reduce_eautoreconf: sed on configure.ac failed with ${1}"
+
+	sed -i -e "/^SUBDIRS/s/\ \(@${1}_dir@\|${1}\)//1" \
+	Makefile.am \
+	|| die "my_reduce_eautoreconf: sed on Makefile.am failed with ${1}"
+}
+
+my_examine_components() {
+	local comp="gb.*/src/*.component gb.*/src/*/*.component main/lib/*/*.component comp/src/*/.component"
+
+	# Examine app/src/gambas2/CComponent.class for more info
+	echo
+	einfo "Checking component files ..."
+	einfo
+	elog "The following components are reported stable, but incomplete:"
+	elog "$(grep '^State=1' ${comp} | sed -e 's/.*\(gb\.[^/]*\)[/]\?\.component.*/\1/')"
+	einfo
+	ewarn "The following components are reported unstable:"
+	ewarn "$(grep '^\(State=2\|Alpha\)' ${comp} | sed -e 's/.*\(gb\.[^/]*\)[/]\?\.component.*/\1/')"
+	echo
+}
+
+src_prepare() {
+	if { ! use qt3; } && use gtk; then
+		ebegin "Applying sed no-Qt-use-GTK-workaround-patch (EXPERIMENTAL)"
+		# Gentoo-specific patch/workaround
+		sed -i -e 's/EXPORT = "gb.qt"/EXPORT = "gb.gtk"/' \
+		main/lib/gui/main.c \
+		|| die "sed no-Qt-use-GTK-workaround-patch (EXPERIMENTAL)"
+		eend 0
+	fi
+
+	ebegin "Applying sed no-automagic-patch"
+	# Gentoo-specific patch
+	sed -i -e 's/gb_enable_\$1=yes/gb_enable_\$1=no/' \
+	acinclude.m4 \
+	|| die "sed no-automagic-patch failed"
+	eend 0
+
+	# Gentoo-specific patches for libtool compatibility
+	#epatch "${FILESDIR}/${PN}-2.7.0-r1-remove-libltdl-from-main.patch"
+	epatch "${FILESDIR}/${PN}-2.8.0-libtool.patch"
+
+	# Gentoo-specific patch
+	epatch "${FILESDIR}/${PN}-2.8.2-FLAGS.patch"
+
+	# Replacement for Gentoo-specific gambas-2.5.0-mimetype-registration.patch
+	# submitted upstream
+	epatch "${FILESDIR}/svn-r1636-xdg-utils.patch"
+
+	epatch "${FILESDIR}/${PN}-2.9.0-app_Makefile.am.patch"
+	epatch "${FILESDIR}/${PN}-2.9.0-comp_Makefile.am.patch"
+	epatch "${FILESDIR}/${PN}-2.9.0-examples_Makefile.am.patch"
+	epatch "${FILESDIR}/${PN}-2.9.0-help_Makefile.am.patch"
+	epatch "${FILESDIR}/${PN}-2.9.0-main_Makefile.am.patch"
+	epatch "${FILESDIR}/${PN}-2.9.0-component.am.patch"
+
+	ebegin "Applying sed remove-dist_gblib_DATA-patch"
+	# Prevent repeat installation of component files
+	sed -i -e '/^dist_gblib_DATA/d' \
+	component.am \
+	main/lib/Makefile.am \
+	|| die "sed remove-dist_gblib_DATA-patch failed"
+	eend 0
+
+	ebegin "Applying sed remove-libtool-patch"
+	# Gentoo-specific patch, may be obsoleted in the future
+	# Remove embedded libtool.m4 file
+	sed -i -e '/[-][*][-]Autoconf[-][*][-]$/,$d' \
+	acinclude.m4 \
+	|| die "sed remove-libtool-patch failed"
+	eend 0
+
+	my_examine_components
+
+	ebegin "Removing provided libtool/libltdl"
+	rm config.guess config.sub install-sh ltmain.sh \
+	&& rm */config.guess */config.sub */install-sh */ltmain.sh \
+	|| die "removing libtool failed"
+	eend 0
+
+	ebegin "Reducing eautoreconf"
+	# Keep synchronized with myconf in src_compile
+	use bzip2 ||	my_reduce_eautoreconf bzlib2
+	use zlib ||	my_reduce_eautoreconf zlib
+	use mysql ||	my_reduce_eautoreconf mysql
+	use odbc ||	my_reduce_eautoreconf odbc
+	use postgres ||	my_reduce_eautoreconf postgresql
+	use sqlite ||	my_reduce_eautoreconf sqlite2
+	use sqlite3 ||	my_reduce_eautoreconf sqlite3
+	use firebird ||	my_reduce_eautoreconf firebird
+	use gtk ||	my_reduce_eautoreconf gtk
+	use svg ||	my_reduce_eautoreconf gtksvg
+	use pdf ||	my_reduce_eautoreconf pdf
+			#net
+	use curl ||	my_reduce_eautoreconf curl
+	use smtp ||	my_reduce_eautoreconf smtp
+	use pcre ||	my_reduce_eautoreconf pcre
+	use qt3 ||	my_reduce_eautoreconf qt
+			my_reduce_eautoreconf qte
+	use kde ||	my_reduce_eautoreconf kde
+	use sdl ||	my_reduce_eautoreconf sdl
+	use sdl ||	my_reduce_eautoreconf sdlsound
+	use xml ||	my_reduce_eautoreconf xml
+	use v4l ||	my_reduce_eautoreconf v4l
+			#crypt
+	use opengl ||	my_reduce_eautoreconf opengl
+	use corba ||	my_reduce_eautoreconf corba
+	{ use qt3 || use gtk || \
+	use sdl; } ||	my_reduce_eautoreconf image
+	use qt3 ||	my_reduce_eautoreconf desktop
+	# This may work in the future, but it does not work now.
+#	{ use qt3 || \
+#	use gtk; } ||	my_reduce_eautoreconf desktop
+
+	use doc ||	my_reduce_eautoreconf help
+	use examples ||	my_reduce_eautoreconf examples
+	eend 0
+
+	eautoreconf || die "eautoreconf failed"
+}
+
+src_configure() {
+	local myconf="
+		$(use_enable bzip2 bzlib2)
+		$(use_enable zlib)
+		$(use_enable mysql)
+		$(use_enable odbc)
+		$(use_enable postgres postgresql)
+		$(use_enable sqlite sqlite2)
+		$(use_enable sqlite3)
+		$(use_enable firebird)
+		$(use_enable gtk)
+		$(use_enable svg gtksvg)
+		$(use_enable pdf)
+		--enable-net
+		$(use_enable curl)
+		$(use_enable smtp)
+		$(use_enable pcre)
+		$(use_enable qt3 qt)
+		--disable-qte
+		$(use_enable kde)
+		$(use_enable sdl)
+		$(use_enable sdl sdlsound)
+		$(use_enable xml)
+		$(use_enable v4l)
+		--enable-crypt
+		$(use_enable opengl)
+		$(use_enable corba)
+		$( { use qt3 || use gtk || use sdl; } \
+		&& echo '--enable-image' || echo '--disable-image')
+		$(use_enable qt3 desktop)
+	"
+		# This may work in the future, but it does not work now.
+#		$( { use qt3 || use gtk; } && echo '--enable-desktop' || echo '--disable-desktop')"
+
+	myconf="${myconf}
+		--enable-intl
+		--enable-conv
+		--enable-ffi
+		--enable-preloading
+		--disable-profiling
+		$(use_enable debug)
+		$(use_enable xml xslt)
+	"
+	if use qt3; then
+		myconf="${myconf}
+			$(use_enable opengl qtopengl)
+			--enable-qt-translation
+		"
+		if use kde; then
+			myconf="${myconf}
+				--with-kde-includes=/usr/kde/3.5/include
+				--with-kde-libraries=/usr/kde/3.5/$(get_libdir)
+			"
+		fi
+	fi
+
+	# --without-xdg-utils comes from svn-r1636-xdg-utils.patch
+	econf --config-cache ${myconf} --without-xdg-utils \
+	--docdir=/usr/share/doc/${PF} --htmldir=/usr/share/doc/${PF}/html
+}
+
+my_dekstop_and_icon() {
+	# USAGE: <executable> <name> <category> <icon_source_file> <icon_target_dir>
+	local icon="${1}.png"
+
+	make_desktop_entry "${1}" "${2}" "${5}/${icon}" "${3}" \
+	|| die "make_desktop_entry failed for ${1}"
+
+	insinto ${5}
+	newins ${4} ${icon} || die "newins failed for ${1}"
+}
+
+src_compile() {
+	emake LIBTOOLFLAGS="--quiet" || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBTOOLFLAGS="--quiet" install -j1 || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
+	newdoc gb.net/src/doc/README gb.net-README || die "newdoc failed"
+	newdoc gb.net/src/doc/changes.txt gb.net-ChangeLog || die "newdoc failed"
+	use pcre && { newdoc gb.pcre/src/README gb.pcre-README || die "newdoc failed"; }
+
+	if { use qt3 || use gtk; } ; then
+		# Remove qt3 test when it works without it
+		use qt3 && \
+		my_dekstop_and_icon \
+		"${MY_PN}" "Gambas" "Development" \
+		"app/src/${MY_PN}/img/logo/new-logo.png" \
+		"/usr/share/icons/hicolor/128x128/apps"
+
+		my_dekstop_and_icon \
+		"${MY_PN}-database-manager" "Gambas Database Manager" "Development" \
+		"app/src/${MY_PN}-database-manager/img/logo/logo-128.png" \
+		"/usr/share/icons/hicolor/128x128/apps"
+
+		insinto /usr/share/icons/hicolor/64x64/mimetypes
+		doins app/mime/*.png main/mime/*.png || die "doins failed"
+
+		insinto /usr/share/mime/application
+		doins app/mime/*.xml main/mime/*.xml || die "doins failed"
+	fi
+
+	use doc && { dosym "/usr/share/${MY_PN}/help" "/usr/share/doc/${PF}/html" \
+	|| die "dosym failed"; }
+}
+
+my_fdo_update() {
+	{ use qt3 || use gtk; } && fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postinst() {
+	my_fdo_update
+}
+
+pkg_postrm() {
+	my_fdo_update
+}