Use newinitd. Removed virtual/x11.

(Portage version: 2.1.2.5)

4 files changed, 28 insertions, 29 deletions

diff --git a/app-i18n/freewnn/ChangeLog b/app-i18n/freewnn/ChangeLog
index aba8c63f6281..da86f99c2ca1 100644
--- a/app-i18n/freewnn/ChangeLog
+++ b/app-i18n/freewnn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/freewnn
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/ChangeLog,v 1.30 2007/04/22 10:35:09 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/ChangeLog,v 1.31 2007/04/28 15:42:16 tove Exp $
+
+  28 Apr 2007; Torsten Veller <tove@gentoo.org>
+  freewnn-1.1.1_alpha20.ebuild, freewnn-1.1.1_alpha20-r1.ebuild,
+  freewnn-1.1.1_alpha21.ebuild:
+  Use newinitd. Removed virtual/x11.
 
   22 Apr 2007; Markus Rothe <corsair@gentoo.org>
   freewnn-1.1.1_alpha21.ebuild:
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 904c59eb0e96..2f1abe28c263 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-2006 Gentoo Foundation
+# Copyright 1999-2007 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.10 2006/09/16 13:57:19 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/freewnn-1.1.1_alpha20-r1.ebuild,v 1.11 2007/04/28 15:42:16 tove Exp $
 
 inherit eutils
 
@@ -15,19 +15,17 @@ SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc ~x86"
 IUSE="X ipv6"
 
-DEPEND="virtual/libc
-	X? ( || ( ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt )
-	   	 	  virtual/x11 ) )"
+DEPEND="X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt )"
 
 S="${WORKDIR}/FreeWnn-1.10-pl020"
 
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	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
+	epatch "${FILESDIR}"/${P}-gentoo.diff
 }
 
 src_compile() {
@@ -43,11 +41,11 @@ src_compile() {
 
 src_install() {
 	# install executables, libs ,dictionaries
-	make DESTDIR=${D} install || die "installation failed"
+	make DESTDIR="${D}" install || die "installation failed"
 	# install man pages
-	make DESTDIR=${D} install.man || die "installation of manpages failed"
+	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
+	newinitd "${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 c7d0f81dae0c..4122d547734d 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-2006 Gentoo Foundation
+# Copyright 1999-2007 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.13 2006/11/05 16:12:47 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/freewnn-1.1.1_alpha20.ebuild,v 1.14 2007/04/28 15:42:16 tove Exp $
 
 MY_P="FreeWnn-${PV/_alpha/-a0}"
 
@@ -13,9 +13,7 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc alpha -amd64 ia64"
 IUSE="X ipv6"
 
-DEPEND="virtual/libc
-	X? ( || ( ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt )
-	   	 	  virtual/x11 ) )"
+DEPEND="X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt )"
 
 S="${WORKDIR}/FreeWnn-1.10-pl020"
 
@@ -23,9 +21,9 @@ src_unpack() {
 	unpack ${A}
 
 	#Change WNNOWNER to root so we don't need to add wnn user
-	mv ${S}/makerule.mk.in ${T}
+	mv "${S}"/makerule.mk.in "${T}"
 	sed -e "s/WNNOWNER = wnn/WNNOWNER = root/" \
-		${T}/makerule.mk.in > ${S}/makerule.mk.in
+		"${T}"/makerule.mk.in > "${S}"/makerule.mk.in
 }
 
 src_compile() {
@@ -42,11 +40,11 @@ src_compile() {
 
 src_install() {
 	# install executables, libs ,dictionaries
-	make DESTDIR=${D} install || die "installation failed"
+	make DESTDIR="${D}" install || die "installation failed"
 	# install man pages
-	make DESTDIR=${D} install.man || die "installation of manpages failed"
+	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
+	newinitd "${FILESDIR}"/freewnn.initd freewnn
 }
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha21.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha21.ebuild
index 023f1073d323..d6f602110d1f 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-2007 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.6 2007/04/22 10:35:09 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/freewnn-1.1.1_alpha21.ebuild,v 1.7 2007/04/28 15:42:16 tove Exp $
 
 inherit eutils
 
@@ -16,16 +16,14 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 hppa ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="X ipv6"
 
-DEPEND="virtual/libc
-	X? ( || ( ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt )
-	   	 	  virtual/x11 ) )"
+DEPEND="X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt )"
 
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	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
 }
@@ -43,11 +41,11 @@ src_compile() {
 
 src_install() {
 	# install executables, libs ,dictionaries
-	make DESTDIR=${D} install || die "installation failed"
+	make DESTDIR="${D}" install || die "installation failed"
 	# install man pages
-	make DESTDIR=${D} install.man || die "installation of manpages failed"
+	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
+	newexe "${FILESDIR}"/freewnn.initd freewnn
 }