Fix breakage with patch-2.7, wrt bug #435702. Migrate to EAPI 4.

Package-Manager: portage-2.1.11.29/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

3 files changed, 77 insertions, 4 deletions

diff --git a/app-misc/sl/ChangeLog b/app-misc/sl/ChangeLog
index cf7dceae043d..a94c95f23b72 100644
--- a/app-misc/sl/ChangeLog
+++ b/app-misc/sl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/sl
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sl/ChangeLog,v 1.23 2011/02/27 22:28:59 scarabeus Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sl/ChangeLog,v 1.24 2012/10/18 08:51:45 kensington Exp $
+
+*sl-3.03-r2 (18 Oct 2012)
+
+  18 Oct 2012; Michael Palimaka <kensington@gentoo.org> +sl-3.03-r2.ebuild:
+  Fix breakage with patch-2.7, wrt bug #435702. Migrate to EAPI 4.
 
   27 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> -sl-3.03.ebuild:
   old
@@ -76,4 +81,3 @@
   Initial import.  Ebuild submitted by YAMAKURA Makoto <yakina@gentoo.org>
   at GentooJP BugTrack.  Special thanks to Tomoaki Okayama
   <okayama@sodan.ecc.u-tokyo.ac.jp> for the contribution of English manpage.
-
diff --git a/app-misc/sl/Manifest b/app-misc/sl/Manifest
index 4b0e36864828..352b77dc9787 100644
--- a/app-misc/sl/Manifest
+++ b/app-misc/sl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX Makefile.patch 631 SHA256 c1017836090d45164f525cc0245f125f7759c09448e0b4e49fef599a8e582bac SHA512 31ac18f7de0b1bb162e046e41de4217b4e4959800aacab0d4d37ac0aceab8dd560d5dcc72e645e8d23592049ec16e5e3c813ef0ff78d81fedff1ecefa1761709 WHIRLPOOL 0099c2ef48f6944adf5c1cd7726b66da5031d87b9feb359aa5957457f44c508c2adc985f2873fab069a8a7c1f2411d87a6e3d100e531065a81e78bdebcd1436c
 AUX fix_compilation.patch 795 SHA256 3d23b582463c44b08a6f7e70f21d548b5a866b57a2727be4714620f78806f1ca SHA512 0a017b4725f7770ccf50d88f5a8ec9b7b5385244fcb6d64cec6da3b0d68135b38ea4cf3d94d8ebcd713a772b3e4ea1dc475f772d8f1b42181780505440430472 WHIRLPOOL 7f8f3f3b72e615d572af9b44f455a5d6f8e95a5b3c05da1f127398b6450d148ddcddc7a182a06109e4d9648d4f1db927dd65625737eed207095dfa7aea2b3e59
 AUX sl-3.03-gentoo.diff 308 SHA256 1db87cdbd1db94c241e623b6d8d6ffe990ee0e54434db4db7b85c9f0ec88ab4c SHA512 7bf63fe95098534b71c7442f0bec4acba15e74379a79b3bd1070ff708bfdbf727a3c885e7dc2e88b7fccd891381a538c88416826efe5deceaa0824c97c76bf91 WHIRLPOOL e4cafc8c87ed6328b30acdd900d14daa5cb0ad9f1f959ef4ec9b8e6749c8e6e3cc7e54991e534431c586e56321369fff1dbb527628fa386d0d2400f6040fbe1e
@@ -5,5 +8,17 @@ DIST sl.en.1.gz 467 SHA256 51dc6d6c902a9c8dd1f04379b53d873e0f321d78710a7fecccf68
 DIST sl.tar 20480 SHA256 b2bcbd86acf2017c84b6aaf6161b3b24f97e34a2d70ab0204c9503f5d50965f4 SHA512 eb0cc0bc0d6e795e32ed84a6813644b41e81ad6fd7ac51e67ec6c99747acdbc9d102041d3af53c9ba75ba7b1581ab4c6a14fc9db20e1f69a30713aefb17f7737 WHIRLPOOL 5173ab275c8a47ef6a20c39bcb7053a9f5d317c092f5813b882913ed625d806f477eaee35398b53fc40b0944f298d3fc540ce94ec9b343491286237aa35b4168
 DIST sl5-1.patch 36035 SHA256 4943b6f000f518ed08755b36d9b753291989c4867e55d74bc4cc4502f6e9422f SHA512 25321da4fd2359f1e47a6ab939d3ce5dc8a160a6ede4db3e7355d5efcecf686622f3c9e3e941eeeeed504c61cb15b959648d97f70a97f88efe3a2628eaa96038 WHIRLPOOL 56d11bcdf9f1e27d1261b4616859b8381c6ae49c0897d28a7214fe59f7227013b39ff55d438078bd3cd7e196403a327af1edaba8be38255db38f2090db3070b8
 EBUILD sl-3.03-r1.ebuild 1352 SHA256 75e29ad61374963cae717058bb17d4bc26a74f099763bf44a93fadd1a86d5aac SHA512 a6bcd2447b50ea6599bdb435cd2b2f564073f5a7ebb3428c9a441010f6cf57694137149677820a52628548ecec6557248a2f6498a92500be5e4d173fdb89c5b6 WHIRLPOOL ed05924ebc17fd12a9118d009122977c8bbf53a65ec21a8f91e4705e2fc6ef87cf807bd37e2fd3d415d8d677f7426be7a03343d2667d22561ca02e4c66a52774
