Use configure option to stop gnome-specific components being built automagically. Fixes bug 371005.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

3 files changed, 82 insertions, 8 deletions

diff --git a/app-office/mdbtools/ChangeLog b/app-office/mdbtools/ChangeLog
index 5832c6b3080d..47c8633122f4 100644
--- a/app-office/mdbtools/ChangeLog
+++ b/app-office/mdbtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/mdbtools
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.55 2010/12/02 15:51:21 flameeyes Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.56 2011/06/11 16:22:28 graaff Exp $
+
+*mdbtools-0.6_pre2-r3 (11 Jun 2011)
+
+  11 Jun 2011; Hans de Graaff <graaff@gentoo.org> +mdbtools-0.6_pre2-r3.ebuild:
+  Use configure option to stop gnome-specific components being built
+  automagically. Fixes bug 371005.
 
   02 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   -mdbtools-0.6_pre1-r1.ebuild:
diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest
index ccbba4680e0e..c4fde3ce4c5b 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX mdbtools-0.6_pre1-as-needed.patch 482 RMD160 96eb67726fcccd745dc5494fefbcb3e6db936d9a SHA1 59c1e6a246c1dc1245386cfb6f49ec6c88eea0a0 SHA256 38d06663bc41ced3e094d4a78d6a0b81909b08720bec2696ef7431fb90519416
 AUX mdbtools-0.6_pre1-gcc34.patch 1571 RMD160 b21fa43cc3b3f9e336c741862caf73a6fe66f99e SHA1 04e16d502c28cb065d04fc4afe68761380cd8521 SHA256 63a2f8d06d905274c3dfb60373b7a4c967534a06b864dc3e73e2a92ed8b0f633
@@ -12,12 +12,13 @@ AUX mdbtools-0.6_pre2-odbc_definitions.patch 4060 RMD160 53ae212a83bcd30bb255f6f
 AUX mdbtools-0.6_pre2-parallel-make.patch 655 RMD160 f5e9b45e7dcfd240ba5388d049bdd3d29eb2a832 SHA1 2c3a076c482f8b52f963d82eac8d6b220ef7e17c SHA256 406acd023f0af39a0d2b2b25284efd5e01defffbfade6c17ee9dcacdaa29e15a
 DIST mdbtools-cvs-20050624.tar.gz 306961 RMD160 800328d9acc763ce58211b5a37ad20b8ce34cc21 SHA1 15c97da82826935032aa2089d3e9ed7e2931ce43 SHA256 471034a00f9441e34b3a236ce07bdb766fea0bd140fc69a3d8a9c7225bf573b3
 EBUILD mdbtools-0.6_pre2-r2.ebuild 1991 RMD160 c0bc695bcb23c58e8a60c3934911fbf13a5d2987 SHA1 16b8cc25a8401d7e87a616f63bbe1683476a1f44 SHA256 e7184a75f5125c407fd63f9c60757c2f1ae804834de4ad175e82631225023c20
-MISC ChangeLog 7733 RMD160 855a1831bc4a777fa142f86135ef93af9e87fc11 SHA1 059e16e47fa3761dcd0f131312d5f6392d3ec051 SHA256 9e9c48050b3a5295c943c0af63f56a8d89f5d2a40bd10845796ace03cfa75b55
+EBUILD mdbtools-0.6_pre2-r3.ebuild 2026 RMD160 0ced170d068eb9908bb1cc369fabad5aab1256b2 SHA1 fce845a864b2bf842912280f3e6804bfa82f8ed5 SHA256 eff6561394a7b8db9957fd5aa33807d8925ffa4fddaaae11482d66e86f9abb6a
+MISC ChangeLog 7952 RMD160 a95ad339de42dde8d38561d65ad263afb6ab0671 SHA1 92232a75f61185700c898fae427feb1ed6c29f3c SHA256 9981c2c5e6122dedac0f6df9ceb758dfcbd55991b8c40653b67f24d36fa0a002
 MISC metadata.xml 220 RMD160 65cff73eb25c0cc60095d42dd59adbefcb127b77 SHA1 059c076f5c2d3a1eb0b022ef90920bcabaf841b3 SHA256 0f420960bb0e6e212e563ce0883b0e412304dfd506a39e434d2c7a40a603ba86
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkz3wG0ACgkQAiZjviIA2XgD0ACfZSP0hGHA33zNNehKWVO9CT8P
-c2cAoLOCdyBSQf4N4Dcdli1EKxbswKPE
-=FrCV
+iF4EAREIAAYFAk3zlk8ACgkQrnu0mw69JkqofQD/UdSqet+aL5GkWTV1mkj4Rb2S
+pPrIQ5/YC6aRzVT5ugIA/jw0UxUVxqLM+RsWLaULTyUos3R+/7WkEyGY5ViHjpEW
+=WDaJ
 -----END PGP SIGNATURE-----
diff --git a/app-office/mdbtools/mdbtools-0.6_pre2-r3.ebuild b/app-office/mdbtools/mdbtools-0.6_pre2-r3.ebuild
new file mode 100644
index 000000000000..786aa476718a
--- /dev/null
+++ b/app-office/mdbtools/mdbtools-0.6_pre2-r3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/mdbtools-0.6_pre2-r3.ebuild,v 1.1 2011/06/11 16:22:28 graaff Exp $
+
+EAPI="2"
+
+# Will fail with 1.10+ because of config.rpath
+WANT_AUTOMAKE="1.9"
+
+inherit eutils autotools
+
+MY_P=${P/_/}
+S="${WORKDIR}/${PN}-cvs-20050624"
+
+DESCRIPTION="A set of libraries and utilities for reading Microsoft Access database (MDB) files"
+HOMEPAGE="http://sourceforge.net/projects/mdbtools"
+SRC_URI="mirror://gentoo/${PN}-cvs-20050624.tar.gz"
+
+IUSE="gnome odbc static-libs"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND=">=dev-libs/glib-2
+	sys-libs/ncurses
+	sys-libs/readline
+	gnome? (
+		>=gnome-base/libglade-2
+		>=gnome-base/libgnomeui-2 )
+	odbc? ( >=dev-db/unixODBC-2.0 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-devel/flex-2.5.0
+	>=sys-devel/bison-1.35"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc34.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch "${FILESDIR}"/${P}-haveiconv-fix.patch
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
+	epatch "${FILESDIR}"/${P}-odbc_definitions.patch
+
+	# This is necessary since the upstream tarball was created with a
+	# buggy libtool, and the .so suffix in library names is lost in
+	# some platforms (e.g. amd64).  Starting with libtool 2.2.4 it is
+	# also necessary to remove the acinclude.m4 file since it contains
+	# an old libtool.m4 that is obsolete, #227257.
+	rm "${S}"/acinclude.m4
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	use odbc && myconf="${myconf} --with-unixodbc=/usr"
+
+	econf ${myconf} \
+		$(use_enable gnome gmdb2) \
+		$(use_enable static-libs static) || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation failed"
+	dodoc COPYING* NEWS README* TODO AUTHORS HACKING ChangeLog
+
+	# add a compat symlink (gmdb2 is not compiled if gnome USE flag is disabled)
+	use gnome && dosym gmdb2 /usr/bin/gmdb
+}