fix multilib-strict issues

(Portage version: 2.0.51.22-r3)

6 files changed, 31 insertions, 12 deletions

diff --git a/x11-misc/lineak-defaultplugin/ChangeLog b/x11-misc/lineak-defaultplugin/ChangeLog
index b26e89eb76c8..0187bf51d326 100644
--- a/x11-misc/lineak-defaultplugin/ChangeLog
+++ b/x11-misc/lineak-defaultplugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/lineak-defaultplugin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-defaultplugin/ChangeLog,v 1.5 2005/09/17 00:49:32 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-defaultplugin/ChangeLog,v 1.6 2005/11/20 18:51:05 blubb Exp $
+
+  20 Nov 2005; Simon Stelling <blubb@gentoo.org>
+  lineak-defaultplugin-0.8.3.ebuild:
+  fix multilib-strict issues
 
   17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
   Converted to UTF-8, fixed encoding screwups
diff --git a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.8.3.ebuild b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.8.3.ebuild
index 8ee1ee36efc5..d842b5a9f461 100644
--- a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.8.3.ebuild
+++ b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.8.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.8.3.ebuild,v 1.3 2005/06/19 20:32:32 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.8.3.ebuild,v 1.4 2005/11/20 18:51:05 blubb Exp $
+
+inherit multilib
 
 MY_PV=${PV/_/}
 MY_P=${PN/-/_}-${MY_PV}
@@ -12,13 +14,13 @@ SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="virtual/x11
 		x11-misc/lineakd"
 
 src_install () {
-	make DESTDIR=${D} lineakddocdir=/usr/share/doc/${MY_P} install || die
+	make DESTDIR=${D} PLUGINDIR=${D}/usr/$(get_libdir)/lineakd/plugins lineakddocdir=/usr/share/doc/${MY_P} install || die
 	dodoc AUTHORS README
 }
diff --git a/x11-misc/lineak-kdeplugins/ChangeLog b/x11-misc/lineak-kdeplugins/ChangeLog
index a36c2e113984..c7c366b30c06 100644
--- a/x11-misc/lineak-kdeplugins/ChangeLog
+++ b/x11-misc/lineak-kdeplugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/lineak-kdeplugins
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-kdeplugins/ChangeLog,v 1.8 2005/11/02 20:00:57 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-kdeplugins/ChangeLog,v 1.9 2005/11/20 18:51:12 blubb Exp $
+
+  20 Nov 2005; Simon Stelling <blubb@gentoo.org>
+  lineak-kdeplugins-0.8.3.ebuild:
+  fix multilib-strict issues
 
   02 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org>
   lineak-kdeplugins-0.8.2.ebuild, lineak-kdeplugins-0.8.3.ebuild:
diff --git a/x11-misc/lineak-kdeplugins/lineak-kdeplugins-0.8.3.ebuild b/x11-misc/lineak-kdeplugins/lineak-kdeplugins-0.8.3.ebuild
index abd7c8b1c074..73d9820fde35 100644
--- a/x11-misc/lineak-kdeplugins/lineak-kdeplugins-0.8.3.ebuild
+++ b/x11-misc/lineak-kdeplugins/lineak-kdeplugins-0.8.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-kdeplugins/lineak-kdeplugins-0.8.3.ebuild,v 1.4 2005/11/02 20:00:57 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-kdeplugins/lineak-kdeplugins-0.8.3.ebuild,v 1.5 2005/11/20 18:51:12 blubb Exp $
 
-inherit kde
+inherit kde multilib
 
 MY_PV=${PV/_/}
 MY_P=${PN/-/_}-${MY_PV}
@@ -21,3 +21,8 @@ RDEPEND="virtual/x11
 	x11-misc/lineakd"
 
 need-kde 3.2
+
+src_install() {
+	make DESTDIR=${D} PLUGINDIR=${D}/usr/$(get_libdir)/lineakd/plugins lineakddocdir=/usr/share/doc/${P} install || die
+	dodoc AUTHORS README TODO
+}
diff --git a/x11-misc/lineak-xosdplugin/ChangeLog b/x11-misc/lineak-xosdplugin/ChangeLog
index 3442906736ef..bf29321e2bb7 100644
--- a/x11-misc/lineak-xosdplugin/ChangeLog
+++ b/x11-misc/lineak-xosdplugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/lineak-xosdplugin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-xosdplugin/ChangeLog,v 1.7 2005/11/02 19:56:28 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-xosdplugin/ChangeLog,v 1.8 2005/11/20 18:51:07 blubb Exp $
+
+  20 Nov 2005; Simon Stelling <blubb@gentoo.org>
+  lineak-xosdplugin-0.8.3.ebuild:
+  fix multilib-strict issues
 
   02 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org>
   lineak-xosdplugin-0.8.2.ebuild, lineak-xosdplugin-0.8.3.ebuild:
diff --git a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.8.3.ebuild b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.8.3.ebuild
index 3adc3a7bd0b6..7a7d717d3ed9 100644
--- a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.8.3.ebuild
+++ b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.8.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.8.3.ebuild,v 1.5 2005/11/02 19:56:28 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.8.3.ebuild,v 1.6 2005/11/20 18:51:07 blubb Exp $
 
-inherit eutils
+inherit multilib
 
 IUSE=""
 MY_PV=${PV/_/}
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc x86"
 
 RDEPEND="virtual/x11
 		=x11-misc/lineakd-${PV}*
@@ -27,6 +27,6 @@ src_compile() {
 }
 
 src_install () {
-	make DESTDIR=${D} lineakddocdir=/usr/share/doc/${P} install || die
+	make DESTDIR=${D} PLUGINDIR=${D}/usr/$(get_libdir)/lineakd/plugins lineakddocdir=/usr/share/doc/${P} install || die
 	dodoc AUTHORS README TODO
 }