Improve multi abi support

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

4 files changed, 178 insertions, 5 deletions

diff --git a/app-admin/elektra/ChangeLog b/app-admin/elektra/ChangeLog
index 874aec2209b5..8cea86f1af9d 100644
--- a/app-admin/elektra/ChangeLog
+++ b/app-admin/elektra/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/elektra
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/ChangeLog,v 1.15 2013/04/22 10:50:07 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/ChangeLog,v 1.16 2013/04/22 14:17:35 xmw Exp $
+
+*elektra-0.8.3-r2 (22 Apr 2013)
+*elektra-0.7.1-r4 (22 Apr 2013)
+
+  22 Apr 2013; Michael Weber <xmw@gentoo.org> +elektra-0.7.1-r4.ebuild,
+  +elektra-0.8.3-r2.ebuild:
+  Improve multi abi support
 
   22 Apr 2013; Michael Weber <xmw@gentoo.org> -elektra-0.7.1-r2.ebuild,
   -elektra-0.8.3.ebuild:
diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
index bbb3cd3df2e8..a709e1d2dffc 100644
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@@ -10,13 +10,15 @@ AUX elektra-0.8.3-introduce-attributes.patch 806 SHA256 09ea008048e620e05b6e64a8
 DIST elektra-0.7.1.tar.gz 1347524 SHA256 ff90ae274935eac9c9c5c85ca7e66049be46a31d9ef08bc59a59858a15284c8c SHA512 25ca25e95d1a20a79ba97b094dc9630fb791f6653c2bacec751cc51492202831b7d28ae0786081e6be91581245bda3f5b7e2f3b523f7faa6bfb1d97b3d209684 WHIRLPOOL e90e7c126f2467c8ae29e3cffd5d8a6bfa444dfd38edcc8809d49562825aff8ec6c826139da4a2aa09e38935ee63b48674431c7cc27e2a14d372b2b8270b170d
 DIST elektra-0.8.3.tar.gz 1092409 SHA256 48fab82a6b1e8f0038c43ae9ade4da25b697d0aa74e39b7b94056ab7febc4be1 SHA512 e298c0515515a3a59fe28e695fd347ce775465d95f95f8d08c54e0223baf24300ec7e876d35fd3a07f2348290fdc7f740557333b26e847d09b4c41df63a1d886 WHIRLPOOL 64673416e96cc0a8f3ffbfc3f88525de3bc1270b381d0642b59f0a4f9d49db5cb296bd10a2839bc2baea82f58dcb6416ada1031553d378cba858d8f94df2d3b9
 EBUILD elektra-0.7.1-r3.ebuild 2449 SHA256 9479a2b3737c229ea1b771031ce17dcc437f20f95f0674cf7e8e5cd12d430e23 SHA512 bf93a343aebd440faab354164225f9a7cbcd5774a09d38dcf47784606491705b351c0c9cd900de2e426b99aea7c4501c15aae3be8ad551ae3b4d6425dce760fe WHIRLPOOL 63c15b66df81b9bfea905915dee1dc98427bb000a283b36d2a32a07a59881c18474d24c4019c498cf4a6c68329cf9354e6a3bffc7e21a48f797e8d3b8ddf8e95
+EBUILD elektra-0.7.1-r4.ebuild 2232 SHA256 b96e598511c12052e365656b955dd1ce9155b594c099541953fa12fed889c434 SHA512 d638e2fd37d93ff3f01741e86bc10fc5a11d0df87355108a0fb91c59416c7ebd51d82fd5094e9a077dde5a92159484c0c6eb05e3ad438d1bdffcee1599974bae WHIRLPOOL ed50c6f761975f0407c878616400bb59af8d111bdec9240345d659a3e8f65297c8f4df2413d1e571ed66cdefa247bbd2d750319bf0243aa2dd370c3c6066061a
 EBUILD elektra-0.8.3-r1.ebuild 2307 SHA256 1d7d8da839d72d418a64bf60e0e916fd7f45933ad06d05ff4a876aad34f15ad6 SHA512 da27d7c614af193219b733d2dfa1c7f69ef72a21363ca91142ef838e7ef6aee66400b56d51588058a3aef1fb6e5d7c021191e3ab64006f91db4f4c638a66fcdb WHIRLPOOL 70d63c34bd2a497b90b14bdac7e314613ed7c745310d0e8ef7411229233c8f4158de9345a219007cbbdaaed82818bcd588c0696f0ecec46e153cc28e48b3e9e2
