fixed motif dep

42 files changed, 168 insertions, 125 deletions

diff --git a/app-sci/ncbi-tools/ChangeLog b/app-sci/ncbi-tools/ChangeLog
index 8b6a4842253d..c83ca765400b 100644
--- a/app-sci/ncbi-tools/ChangeLog
+++ b/app-sci/ncbi-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-sci/ncbi-tools
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/ncbi-tools/ChangeLog,v 1.5 2003/12/13 21:10:46 sediener Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/ncbi-tools/ChangeLog,v 1.6 2004/01/11 13:51:29 lanius Exp $
+
+  11 Jan 2004; Heinrich Wendel <lanius@gentoo.org>
+  ncbi-tools-04222003-r1.ebuild, ncbi-tools-04222003-r2.ebuild,
+  ncbi-tools-20030422.ebuild, ncbi-tools-20031103.ebuild:
+  fixed motif dep
 
 *ncbi-tools-20031103 (13 Dec 2003)
 
diff --git a/app-sci/ncbi-tools/Manifest b/app-sci/ncbi-tools/Manifest
index bcba2d354f4a..ab7794ea09cb 100644
--- a/app-sci/ncbi-tools/Manifest
+++ b/app-sci/ncbi-tools/Manifest
@@ -1,9 +1,9 @@
-MD5 c2e8575214b0fc09491707b7a62fbf74 ncbi-tools-04222003-r1.ebuild 2269
+MD5 3b9a7641e55ab2a567197f767f9860e3 ncbi-tools-04222003-r1.ebuild 2259
 MD5 67da8c37fd39a6869fffbaf805c4eab5 ncbi-tools-04222003.ebuild 2126
-MD5 dabcf899df868cd13e2fd1a00a0db3c1 ncbi-tools-20030422.ebuild 2336
-MD5 5da43ab21b280376d96ac8779bf63b0f ncbi-tools-04222003-r2.ebuild 2363
-MD5 9c2508fc859c5dab9a49508107be1a25 ncbi-tools-20031103.ebuild 2320
-MD5 097731d4ca12276e4613506ea7a5ec25 ChangeLog 1286
+MD5 5494c99330aedd33dbb8b2768805e7cc ncbi-tools-20030422.ebuild 2326
+MD5 60fac9aa207182410d1fa4c26e2aa13a ncbi-tools-04222003-r2.ebuild 2354
+MD5 41fea5bbb2eb97f17b1bb05ed88127ed ncbi-tools-20031103.ebuild 2310
+MD5 50f3512ef67fe22bb637e0936ef2dff2 ChangeLog 1476
 MD5 e8b4df3df76800c376905734d8043cfa metadata.xml 216
 MD5 14127812e393e96ae78632a71f4a9f01 files/digest-ncbi-tools-04222003 114
 MD5 7c726288b5f5fd1f2fafcf08a7ffa267 files/dot-ncbirc 26
diff --git a/app-sci/ncbi-tools/ncbi-tools-04222003-r1.ebuild b/app-sci/ncbi-tools/ncbi-tools-04222003-r1.ebuild
index 6178c970adc3..98c45ba05fc7 100644
--- a/app-sci/ncbi-tools/ncbi-tools-04222003-r1.ebuild
+++ b/app-sci/ncbi-tools/ncbi-tools-04222003-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/ncbi-tools/ncbi-tools-04222003-r1.ebuild,v 1.4 2003/09/10 01:44:24 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/ncbi-tools/ncbi-tools-04222003-r1.ebuild,v 1.5 2004/01/11 13:51:29 lanius Exp $
 
 DESCRIPTION="NCBI toolkit including the BLAST group of programs, entrez, ddv, udv, sequin and others"
 HOMEPAGE="http://www.ncbi.nlm.nih.gov/"
@@ -14,7 +14,7 @@ KEYWORDS="x86 ~ppc ~sparc ~alpha"
 IUSE="X"
 
 DEPEND="app-shells/tcsh
-	X? ( >=xfree-4.3.0 >=x11-libs/openmotif-2.2.2 media-libs/libpng )"
+	X? ( >=xfree-4.3.0 x11-libs/openmotif media-libs/libpng )"
 
 S=${WORKDIR}/${P}
 
diff --git a/app-sci/ncbi-tools/ncbi-tools-04222003-r2.ebuild b/app-sci/ncbi-tools/ncbi-tools-04222003-r2.ebuild
index 7a5b7d4421b6..878d1717ca6a 100644
--- a/app-sci/ncbi-tools/ncbi-tools-04222003-r2.ebuild
+++ b/app-sci/ncbi-tools/ncbi-tools-04222003-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/ncbi-tools/ncbi-tools-04222003-r2.ebuild,v 1.1 2003/10/08 22:08:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/ncbi-tools/ncbi-tools-04222003-r2.ebuild,v 1.2 2004/01/11 13:51:29 lanius Exp $
 
 DESCRIPTION="NCBI toolkit including the BLAST group of programs, entrez, ddv, udv, sequin and others"
 HOMEPAGE="http://www.ncbi.nlm.nih.gov/"
@@ -14,7 +14,7 @@ KEYWORDS="x86 ~ppc ~sparc ~alpha"
 IUSE="X"
 
 DEPEND="app-shells/tcsh
-	X? ( >=xfree-4.3.0 >=x11-libs/openmotif-2.2.2 media-libs/libpng )"
+	X? ( >=xfree-4.3.0 x11-libs/openmotif media-libs/libpng )"
 
 S=${WORKDIR}/${P}
 
