modular X deps.

Package-Manager: portage-2.1_pre4-r1

9 files changed, 70 insertions, 137 deletions

diff --git a/app-i18n/freewnn/ChangeLog b/app-i18n/freewnn/ChangeLog
index 2bd05f009e5d..4b8783551586 100644
--- a/app-i18n/freewnn/ChangeLog
+++ b/app-i18n/freewnn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/freewnn
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/ChangeLog,v 1.23 2005/12/07 00:50:05 usata Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/ChangeLog,v 1.24 2006/02/10 18:58:47 liquidx Exp $
+
+  10 Feb 2006; Alastair Tse <liquidx@gentoo.org>
+  -freewnn-1.1.1_alpha17.ebuild, freewnn-1.1.1_alpha20.ebuild,
+  freewnn-1.1.1_alpha20-r1.ebuild, -freewnn-1.1.1_alpha20-r2.ebuild,
+  freewnn-1.1.1_alpha21.ebuild:
+  modular X deps.
 
 *freewnn-1.1.1_alpha21 (07 Dec 2005)
 
diff --git a/app-i18n/freewnn/Manifest b/app-i18n/freewnn/Manifest
index b8d04592e294..eb31063cc052 100644
--- a/app-i18n/freewnn/Manifest
+++ b/app-i18n/freewnn/Manifest
@@ -1,19 +1,55 @@
-MD5 c532270a756b001d4979da026c1203be ChangeLog 3607
-MD5 d9c3641aa9d719e8c3637d61d4557b8c freewnn-1.1.1_alpha20.ebuild 1337
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 bdec38e5ac706a14a5f418d1ebf73561 freewnn-1.1.1_alpha17.ebuild 1551
-MD5 50d5776f38310e19c7c7a651bbe33415 freewnn-1.1.1_alpha20-r1.ebuild 1347
-MD5 b8d8371ce8848b7a64fc31b6c410105e freewnn-1.1.1_alpha20-r2.ebuild 1353
-MD5 3ef901a5a1d6e01e6915a4eeb7159162 freewnn-1.1.1_alpha21.ebuild 1331
-MD5 a67e6df6683b65c8912a11446a1c1240 files/digest-freewnn-1.1.1_alpha20 72
-MD5 9ef81b34a1fb16dd2b5c6f717913cb9e files/freewnn.initd 296
-MD5 26f2f4f4d23f76e26254c9d074e3e75a files/digest-freewnn-1.1.1_alpha17 71
-MD5 a67e6df6683b65c8912a11446a1c1240 files/digest-freewnn-1.1.1_alpha20-r1 72
-MD5 e6f71c09539eca59f75a3480b734d3d1 files/freewnn-1.1.1_alpha20-gentoo.diff 1044
-MD5 a67e6df6683b65c8912a11446a1c1240 files/digest-freewnn-1.1.1_alpha20-r2 72
-MD5 c3a76c81e155c1ddeceaa75c0ed083f4 files/digest-freewnn-1.1.1_alpha21 72
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b727850e4bcbd196c699f17a21511713 ChangeLog 3841
+RMD160 94cd257cc07be03160a753df5563fecf7af38c68 ChangeLog 3841
+SHA256 cb32fe6d2f8d48ab5b6d374ecf9498b6f9c8e1b29a9f21a251043718d5673adf ChangeLog 3841
 MD5 8b54a21960c4499a862294bac020848b files/a017/FreeWnn-1.1.1-a017.dif 19564
+RMD160 be7b0a5d3d1d4fa6e339d43dcc2450c376b1137f files/a017/FreeWnn-1.1.1-a017.dif 19564
+SHA256 a6080cfa7ac2e92be9f099e02ec371f662c5ddb553047bb6757fb93ba12c5217 files/a017/FreeWnn-1.1.1-a017.dif 19564
 MD5 d7f8705d389f74cb64218fe0ff512be5 files/a017/FreeWnn-lib64.patch 479
+RMD160 576ad7b4331dd7531f7082e4348ae5655a98e779 files/a017/FreeWnn-lib64.patch 479
+SHA256 a05992739cc05d00af0c5001d00e72acbad8ac25eda655b7f0505c154c426035 files/a017/FreeWnn-lib64.patch 479
 MD5 96c9b5198682f09611b2ec0dbeddbce3 files/a017/FreeWnn-s390x.patch 7099
