From 6a9c0f885c4e721ded25c28ea5f39ff9fd07372a Mon Sep 17 00:00:00 2001 From: Alastair Tse Date: Fri, 10 Feb 2006 18:58:47 +0000 Subject: modular X deps. (Portage version: 2.1_pre4-r1) --- app-i18n/freewnn/ChangeLog | 10 +++- .../freewnn/files/digest-freewnn-1.1.1_alpha17 | 1 - .../freewnn/files/digest-freewnn-1.1.1_alpha20-r2 | 1 - app-i18n/freewnn/freewnn-1.1.1_alpha17.ebuild | 58 ---------------------- app-i18n/freewnn/freewnn-1.1.1_alpha20-r1.ebuild | 7 +-- app-i18n/freewnn/freewnn-1.1.1_alpha20-r2.ebuild | 52 ------------------- app-i18n/freewnn/freewnn-1.1.1_alpha20.ebuild | 7 +-- app-i18n/freewnn/freewnn-1.1.1_alpha21.ebuild | 7 +-- 8 files changed, 20 insertions(+), 123 deletions(-) delete mode 100644 app-i18n/freewnn/files/digest-freewnn-1.1.1_alpha17 delete mode 100644 app-i18n/freewnn/files/digest-freewnn-1.1.1_alpha20-r2 delete mode 100644 app-i18n/freewnn/freewnn-1.1.1_alpha17.ebuild delete mode 100644 app-i18n/freewnn/freewnn-1.1.1_alpha20-r2.ebuild (limited to 'app-i18n/freewnn') 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 + -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/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}" -- cgit v1.2.3-65-gdbad