diff --git a/app-sci/ncbi-tools/ncbi-tools-20030422.ebuild b/app-sci/ncbi-tools/ncbi-tools-20030422.ebuild
index 4992df2356ff..17bd8fbb3504 100644
--- a/app-sci/ncbi-tools/ncbi-tools-20030422.ebuild
+++ b/app-sci/ncbi-tools/ncbi-tools-20030422.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/ncbi-tools/ncbi-tools-20030422.ebuild,v 1.1 2003/11/11 15:49:33 sediener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/ncbi-tools/ncbi-tools-20030422.ebuild,v 1.2 2004/01/11 13:51:29 lanius Exp $
 
 DESCRIPTION="NCBI toolkit including the BLAST group of programs, entrez, ddv, udv, sequin and others"
 HOMEPAGE="http://www.ncbi.nlm.nih.gov/"
@@ -14,7 +14,7 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 IUSE="X"
 
 DEPEND="app-shells/tcsh
-	X? ( >=xfree-4.3.0 >=x11-libs/openmotif-2.2.2 media-libs/libpng )"
+	X? ( >=xfree-4.3.0 x11-libs/openmotif media-libs/libpng )"
 
 S=${WORKDIR}/${P}
 
diff --git a/app-sci/ncbi-tools/ncbi-tools-20031103.ebuild b/app-sci/ncbi-tools/ncbi-tools-20031103.ebuild
index 1c060f9174c7..01ab392cf43c 100644
--- a/app-sci/ncbi-tools/ncbi-tools-20031103.ebuild
+++ b/app-sci/ncbi-tools/ncbi-tools-20031103.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/ncbi-tools/ncbi-tools-20031103.ebuild,v 1.1 2003/12/13 21:10:46 sediener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/ncbi-tools/ncbi-tools-20031103.ebuild,v 1.2 2004/01/11 13:51:29 lanius Exp $
 
 DESCRIPTION="NCBI toolkit including the BLAST group of programs, entrez, ddv, udv, sequin and others"
 HOMEPAGE="http://www.ncbi.nlm.nih.gov/"
@@ -14,7 +14,7 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 IUSE="X"
 
 DEPEND="app-shells/tcsh
