finally fixes #206822

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-rc7 x86_64

3 files changed, 112 insertions, 2 deletions

diff --git a/media-libs/libcaptury/ChangeLog b/media-libs/libcaptury/ChangeLog
index 94774f12eb95..a8e511e8d241 100644
--- a/media-libs/libcaptury/ChangeLog
+++ b/media-libs/libcaptury/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libcaptury
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaptury/ChangeLog,v 1.6 2008/05/22 10:10:25 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaptury/ChangeLog,v 1.7 2008/10/13 19:55:19 trapni Exp $
+
+*libcaptury-0.3.0_pre200712251-r2 (13 Oct 2008)
+
+  13 Oct 2008; Christian Parpart <trapni@gentoo.org>
+  +libcaptury-0.3.0_pre200712251-r2.ebuild:
+  finally fixes #206822
 
 *libcaptury-0.3.0_pre200712251-r1 (22 May 2008)
 
diff --git a/media-libs/libcaptury/Manifest b/media-libs/libcaptury/Manifest
index a9d3e802d484..3982a1a95ae2 100644
--- a/media-libs/libcaptury/Manifest
+++ b/media-libs/libcaptury/Manifest
@@ -2,6 +2,7 @@ DIST captury-0.3.0_pre200706031.tar.bz2 1215736 RMD160 fedb5db4b560a3fcb225a204f
 DIST captury-0.3.0_pre200712251.tar.bz2 1256351 RMD160 0527f5f18e84ada5b37941f7f55355c20ef0fc0e SHA1 19227bbd1f4e609f274311be835a4b09ce91a67e SHA256 119499991c8bf68632485adce7bc13ce9b754d8b406862351abe8d92e3eb5fc3
 EBUILD libcaptury-0.3.0_pre200706031.ebuild 2074 RMD160 400bb382e1f44e172fe771dba6b75fbef796c88d SHA1 98eca697d1269f7725c02bc0c224cdffc4b6eba0 SHA256 d6ac2229bb9757988ecb8ec78b9dc9049cb336fd32fa7566b08f05eca12f88aa
 EBUILD libcaptury-0.3.0_pre200712251-r1.ebuild 2247 RMD160 48c086c7d8d4fae447ef32b613d41b20581b3039 SHA1 34a4ed8a505346badebc3b18061310571db575de SHA256 f0b67307326a58f597f7fc43ed983c7a3c542ae5055222fc6aa4d00923aa5ae9
+EBUILD libcaptury-0.3.0_pre200712251-r2.ebuild 2390 RMD160 e33c6cc94844922ec1222b8db5bc1070aa47d1cb SHA1 68c2dba59b60bbdab56fa1ca36cc7629997f6006 SHA256 d8ed968daa5ab34619171535ea98334228f8a1acedebbda3b2dfffd17118b4f8
 EBUILD libcaptury-0.3.0_pre200712251.ebuild 2074 RMD160 fa12970a9bc01f06ccedcd370eac981d9c7d4ab3 SHA1 92d7df1a32b5eca064334062ff1398004a51b506 SHA256 6715920f346d5076a732ec1f227fcd8608a3a1d9435ec5ab3ee7c88ffbdfc6fc
-MISC ChangeLog 1073 RMD160 01e9e12cdf893b12566b112521e1ef64890be2a7 SHA1 be4f04144eebdd7aec3a8438269d54df662698c7 SHA256 9c4e3a01dc826688d6867370b370f2acf55ff89fafbbf727dfb5becdc458286e
+MISC ChangeLog 1244 RMD160 46a0020f10e9f674ff66a13c777bad407e472536 SHA1 273901a04eab22737b630dc24c6508f1bc6c7773 SHA256 253a8c4320f5cdd1e5df3462ab9f093490c3e864011a6bbadc04ae31a0aa15af
 MISC metadata.xml 220 RMD160 ba793b36fde5acec86d8150ceddf4f3cfb5c2ae9 SHA1 6eb5af4c500c3736062744a87af40484a47e6951 SHA256 9375701257b18e240ba4baf120f7ee473798d867728c9c3fdc50b3b305df7ded
diff --git a/media-libs/libcaptury/libcaptury-0.3.0_pre200712251-r2.ebuild b/media-libs/libcaptury/libcaptury-0.3.0_pre200712251-r2.ebuild
new file mode 100644
index 000000000000..da0d8f3a916d
--- /dev/null
+++ b/media-libs/libcaptury/libcaptury-0.3.0_pre200712251-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaptury/libcaptury-0.3.0_pre200712251-r2.ebuild,v 1.1 2008/10/13 19:55:19 trapni Exp $
+
+inherit multilib flag-o-matic
+
+DESCRIPTION="Captury Framework Library"
+HOMEPAGE="http://rm-rf.in/projects/captury/"
+SRC_URI="http://upstream.rm-rf.in./captury/captury-${PV}.tar.bz2"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug multilib"
+
+RDEPEND=">=media-libs/capseo-0.3.0_pre200712251
+		 x11-libs/libX11
+		 x11-libs/libXfixes
+		 virtual/opengl
+		 amd64? ( multilib? (
+		 	app-emulation/emul-linux-x86-xlibs
+		 	app-emulation/emul-linux-x86-medialibs
+		 ) )"
+
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig"
+
+EMULTILIB_PKG="true"
+
+S="${WORKDIR}/captury-${PV}/${PN}"
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+}
+
+setup_env() {
+	LD_LIBRARY_PATH=
+	LDFLAGS=
+
+	# keep backwards compatibility as long as I *have* to.
+	if use amd64 && [[ ${ABI} = "x86" ]]; then
+		if has_version '<app-emulation/emul-linux-x86-xlibs-7.0-r8'; then
+			LDFLAGS="-L/emul/linux/x86/usr/lib"
+			LD_LIBRARY_PATH="/emul/linux/x86/usr/lib"
+		fi
+	fi
+
+	export LDFLAGS
+	export LD_LIBRARY_PATH
+
+	# workaround for users having FEATURES=ccache set, as ccache doesn't, play
+	# nice to multilib builds (see bug 206822)
+	filter-flags -DABI=*
+	append-flags -DABI=${ABI}
+}
+
+src_compile() {
+	if [[ -z ${OABI} ]] && has_multilib_profile; then
+		use debug && append-flags -O0 -g3
+		use debug || append-flags -DNDEBUG=1
+
+		einfo "Building multilib ${PN} for ABIs: $(get_install_abis)"
+		OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			export ABI=${ABI}
+			src_compile
+		done
+		ABI=${OABI}
+		return
+	fi
+
+	cd "${S}"
+
+	if [[ ! -f configure ]]; then
+		./autogen.sh || die "autogen.sh failed"
+	fi
+
+	ABI=${ABI:-default}
+
+	setup_env
+
+	mkdir abi-${ABI}
+	cd abi-${ABI}
+
+	../configure \
+		--prefix="/usr" \
+		--host="$(get_abi_CHOST ${ABI})" \
+		--libdir="/usr/$(get_libdir)" \
+		|| die "./configure for ABI ${ABI} failed"
+
+	emake || die "make for ABI ${ABI} failed"
+}
+
+src_install() {
+	for ABI in $(get_install_abis); do
+		make -C abi-${ABI} install DESTDIR="${D}" || die "make install for ABI ${ABI} failed."
+	done
+
+	dodoc AUTHORS ChangeLog* NEWS README* TODO
+}
+
+# vim:ai:noet:ts=4:nowrap