-MISC ChangeLog 2891 SHA256 e676a8e09f5ac56c3cf9767ef721a1806b682d596a0ca7ee554d1055c61195d1 SHA512 71d2002a6420ce31f40d5ef5ad5048b14bef5972c71b26513d37d9ee85ff3d8a5d146b27c561158d24aa616d8705b9a2231e76e4743cb0e1131460d185b7a996 WHIRLPOOL ad7fd8dd931510c6ef271bba75fbe0991f80f0d46927100c7dd947c9c7b60c5ea616ad2fe72ce3e9bc8527a64df157d31f7441ce21176dbbad0c32f66b37bb33
+EBUILD sl-3.03-r2.ebuild 1361 SHA256 9576f7b2ae30df36644befcda013c5a37ec22b3ea0573a5af83fdec0d4b1456f SHA512 ff5ac7f47afc19c88636a0c17a489de33dc6f14c5b31b808ed15fc625eb65668d4d74c0f80c75431fd84c46f23fe041c32fe23a46faec2162e8684cd5e617a1c WHIRLPOOL f8d44d0165c87e51051b084e86cef2fdf4f891b4b982a5e1dd0fe9e5686f62c54bdee60733b3e9982a4011d8ff59d99169fa9c9ce8305ea98dc2c29118854add
+MISC ChangeLog 3062 SHA256 2276d53e34834d599cda523beafaa0eefd31a9ccad1113da7e529b1dfbbb1277 SHA512 13f39b64c7c093688bab157fc85cb5bd4e4ff0e2f967aaa7cd3d93dc115b8e673ec24f618c54f46ff6aae375eb952bae9a5c59d4409a5c1b44240b2a5b149a6d WHIRLPOOL a2c7a4e2cf8fc7d382c2952139f8870223012c5d71b43535f7827ef601633dc0afe0ee6eb05422ae42f185f8231db3bd7494c3025b82bd922bd145095950234a
 MISC metadata.xml 494 SHA256 80a14bfd27f093cdd72c99b7e9aae29fb9e014fd1b03fb280995b0ec498f41ce SHA512 1442425266861b5df3c244a0f4566529013c483b30e222c936072bee3abe1277a5c60257240419f47a6920809fbed138e1b809840551dea0fde0b7ee56191ef2 WHIRLPOOL ef60a02f307887c0af1a227e91ccd9eefed96e2dc759be056c6121100863a1cb09c833f980ff441a00b38be72c4d0c29f8bf653c6f2a9cd0314d32a3d7fa1402
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQf8LSAAoJEMbwO6tnXQ0sEEcH/1i5HIJoIsC4Rm5izSvYkyMm
+VHbkw56Te4EWCkvaCb+nfCHwHXABvjOWmaHqE0PZUtH3+/7b/0EGooNh15wSNS1g
+SYgYUWmCBPkvgdLT5x+41s3TiehWH2Nfq49T66OfafHeAB10IakyAWM5/5yPyKpE
+Ew0Nb2CcWy7NOJZ0k80J8gD2lx4qFUUYZ7DTBiC1Q+l8W8cRUtcqCu1u03cp4W/M
+z6qgYf0jWPgfxEgL+dZHwJNRpywLe6DLGiZtWC1zazUdt3xpUcCNa+v1iQWI039T
+qeFlxrctd2obQ4jf8btdNpRsGhQG5cqqKemMni89xGt4PHhEfJ2KoYJUQj1ZWFc=
+=pZ1x
+-----END PGP SIGNATURE-----
diff --git a/app-misc/sl/sl-3.03-r2.ebuild b/app-misc/sl/sl-3.03-r2.ebuild
new file mode 100644
index 000000000000..56e055f93b28
--- /dev/null
+++ b/app-misc/sl/sl-3.03-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sl/sl-3.03-r2.ebuild,v 1.1 2012/10/18 08:51:44 kensington Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs flag-o-matic
+
+SL_PATCH="sl5-1.patch"
+
+DESCRIPTION="sophisticated graphical program which corrects your miss typing"
+HOMEPAGE="http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/ http://www.izumix.org.uk/sl/"
+SRC_URI="http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/sl/${PN}.tar
+	http://www.linet.gr.jp/~izumi/sl/${SL_PATCH}
+	http://www.sodan.ecc.u-tokyo.ac.jp/~okayama/sl/${PN}.en.1.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug linguas_ja"
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	tc-export CC
+	use debug && append-cppflags -DDEBUG
+}
+
+src_prepare() {
+	epatch -p1 "${DISTDIR}/${SL_PATCH}"
+	epatch "${FILESDIR}/${P}-gentoo.diff"
+	epatch "${FILESDIR}/Makefile.patch"
+	epatch "${FILESDIR}/fix_compilation.patch"
+
+	if use linguas_ja; then
+		iconv -f ISO-2022-JP -t EUC-JP sl.1 > sl.ja.1
+	fi
+}
+
+src_install() {
+	dobin sl
+
+	newman "${WORKDIR}/sl.en.1" sl.1
+	dodoc sl.txt
+
+	if use linguas_ja ; then
+		dodoc README*
+		insinto /usr/share/man/ja/man1
+		newins sl.ja.1 sl.1
+	fi
+}