modular-x-ified. cleanup.

Package-Manager: portage-2.1_pre4-r1

7 files changed, 34 insertions, 77 deletions

diff --git a/dev-libs/libotf/ChangeLog b/dev-libs/libotf/ChangeLog
index a574af3d732f..6b90cd5790d1 100644
--- a/dev-libs/libotf/ChangeLog
+++ b/dev-libs/libotf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libotf
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libotf/ChangeLog,v 1.19 2005/04/08 16:07:48 corsair Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libotf/ChangeLog,v 1.20 2006/02/10 22:30:00 liquidx Exp $
+
+  10 Feb 2006; Alastair Tse <liquidx@gentoo.org> -libotf-0.9-r1.ebuild,
+  -libotf-0.9.2.ebuild, libotf-0.9.3.ebuild:
+  modular-x-ified. cleanup.
 
   08 Apr 2005; Markus Rothe <corsair@gentoo.org> libotf-0.9.3.ebuild:
   Stable on ppc64
diff --git a/dev-libs/libotf/Manifest b/dev-libs/libotf/Manifest
index f684e195f9bb..df9364743b21 100644
--- a/dev-libs/libotf/Manifest
+++ b/dev-libs/libotf/Manifest
@@ -1,8 +1,22 @@
-MD5 53d11c8e463378b2254215c532e60747 ChangeLog 2023
-MD5 e6b5cf2e57b0f54d2ff86e5ac35beb91 libotf-0.9-r1.ebuild 756
-MD5 56b2c184224393ff9814c2e0ae35192a libotf-0.9.2.ebuild 755
-MD5 6b0c53b1141906cbf510021d37fa6d0c libotf-0.9.3.ebuild 1041
-MD5 9c69ff3ce8108c99baa12b2b38780494 metadata.xml 175
-MD5 217cc51840278a313dad72cf54a9df30 files/digest-libotf-0.9-r1 62
-MD5 fad5e18e05f4ed9a5da65149bf4f57fc files/digest-libotf-0.9.2 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a27b2a15e908a895e921dbc398fdc379 ChangeLog 2169
+RMD160 08ae09b2b117ce1a8e350d5340ef93b081d6bd60 ChangeLog 2169
+SHA256 dd0c1724b44c54785159eb456d802785b5b80a37c623708d0d8e1457ec8d598b ChangeLog 2169
 MD5 705950d3f42b8d228b3d04fc98e953ef files/digest-libotf-0.9.3 64
+RMD160 e69ab161dd8051cc4248147b5d9bd5515bb40595 files/digest-libotf-0.9.3 64
+SHA256 097d093323a46254b7c976395285f9a31cbea6e16fb4715e19e4c521c98253db files/digest-libotf-0.9.3 64
+MD5 311697404790781308f908c92d06f3eb libotf-0.9.3.ebuild 1094
+RMD160 4f4e85cb378e990173b018b58f3b18e451d6c03b libotf-0.9.3.ebuild 1094
+SHA256 5238d3840d11c2fa7350647e20f760512e1b0d9aeb6897e7cbb23e41c691a542 libotf-0.9.3.ebuild 1094
+MD5 9c69ff3ce8108c99baa12b2b38780494 metadata.xml 175
+RMD160 4be49b8c0297a54a570715005c60f91a178807bf metadata.xml 175
+SHA256 5c2b5892c4a52e0f1585a34ed70e94042c3684a5f1021f077b2c5756d51120ce metadata.xml 175
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD7RP19ZFPrqoILX8RAndrAJ45uRlQrCqaUB3jpplSb4EHnRa1ggCfUxYO
+ew1cUyf/wC3dSCvP0yx5Op8=
+=t2TI
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libotf/files/digest-libotf-0.9-r1 b/dev-libs/libotf/files/digest-libotf-0.9-r1
deleted file mode 100644
index aea3c7e2bcaa..000000000000
--- a/dev-libs/libotf/files/digest-libotf-0.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 09fd82c268718f95cd367c3b6faddfe2 libotf-0.9.tar.gz 256323
diff --git a/dev-libs/libotf/files/digest-libotf-0.9.2 b/dev-libs/libotf/files/digest-libotf-0.9.2
deleted file mode 100644
index 92356e188e26..000000000000
--- a/dev-libs/libotf/files/digest-libotf-0.9.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 579f088d64844c00a1f1036a04b53a0a libotf-0.9.2.tar.gz 338447
diff --git a/dev-libs/libotf/libotf-0.9-r1.ebuild b/dev-libs/libotf/libotf-0.9-r1.ebuild
deleted file mode 100644
index c362f8026c8f..000000000000
--- a/dev-libs/libotf/libotf-0.9-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libotf/libotf-0.9-r1.ebuild,v 1.6 2005/01/01 16:19:57 usata Exp $
-
-DESCRIPTION="Library for handling OpenType fonts (OTF)"
-HOMEPAGE="http://www.m17n.org/libotf/"
-SRC_URI="http://www.m17n.org/libotf/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="x86 ppc alpha amd64 ppc64 ~sparc"
-IUSE="X"
-
-RDEPEND="X? ( virtual/x11 )
-	>=media-libs/freetype-2.1"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use X || sed -i -e '/^bin_PROGRAMS/s/otfview//' example/Makefile.in || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS INSTALL NEWS README ChangeLog
-}
diff --git a/dev-libs/libotf/libotf-0.9.2.ebuild b/dev-libs/libotf/libotf-0.9.2.ebuild
deleted file mode 100644
index 6d5967f72d31..000000000000
--- a/dev-libs/libotf/libotf-0.9.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libotf/libotf-0.9.2.ebuild,v 1.5 2005/01/01 16:19:57 usata Exp $
-
-DESCRIPTION="Library for handling OpenType fonts (OTF)"
-HOMEPAGE="http://www.m17n.org/libotf/"
-SRC_URI="http://www.m17n.org/libotf/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="x86 ppc alpha amd64 ~ppc64 sparc"
-IUSE="X"
-
-RDEPEND="X? ( virtual/x11 )
-	>=media-libs/freetype-2.1"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use X || sed -i -e '/^bin_PROGRAMS/s/otfview//' example/Makefile.in || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS INSTALL NEWS README ChangeLog
-}
diff --git a/dev-libs/libotf/libotf-0.9.3.ebuild b/dev-libs/libotf/libotf-0.9.3.ebuild
index fe900e8819bf..0e98d07e6733 100644
--- a/dev-libs/libotf/libotf-0.9.3.ebuild
+++ b/dev-libs/libotf/libotf-0.9.3.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/dev-libs/libotf/libotf-0.9.3.ebuild,v 1.6 2005/04/08 16:07:48 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libotf/libotf-0.9.3.ebuild,v 1.7 2006/02/10 22:30:00 liquidx Exp $
 
 DESCRIPTION="Library for handling OpenType fonts (OTF)"
 HOMEPAGE="http://www.m17n.org/libotf/"
@@ -11,9 +11,12 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="x86 ppc alpha amd64 ppc64 sparc hppa"
 IUSE="X"
-
-RDEPEND="X? ( virtual/x11 )
+RDEPEND="|| ( ( x11-libs/libXaw 
+				x11-libs/libICE
+			  )
+			  virtual/x11 )		
 	>=media-libs/freetype-2.1"
+
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"