+RMD160 b70d009889870626d3c485b2287974c6113b8a13 files/a017/FreeWnn-s390x.patch 7099
+SHA256 c6f422c81821e57f35f99960e1f2107f77674979efde6e31bf777b98dac54a74 files/a017/FreeWnn-s390x.patch 7099
 MD5 a24127af4d21ec364c841cc06b37411a files/a017/FreeWnn-sighandler.patch 876
+RMD160 3ab8a693024ebfe7732861dac42fec21e15da339 files/a017/FreeWnn-sighandler.patch 876
+SHA256 955bb0b65a6e79f4a21c24fa312402745a56eb067d9fa1cc2879d14f967e6f6c files/a017/FreeWnn-sighandler.patch 876
 MD5 7db8085bf871d6445f549b015b7217a9 files/a017/FreeWnn-uum.patch 1983
+RMD160 27b637f072ddf9b9d46067d0cad739c99485c682 files/a017/FreeWnn-uum.patch 1983
+SHA256 8d44ffa69f2fca2e04ecf1a8bd510a519d645be67fd9809f7e8e3b432fc613cd files/a017/FreeWnn-uum.patch 1983
+MD5 a67e6df6683b65c8912a11446a1c1240 files/digest-freewnn-1.1.1_alpha20 72
+RMD160 7735ddeaad15e5cfa746a6b0093e2bff3840c2e2 files/digest-freewnn-1.1.1_alpha20 72
+SHA256 85d1dfbf7adfff23c93a027be41ade1ac31f4c5a639014b2b64913f282097096 files/digest-freewnn-1.1.1_alpha20 72
+MD5 a67e6df6683b65c8912a11446a1c1240 files/digest-freewnn-1.1.1_alpha20-r1 72
+RMD160 7735ddeaad15e5cfa746a6b0093e2bff3840c2e2 files/digest-freewnn-1.1.1_alpha20-r1 72
+SHA256 85d1dfbf7adfff23c93a027be41ade1ac31f4c5a639014b2b64913f282097096 files/digest-freewnn-1.1.1_alpha20-r1 72
+MD5 c3a76c81e155c1ddeceaa75c0ed083f4 files/digest-freewnn-1.1.1_alpha21 72
+RMD160 c9c4e68ff3c9a748aed51ff078aaf408b94baafc files/digest-freewnn-1.1.1_alpha21 72
+SHA256 a404b481bc7e1d5fc6b3ba21e22f443bd396cb4c48f28d0479e69ad5dcb7449a files/digest-freewnn-1.1.1_alpha21 72
+MD5 e6f71c09539eca59f75a3480b734d3d1 files/freewnn-1.1.1_alpha20-gentoo.diff 1044
+RMD160 375c5f7b16a75734e97243d6cb19aca50bf852c0 files/freewnn-1.1.1_alpha20-gentoo.diff 1044
+SHA256 0dd0b950758158c226f482ffe7fd83fc1f942f89364ccf84e9e9bb3604d68cda files/freewnn-1.1.1_alpha20-gentoo.diff 1044
+MD5 9ef81b34a1fb16dd2b5c6f717913cb9e files/freewnn.initd 296
+RMD160 db65942c05ba419428b0fb475c1be1e49aedaf26 files/freewnn.initd 296
+SHA256 595c0dc6c5218d0227c1696934ff38774fe294337d95da470935c411d299d350 files/freewnn.initd 296
+MD5 11e4ef38a82c74654987e1623f82b74f freewnn-1.1.1_alpha20-r1.ebuild 1413
+RMD160 17bfed5a1825da64e5f34977bd1cf76776762578 freewnn-1.1.1_alpha20-r1.ebuild 1413
+SHA256 00861556675219163fa25f5dcbd6cf838c16d86bc08b65f573ddad5f0985eb30 freewnn-1.1.1_alpha20-r1.ebuild 1413
+MD5 e3c30d45a480bbfaf551128ceeca4ede freewnn-1.1.1_alpha20.ebuild 1401
+RMD160 43451feea04141e644c66c8423393f9f5f8d786e freewnn-1.1.1_alpha20.ebuild 1401
+SHA256 c294b745543951a9c5db4004b767ae845ccf594c7ea1f193710071501eff725a freewnn-1.1.1_alpha20.ebuild 1401
+MD5 6cc45e8e2e56a5b6f5cb99c31e8c1afe freewnn-1.1.1_alpha21.ebuild 1400
+RMD160 4d8297a7665dd8899af747de5d122bde6f12dcf7 freewnn-1.1.1_alpha21.ebuild 1400
+SHA256 7881de2f9f581df1d9bab7c5b4809df697c49539a0612b27f3291b37582870c7 freewnn-1.1.1_alpha21.ebuild 1400
+MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
+SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD7OJ09ZFPrqoILX8RAnHFAJ41SpqT69B1BXYW1ZWZ76ZuWRnC5gCgtq1I
+P8poEaiqr35AFPqbXwOGd0o=
+=T5YJ
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/freewnn/files/digest-freewnn-1.1.1_alpha17 b/app-i18n/freewnn/files/digest-freewnn-1.1.1_alpha17
deleted file mode 100644
index 1bb27067cd4c..000000000000
--- a/app-i18n/freewnn/files/digest-freewnn-1.1.1_alpha17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cf7cb1fa5ac5b624c559469de17282f9 FreeWnn-1.1.1-a017.tar.gz 3357397
diff --git a/app-i18n/freewnn/files/digest-freewnn-1.1.1_alpha20-r2 b/app-i18n/freewnn/files/digest-freewnn-1.1.1_alpha20-r2
deleted file mode 100644
index 8dcce6ef112d..000000000000
--- a/app-i18n/freewnn/files/digest-freewnn-1.1.1_alpha20-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c00549415cdb08c1f35240dccf8dab20 FreeWnn-1.1.1-a020.tar.bz2 3015928
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha17.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha17.ebuild
deleted file mode 100644
index 31384c64701f..000000000000
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha17.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/freewnn-1.1.1_alpha17.ebuild,v 1.8 2005/01/01 14:28:03 eradicator Exp $
-
-inherit eutils
-
-MY_P="FreeWnn-${PV/_alpha/-a0}"
-
-DESCRIPTION="Network-Extensible Kana-to-Kanji Conversion System"
-HOMEPAGE="http://www.freewnn.org/"
-SRC_URI="ftp://ftp.freewnn.org/pub/FreeWnn/alpha/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
-IUSE="X ipv6"
-
-DEPEND="virtual/libc
-	X? ( virtual/x11 )"
-
-S="${WORKDIR}/${MY_P}/Xsi"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/a017/FreeWnn-sighandler.patch
-	epatch ${FILESDIR}/a017/FreeWnn-uum.patch
-	epatch ${FILESDIR}/a017/FreeWnn-1.1.1-a017.dif
-	#epatch ${FILESDIR}/a017/FreeWnn-lib64.patch
-	use s390 && epatch ${FILESDIR}/a017/FreeWnn-s390x.patch
-
-	#Change WNNOWNER to root so we don't need to add wnn user
-	sed -i -e "s/WNNOWNER = wnn/WNNOWNER = root/" ${S}/makerule.mk.in
-}
-
-src_compile() {
-	econf \
-		--disable-cWnn \
-		--disable-kWnn \
-		--without-termcap \
-		`use_with X x` \
-		`use_with ipv6` || die "./configure failed"
-
-	emake || die
-	#make || die
-}
-
-src_install() {
-	# install executables, libs ,dictionaries
-	make DESTDIR=${D} install || die "installation failed"
-	# install man pages
-	make DESTDIR=${D} install.man || die "installation of manpages failed"
-	# install docs
-	dodoc ChangeLog* INSTALL* CONTRIBUTORS
-	# install rc script
-	exeinto /etc/init.d ; newexe ${FILESDIR}/freewnn.initd freewnn
-}
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha20-r1.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha20-r1.ebuild
index 52ccd37e9df3..4a01539d42a2 100644
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha20-r1.ebuild
+++ b/app-i18n/freewnn/freewnn-1.1.1_alpha20-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/app-i18n/freewnn/freewnn-1.1.1_alpha20-r1.ebuild,v 1.8 2005/09/09 16:21:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/freewnn-1.1.1_alpha20-r1.ebuild,v 1.9 2006/02/10 18:58:47 liquidx Exp $
 
 inherit eutils
 
