Fix logic of toolkit USE flags.

Package-Manager: portage-2.1.2.7

5 files changed, 94 insertions, 66 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 6fb569003f75..f213702fd3fd 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,11 +1,12 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.120 2007/05/17 20:32:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.121 2007/05/17 22:50:33 ulm Exp $
 
 *emacs-cvs-22.0.990 (17 May 2007)
 
   17 May 2007; Ulrich Mueller <ulm@gentoo.org> -emacs-cvs-22.0.98.ebuild,
-  +emacs-cvs-22.0.990.ebuild:
+  +emacs-cvs-22.0.990.ebuild, emacs-cvs-22.0.9999-r10.ebuild,
+  emacs-cvs-22.1.50.ebuild, emacs-cvs-23.0.0-r6.ebuild:
   Version bump; logic of toolkit USE flags fixed. Clean up old version.
 
   15 May 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.0.97.ebuild,
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 38ae514502bc..97976e95de65 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -40,26 +40,26 @@ EBUILD emacs-cvs-22.0.990.ebuild 7562 RMD160 5d6dc9a5576c14e10b643e7a494a610c550
 MD5 c807e945338b74f34a43cee09844d811 emacs-cvs-22.0.990.ebuild 7562
 RMD160 5d6dc9a5576c14e10b643e7a494a610c550f21d6 emacs-cvs-22.0.990.ebuild 7562
 SHA256 00d460192f62229939681e7fe5241f080f4ab2dacfde1c799383529c7692af66 emacs-cvs-22.0.990.ebuild 7562
-EBUILD emacs-cvs-22.0.9999-r10.ebuild 7867 RMD160 aaf543b08478ba45cf26ffa375938739dd02c9a2 SHA1 4d1a4bea4e3424e3d43245d109f592abd8675119 SHA256 d7020d3555959561ca7dad4d470c01bdfb48c498b52f85a5cb2bcd12992c82d7
-MD5 8d4914a2df0f4e6b9f91e02ce2e6d215 emacs-cvs-22.0.9999-r10.ebuild 7867
-RMD160 aaf543b08478ba45cf26ffa375938739dd02c9a2 emacs-cvs-22.0.9999-r10.ebuild 7867
-SHA256 d7020d3555959561ca7dad4d470c01bdfb48c498b52f85a5cb2bcd12992c82d7 emacs-cvs-22.0.9999-r10.ebuild 7867
-EBUILD emacs-cvs-22.1.50.ebuild 7730 RMD160 d40333963bb10580d6aa46d52fa55f008ffeeb10 SHA1 cc53625728216372bd2da3c8ee39bc8dfe095023 SHA256 1023b32508b52a07145e498669a5349bf9f0fef7814a8a97253b9d40d56461d5
-MD5 713b5dbf2016edf7f69d105ec674458b emacs-cvs-22.1.50.ebuild 7730
-RMD160 d40333963bb10580d6aa46d52fa55f008ffeeb10 emacs-cvs-22.1.50.ebuild 7730
-SHA256 1023b32508b52a07145e498669a5349bf9f0fef7814a8a97253b9d40d56461d5 emacs-cvs-22.1.50.ebuild 7730
+EBUILD emacs-cvs-22.0.9999-r10.ebuild 7896 RMD160 3ac9dc4b3ac7cc9fd47da86d4b8cb58357c240dc SHA1 246b99ac34decea9970a860e379badb6f1b51a3e SHA256 4169dad3bfe71e772a99cf8ef27a8399fb609114eff760f40ab70266780c4ad7
+MD5 4b57ceaf8cc12828c09265512b871c27 emacs-cvs-22.0.9999-r10.ebuild 7896
+RMD160 3ac9dc4b3ac7cc9fd47da86d4b8cb58357c240dc emacs-cvs-22.0.9999-r10.ebuild 7896
+SHA256 4169dad3bfe71e772a99cf8ef27a8399fb609114eff760f40ab70266780c4ad7 emacs-cvs-22.0.9999-r10.ebuild 7896
+EBUILD emacs-cvs-22.1.50.ebuild 7759 RMD160 84ad98e86cf9b2c1738d5a671ad09097dbf9b251 SHA1 5b42fd183cf7962bffc13cd01c84c700fffa4765 SHA256 1e70b79a43d54075ea2538484e75d4329c23bd73c745377cd19273967da818e5
+MD5 9f37a72e601422a2716b3ea870cf68c9 emacs-cvs-22.1.50.ebuild 7759
+RMD160 84ad98e86cf9b2c1738d5a671ad09097dbf9b251 emacs-cvs-22.1.50.ebuild 7759
+SHA256 1e70b79a43d54075ea2538484e75d4329c23bd73c745377cd19273967da818e5 emacs-cvs-22.1.50.ebuild 7759
 EBUILD emacs-cvs-23.0.0-r1.ebuild 5849 RMD160 c6b64383c4dda706e2301c4f1634a966f4518daf SHA1 b9d1e7e0bde0128306e55f5f623f2471477a4669 SHA256 aed5bebe908df217c23b7f0d96df6b96c3ab0aeac83623c58922b5bf32719365
 MD5 13d980ab8fdb31391fe4f2f6c5cbe321 emacs-cvs-23.0.0-r1.ebuild 5849
 RMD160 c6b64383c4dda706e2301c4f1634a966f4518daf emacs-cvs-23.0.0-r1.ebuild 5849
 SHA256 aed5bebe908df217c23b7f0d96df6b96c3ab0aeac83623c58922b5bf32719365 emacs-cvs-23.0.0-r1.ebuild 5849
