Use libdir instead of libexecdir.

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

8 files changed, 64 insertions, 32 deletions

diff --git a/xfce-extra/xfce4-cpufreq-plugin/ChangeLog b/xfce-extra/xfce4-cpufreq-plugin/ChangeLog
index 23fff0aeb02d..64761952e4f1 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/ChangeLog
+++ b/xfce-extra/xfce4-cpufreq-plugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-extra/xfce4-cpufreq-plugin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpufreq-plugin/ChangeLog,v 1.5 2011/03/22 20:49:54 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpufreq-plugin/ChangeLog,v 1.6 2012/04/09 21:23:22 ssuominen Exp $
+
+  09 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-cpufreq-plugin-1.0.0.ebuild:
+  Use libdir instead of libexecdir.
 
   22 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org>
   xfce4-cpufreq-plugin-1.0.0.ebuild:
diff --git a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.0.0.ebuild b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.0.0.ebuild
index 5b72c3e4235d..6a1423379894 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.0.0.ebuild
+++ b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.0.0.ebuild,v 1.5 2011/05/19 21:29:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.0.0.ebuild,v 1.6 2012/04/09 21:23:22 ssuominen Exp $
 
 EAPI=4
-inherit xfconf
+inherit multilib xfconf
 
 DESCRIPTION="A panel plugin for showing information about cpufreq settings"
 HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2.6:2
+RDEPEND="x11-libs/gtk+:2
 	>=xfce-base/libxfce4util-4.8
 	>=xfce-base/libxfcegui4-4.8
 	>=xfce-base/xfce4-panel-4.8"
@@ -24,5 +24,9 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 pkg_setup() {
+	XFCONF=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		)
+
 	DOCS=( AUTHORS ChangeLog NEWS README )
 }
diff --git a/xfce-extra/xfce4-mount-plugin/ChangeLog b/xfce-extra/xfce4-mount-plugin/ChangeLog
index 52d21c96457b..4866edf13937 100644
--- a/xfce-extra/xfce4-mount-plugin/ChangeLog
+++ b/xfce-extra/xfce4-mount-plugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-extra/xfce4-mount-plugin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mount-plugin/ChangeLog,v 1.2 2009/10/08 17:38:00 darkside Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mount-plugin/ChangeLog,v 1.3 2012/04/09 21:25:45 ssuominen Exp $
+
+  09 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-mount-plugin-0.5.5.ebuild:
+  Use libdir instead of libexecdir.
 
   08 Oct 2009; Jeremy Olexa <darkside@gentoo.org>
   xfce4-mount-plugin-0.5.5.ebuild:
diff --git a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.5.5.ebuild b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.5.5.ebuild
index 7c5f62070e91..0870025b7c9d 100644
--- a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.5.5.ebuild
+++ b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.5.5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.5.5.ebuild,v 1.4 2011/05/19 20:17:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.5.5.ebuild,v 1.5 2012/04/09 21:25:45 ssuominen Exp $
 
 EAPI=4
-inherit xfconf
+inherit multilib xfconf
 
 DESCRIPTION="Mount plugin for the Xfce panel"
 HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/0.5/${P}.tar.bz2"
+SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,6 +21,10 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 pkg_setup() {
-	XFCONF=( $(use_enable debug) )
+	XFCONF=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		$(use_enable debug)
+		)
+
 	DOCS=( AUTHORS ChangeLog NEWS README TODO )
 }
diff --git a/xfce-extra/xfce4-radio-plugin/ChangeLog b/xfce-extra/xfce4-radio-plugin/ChangeLog
index a65e4b38b3a1..2224f618c639 100644
--- a/xfce-extra/xfce4-radio-plugin/ChangeLog
+++ b/xfce-extra/xfce4-radio-plugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-extra/xfce4-radio-plugin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-radio-plugin/ChangeLog,v 1.18 2011/10/29 20:16:15 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-radio-plugin/ChangeLog,v 1.19 2012/04/09 21:29:44 ssuominen Exp $
+
+  09 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-radio-plugin-0.5.1.ebuild:
+  Use libdir instead of libexecdir.
 
   29 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
   -xfce4-radio-plugin-0.4.4.ebuild, -xfce4-radio-plugin-0.5.0.ebuild:
diff --git a/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1.ebuild b/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1.ebuild
index c46112258744..5b23e6fee082 100644
--- a/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1.ebuild
+++ b/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1.ebuild
@@ -1,26 +1,30 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1.ebuild,v 1.3 2011/10/16 05:25:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1.ebuild,v 1.4 2012/04/09 21:29:44 ssuominen Exp $
 
 EAPI=4
-inherit xfconf
+inherit multilib xfconf
 
 DESCRIPTION="V4L radio device control plug-in for the Xfce desktop environment"
 HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-radio-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/0.5/${P}.tar.bz2"
+SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug"
 
-RDEPEND=">=xfce-base/libxfcegui4-4.3.22
-	>=xfce-base/xfce4-panel-4.3.22"
+RDEPEND=">=xfce-base/libxfcegui4-4.8
+	>=xfce-base/xfce4-panel-4.8"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.40"
+	dev-util/intltool
+	dev-util/pkgconfig"
 
 pkg_setup() {
-	XFCONF=( $(xfconf_use_debug) )
+	XFCONF=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		$(xfconf_use_debug)
+		)
+
 	DOCS=( AUTHORS NEWS README )
 }
diff --git a/xfce-extra/xfce4-weather-plugin/ChangeLog b/xfce-extra/xfce4-weather-plugin/ChangeLog
index 40ecbef26348..2f1c20bcb7a6 100644
--- a/xfce-extra/xfce4-weather-plugin/ChangeLog
+++ b/xfce-extra/xfce4-weather-plugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-extra/xfce4-weather-plugin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/ChangeLog,v 1.17 2012/02/10 12:28:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/ChangeLog,v 1.18 2012/04/09 21:22:32 ssuominen Exp $
+
+  09 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-weather-plugin-0.7.4-r1.ebuild:
+  Use libdir instead of libexecdir.
 
   10 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-weather-plugin-0.7.4-r1.ebuild:
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4-r1.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4-r1.ebuild
index 84944f7c50b5..c6cac7cef342 100644
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4-r1.ebuild
+++ b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4-r1.ebuild
@@ -1,30 +1,34 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4-r1.ebuild,v 1.3 2012/02/10 12:28:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4-r1.ebuild,v 1.4 2012/04/09 21:22:32 ssuominen Exp $
 
 EAPI=4
-inherit xfconf
+inherit multilib xfconf
 
 DESCRIPTION="A weather plug-in for the Xfce desktop environment"
 HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/0.7/${P}.tar.bz2"
+SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug"
 
-RDEPEND=">=x11-libs/gtk+-2.6:2
+RDEPEND="dev-libs/libxml2
+	x11-libs/gtk+:2
 	>=xfce-base/libxfce4util-4.8
 	>=xfce-base/libxfcegui4-4.8
-	>=xfce-base/xfce4-panel-4.8
-	>=dev-libs/libxml2-2.4"
+	>=xfce-base/xfce4-panel-4.8"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig"
 
 pkg_setup() {
-	XFCONF=( $(xfconf_use_debug) )
+	XFCONF=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		$(xfconf_use_debug)
+		)
+
 	DOCS=( AUTHORS ChangeLog NEWS README TODO )
 }