-MISC ChangeLog 2843 SHA256 1c81f527aa6521108fc9f7dedbcf5c73b90282f4751a0ae03f49baa2019c6517 SHA512 c54f60d099271c2db65bdee61d6bc890056c52a91e34b4e46a7c68a2a5b16efb29d08a2c35bb31bd8f9420b79e49219eb425b1713820b953b7a876195c0b85c1 WHIRLPOOL f9626169f71dba7f72cc7ffc73c8ca047db3315bf1bc5eb9d69c40b3e83f57be045857cc330abbc27a3bd54f27f944b0912409cfa559ff52f6bff8fbb721024d
+EBUILD elektra-0.8.3-r2.ebuild 2446 SHA256 2b2226b20b9eaeeaab1d84fc96e900e20ebce553f92c416db26709bb2f377671 SHA512 a69e0e19f700bfd486053114b1751f1a00997244e0e5f9396782f78ba8388a0b7ddae127565b3882bcdb42bd13ac93504d8871976dc6d60f843dc5b515a42fc5 WHIRLPOOL c0ac0ab148ef2d7ae56528a4f520561c6ac789117dd6465886e3ee687c39280f9a94b98e2d4cf3fde2a51ea01b13aa6fd19e3911bcca641fc6debea2e7f118e8
+MISC ChangeLog 3037 SHA256 16999f01080a483b772c3d6f5c3b39a57a5a433f5ef803c50dd3616827fd38a1 SHA512 5f537403bfcf79225183be1b69a3a3ccafdfc18935f184b66d9d6e362f595bce04273b82322bf580879cebc718257949669af7f7a73b4585ca2404aca50fec36 WHIRLPOOL 28fc6dc51ad56a01b22941a1c1503166dcdfa4de43d781a4c775eae2f82f63e8c12c0946c566c316344a4d71d977339aa59d9af968d130598315162e23654bfa
 MISC metadata.xml 389 SHA256 734b96e3a1277ec120fa70a2476e91dd54ea5a6d661a6945665f9e74085d650d SHA512 cfdd3e6f1974390d1b6bea8c7acb682ea9659cd240e274d4a06423fa4dc98660d1d5cb0cbe4eb94178ea73af04c8c453a9d29ce350b7590225324ec7f4824d4a WHIRLPOOL 0365d182deaf06c7680788cbb9f15fef5afbb66d8a90a1bbe8bac62c046f44a5dea9e26594501a362fa3b2d36136000f8f47adb1df928951243c3b1932fd2ce4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlF1FeIACgkQknrdDGLu8JAL8wD/bzgdHl4o9W6sJTNkEhvMSvO3
-qZf3Mgm6bh95ARpuEYsA/3iqRPluFLHtdqm0nqrhArcwQcb5e57602gZkUvIq/wu
-=CJ1B
+iF4EAREIAAYFAlF1RqUACgkQknrdDGLu8JDQVQEAgyAeuGYikC2tqD6VCxITvaQr
+rrnZdpP4Ej/7veQdNrkA/12uYuGu9zKUKguPJIAvxbFnPKxZySWHJnJT4HRx6+FK
+=qh8l
 -----END PGP SIGNATURE-----