-EBUILD emacs-cvs-23.0.0-r6.ebuild 7930 RMD160 3c9095db596de14d6e69a41d96a536799a164b70 SHA1 3281e552ce4712cb7ce34acbef5a0b9555269833 SHA256 1884956cdda8fda561e32e87300c9eb1c5c354ce2a11ca7fa48b86e6eb4579a0
-MD5 bae450c0f0ba6cefed2c890e287924f8 emacs-cvs-23.0.0-r6.ebuild 7930
-RMD160 3c9095db596de14d6e69a41d96a536799a164b70 emacs-cvs-23.0.0-r6.ebuild 7930
-SHA256 1884956cdda8fda561e32e87300c9eb1c5c354ce2a11ca7fa48b86e6eb4579a0 emacs-cvs-23.0.0-r6.ebuild 7930
-MISC ChangeLog 23872 RMD160 be895ea3cc897ef05a69e04561a39bbc1c9162a7 SHA1 304d535f3c206672e45aa1ebafa5b071417a5f88 SHA256 59412569ebc90c8da54d91b2a6a208c1d3a184c751b1aac52c6cafa1f184a138
-MD5 a2f1ac8eaad888c38903065a05c1b5b2 ChangeLog 23872
-RMD160 be895ea3cc897ef05a69e04561a39bbc1c9162a7 ChangeLog 23872
-SHA256 59412569ebc90c8da54d91b2a6a208c1d3a184c751b1aac52c6cafa1f184a138 ChangeLog 23872
+EBUILD emacs-cvs-23.0.0-r6.ebuild 7959 RMD160 1ae1c5c4bbdaa1bceadc439c8a9e348e6072fb82 SHA1 9bf74c08db192687790664b696b93a645fbe37ad SHA256 6f55b9842cfa610431081e0eb5a4e8c3969ba401c7782b471911db719fde11ce
+MD5 3169bf85404b89d5eed8c18f09e846ed emacs-cvs-23.0.0-r6.ebuild 7959
+RMD160 1ae1c5c4bbdaa1bceadc439c8a9e348e6072fb82 emacs-cvs-23.0.0-r6.ebuild 7959
+SHA256 6f55b9842cfa610431081e0eb5a4e8c3969ba401c7782b471911db719fde11ce emacs-cvs-23.0.0-r6.ebuild 7959
+MISC ChangeLog 23960 RMD160 0e66a67bb24ec81b04ee0e878ad3ffb1b7824ef1 SHA1 b6329c5382917710da31239345c4864f2265f8ee SHA256 5d29f7495e75f0f224adc9064f6ec126508c52a4c7a17dcb875c301e3ea3a59a
+MD5 4407ba8505b1dea5e42b20020c4c8c49 ChangeLog 23960
+RMD160 0e66a67bb24ec81b04ee0e878ad3ffb1b7824ef1 ChangeLog 23960
+SHA256 5d29f7495e75f0f224adc9064f6ec126508c52a4c7a17dcb875c301e3ea3a59a ChangeLog 23960
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -88,7 +88,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGTLzGOeoy/oIi7uwRAgVfAJoCRBjaYyeecNA3MFkaWERCbUQ9EwCeMj61
-p3AjTXMuRWdM6YOtE/UMZws=
-=npyy
+iD8DBQFGTNy+Oeoy/oIi7uwRAtSqAJ9ClkOPsVxpSGfLUqzdTmohjPKULgCfW9nO
+OxvPoqlGBAN1/mBb/rq7qi0=
+=ouK3
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild
index 1766e65265e1..68bd1c871029 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.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-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild,v 1.13 2007/05/15 15:02:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild,v 1.14 2007/05/17 22:50:33 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -28,7 +28,8 @@ RDEPEND="sys-libs/ncurses
 	hesiod? ( net-dns/hesiod )
 	spell? ( || ( app-text/ispell app-text/aspell ) )
 	alsa? ( media-sound/alsa-headers )
