Fixed DEPEND for modular X. Removed old version.

Package-Manager: portage-2.1_pre3-r1

6 files changed, 32 insertions, 55 deletions

diff --git a/x11-misc/lineakd/ChangeLog b/x11-misc/lineakd/ChangeLog
index fa3f10d28f6d..a0b50ec396a7 100644
--- a/x11-misc/lineakd/ChangeLog
+++ b/x11-misc/lineakd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/lineakd
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineakd/ChangeLog,v 1.26 2005/12/25 00:24:00 genstef Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineakd/ChangeLog,v 1.27 2006/01/15 16:48:49 nelchael Exp $
+
+  15 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -lineakd-0.8.3.ebuild,
+  lineakd-0.8.3-r1.ebuild, lineakd-0.8.4.ebuild:
+  Fixed DEPEND for modular X. Removed old version.
 
 *lineakd-0.8.4 (25 Dec 2005)
 
diff --git a/x11-misc/lineakd/Manifest b/x11-misc/lineakd/Manifest
index fafa4f0bbd53..5c1f3b0fbbe2 100644
--- a/x11-misc/lineakd/Manifest
+++ b/x11-misc/lineakd/Manifest
@@ -1,13 +1,11 @@
-MD5 0f70c8accfcbecdf322cea3721f62413 ChangeLog 3884
+MD5 8f62a54dc77cd64ba0bafec59179d9b4 ChangeLog 4062
 MD5 7d34394cb4d85fa0c1aeca17e614ab85 files/digest-lineakd-0.8.2 65
-MD5 c3a210f82bfa5f48a2de86956bccec43 files/digest-lineakd-0.8.3 65
 MD5 c3a210f82bfa5f48a2de86956bccec43 files/digest-lineakd-0.8.3-r1 65
 MD5 82668be500e0a62ba5e8c5c54f86445c files/digest-lineakd-0.8.4 65
 MD5 e717a512457930f279382e5d4f677ff6 files/lineakd-0.8.3-lineakkb.def.patch 555
 MD5 8e7c3da0e4887af342ee4454896e30c0 files/lineakd-0.8.4-mandestdir.patch 1683
 MD5 c5669d240c36c2f263c6ace7678e382c files/lkey-cast.patch 519
 MD5 f453744ffac61ecc1c9736351cf190af lineakd-0.8.2.ebuild 841
-MD5 99264bf83bb9b5cefbc43230a769f7a6 lineakd-0.8.3-r1.ebuild 926
-MD5 159f5c76c3a78856bb20affbb6c210f1 lineakd-0.8.3.ebuild 833
-MD5 d02c0edc3a2f2ba00d8c28a7eb15184f lineakd-0.8.4.ebuild 1176
+MD5 ff3d00741ee8957a12cb7d4645a49d93 lineakd-0.8.3-r1.ebuild 1150
+MD5 8fa4b4f79510b6dffb337fb5b8195f8d lineakd-0.8.4.ebuild 1153
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
diff --git a/x11-misc/lineakd/files/digest-lineakd-0.8.3 b/x11-misc/lineakd/files/digest-lineakd-0.8.3
deleted file mode 100644
index d69e07e9e514..000000000000
--- a/x11-misc/lineakd/files/digest-lineakd-0.8.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fc1d3add18afbb8e61b8277b89c525c6 lineakd-0.8.3.tar.gz 852158
diff --git a/x11-misc/lineakd/lineakd-0.8.3-r1.ebuild b/x11-misc/lineakd/lineakd-0.8.3-r1.ebuild
index cffe61ff01cf..7b4a82043adf 100644
--- a/x11-misc/lineakd/lineakd-0.8.3-r1.ebuild
+++ b/x11-misc/lineakd/lineakd-0.8.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineakd/lineakd-0.8.3-r1.ebuild,v 1.5 2005/11/21 18:51:57 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineakd/lineakd-0.8.3-r1.ebuild,v 1.6 2006/01/15 16:48:49 nelchael Exp $
 
 inherit eutils
 
@@ -17,7 +17,20 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libX11
+			x11-libs/libXext )
+		virtual/x11 )"
+
+DEPEND="${RDEPEND}
+		|| ( (
+			x11-libs/libxkbfile
+			x11-libs/libXt
+			x11-proto/xextproto
+			x11-proto/xproto )
+		virtual/x11 )"
 
 src_unpack() {
 	unpack "${A}"
diff --git a/x11-misc/lineakd/lineakd-0.8.3.ebuild b/x11-misc/lineakd/lineakd-0.8.3.ebuild
deleted file mode 100644
index 9aba454c3fd9..000000000000
--- a/x11-misc/lineakd/lineakd-0.8.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineakd/lineakd-0.8.3.ebuild,v 1.4 2005/11/02 19:52:49 nelchael Exp $
-
-IUSE=""
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Linux support for Easy Access and Internet Keyboards features X11 support"
-HOMEPAGE="http://lineak.sourceforge.net/"
-SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-
-DEPEND="virtual/x11"
-
-
-src_compile() {
-	econf --with-x || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} lineakddocdir=/usr/share/doc/${P} install || die
-	dodoc AUTHORS README TODO
-	keepdir /usr/lib/lineakd/plugins
-
-	insinto /etc/lineak
-	doins lineakd.conf.example
-	doins lineakd.conf.kde.example
-}
diff --git a/x11-misc/lineakd/lineakd-0.8.4.ebuild b/x11-misc/lineakd/lineakd-0.8.4.ebuild
index 9c7c6f04db98..7113ba347922 100644
--- a/x11-misc/lineakd/lineakd-0.8.4.ebuild
+++ b/x11-misc/lineakd/lineakd-0.8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineakd/lineakd-0.8.4.ebuild,v 1.1 2005/12/25 00:24:00 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineakd/lineakd-0.8.4.ebuild,v 1.2 2006/01/15 16:48:49 nelchael Exp $
 
 inherit eutils
 
@@ -13,22 +13,19 @@ SLOT="0"
 IUSE=""
 KEYWORDS="~amd64 ~ppc ~x86"
 
-RDEPEND="|| (
-			( sys-libs/glibc
+RDEPEND="|| ( (
 			x11-libs/libICE
 			x11-libs/libSM
 			x11-libs/libX11
 			x11-libs/libXext )
-			virtual/x11
-		)"
+		virtual/x11 )"
 DEPEND="${RDEPEND}
-		|| (
-			( x11-libs/libxkbfile
+		|| ( (
+			x11-libs/libxkbfile
 			x11-libs/libXt
 			x11-proto/xextproto
 			x11-proto/xproto )
-			virtual/x11
-		)"
+		virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}