Ebuild cleanup. Thanks to flameeyes; bug #158688.

Package-Manager: portage-2.1.1-r2

4 files changed, 53 insertions, 33 deletions

diff --git a/app-misc/sl/ChangeLog b/app-misc/sl/ChangeLog
index 261ec0a02f4b..f8cb005a0aa8 100644
--- a/app-misc/sl/ChangeLog
+++ b/app-misc/sl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-misc/sl
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sl/ChangeLog,v 1.9 2005/05/12 19:03:23 gmsoft Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sl/ChangeLog,v 1.10 2006/12/30 12:32:11 usata Exp $
+
+  30 Dec 2006; Mamoru KOMACHI <usata@gentoo.org> sl-3.03.ebuild:
+  Ebuild cleanup. Thanks to flameeyes; bug #158688.
 
   12 May 2005; Guy Martin <gmsoft@gentoo.org> sl-3.03.ebuild:
   Stable on hppa.
diff --git a/app-misc/sl/Manifest b/app-misc/sl/Manifest
index 99402240cd11..ad8c0d464068 100644
--- a/app-misc/sl/Manifest
+++ b/app-misc/sl/Manifest
@@ -1,15 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8e662c03ac8f7f63b92ce566df16045f sl-3.03.ebuild 1239
-MD5 1da7d0217be5361135dbe9d1116173fe ChangeLog 1078
-MD5 74259585a678d98216dab4cf4c51a2d0 metadata.xml 553
+AUX sl-3.03-gentoo.diff 308 RMD160 261626931973a2a7c97b114b9f07de872ebbba06 SHA1 1d07468259e8a05b6eee1280c18f8b3b7de66b5c SHA256 1db87cdbd1db94c241e623b6d8d6ffe990ee0e54434db4db7b85c9f0ec88ab4c
 MD5 e57bae202fffa96c41007326fa247bd4 files/sl-3.03-gentoo.diff 308
-MD5 bed5f5ce56f0fb8f672cf6661fb39567 files/digest-sl-3.03 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzRdRBXaUFmZvwyMRAjU4AJ4tp91lLgRlOKVk5WXJfzd2qF3QbQCbBv4i
-SKpYKMolhaR78C6O0J+Wmec=
-=vlN1
------END PGP SIGNATURE-----
+RMD160 261626931973a2a7c97b114b9f07de872ebbba06 files/sl-3.03-gentoo.diff 308
+SHA256 1db87cdbd1db94c241e623b6d8d6ffe990ee0e54434db4db7b85c9f0ec88ab4c files/sl-3.03-gentoo.diff 308
+DIST sl.en.1.gz 467 RMD160 de2a756ab9eacd4268b52c526fb6bc0d7c3e3b2b SHA1 7c5bfd7ff0ed9eb6c5614702354b40a693baabc9 SHA256 51dc6d6c902a9c8dd1f04379b53d873e0f321d78710a7fecccf68f08ca6923dc
+DIST sl.tar 20480 RMD160 8bf03c727cafeb8873377a1bfd17c3ff8bd6dd29 SHA1 57e18b4333e05be67faff58c42a06fcbc231def9 SHA256 b2bcbd86acf2017c84b6aaf6161b3b24f97e34a2d70ab0204c9503f5d50965f4
+DIST sl5-1.patch 36035 RMD160 03feef9ec80e127b0aee3b08b15fa605e9b6aad2 SHA1 4bad34d817f725626c1f1b655d968290ec78a19a SHA256 4943b6f000f518ed08755b36d9b753291989c4867e55d74bc4cc4502f6e9422f
+EBUILD sl-3.03.ebuild 1307 RMD160 d6d6df0121fbf05c2cf3682e6ab191226243d826 SHA1 2c62d3e04cb15094034f6d36af4b95af9b766ea7 SHA256 ac690b1bc5e4d0b51cb9e0391101f497cd3f652da41b6da30cdca31ec5e7c47a
+MD5 f194a3fe8a15d7af8e6991909bd8f9cb sl-3.03.ebuild 1307
+RMD160 d6d6df0121fbf05c2cf3682e6ab191226243d826 sl-3.03.ebuild 1307
+SHA256 ac690b1bc5e4d0b51cb9e0391101f497cd3f652da41b6da30cdca31ec5e7c47a sl-3.03.ebuild 1307
+MISC ChangeLog 1196 RMD160 0253958f1f73f39a5a9bc219d95712d1b90eff0f SHA1 8cc4ec121d0fe6a84e01086e46922c2dae447d0c SHA256 26c6994394cf034dfadcc53b00f72167f6446a829b602253a2c32f5a649155e0
+MD5 775806f639cc5cf98c868bb6aaa897e8 ChangeLog 1196
+RMD160 0253958f1f73f39a5a9bc219d95712d1b90eff0f ChangeLog 1196
+SHA256 26c6994394cf034dfadcc53b00f72167f6446a829b602253a2c32f5a649155e0 ChangeLog 1196
+MISC metadata.xml 553 RMD160 fa40b345e19d6382df2c2ea2905fc0584444d117 SHA1 836b764b80a3e3729d45bbe7a77159a6ce3b0813 SHA256 c3d80b6114226f638b95e2a063892582fab7b30872f25a2bc11aac87e635c61c
+MD5 74259585a678d98216dab4cf4c51a2d0 metadata.xml 553
+RMD160 fa40b345e19d6382df2c2ea2905fc0584444d117 metadata.xml 553
+SHA256 c3d80b6114226f638b95e2a063892582fab7b30872f25a2bc11aac87e635c61c metadata.xml 553
+MD5 0672674c9b794f2b8dea2e06c4e33856 files/digest-sl-3.03 609
+RMD160 2e9eb5c4cd3b428031c7e07ea7d8ba3cfc612a26 files/digest-sl-3.03 609
+SHA256 34c5219953572440afea08573f08504c61ab311a435e53c3e6872d08b831bceb files/digest-sl-3.03 609
diff --git a/app-misc/sl/files/digest-sl-3.03 b/app-misc/sl/files/digest-sl-3.03
index 28e008a7d0ff..c5d2bf56b344 100644
--- a/app-misc/sl/files/digest-sl-3.03
+++ b/app-misc/sl/files/digest-sl-3.03
@@ -1,3 +1,9 @@
+MD5 5cc47d1989d66f2ae3daba5e6c561a75 sl.en.1.gz 467
+RMD160 de2a756ab9eacd4268b52c526fb6bc0d7c3e3b2b sl.en.1.gz 467
+SHA256 51dc6d6c902a9c8dd1f04379b53d873e0f321d78710a7fecccf68f08ca6923dc sl.en.1.gz 467
 MD5 cc06b159f78f86bfd2d4e0e16330fbae sl.tar 20480