-	X? ( $X_DEPEND
+	X? (
+		$X_DEPEND
 		x11-misc/emacs-desktop
 		gif? ( media-libs/giflib )
 		jpeg? ( media-libs/jpeg )
@@ -36,9 +37,14 @@ RDEPEND="sys-libs/ncurses
 		png? ( media-libs/libpng )
 		xpm? ( x11-libs/libXpm )
 		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
-		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
-		!motif? ( lesstif? ( x11-libs/lesstif ) ) )"
+		!gtk? (
+			Xaw3d? ( x11-libs/Xaw3d )
+			!Xaw3d? (
+				motif? ( x11-libs/openmotif )
+				!motif? ( lesstif? ( x11-libs/lesstif ) )
+			)
+		)
+	)"
 
 DEPEND="${RDEPEND}
 	gzip-el? ( app-arch/gzip )"
@@ -54,8 +60,9 @@ src_unpack() {
 	cvs_src_unpack
 
 	cd "${S}"
-	# FULL_VERSION keeps the full version number, which is needed in order to
-	# determine some path information correctly for copy/move operations later on
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
 	FULL_VERSION=$(grep 'defconst[	 ]*emacs-version' lisp/version.el \
 		| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
 	[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
@@ -67,9 +74,11 @@ src_unpack() {
 		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
 		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
 	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and compresses
-		# el files.	 We don't want that so confuse it with a wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in || die "unable to sed configure.in"
+		# Emacs' build system automatically detects the gzip binary and
+		# compresses el files. We don't want that so confuse it with a
+		# wrong binary name
+		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
+			|| die "unable to sed configure.in"
 	fi
 
 	epatch "${FILESDIR}/${PN}-Xaw3d-headers.patch"
@@ -102,9 +111,9 @@ src_compile() {
 	fi
 
 	if use X; then
-		# GTK+ is the default toolkit if USE=gtk is chosen with other possibilities.
-		# Emacs upstream thinks this should be standard policy on all
-		# distributions
+		# GTK+ is the default toolkit if USE=gtk is chosen with other
+		# possibilities. Emacs upstream thinks this should be standard
+		# policy on all distributions
 		myconf="${myconf} --with-x"
 		myconf="${myconf} $(use_with xpm)"
 		myconf="${myconf} $(use_with toolkit-scroll-bars)"
@@ -132,8 +141,8 @@ src_compile() {
 		myconf="${myconf} --without-x"
 	fi
 
-	# $(use_with hesiod) is not possible, as "--without-hesiod" breaks the build
-	# system (has been reported upstream)
+	# $(use_with hesiod) is not possible, as "--without-hesiod" breaks
+	# the build system (has been reported upstream)
 	use hesiod && myconf="${myconf} --with-hesiod"
 
 	econf \
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild
index e0ca41fb84b9..7e6b3aed03c3 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.1.50.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-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild,v 1.5 2007/05/15 15:02:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild,v 1.6 2007/05/17 22:50:33 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -28,7 +28,8 @@ RDEPEND="sys-libs/ncurses
 	hesiod? ( net-dns/hesiod )
 	spell? ( || ( app-text/ispell app-text/aspell ) )
 	alsa? ( media-sound/alsa-headers )
-	X? ( $X_DEPEND
+	X? (
+		$X_DEPEND
 		x11-misc/emacs-desktop
 		gif? ( media-libs/giflib )
 		jpeg? ( media-libs/jpeg )
@@ -36,9 +37,14 @@ RDEPEND="sys-libs/ncurses
 		png? ( media-libs/libpng )
 		xpm? ( x11-libs/libXpm )
 		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
-		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
-		!motif? ( lesstif? ( x11-libs/lesstif ) ) )"
+		!gtk? (
+			Xaw3d? ( x11-libs/Xaw3d )
+			!Xaw3d? (
+				motif? ( x11-libs/openmotif )
+				!motif? ( lesstif? ( x11-libs/lesstif ) )
+			)
+		)
+	)"
 
 DEPEND="${RDEPEND}
 	gzip-el? ( app-arch/gzip )"
@@ -55,8 +61,9 @@ src_unpack() {
 	cvs_src_unpack
 
 	cd "${S}"
-	# FULL_VERSION keeps the full version number, which is needed in order to
-	# determine some path information correctly for copy/move operations later on
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
 	FULL_VERSION=$(grep 'defconst[	 ]*emacs-version' lisp/version.el \
 		| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
 	[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
@@ -68,9 +75,11 @@ src_unpack() {
 		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
 		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
 	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and compresses
-		# el files.	 We don't want that so confuse it with a wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in || die "unable to sed configure.in"
+		# Emacs' build system automatically detects the gzip binary and
+		# compresses el files. We don't want that so confuse it with a
+		# wrong binary name
+		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
+			|| die "unable to sed configure.in"
 	fi
 
 	epatch "${FILESDIR}/${PN}-Xaw3d-headers.patch"
@@ -103,9 +112,9 @@ src_compile() {
 	fi
 
 	if use X; then
-		# GTK+ is the default toolkit if USE=gtk is chosen with other possibilities.
-		# Emacs upstream thinks this should be standard policy on all
-		# distributions
+		# GTK+ is the default toolkit if USE=gtk is chosen with other
+		# possibilities. Emacs upstream thinks this should be standard
+		# policy on all distributions
 		myconf="${myconf} --with-x"
 		myconf="${myconf} $(use_with xpm)"
 		myconf="${myconf} $(use_with toolkit-scroll-bars)"
@@ -133,8 +142,8 @@ src_compile() {
 		myconf="${myconf} --without-x"
 	fi
 
-	# $(use_with hesiod) is not possible, as "--without-hesiod" breaks the build
-	# system (has been reported upstream)
+	# $(use_with hesiod) is not possible, as "--without-hesiod" breaks
+	# the build system (has been reported upstream)
 	use hesiod && myconf="${myconf} --with-hesiod"
 
 	econf \
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
index 7b855b81ff42..2d17086fa25c 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.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-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.10 2007/05/15 15:02:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.11 2007/05/17 22:50:33 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -28,7 +28,8 @@ RDEPEND="sys-libs/ncurses
 	hesiod? ( net-dns/hesiod )
 	spell? ( || ( app-text/ispell app-text/aspell ) )
 	alsa? ( media-sound/alsa-headers )
-	X? ( $X_DEPEND
+	X? (
+		$X_DEPEND
 		x11-misc/emacs-desktop
 		gif? ( media-libs/giflib )
 		jpeg? ( media-libs/jpeg )
@@ -37,9 +38,14 @@ RDEPEND="sys-libs/ncurses
 		xpm? ( x11-libs/libXpm )
 		xft? ( media-libs/fontconfig virtual/xft >=dev-libs/libotf-0.9.4 )
 		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
-		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
-		!motif? ( lesstif? ( x11-libs/lesstif ) ) )"
+		!gtk? (
+			Xaw3d? ( x11-libs/Xaw3d )
+			!Xaw3d? (
+				motif? ( x11-libs/openmotif )
+				!motif? ( lesstif? ( x11-libs/lesstif ) )
+			)
+		)
+	)"
 
 DEPEND="${RDEPEND}
 	gzip-el? ( app-arch/gzip )"
@@ -55,8 +61,9 @@ src_unpack() {
 	cvs_src_unpack
 
 	cd "${S}"
-	# FULL_VERSION keeps the full version number, which is needed in order to
-	# determine some path information correctly for copy/move operations later on
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
 	FULL_VERSION=$(grep 'defconst[	 ]*emacs-version' lisp/version.el \
 		| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
 	[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
@@ -68,9 +75,11 @@ src_unpack() {
 		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
 		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
 	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and compresses
-		# el files.	 We don't want that so confuse it with a wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in || die "unable to sed configure.in"
+		# Emacs' build system automatically detects the gzip binary and
+		# compresses el files. We don't want that so confuse it with a
+		# wrong binary name
+		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
+			|| die "unable to sed configure.in"
 	fi
 
 	epatch "${FILESDIR}/${PN}-Xaw3d-headers.patch"
@@ -103,9 +112,9 @@ src_compile() {
 	fi
 
 	if use X; then
-		# GTK+ is the default toolkit if USE=gtk is chosen with other possibilities.
-		# Emacs upstream thinks this should be standard policy on all
-		# distributions
+		# GTK+ is the default toolkit if USE=gtk is chosen with other
+		# possibilities. Emacs upstream thinks this should be standard
+		# policy on all distributions
 		myconf="${myconf} --with-x"
 		myconf="${myconf} $(use_with xpm)"
 		myconf="${myconf} $(use_with toolkit-scroll-bars)"
@@ -136,8 +145,8 @@ src_compile() {
 		myconf="${myconf} --without-x"
 	fi
 
-	# $(use_with hesiod) is not possible, as "--without-hesiod" breaks the build
-	# system (has been reported upstream)
+	# $(use_with hesiod) is not possible, as "--without-hesiod" breaks
+	# the build system (has been reported upstream)
 	use hesiod && myconf="${myconf} --with-hesiod"
 
 	econf \