-	X? ( >=xfree-4.3.0 >=x11-libs/openmotif-2.2.2 media-libs/libpng )"
+	X? ( >=xfree-4.3.0 x11-libs/openmotif media-libs/libpng )"
 S=${WORKDIR}/${P}
 
 src_compile() {
diff --git a/media-gfx/grace/ChangeLog b/media-gfx/grace/ChangeLog
index e00ef60156c9..683cda4657e5 100644
--- a/media-gfx/grace/ChangeLog
+++ b/media-gfx/grace/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/grace
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/ChangeLog,v 1.17 2003/12/10 16:31:17 phosphan Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/ChangeLog,v 1.18 2004/01/11 13:55:22 lanius Exp $
+
+  11 Jan 2004; Heinrich Wendel <lanius@gentoo.org> grace-5.1.10-r1.ebuild,
+  grace-5.1.12-r1.ebuild, grace-5.1.13.ebuild, grace-5.1.7-r2.ebuild:
+  fixed motif dep
+
+  11 Jan 2004; Heinrich Wendel <lanius@gentoo.org> grace-5.1.10-r1.ebuild,
+  grace-5.1.12-r1.ebuild, grace-5.1.13.ebuild, grace-5.1.7-r2.ebuild:
+  fixed motif dep
 
   10 Dec 2003; Patrick Kursawe <phosphan@gentoo.org> grace-5.1.13.ebuild:
   I guess ~ppc was removed by accident, at least there is no !ppc.
diff --git a/media-gfx/grace/Manifest b/media-gfx/grace/Manifest
index b6afa5a0bc49..b3a1f36970db 100644
--- a/media-gfx/grace/Manifest
+++ b/media-gfx/grace/Manifest
@@ -1,8 +1,8 @@
-MD5 de60fec1c4a9fd521c07acc1a83ea650 grace-5.1.7-r2.ebuild 2040
-MD5 35426ee0adaebdf35ac04f3a6d95ed05 grace-5.1.10-r1.ebuild 3082
-MD5 b976d1d17feb9bf0c3648063a306f284 grace-5.1.13.ebuild 3403
-MD5 a45fb40a8636934fb263ad90235be236 grace-5.1.12-r1.ebuild 3501
-MD5 d85bec436971492257c0bdd1a080d15d ChangeLog 3240
+MD5 4ae817ed531044a8130b6fd5c9debbe8 grace-5.1.7-r2.ebuild 2046
+MD5 3bbd19d9ae81146ecb1e6ebed90869b3 grace-5.1.10-r1.ebuild 3088
+MD5 bab6c77313a123348da8f7ed0f0d39fc grace-5.1.13.ebuild 3406
+MD5 737c1a64f521dbb45782d45490ea6970 grace-5.1.12-r1.ebuild 3507
+MD5 c77cd1d6a3c7ad0388585e0e8156fede ChangeLog 3566
 MD5 3862c6034595e39fcd14a6bd239f749b metadata.xml 270
 MD5 97e5d164e32726698f9e90f93d723c8f files/grace-helpviewer-gentoo.diff 384
 MD5 32c9edc625157e58d92136712af4dc0b files/grace-5.1.12-t1lib-fix-gentoo.patch 836
diff --git a/media-gfx/grace/grace-5.1.10-r1.ebuild b/media-gfx/grace/grace-5.1.10-r1.ebuild
index 89c01b417126..394e00e8342f 100644
--- a/media-gfx/grace/grace-5.1.10-r1.ebuild
+++ b/media-gfx/grace/grace-5.1.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.10-r1.ebuild,v 1.4 2003/10/30 08:52:59 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.10-r1.ebuild,v 1.5 2004/01/11 13:55:22 lanius Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ KEYWORDS="x86 ~ppc"
 IUSE="pdflib"
 
 DEPEND="virtual/x11
-	virtual/motif
+	x11-libs/openmotif
 	media-libs/libpng
 	media-libs/t1lib
 	>=media-libs/tiff-3.5
diff --git a/media-gfx/grace/grace-5.1.12-r1.ebuild b/media-gfx/grace/grace-5.1.12-r1.ebuild
index fb5c311c2295..fdba15c2d8f0 100644
--- a/media-gfx/grace/grace-5.1.12-r1.ebuild
+++ b/media-gfx/grace/grace-5.1.12-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.12-r1.ebuild,v 1.5 2003/10/30 08:52:59 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.12-r1.ebuild,v 1.6 2004/01/11 13:55:22 lanius Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ KEYWORDS="x86 ~sparc"
 IUSE="debug png jpeg pdflib fftw netcdf"
 
 DEPEND="virtual/x11
-	virtual/motif
+	x11-libs/openmotif
 	>=sys-libs/zlib-1.0.3
 	>=media-libs/t1lib-1.3.1
 	>=media-libs/tiff-3.5
diff --git a/media-gfx/grace/grace-5.1.13.ebuild b/media-gfx/grace/grace-5.1.13.ebuild
index 32a1f1d85034..839346cbde6a 100644
--- a/media-gfx/grace/grace-5.1.13.ebuild
+++ b/media-gfx/grace/grace-5.1.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.13.ebuild,v 1.5 2003/12/10 16:31:17 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.13.ebuild,v 1.6 2004/01/11 13:55:22 lanius Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ KEYWORDS="x86 ~sparc ~ppc"
 IUSE="debug png jpeg pdflib fftw netcdf"
 
 DEPEND="virtual/x11
-	virtual/motif
+	x11-libs/openmotif
 	>=sys-libs/zlib-1.0.3
 	>=media-libs/t1lib-1.3.1
 	>=media-libs/tiff-3.5
diff --git a/media-gfx/grace/grace-5.1.7-r2.ebuild b/media-gfx/grace/grace-5.1.7-r2.ebuild
index 8bea92445270..266b5785a470 100644
--- a/media-gfx/grace/grace-5.1.7-r2.ebuild
+++ b/media-gfx/grace/grace-5.1.7-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.7-r2.ebuild,v 1.11 2003/09/08 20:40:19 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.7-r2.ebuild,v 1.12 2004/01/11 13:55:22 lanius Exp $
 
 DESCRIPTION="WYSIWYG 2D plotting tool for the X Window System"
 SRC_URI="ftp://plasma-gate.weizmann.ac.il/pub/grace/src/${P}.tar.gz"
@@ -12,7 +12,7 @@ KEYWORDS="x86 ppc"
 IUSE="pdflib"
 
 DEPEND="virtual/x11
-	virtual/motif
+	x11-libs/openmotif
 	media-libs/libpng
 	>=media-libs/tiff-3.5
 	pdflib? ( >=media-libs/pdflib-3.0.2 )"
diff --git a/net-print/mtink/ChangeLog b/net-print/mtink/ChangeLog
index 68b52252f059..6418151ac5ba 100644
--- a/net-print/mtink/ChangeLog
+++ b/net-print/mtink/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/mtink
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/mtink/ChangeLog,v 1.2 2003/11/25 17:46:39 lanius Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/mtink/ChangeLog,v 1.3 2004/01/11 13:50:37 lanius Exp $
+
+*mtink-0.9.55 (11 Jan 2004)
+
+  11 Jan 2004; Heinrich Wendel <lanius@gentoo.org> mtink-0.9.55.ebuild,
+  mtink-0.9.57.ebuild:
+  fixed motif dep
 
 *mtink-0.9.57 (25 Nov 2003)
 
diff --git a/net-print/mtink/Manifest b/net-print/mtink/Manifest
index 00452bb32919..d4093aafa56f 100644
--- a/net-print/mtink/Manifest
+++ b/net-print/mtink/Manifest
@@ -1,7 +1,7 @@
-MD5 f81048ec4e733f01ec5f76c74d8a923d mtink-0.9.57.ebuild 1307
-MD5 5e614785153430885846ab5c6761cc1b ChangeLog 463
+MD5 63e9df44c0873e2cd3abf17598bfc71e mtink-0.9.57.ebuild 1312
+MD5 56c0aeb5b5cc7c93cc4cd9ecd2ec153e ChangeLog 606
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 432113140ae37a2e4cfe9263e807dc31 mtink-0.9.55.ebuild 1360
+MD5 94bda9e7c3c0f7dfb8c54f3ff9f15ed5 mtink-0.9.55.ebuild 1363
 MD5 d634fcba2aac9dc7626141e6ff68e538 files/mtinkd.confd 511
 MD5 8423fb1ca2090ec4069b5a0ecb696183 files/mtinkd.rc 456
 MD5 6e4f37da8ada0ed3ec7b695aba334737 files/digest-mtink-0.9.55 64
diff --git a/net-print/mtink/mtink-0.9.55.ebuild b/net-print/mtink/mtink-0.9.55.ebuild
index ade0c6b5c3ef..26275e49cd70 100644
--- a/net-print/mtink/mtink-0.9.55.ebuild
+++ b/net-print/mtink/mtink-0.9.55.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/mtink/mtink-0.9.55.ebuild,v 1.2 2003/09/07 00:18:10 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/mtink/mtink-0.9.55.ebuild,v 1.3 2004/01/11 13:50:37 lanius Exp $
 
 DESCRIPTION="mtink is a status monitor and inkjet cartridge changer for some Epson printers"
 HOMEPAGE="http://xwtools.automatix.de/"
@@ -10,7 +10,7 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE="doc cups"
 
-DEPEND="virtual/motif
+DEPEND="x11-libs/openmotif
 	x11-base/xfree
 	cups? ( net-print/cups )"
 RDEPEND="${DEPEND}"
diff --git a/net-print/mtink/mtink-0.9.57.ebuild b/net-print/mtink/mtink-0.9.57.ebuild
index 46c6f91db739..457e1d0992c1 100644
--- a/net-print/mtink/mtink-0.9.57.ebuild
+++ b/net-print/mtink/mtink-0.9.57.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/mtink/mtink-0.9.57.ebuild,v 1.1 2003/11/25 17:46:39 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/mtink/mtink-0.9.57.ebuild,v 1.2 2004/01/11 13:50:37 lanius Exp $
 
 DESCRIPTION="mtink is a status monitor and inkjet cartridge changer for some Epson printers"
 HOMEPAGE="http://xwtools.automatix.de/"
@@ -10,7 +10,7 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE="doc cups"
 
-DEPEND="virtual/motif
+DEPEND="x11-libs/openmotif
 	x11-base/xfree
 	cups? ( net-print/cups )"
 
diff --git a/net-www/amaya/ChangeLog b/net-www/amaya/ChangeLog
index e8a526c8aa4d..3db97b8d0bdf 100644
--- a/net-www/amaya/ChangeLog
+++ b/net-www/amaya/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/amaya
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/ChangeLog,v 1.17 2004/01/09 21:54:01 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/ChangeLog,v 1.18 2004/01/11 13:51:11 lanius Exp $
+
+  11 Jan 2004; Heinrich Wendel <lanius@gentoo.org> amaya-6.1.ebuild,
+  amaya-7.1.ebuild, amaya-7.2.ebuild, amaya-8.0.ebuild, amaya-8.1a.ebuild,
+  amaya-8.2.ebuild:
+  fixed motif dep
 
   09 Jan 2004; Jason Wever <weeve@gentoo.org> amaya-8.0.ebuild,
   amaya-8.2.ebuild:
diff --git a/net-www/amaya/Manifest b/net-www/amaya/Manifest
index 3cfd9ce098fc..8f12b890b08e 100644
--- a/net-www/amaya/Manifest
+++ b/net-www/amaya/Manifest
@@ -1,13 +1,13 @@
-MD5 b19f58e47d0abc806871b1196aa117da ChangeLog 2380
-MD5 0fae3b4ea64c8075649794bb4b2961fd amaya-6.1.ebuild 878
-MD5 f27af9fbb9ea94096ab02895a097e531 amaya-7.1.ebuild 896
-MD5 cb785d5b1a1dfe1d7826ef01398a99ca amaya-7.2.ebuild 1094
-MD5 6792b1fe08bd3ea3edd4d36526de31f7 amaya-8.0.ebuild 1128
-MD5 38a2d6db066cafb4f4845a007cdf8cfa amaya-8.1a.ebuild 1124
-MD5 018a51965db4bc852efda3b5a08930c5 amaya-8.2.ebuild 1128
+MD5 b293ae75dd661bcca45d84822ca7faf7 amaya-7.1.ebuild 903
+MD5 d6314206bea35a4b6ee5fcf486796626 amaya-8.1a.ebuild 1129
+MD5 6260e5ccc9154a8503be09a94d9d8c3c amaya-7.2.ebuild 1097
+MD5 8a5a18da2911190e397dbbbd7831347e amaya-8.0.ebuild 1134
+MD5 d9f59fac6504afefebacdff889e992b7 amaya-6.1.ebuild 881
+MD5 932795e7ee09ff0be9a03eabe68bc8d0 ChangeLog 2564
+MD5 2676a3605f7c924ab889866a0d66b3f6 amaya-8.2.ebuild 1134
 MD5 215d7cb127e55154da64d6095454f996 files/digest-amaya-6.1 63
 MD5 11b38151f5999852f7a8464584ac5c71 files/digest-amaya-7.1 63
 MD5 52a934a60b4b55a0381aa7006fd375a3 files/digest-amaya-7.2 63
 MD5 7a19c33d4760bf30e9618b8eb83078d6 files/digest-amaya-8.0 63
-MD5 353beae5d0ef0a78307400c82175a6cd files/digest-amaya-8.1a 64
 MD5 d32b3050e60c33e8bae74f477e2cc393 files/digest-amaya-8.2 63
+MD5 353beae5d0ef0a78307400c82175a6cd files/digest-amaya-8.1a 64
diff --git a/net-www/amaya/amaya-6.1.ebuild b/net-www/amaya/amaya-6.1.ebuild
index 9d708c4d12c2..68a0d21bb748 100644
--- a/net-www/amaya/amaya-6.1.ebuild
+++ b/net-www/amaya/amaya-6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/amaya-6.1.ebuild,v 1.13 2003/09/06 01:54:08 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/amaya-6.1.ebuild,v 1.14 2004/01/11 13:51:11 lanius Exp $
 
 S=${WORKDIR}/Amaya/LINUX-ELF
 DESCRIPTION="The W3C Web-Browser"
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-RDEPEND="virtual/motif"
+RDEPEND="x11-libs/openmotif"
 DEPEND="dev-lang/perl
 	${RDEPEND}"
 
diff --git a/net-www/amaya/amaya-7.1.ebuild b/net-www/amaya/amaya-7.1.ebuild
index c6a65cd5793d..fab512a29043 100644
--- a/net-www/amaya/amaya-7.1.ebuild
+++ b/net-www/amaya/amaya-7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/amaya-7.1.ebuild,v 1.6 2003/07/13 21:44:10 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/amaya-7.1.ebuild,v 1.7 2004/01/11 13:51:11 lanius Exp $
 
 inherit libtool
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-RDEPEND="virtual/motif"
+RDEPEND="x11-libs/openmotif"
 DEPEND="dev-lang/perl
 	${RDEPEND}"
 
diff --git a/net-www/amaya/amaya-7.2.ebuild b/net-www/amaya/amaya-7.2.ebuild
index 2a4eb1079083..f3d30000c1d4 100644
--- a/net-www/amaya/amaya-7.2.ebuild
+++ b/net-www/amaya/amaya-7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/amaya-7.2.ebuild,v 1.7 2003/09/06 01:54:08 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/amaya-7.2.ebuild,v 1.8 2004/01/11 13:51:11 lanius Exp $
 
 inherit libtool
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="gtk"
 
-RDEPEND="virtual/motif
+RDEPEND="x11-libs/openmotif
 	( gtk? =x11-libs/gtk+-1.2* )
 	( gtk? =dev-libs/glib-1.2* )"
 
diff --git a/net-www/amaya/amaya-8.0.ebuild b/net-www/amaya/amaya-8.0.ebuild
index 8ceccc6b0ed3..e1db02529a1b 100644
--- a/net-www/amaya/amaya-8.0.ebuild
+++ b/net-www/amaya/amaya-8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/amaya-8.0.ebuild,v 1.5 2004/01/09 21:54:01 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/amaya-8.0.ebuild,v 1.6 2004/01/11 13:51:11 lanius Exp $
 
 inherit libtool
 
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="gtk"
 
 RDEPEND="
-	( gtk? =x11-libs/gtk+-1.2* : virtual/motif )
+	( gtk? =x11-libs/gtk+-1.2* : x11-libs/openmotif )
 	( gtk? =dev-libs/glib-1.2* )
 	gtk? ( media-libs/imlib )"
 
diff --git a/net-www/amaya/amaya-8.1a.ebuild b/net-www/amaya/amaya-8.1a.ebuild
index f6f888d1ab55..8996992fcbc1 100644
--- a/net-www/amaya/amaya-8.1a.ebuild
+++ b/net-www/amaya/amaya-8.1a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/amaya-8.1a.ebuild,v 1.3 2003/10/01 12:32:04 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/amaya-8.1a.ebuild,v 1.4 2004/01/11 13:51:11 lanius Exp $
 
 inherit libtool
 
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="gtk"
 
 RDEPEND="
-	( gtk? =x11-libs/gtk+-1.2* : virtual/motif )
+	( gtk? =x11-libs/gtk+-1.2* : x11-libs/openmotif )
 	( gtk? =dev-libs/glib-1.2* )
 	gtk? ( media-libs/imlib )"
 
diff --git a/net-www/amaya/amaya-8.2.ebuild b/net-www/amaya/amaya-8.2.ebuild
index b488edf604b4..0bc19c6e12bb 100644
--- a/net-www/amaya/amaya-8.2.ebuild
+++ b/net-www/amaya/amaya-8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/amaya-8.2.ebuild,v 1.3 2004/01/09 21:54:01 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/amaya-8.2.ebuild,v 1.4 2004/01/11 13:51:11 lanius Exp $
 
 inherit libtool
 
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="gtk"
 
 RDEPEND="
-	( gtk? =x11-libs/gtk+-1.2* : virtual/motif )
+	( gtk? =x11-libs/gtk+-1.2* : x11-libs/openmotif )
 	( gtk? =dev-libs/glib-1.2* )
 	gtk? ( media-libs/imlib )"
 
diff --git a/x11-libs/ViewKlass/ChangeLog b/x11-libs/ViewKlass/ChangeLog
index ac8517330a80..f7d886532db2 100644
--- a/x11-libs/ViewKlass/ChangeLog
+++ b/x11-libs/ViewKlass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/ViewKlass
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/ViewKlass/ChangeLog,v 1.2 2003/02/11 08:13:44 mkennedy Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/ViewKlass/ChangeLog,v 1.3 2004/01/11 13:51:46 lanius Exp $
+
+  11 Jan 2004; Heinrich Wendel <lanius@gentoo.org> ViewKlass-0.6.0.ebuild:
+  fixed motif dep
 
 *ViewKlass-0.6.0 (11 Feb 2003)
 
diff --git a/x11-libs/ViewKlass/Manifest b/x11-libs/ViewKlass/Manifest
index 2b471f775cba..7f39a024924a 100644
--- a/x11-libs/ViewKlass/Manifest
+++ b/x11-libs/ViewKlass/Manifest
@@ -1,4 +1,4 @@
-MD5 e58e5161f1e0d8f12d275dc5ce685ac6 ChangeLog 624
-MD5 dcdee5abab396875fc02aef999e998a8 ViewKlass-0.6.0.ebuild 860
+MD5 a11793b60c8b7f06c03d1d3172c8afd6 ViewKlass-0.6.0.ebuild 865
+MD5 9ee49f77ee0a38b01b2eab73975242e2 ChangeLog 716
 MD5 f0a90700a678d09e23a00056fe8e774f files/ViewKlass-0.6.0-gentoo.patch.gz 8810
 MD5 36b02a31ee3dcda42c1d897e0e75a977 files/digest-ViewKlass-0.6.0 67
diff --git a/x11-libs/ViewKlass/ViewKlass-0.6.0.ebuild b/x11-libs/ViewKlass/ViewKlass-0.6.0.ebuild
index b309c1ff4101..051ed062f924 100644
--- a/x11-libs/ViewKlass/ViewKlass-0.6.0.ebuild
+++ b/x11-libs/ViewKlass/ViewKlass-0.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/ViewKlass/ViewKlass-0.6.0.ebuild,v 1.3 2003/02/13 16:54:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/ViewKlass/ViewKlass-0.6.0.ebuild,v 1.4 2004/01/11 13:51:46 lanius Exp $
 
 IUSE=""
 
@@ -9,7 +9,7 @@ SRC_URI="http://unc.dl.sourceforge.net/sourceforge/viewklass/${P}.tar.gz"
 HOMEPAGE="http://viewklass.sourceforge.net"
 LICENSE="LGPL-2.1"
 
-DEPEND="virtual/motif"
+DEPEND="x11-libs/openmotif"
 
 SLOT="0"
 KEYWORDS="~x86 ~sparc"
diff --git a/x11-misc/xcb/ChangeLog b/x11-misc/xcb/ChangeLog
index ec210a7fd0f8..9218ba821653 100644
--- a/x11-misc/xcb/ChangeLog
+++ b/x11-misc/xcb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xcb
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcb/ChangeLog,v 1.5 2003/11/04 03:40:44 abhishek Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcb/ChangeLog,v 1.6 2004/01/11 13:52:22 lanius Exp $
+
+  11 Jan 2004; Heinrich Wendel <lanius@gentoo.org> xcb-2.4.ebuild:
+  fixed motif dep
 
   03 Nov 2003; Abhishek Amit <abhishek@gentoo.org> metadata.xml:
   Added metadata.xml
diff --git a/x11-misc/xcb/xcb-2.4.ebuild b/x11-misc/xcb/xcb-2.4.ebuild
index f673775646ca..a366a091bc6a 100644
--- a/x11-misc/xcb/xcb-2.4.ebuild
+++ b/x11-misc/xcb/xcb-2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcb/xcb-2.4.ebuild,v 1.4 2003/06/21 18:33:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcb/xcb-2.4.ebuild,v 1.5 2004/01/11 13:52:22 lanius Exp $
 
 DESCRIPTION="Marc Lehmann's improved X Cut Buffers"
 HOMEPAGE="http://www.goof.com/pcg/marc/xcb.html"
@@ -11,7 +11,7 @@ KEYWORDS="alpha x86"
 IUSE="motif"
 
 DEPEND="virtual/x11
-	motif? ( virtual/motif )"
+	motif? ( x11-libs/openmotif )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 4355a18fd2c9..847adb673421 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.45 2004/01/11 01:48:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.46 2004/01/11 13:53:15 lanius Exp $
+
+  11 Jan 2004; Heinrich Wendel <lanius@gentoo.org>
+  xscreensaver-4.05-r3.ebuild, xscreensaver-4.10.ebuild,
+  xscreensaver-4.14-r1.ebuild, xscreensaver-4.14.ebuild:
+  fixed motif dep
 
   09 Jan 2004; Alastair Tse <liquidx@gentoo.org> xscreensaver-4.14-r1.ebuild,
   files/xscreensaver-4.14-icc.patch:
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 7d7b4990a529..2108ab1ed381 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,16 +1,16 @@
-MD5 f044ad1455348e9d5689667831185655 ChangeLog 9234
-MD5 3cea46b1218e1b35ca6fbae8371125c3 xscreensaver-4.05-r3.ebuild 2468
+MD5 31280a94b2c849cb1e791e966b111f3f xscreensaver-4.10.ebuild 4493
+MD5 2626622aecb3ac1e23a98a135af75c56 xscreensaver-4.14.ebuild 4379
+MD5 d0b26b109362d6e27f44c8b91efd5619 xscreensaver-4.05-r3.ebuild 2471
+MD5 d4b135833171ed1166bff917c0e4c516 xscreensaver-4.14-r1.ebuild 4594
+MD5 6ea931ed84188df586e687cdbe11e887 ChangeLog 9416
 MD5 0c7e1c065d3ff356793aa700b36c3380 metadata.xml 309
-MD5 16d7ca3502b68e149b3b8d48127f6125 xscreensaver-4.10.ebuild 4486
-MD5 ce57e6860fa71684790861e0842f2b3b xscreensaver-4.14-r1.ebuild 4591
-MD5 7ee9d56f0de7afe1c8233adccb515895 xscreensaver-4.14.ebuild 4375
-MD5 ab5c2c76af72bf7bc833b2ad04a4875a files/digest-xscreensaver-4.05-r3 70
-MD5 51f90e218232e1e767a3962668c7ec9f files/xscreensaver-4.10-klein.c 10125
-MD5 dc4579312065187f296cd6fdeba96664 files/xscreensaver-4.09-norpm.patch 1266
 MD5 090965baf6477220cda1f998feae72d6 files/digest-xscreensaver-4.10 70
+MD5 a7b4dde4c87b97301e1a02c7ddc2dfc9 files/digest-xscreensaver-4.14 70
+MD5 51f90e218232e1e767a3962668c7ec9f files/xscreensaver-4.10-klein.c 10125
 MD5 dc4579312065187f296cd6fdeba96664 files/xscreensaver-4.10-norpm.patch 1266
+MD5 18988e2c62fe964e00bc98c251dba3ee files/xscreensaver-4.14-icc.patch 8126
+MD5 ab5c2c76af72bf7bc833b2ad04a4875a files/digest-xscreensaver-4.05-r3 70
 MD5 a7b4dde4c87b97301e1a02c7ddc2dfc9 files/digest-xscreensaver-4.14-r1 70
-MD5 a7b4dde4c87b97301e1a02c7ddc2dfc9 files/digest-xscreensaver-4.14 70
 MD5 23c5d8085eb70d6dc6168857a31cc284 files/xscreensaver-4.14-fortune.patch 348
-MD5 18988e2c62fe964e00bc98c251dba3ee files/xscreensaver-4.14-icc.patch 8126
+MD5 dc4579312065187f296cd6fdeba96664 files/xscreensaver-4.09-norpm.patch 1266
 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/pam.d/xscreensaver 79
diff --git a/x11-misc/xscreensaver/xscreensaver-4.05-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-4.05-r3.ebuild
index 1e9b514e1f40..e2f54b8f334a 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.05-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.05-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.05-r3.ebuild,v 1.14 2003/09/05 23:18:18 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.05-r3.ebuild,v 1.15 2004/01/11 13:53:15 lanius Exp $
 
 IUSE="pam gtk motif gnome opengl"
 
@@ -13,7 +13,7 @@ SLOT="0"
 
 DEPEND="virtual/x11 sys-devel/bc
 	gtk? ( x11-libs/gtk+ )
-	motif? ( virtual/motif )
+	motif? ( x11-libs/openmotif )
 	opengl? ( virtual/opengl >=media-libs/gle-3.0.1 )
 	gnome? ( media-libs/gdk-pixbuf
 		>=gnome-base/control-center-1.4.0.1-r1 )
diff --git a/x11-misc/xscreensaver/xscreensaver-4.10.ebuild b/x11-misc/xscreensaver/xscreensaver-4.10.ebuild
index d0ca3b2a5168..42fbf1d0d2df 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.10.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.10.ebuild,v 1.11 2003/11/08 16:57:15 todd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.10.ebuild,v 1.12 2004/01/11 13:53:15 lanius Exp $
 
 IUSE="pam kerberos krb4 gtk gtk2 gnome opengl jpeg xinerama"
 
@@ -35,7 +35,7 @@ RDEPEND="virtual/x11
 					=gnome-base/libglade-0.17* ) )
 	gtk? ( !gtk2? ( gnome? ( =gnome-base/control-center-1.4*
 							>=gnome-base/gnome-libs-1.4 ) ) )
