summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2013-02-25 09:07:15 +0000
committerZac Medico <zmedico@gentoo.org>2013-02-25 09:07:15 +0000
commitce1c85dabfa81b27ab87ad53669cfc0f6b138223 (patch)
treefb3b637d756739785a56288ed1254e29595e9ec0 /gnome-base
parentAdd ~arm-linux keywords. (diff)
downloadgentoo-2-ce1c85dabfa81b27ab87ad53669cfc0f6b138223.tar.gz
gentoo-2-ce1c85dabfa81b27ab87ad53669cfc0f6b138223.tar.bz2
gentoo-2-ce1c85dabfa81b27ab87ad53669cfc0f6b138223.zip
Fix for prefix and add ~arm-linux + ~x86-linux keywords.
(Portage version: 2.2.0_alpha163_p13/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gconf/ChangeLog6
-rw-r--r--gnome-base/gconf/gconf-3.2.5.ebuild12
-rw-r--r--gnome-base/gconf/gconf-3.2.6.ebuild12
3 files changed, 17 insertions, 13 deletions
diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 8ffa64c5a53e..904b2e90bdeb 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-base/gconf
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.275 2013/01/22 03:59:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.276 2013/02/25 09:07:15 zmedico Exp $
+
+ 25 Feb 2013; Zac Medico <zmedico@gentoo.org> gconf-3.2.5.ebuild,
+ gconf-3.2.6.ebuild:
+ Fix for prefix and add ~arm-linux + ~x86-linux keywords.
*gconf-3.2.6 (22 Jan 2013)
diff --git a/gnome-base/gconf/gconf-3.2.5.ebuild b/gnome-base/gconf/gconf-3.2.5.ebuild
index 55c4dc976d46..f70b2d24abb4 100644
--- a/gnome-base/gconf/gconf-3.2.5.ebuild
+++ b/gnome-base/gconf/gconf-3.2.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.5.ebuild,v 1.8 2013/01/17 20:39:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.5.ebuild,v 1.9 2013/02/25 09:07:15 zmedico Exp $
EAPI="5"
GCONF_DEBUG="yes"
@@ -14,7 +14,7 @@ HOMEPAGE="http://projects.gnome.org/gconf/"
LICENSE="LGPL-2+"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="debug gtk +introspection ldap orbit policykit"
RDEPEND=">=dev-libs/glib-2.31:2
@@ -81,10 +81,10 @@ pkg_postinst() {
# change the permissions to avoid some gconf bugs
einfo "changing permissions for gconf dirs"
- find /etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
+ find "${EPREFIX}"/etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
einfo "changing permissions for gconf files"
- find /etc/gconf/ -type f -exec chmod ugo+r "{}" \;
+ find "${EPREFIX}"/etc/gconf/ -type f -exec chmod ugo+r "{}" \;
if ! use orbit; then
ewarn "You are using dbus for GConf's IPC. If you are upgrading from"
@@ -98,9 +98,9 @@ pkg_postinst() {
kill_gconf() {
# This function will kill all running gconfd-2 that could be causing troubles
- if [ -x /usr/bin/gconftool-2 ]
+ if [ -x "${EPREFIX}"/usr/bin/gconftool-2 ]
then
- /usr/bin/gconftool-2 --shutdown
+ "${EPREFIX}"/usr/bin/gconftool-2 --shutdown
fi
return 0
diff --git a/gnome-base/gconf/gconf-3.2.6.ebuild b/gnome-base/gconf/gconf-3.2.6.ebuild
index b6ac68c49d92..c5df88e26557 100644
--- a/gnome-base/gconf/gconf-3.2.6.ebuild
+++ b/gnome-base/gconf/gconf-3.2.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.6.ebuild,v 1.1 2013/01/22 03:59:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.6.ebuild,v 1.2 2013/02/25 09:07:15 zmedico Exp $
EAPI="5"
GCONF_DEBUG="yes"
@@ -14,7 +14,7 @@ HOMEPAGE="http://projects.gnome.org/gconf/"
LICENSE="LGPL-2+"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="debug gtk +introspection ldap orbit policykit"
RDEPEND=">=dev-libs/glib-2.31:2
@@ -82,10 +82,10 @@ pkg_postinst() {
# change the permissions to avoid some gconf bugs
einfo "changing permissions for gconf dirs"
- find /etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
+ find "${EPREFIX}"/etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
einfo "changing permissions for gconf files"
- find /etc/gconf/ -type f -exec chmod ugo+r "{}" \;
+ find "${EPREFIX}"/etc/gconf/ -type f -exec chmod ugo+r "{}" \;
if ! use orbit; then
ewarn "You are using dbus for GConf's IPC. If you are upgrading from"
@@ -99,9 +99,9 @@ pkg_postinst() {
kill_gconf() {
# This function will kill all running gconfd-2 that could be causing troubles
- if [ -x /usr/bin/gconftool-2 ]
+ if [ -x "${EPREFIX}"/usr/bin/gconftool-2 ]
then
- /usr/bin/gconftool-2 --shutdown
+ "${EPREFIX}"/usr/bin/gconftool-2 --shutdown
fi
return 0