summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-08-14 09:33:26 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-08-14 09:33:26 +0000
commit56c646ad280c0ae6a527d2b9da1c3fb838ab8797 (patch)
treeb32042d0df6f9d47e10ce6a8b16a42a433b70f01 /dev-util/pkgconfig
parentUse temporary PN_VALA_SLOT variable to avoid duplicating the version twice. Y... (diff)
downloadgentoo-2-56c646ad280c0ae6a527d2b9da1c3fb838ab8797.tar.gz
gentoo-2-56c646ad280c0ae6a527d2b9da1c3fb838ab8797.tar.bz2
gentoo-2-56c646ad280c0ae6a527d2b9da1c3fb838ab8797.zip
Remove deletion of 3 .m4 files which belong to >=dev-libs/glib-2 from src_install() because upstream fixed Makefile.am to not install them wrt http://cgit.freedesktop.org/pkg-config/commit/?id=40dc57fb41205c80f5ab69023669efb31edf840d
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/pkgconfig')
-rw-r--r--dev-util/pkgconfig/ChangeLog8
-rw-r--r--dev-util/pkgconfig/pkgconfig-0.27.ebuild5
-rw-r--r--dev-util/pkgconfig/pkgconfig-9999.ebuild5
3 files changed, 11 insertions, 7 deletions
diff --git a/dev-util/pkgconfig/ChangeLog b/dev-util/pkgconfig/ChangeLog
index 38fb776ad771..ca5000d95222 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.113 2012/08/14 00:31:51 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.114 2012/08/14 09:33:26 ssuominen Exp $
+
+ 14 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> pkgconfig-9999.ebuild:
+ Remove deletion of 3 .m4 files which belong to >=dev-libs/glib-2 from
+ src_install() because upstream fixed Makefile.am to not install them wrt
+ http://cgit.freedesktop.org/pkg-config/commit/?id=40dc57fb41205c80f5ab6902366
+ 9efb31edf840d
14 Aug 2012; Anthony G. Basile <blueness@gentoo.org> pkgconfig-0.27.ebuild:
Stable ppc ppc64, bug #430814
diff --git a/dev-util/pkgconfig/pkgconfig-0.27.ebuild b/dev-util/pkgconfig/pkgconfig-0.27.ebuild
index 5276fa6c6ed9..13b0866ab026 100644
--- a/dev-util/pkgconfig/pkgconfig-0.27.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.27.ebuild
@@ -1,6 +1,6 @@
# 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-0.27.ebuild,v 1.6 2012/08/14 00:31:51 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.27.ebuild,v 1.7 2012/08/14 09:33:26 ssuominen Exp $
EAPI=4
@@ -72,7 +72,8 @@ src_configure() {
src_install() {
default
- # http://bugs.freedesktop.org/show_bug.cgi?id=52044
+ # http://bugs.freedesktop.org/show_bug.cgi?id=52031
+ # http://cgit.freedesktop.org/pkg-config/commit/?id=40dc57fb41205c80f5ab69023669efb31edf840d
rm -f "${ED}"/usr/share/aclocal/g{settings,lib-gettext,lib-2.0}.m4
if use prefix; then
diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild
index 737df54c2296..c233e666d886 100644
--- a/dev-util/pkgconfig/pkgconfig-9999.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-9999.ebuild
@@ -1,6 +1,6 @@
# 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.3 2012/07/13 09:27:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v 1.4 2012/08/14 09:33:26 ssuominen Exp $
EAPI=4
@@ -72,9 +72,6 @@ src_configure() {
src_install() {
default
- # http://bugs.freedesktop.org/show_bug.cgi?id=52044
- 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