-	!gtk? ( virtual/motif
+	!gtk? ( x11-libs/openmotif
 		>=media-libs/gdk-pixbuf-0.18 )
 	pam? ( sys-libs/pam )
 	kerberos? ( krb4? ( >=app-crypt/mit-krb5-1.2.5 ) )
diff --git a/x11-misc/xscreensaver/xscreensaver-4.14-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-4.14-r1.ebuild
index b266fa665589..8ebd80b85ea1 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.14-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.14-r1.ebuild,v 1.6 2004/01/11 01:48:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.14-r1.ebuild,v 1.7 2004/01/11 13:53:15 lanius Exp $
 
 IUSE="pam kerberos krb4 gtk gtk2 gnome opengl jpeg xinerama icc"
 
@@ -35,7 +35,7 @@ RDEPEND="virtual/x11
 	gtk? ( !gtk2? ( gnome? ( =gnome-base/control-center-1.4*
 							>=media-libs/gdk-pixbuf-0.18
 							>=gnome-base/gnome-libs-1.4 ) ) )
-	!gtk? ( virtual/motif )
+	!gtk? ( x11-libs/openmotif )
 	pam? ( sys-libs/pam )
 	kerberos? ( krb4? ( >=app-crypt/mit-krb5-1.2.5 ) )
 	jpeg? ( media-libs/jpeg )
diff --git a/x11-misc/xscreensaver/xscreensaver-4.14.ebuild b/x11-misc/xscreensaver/xscreensaver-4.14.ebuild
index c442af1eabcf..b0fbccd95927 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.14.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.14.ebuild,v 1.3 2003/11/22 14:02:05 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.14.ebuild,v 1.4 2004/01/11 13:53:15 lanius Exp $
 
 IUSE="pam kerberos krb4 gtk gtk2 gnome opengl jpeg xinerama"
 
@@ -35,7 +35,7 @@ RDEPEND="virtual/x11
 	gtk? ( !gtk2? ( gnome? ( =gnome-base/control-center-1.4*
 							>=media-libs/gdk-pixbuf-0.18
 							>=gnome-base/gnome-libs-1.4 ) ) )
-	!gtk? ( virtual/motif )
+	!gtk? ( x11-libs/openmotif )
 	pam? ( sys-libs/pam )
 	kerberos? ( krb4? ( >=app-crypt/mit-krb5-1.2.5 ) )
 	jpeg? ( media-libs/jpeg )
diff --git a/x11-wm/evilwm/ChangeLog b/x11-wm/evilwm/ChangeLog
index ea5abf5adbc3..16b55820ccba 100644
--- a/x11-wm/evilwm/ChangeLog
+++ b/x11-wm/evilwm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/evilwm
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/ChangeLog,v 1.16 2004/01/09 22:13:38 aether Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/ChangeLog,v 1.17 2004/01/11 13:53:56 lanius Exp $
+
+  11 Jan 2004; Heinrich Wendel <lanius@gentoo.org> evilwm-0.99.14.ebuild,
+  evilwm-0.99.17.ebuild:
+  fixed motif dep
 
   09 Jan 2004; Jason A Mobarak <aether@gentoo.org> evilwm-0.99.16.ebuild,
   evilwm-0.99.17.ebuild:
diff --git a/x11-wm/evilwm/Manifest b/x11-wm/evilwm/Manifest
index a5469481af65..c050855ab3a2 100644
--- a/x11-wm/evilwm/Manifest
+++ b/x11-wm/evilwm/Manifest
@@ -1,7 +1,7 @@
-MD5 90ce772862e0a9b3acfb4c58f7997861 evilwm-0.99.17.ebuild 873
-MD5 6d45d278abf7cf27075d841d6ea79536 evilwm-0.99.14.ebuild 871
+MD5 f335ec61dccfa9e22d9ff0b50b1e807b evilwm-0.99.17.ebuild 878
+MD5 1dfbd2c57bbc92630cba4424446b4eae evilwm-0.99.14.ebuild 877
 MD5 fe676c571dccc61e841937be0cf844bf evilwm-0.99.4.ebuild 665
-MD5 3f37751c70a7969a333cb0d0f77cd0e0 ChangeLog 2187
+MD5 102f922d07a5b95a6a96b225495fc091 ChangeLog 2305
 MD5 812682313f81c24f4cfe80fcbd78ec28 metadata.xml 462
 MD5 f1c3baa65c3f9d38f66da5acd242f087 files/digest-evilwm-0.99.4 66
 MD5 87249d20528e6e0f7ed6fa59fb73ebfa files/digest-evilwm-0.99.14 70
diff --git a/x11-wm/evilwm/evilwm-0.99.14.ebuild b/x11-wm/evilwm/evilwm-0.99.14.ebuild
index 3e3f2dd33056..959441671c8e 100644
--- a/x11-wm/evilwm/evilwm-0.99.14.ebuild
+++ b/x11-wm/evilwm/evilwm-0.99.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/evilwm-0.99.14.ebuild,v 1.9 2004/01/09 22:13:38 aether Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/evilwm-0.99.14.ebuild,v 1.10 2004/01/11 13:53:56 lanius Exp $
 
 MY_P="${PN}_${PV}.orig"
 S=${WORKDIR}/${MY_P/_/-}
@@ -15,7 +15,7 @@ LICENSE="as-is"
 KEYWORDS="x86 ~ppc sparc alpha"
 
 DEPEND="virtual/x11
-	motif? ( virtual/motif )"
+	motif? ( x11-libs/openmotif )"
 
 src_unpack() {
 
diff --git a/x11-wm/evilwm/evilwm-0.99.17.ebuild b/x11-wm/evilwm/evilwm-0.99.17.ebuild
index ab1d7546a7b2..ea8cd92ab5dc 100644
--- a/x11-wm/evilwm/evilwm-0.99.17.ebuild
+++ b/x11-wm/evilwm/evilwm-0.99.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/evilwm-0.99.17.ebuild,v 1.3 2004/01/09 22:13:38 aether Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/evilwm-0.99.17.ebuild,v 1.4 2004/01/11 13:53:56 lanius Exp $
 
 MY_P="${PN}_${PV}.orig"
 S=${WORKDIR}/${MY_P/_/-}
@@ -15,7 +15,7 @@ LICENSE="as-is"
 KEYWORDS="x86 ~ppc ~sparc ~alpha"
 
 DEPEND="virtual/x11
-	motif? ( virtual/motif )"
+	motif? ( x11-libs/openmotif )"
 
 src_unpack() {
 
diff --git a/x11-wm/lwm/ChangeLog b/x11-wm/lwm/ChangeLog
index 4e74626440d6..82cbd88c758a 100644
--- a/x11-wm/lwm/ChangeLog
+++ b/x11-wm/lwm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/lwm
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/lwm/ChangeLog,v 1.7 2003/12/06 16:20:03 tseng Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/lwm/ChangeLog,v 1.8 2004/01/11 13:54:33 lanius Exp $
+
+  11 Jan 2004; Heinrich Wendel <lanius@gentoo.org> lwm-1.1.5.ebuild,
+  lwm-1.1.6.ebuild:
+  fixed motif dep
 
 *lwm-1.1.6 (06 Dec 2003)
 
diff --git a/x11-wm/lwm/lwm-1.1.5.ebuild b/x11-wm/lwm/lwm-1.1.5.ebuild
index 2de2e3d3fc8c..47bacb49d1ed 100644
--- a/x11-wm/lwm/lwm-1.1.5.ebuild
+++ b/x11-wm/lwm/lwm-1.1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/lwm/lwm-1.1.5.ebuild,v 1.2 2003/09/17 11:26:45 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/lwm/lwm-1.1.5.ebuild,v 1.3 2004/01/11 13:54:33 lanius Exp $
 
 IUSE="motif"
 
@@ -13,10 +13,10 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc ~ppc"
 
-DEPEND="motif? ( virtual/motif >=sys-apps/sed-4 )
+DEPEND="motif? ( x11-libs/openmotif >=sys-apps/sed-4 )
 	virtual/x11"
 
-RDEPEND="virtual/motif
+RDEPEND="x11-libs/openmotif
 	virtual/x11"
 
 src_compile() {
diff --git a/x11-wm/lwm/lwm-1.1.6.ebuild b/x11-wm/lwm/lwm-1.1.6.ebuild
index e5cd17501155..b99fcc4c894b 100644
--- a/x11-wm/lwm/lwm-1.1.6.ebuild
+++ b/x11-wm/lwm/lwm-1.1.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/lwm/lwm-1.1.6.ebuild,v 1.1 2003/12/06 16:20:03 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/lwm/lwm-1.1.6.ebuild,v 1.2 2004/01/11 13:54:33 lanius Exp $
 
 IUSE="motif"
 
@@ -13,10 +13,10 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc ~ppc"
 
-DEPEND="motif? ( virtual/motif >=sys-apps/sed-4 )
+DEPEND="motif? ( x11-libs/openmotif >=sys-apps/sed-4 )
 	virtual/x11"
 
-RDEPEND="virtual/motif
+RDEPEND="x11-libs/openmotif
 	virtual/x11"
 
 src_compile() {