@@ -16,7 +16,8 @@ KEYWORDS="alpha amd64 ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE="X ipv6"
 
 DEPEND="virtual/libc
-	X? ( virtual/x11 )"
+	X? ( || ( ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt )
+	   	 	  virtual/x11 ) )"
 
 S="${WORKDIR}/FreeWnn-1.10-pl020"
 
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha20-r2.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha20-r2.ebuild
deleted file mode 100644
index 479a8bfd9df5..000000000000
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha20-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/freewnn-1.1.1_alpha20-r2.ebuild,v 1.4 2005/11/29 03:31:45 vapier Exp $
-
-inherit eutils
-
-MY_P="FreeWnn-${PV/_alpha/-a0}"
-
-DESCRIPTION="Network-Extensible Kana-to-Kanji Conversion System"
-HOMEPAGE="http://www.freewnn.org/"
-SRC_URI="ftp://ftp.freewnn.org/pub/FreeWnn/alpha/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE="X ipv6"
-
-DEPEND="virtual/libc
-	X? ( virtual/x11 )"
-
-S="${WORKDIR}/FreeWnn-1.10-pl020"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	#Change WNNOWNER to root so we don't need to add wnn user
-	sed -i -e "s/WNNOWNER = wnn/WNNOWNER = root/" makerule.mk.in || die
-	epatch ${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	econf \
-		--disable-cWnn \
-		--disable-kWnn \
-		--without-termcap \
-		$(use_with X x) \
-		$(use_with ipv6) \
-		|| die "./configure failed"
-	emake -j1 || die
-}
-
-src_install() {
-	# install executables, libs ,dictionaries
-	make DESTDIR=${D} install || die "installation failed"
-	# install man pages
-	make DESTDIR=${D} install.man || die "installation of manpages failed"
-	# install docs
-	dodoc ChangeLog* INSTALL* CONTRIBUTORS
-	# install rc script
-	exeinto /etc/init.d ; newexe ${FILESDIR}/freewnn.initd freewnn
-}
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha20.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha20.ebuild
index de2250775a40..9c4fe704cdcc 100644
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha20.ebuild
+++ b/app-i18n/freewnn/freewnn-1.1.1_alpha20.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/app-i18n/freewnn/freewnn-1.1.1_alpha20.ebuild,v 1.11 2005/01/01 14:28:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/freewnn-1.1.1_alpha20.ebuild,v 1.12 2006/02/10 18:58:47 liquidx Exp $
 
 MY_P="FreeWnn-${PV/_alpha/-a0}"
 
@@ -14,7 +14,8 @@ KEYWORDS="x86 ppc sparc alpha -amd64 ia64"
 IUSE="X ipv6"
 
 DEPEND="virtual/libc
-	X? ( virtual/x11 )"
+	X? ( || ( ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt )
+	   	 	  virtual/x11 ) )"
 
 S="${WORKDIR}/FreeWnn-1.10-pl020"
 
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha21.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha21.ebuild
index b604333d8aec..3e8ab3cd786f 100644
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha21.ebuild
+++ b/app-i18n/freewnn/freewnn-1.1.1_alpha21.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/app-i18n/freewnn/freewnn-1.1.1_alpha21.ebuild,v 1.1 2005/12/07 00:50:05 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/freewnn-1.1.1_alpha21.ebuild,v 1.2 2006/02/10 18:58:47 liquidx Exp $
 
 inherit eutils
 
@@ -17,7 +17,8 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE="X ipv6"
 
 DEPEND="virtual/libc
-	X? ( virtual/x11 )"
+	X? ( || ( ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt )
+	   	 	  virtual/x11 ) )"
 
 S="${WORKDIR}/${MY_P}"