diff --git a/app-admin/elektra/elektra-0.7.1-r4.ebuild b/app-admin/elektra/elektra-0.7.1-r4.ebuild
new file mode 100644
index 000000000000..e1bf2c573c2c
--- /dev/null
+++ b/app-admin/elektra/elektra-0.7.1-r4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/elektra-0.7.1-r4.ebuild,v 1.1 2013/04/22 14:17:35 xmw Exp $
+
+EAPI=5
+
+inherit autotools autotools-multilib eutils multilib
+
+DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
+HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
+SRC_URI="ftp://ftp.markus-raab.org/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gcov iconv static-libs test"
+
+RDEPEND="!amd64? ( dev-libs/libxml2 )
+	amd64? (
+		abi_x86_64? ( dev-libs/libxml2 )
+		abi_x86_32? ( app-emulation/emul-linux-x86-baselibs ) )"
+DEPEND="${RDEPEND}
+	!amd64? ( sys-devel/libtool )
+	amd64? ( abi_x86_64? ( sys-devel/libtool ) )
+	iconv? ( virtual/libiconv )
+	!amd64? ( test? ( dev-libs/libxml2[static-libs] ) )"
+
+src_prepare() {
+	einfo 'Removing bundled libltdl'
+	rm -rf libltdl || die
+
+	epatch \
+		"${FILESDIR}"/${P}-test.patch \
+		"${FILESDIR}"/${P}-ltdl.patch \
+		"${FILESDIR}"/${P}-automake-1.12.patch \
+		"${FILESDIR}"/${P}-remove-ddefault-link.patch
+
+	touch config.rpath
+	eautoreconf
+}
+
+src_configure() {
+	# berkeleydb, daemon, fstab, gconf, python do not work
+	# avoid collision with kerberos (bug 403025, 447246)
+	local myeconfargs=(
+		--enable-filesys
+		--enable-hosts
+		--enable-ini
+		--enable-passwd
+		--disable-berkeleydb
+		--disable-fstab
+		--disable-gconf
+		--disable-daemon
+		--enable-cpp
+		--disable-python
+		$(use_enable gcov)
+		$(use_enable iconv)
+		$(use_enable static-libs static)
+		--with-docdir=/usr/share/doc/${PF}
+		--with-develdocdir=/usr/share/doc/${PF}a
+		--includedir=/usr/include/${PN}
+	)
+	autotools-multilib_src_configure
+	dodir /usr/share/man/man3
+}
+
+src_install() {
+	autotools-multilib_src_install
+
+	#avoid collision with allegro (bug 409305)
+	local my_f=""
+	for my_f in $(find "${D}"/usr/share/man/man3 -name "key.3*") ; do
+		mv "${my_f}" "${my_f/key/elektra-key}" || die
+		elog "/usr/share/man/man3/$(basename "${my_f}") installed as $(basename "${my_f/key/elektra-key}")"
+	done
+
+	if ! use static-libs; then
+		find "${D}" -name "*.a" -delete || die
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/app-admin/elektra/elektra-0.8.3-r2.ebuild b/app-admin/elektra/elektra-0.8.3-r2.ebuild
new file mode 100644
index 000000000000..ee085fc1bcab
--- /dev/null
+++ b/app-admin/elektra/elektra-0.8.3-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/elektra-0.8.3-r2.ebuild,v 1.1 2013/04/22 14:17:35 xmw Exp $
+
+EAPI=5
+
+inherit cmake-multilib eutils
+
+DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
+HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
+SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus doc examples iconv inifile simpleini static-libs syslog tcl test xml yajl"
+
+RDEPEND="!amd64? ( dev-libs/libxml2 )
+	amd64? (
+		abi_x86_64? ( dev-libs/libxml2 )
+		abi_x86_32? ( app-emulation/emul-linux-x86-baselibs ) )"
+DEPEND="${RDEPEND}
+	!amd64? ( sys-devel/libtool )
+	doc? ( app-doc/doxygen )
+	iconv? ( virtual/libiconv )
+	!amd64? ( test? ( dev-libs/libxml2[static-libs] ) )
+	yajl? ( <dev-libs/yajl-2 )"
+
+src_configure() {
+	local my_plugins="ccode;dump;error;fstab;glob;hexcode;hidden;hosts;network;ni;null;path;resolver;struct;success;template;timeofday;tracer;type;validation"
+
+	#fix QA issues with upstream patches
+	epatch "${FILESDIR}/${P}-introduce-attributes.patch"
+	epatch "${FILESDIR}/${P}-fix-yajl-if-user-config.patch"
+
+	#move doc files to correct location
+	sed -e "s/elektra-api/${PF}/" \
+		-i cmake/ElektraCache.cmake || die
+
+	use dbus    && my_plugins+=";dbus"
+	use doc     && my_plugins+=";doc"
+	use iconv   && my_plugins+=";iconv"
+	use inifile && my_plugins+=";simpleini"
+	use syslog  && my_plugins+=";syslog"
+	use tcl     && my_plugins+=";tcl"
+	use xml     && my_plugins+=";xmltool"
+	use yajl    && my_plugins+=";yajl"
+
+	mycmakeargs=(
+		"-DPLUGINS=${my_plugins}"
+		"-DLATEX_COMPILER=OFF"
+		"-DTARGET_CMAKE_FOLDER=share/cmake/Modules"
+		$(cmake-utils_use doc BUILD_DOCUMENTATION)
+		$(cmake-utils_use examples BUILD_EXAMPLES)
+		$(cmake-utils_use static-libs BUILD_STATIC)
+		$(cmake-utils_use test BUILD_TESTING)
+	)
+
+	cmake-multilib_src_configure
+}
+
+src_compile() {
+	dodir /usr/share/man/man3
+	cmake-multilib_src_compile
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	dodoc doc/{AUTHORS,CHANGES,NEWS,README,todo/TODO}
+
+	if use doc ; then
+		rm -rf "${D}/usr/share/doc/${PF}/man" || die
+		pushd ${CMAKE_BUILD_DIR}/doc/man/man3
+		local my_f
+		for my_f in *.3 ; do
+			newman ${my_f} ${PN}-${my_f}
+			elog "installed /usr/share/man/man3/${my_f} as ${PN}-${my_f}"
+		done
+		popd
+	fi
+}