Install to libdir instead of libexecdir.

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

6 files changed, 57 insertions, 32 deletions

diff --git a/xfce-extra/xfce4-battery-plugin/ChangeLog b/xfce-extra/xfce4-battery-plugin/ChangeLog
index 17ecbebd1704..bb13ceddd121 100644
--- a/xfce-extra/xfce4-battery-plugin/ChangeLog
+++ b/xfce-extra/xfce4-battery-plugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-extra/xfce4-battery-plugin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery-plugin/ChangeLog,v 1.10 2011/05/05 11:06:01 phajdan.jr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery-plugin/ChangeLog,v 1.11 2012/04/09 18:38:33 ssuominen Exp $
+
+  09 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-battery-plugin-1.0.0-r1.ebuild:
+  Install to libdir instead of libexecdir.
 
   05 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   xfce4-battery-plugin-1.0.0-r1.ebuild:
diff --git a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.0.0-r1.ebuild b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.0.0-r1.ebuild
index 6714bc486888..44fb9ebc7a6b 100644
--- a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.0.0-r1.ebuild
+++ b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.0.0-r1.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-battery-plugin/xfce4-battery-plugin-1.0.0-r1.ebuild,v 1.5 2011/05/19 20:40:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.0.0-r1.ebuild,v 1.6 2012/04/09 18:38:33 ssuominen Exp $
 
 EAPI=4
-inherit xfconf
+inherit multilib xfconf
 
 DESCRIPTION="A battery monitor panel plugin for the Xfce desktop environment"
 HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/1.0/${P}.tar.bz2"
+SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
@@ -15,15 +15,20 @@ KEYWORDS="amd64 ~arm ppc x86"
 IUSE="debug"
 
 RDEPEND=">=x11-libs/gtk+-2.6:2
-	>=xfce-base/xfce4-panel-4.8
 	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/libxfcegui4-4.8"
+	>=xfce-base/libxfcegui4-4.8
+	>=xfce-base/xfce4-panel-4.8"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
+	dev-util/intltool
+	dev-util/pkgconfig"
 
 pkg_setup() {
 	PATCHES=( "${FILESDIR}"/${P}-sysfs.patch )
-	XFCONF=( $(xfconf_use_debug) )
+
+	XFCONF=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		$(xfconf_use_debug)
+		)
+
 	DOCS=( AUTHORS ChangeLog NEWS README )
 }
diff --git a/xfce-extra/xfce4-verve-plugin/ChangeLog b/xfce-extra/xfce4-verve-plugin/ChangeLog
index 3398d782f858..2f95d3d0c059 100644
--- a/xfce-extra/xfce4-verve-plugin/ChangeLog
+++ b/xfce-extra/xfce4-verve-plugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-extra/xfce4-verve-plugin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-verve-plugin/ChangeLog,v 1.13 2011/04/23 17:45:15 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-verve-plugin/ChangeLog,v 1.14 2012/04/09 18:41:24 ssuominen Exp $
+
+  09 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-verve-plugin-1.0.0.ebuild:
+  Install to libdir instead of libexecdir.
 
   23 Apr 2011; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-verve-plugin-1.0.0.ebuild:
diff --git a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.0.0.ebuild b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.0.0.ebuild
index 708d17e36c84..368a06079b4d 100644
--- a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.0.0.ebuild
+++ b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.0.0.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-verve-plugin/xfce4-verve-plugin-1.0.0.ebuild,v 1.9 2011/05/19 20:07:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.0.0.ebuild,v 1.10 2012/04/09 18:41:24 ssuominen Exp $
 
 EAPI=4
-inherit xfconf
+inherit multilib xfconf
 
 DESCRIPTION="A comfortable command line plugin for the Xfce panel"
 HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/1.0/${P}.tar.bz2"
+SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -15,16 +15,20 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~
 IUSE="dbus"
 
 RDEPEND=">=xfce-base/exo-0.6
-	>=xfce-base/xfce4-panel-4.8
 	>=xfce-base/libxfce4util-4.8
 	>=xfce-base/libxfcegui4-4.8
+	>=xfce-base/xfce4-panel-4.8
 	>=dev-libs/libpcre-5
-	dbus? ( >=dev-libs/dbus-glib-0.88 )"
+	dbus? ( >=dev-libs/dbus-glib-0.98 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig"
 
 pkg_setup() {
-	XFCONF=( $(use_enable dbus) )
+	XFCONF=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		$(use_enable dbus)
+		)
+
 	DOCS=( AUTHORS ChangeLog NEWS README THANKS )
 }
diff --git a/xfce-extra/xfce4-wmdock-plugin/ChangeLog b/xfce-extra/xfce4-wmdock-plugin/ChangeLog
index 2e61704a7024..14587e262444 100644
--- a/xfce-extra/xfce4-wmdock-plugin/ChangeLog
+++ b/xfce-extra/xfce4-wmdock-plugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-extra/xfce4-wmdock-plugin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-wmdock-plugin/ChangeLog,v 1.9 2011/10/29 20:15:04 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-wmdock-plugin/ChangeLog,v 1.10 2012/04/09 18:44:09 ssuominen Exp $
+
+  09 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-wmdock-plugin-0.3.4.ebuild:
+  Install to libdir instead of libexecdir.
 
   29 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
   -xfce4-wmdock-plugin-0.3.2.ebuild,
diff --git a/xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.3.4.ebuild b/xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.3.4.ebuild
index 547fc2bd0c32..04fff6dbeec2 100644
--- a/xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.3.4.ebuild
+++ b/xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.3.4.ebuild
@@ -1,31 +1,35 @@
-# 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-wmdock-plugin/xfce4-wmdock-plugin-0.3.4.ebuild,v 1.4 2011/10/16 05:25:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.3.4.ebuild,v 1.5 2012/04/09 18:44:09 ssuominen Exp $
 
 EAPI=4
-inherit xfconf
+inherit multilib xfconf
 
 DESCRIPTION="a compatibility layer for running WindowMaker dockapps on Xfce4."
 HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-wmdock-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/0.3/${P}.tar.bz2"
+SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="debug"
 
-RDEPEND=">=x11-libs/gtk+-2.6:2
-	>=xfce-base/xfce4-panel-4.8
-	>=xfce-base/libxfcegui4-4.8
+RDEPEND="x11-libs/gtk+:2
 	>=xfce-base/libxfce4util-4.8
+	>=xfce-base/libxfcegui4-4.8
+	>=xfce-base/xfce4-panel-4.8
 	>=x11-libs/libwnck-2.8.1:1"
 DEPEND="${RDEPEND}
+	dev-util/intltool
 	dev-util/pkgconfig
-	sys-devel/gettext
-	dev-util/intltool"
+	sys-devel/gettext"
 
 pkg_setup() {
-	XFCONF=( $(xfconf_use_debug) )
+	XFCONF=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		$(xfconf_use_debug)
+		)
+
 	DOCS=( AUTHORS ChangeLog README TODO )
 }