+RMD160 8bf03c727cafeb8873377a1bfd17c3ff8bd6dd29 sl.tar 20480
+SHA256 b2bcbd86acf2017c84b6aaf6161b3b24f97e34a2d70ab0204c9503f5d50965f4 sl.tar 20480
 MD5 97a346188edb4d048021a1e1699fee77 sl5-1.patch 36035
-MD5 5cc47d1989d66f2ae3daba5e6c561a75 sl.en.1.gz 467
+RMD160 03feef9ec80e127b0aee3b08b15fa605e9b6aad2 sl5-1.patch 36035
+SHA256 4943b6f000f518ed08755b36d9b753291989c4867e55d74bc4cc4502f6e9422f sl5-1.patch 36035
diff --git a/app-misc/sl/sl-3.03.ebuild b/app-misc/sl/sl-3.03.ebuild
index 649113d3acbf..bc437602cec8 100644
--- a/app-misc/sl/sl-3.03.ebuild
+++ b/app-misc/sl/sl-3.03.ebuild
@@ -1,8 +1,8 @@
-# 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-misc/sl/sl-3.03.ebuild,v 1.15 2005/07/07 11:51:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sl/sl-3.03.ebuild,v 1.16 2006/12/30 12:32:11 usata Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs flag-o-matic
 
 SL_PATCH="sl5-1.patch"
 
@@ -15,28 +15,32 @@ SRC_URI="http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/sl/${PN}.tar
 LICENSE="freedist"
 SLOT="0"
 KEYWORDS="x86 alpha sparc ppc64 ppc ppc-macos ~amd64 hppa"
-IUSE="cjk"
+IUSE="linguas_ja debug"
 
-DEPEND="virtual/libc
-	sys-libs/ncurses
-	!ppc-macos? ( cjk? ( app-i18n/nkf ) )"
-RDEPEND="virtual/libc
-	sys-libs/ncurses"
+DEPEND="sys-libs/ncurses"
 
 S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${PN}.tar
-	cd ${S}
-	epatch ${DISTDIR}/${SL_PATCH}
-	epatch ${FILESDIR}/${P}-gentoo.diff
+	cd "${S}"
+	epatch "${DISTDIR}/${SL_PATCH}"
+	epatch "${FILESDIR}/${P}-gentoo.diff"
 	unpack ${PN}.en.1.gz
 }
 
+doecho() {
+	echo "$@"
+	"$@"
+}
+
 src_compile() {
-	emake CFLAGS="${CFLAGS}" LDFLAGS="-lncurses" || die
-	if use cjk; then
-		nkf -e sl.1 > sl.ja.1
+	use debug && append-flags -DDEBUG
+
+	doecho "$(tc-getCC)" ${CFLAGS} ${LDFLAGS} sl.c -lncurses -o sl
+
+	if use linguas_ja; then
+		iconv -f ISO-2022-JP -t EUC-JP sl.1 > sl.ja.1
 	fi
 }
 
@@ -44,7 +48,7 @@ src_install() {
 	dobin sl || die
 	newman sl.en.1 sl.1
 	dodoc README* sl.txt
-	if use cjk ; then
+	if use linguas_ja ; then
 		insinto /usr/share/man/ja/man1
 		newins sl.ja.1 sl.1
 	fi