Live ebuild with USE="internal-glib" for embedded systems wrt #414101

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 107 insertions, 10 deletions

diff --git a/dev-util/pkgconfig/ChangeLog b/dev-util/pkgconfig/ChangeLog
index d60923567c0e..c1e0d5eaca5a 100644
--- a/dev-util/pkgconfig/ChangeLog
+++ b/dev-util/pkgconfig/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/pkgconfig
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.105 2012/04/26 14:15:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.106 2012/05/04 09:40:40 ssuominen Exp $
+
+*pkgconfig-9999 (04 May 2012)
+
+  04 May 2012; Samuli Suominen <ssuominen@gentoo.org> +pkgconfig-9999.ebuild,
+  metadata.xml:
+  Live ebuild with USE="internal-glib" for embedded systems wrt #414101
 
   26 Apr 2012; Alexis Ballier <aballier@gentoo.org> pkgconfig-0.26.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index 647b6bde08dd..1eefe2a8e79a 100644
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -3,12 +3,17 @@ Hash: SHA1
 
 DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52d0 SHA1 fd71a70b023b9087c8a7bb76a0dc135a61059652 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af
 EBUILD pkgconfig-0.26.ebuild 1986 RMD160 2ad08521d79519e94d74c747753edf71f5801a53 SHA1 b82e09bec599ee135f328412bb66bf1c7fe0c8e2 SHA256 029f9201027a5cf9589da6e9fc241a6adc99e964429f3e6f49d75d7e7152f897
-MISC ChangeLog 12406 RMD160 d9b10973ae27f6a27cdc068c175c583bb671eadb SHA1 d8f88a55a8059ecb284465cc28b22ecd721cfac6 SHA256 ba4453817e276a01f8f90bc8d032e572f7dae44cdf9f5da8555d52edde53b6be
-MISC metadata.xml 235 RMD160 2b622eaee2f1b2f24614266e8e78bfb92a73b7bd SHA1 e0b0a496d62ad809efd1eb23df0a12e30e5598f0 SHA256 90059f50c905d3fedb940d40badfa498daf5ea7af7f9586df10cd00c59c71678
+EBUILD pkgconfig-9999.ebuild 2488 RMD160 c20ad13c791e5b2f37a2bbd57458c342614c4982 SHA1 2fc76b10d46184d3e99f58d3a41deb679f99ad60 SHA256 db3708b90a7c1796a54faf8ca5654f925d91c7e75ede6539a2a314ed78c643bc
+MISC ChangeLog 12605 RMD160 fe0c81a5f10488eabea01424d76515525f1c7c31 SHA1 af73c1ce6cec67b2985c0f80eec31502cab597ac SHA256 ffd9cf8feed07ff8568872194f5714f82a39e21078d1d0f30169525d237de87d
+MISC metadata.xml 336 RMD160 cf57223ae440de19b57f54e3af717927fd553a8c SHA1 ca2605ba4a57002fd6cf35f23ba85515699c96d5 SHA256 d206684f8bec51574f6ef890d1acecb52e346d9f6b42ae9bd6840cfde824a482
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+ZWHkACgkQvFcC4BYPU0qCAwCfaDDxdhL9812cHXSsdqE1l/d0
-aHUAn2hwbCabCO4P6brciDEA6EE8Mzd9
-=0MdZ
+iQEcBAEBAgAGBQJPo6OIAAoJEEdUh39IaPFNl9cH/2R7R6J3GPvdA/nvZEYxQ7tP
++eVjuMRiOXrCzXiGEF229eYvSTyQT9YHA5buMO2egtewEUDr8UOGXzk2IlwPOpiY
+6+GQgJUaI5pr6Q3RQF3h2FH5vGlW8fMG2lF0RdIqSc6Xqq/w775iQ69kVNqaLw2x
+2pj6Nh9yQ0MDud0F8H5YBI96by75oqtaxLbJaSlSgtE76LWeP49chommAvjSszIW
+VLgVXkFmkZ8U18XF3xkgDlB0G46LjKReMAD4YsL2ErN1Jg8CcpibeT7s4A8cAWdY
+SuAovQtxkudLpm8/V5lnN7WRb5Q2eWVB+wej4p9dDgao3ye1Aqpy2kf95TTNAq8=
+=P2Q2
 -----END PGP SIGNATURE-----
diff --git a/dev-util/pkgconfig/metadata.xml b/dev-util/pkgconfig/metadata.xml
index 389514cc8329..572c23e967c4 100644
--- a/dev-util/pkgconfig/metadata.xml
+++ b/dev-util/pkgconfig/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>freedesktop</herd>
-<maintainer>
-	<email>freedesktop-bugs@gentoo.org</email>
-</maintainer>
+	<herd>freedesktop</herd>
+	<maintainer>
+		<email>freedesktop-bugs@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name='internal-glib'>Use internal copy of <pkg>dev-libs/glib</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild
new file mode 100644
index 000000000000..b816d78cc558
--- /dev/null
+++ b/dev-util/pkgconfig/pkgconfig-9999.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v 1.1 2012/05/04 09:40:40 ssuominen Exp $
+
+EAPI=4
+
+unset _live_inherits
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config"
+	_live_inherits="autotools git-2"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI="http://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
+fi
+
+inherit flag-o-matic libtool multilib ${_live_inherits}
+
+MY_P=pkg-config-${PV}
+
+DESCRIPTION="Package config system that manages compile/link flags"
+HOMEPAGE="http://pkgconfig.freedesktop.org/wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="elibc_FreeBSD hardened internal-glib"
+
+RDEPEND="!internal-glib? ( >=dev-libs/glib-2.28 )
+	>=dev-libs/popt-1.16"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+	if [[ ${PV} == *9999* ]]; then
+		eautoreconf
+	else
+		elibtoolize # Required for FreeMiNT wrt #333429
+	fi
+}
+
+src_configure() {
+	local myconf
+
+	if use internal-glib; then
+		myconf+=' --with-internal-glib'
+	else
+		if ! has_version dev-util/pkgconfig; then
+			export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
+			export GLIB_LIBS="-lglib-2.0"
+		fi
+	fi
+
+	use ppc64 && use hardened && replace-flags -O[2-3] -O1
+
+	# Force using all the requirements when linking, so that needed -pthread
+	# lines are inherited between libraries
+	use elibc_FreeBSD && myconf+=' --enable-indirect-deps'
+
+	[[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode'
+
+	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--with-system-include-path="${EPREFIX}"/usr/include \
+		--with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \
+		--with-installed-popt \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	rm -f "${ED}"/usr/share/aclocal/g{settings,lib-gettext,lib-2.0}.m4
+
+	if use prefix; then
+		# Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to
+		# simplify cross-prefix builds
+		echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN}
+		doenvd "${T}"/99${PN}
+	fi
+}