diff options
| -rw-r--r-- | app-misc/sl/ChangeLog | 11 | ||||
| -rw-r--r-- | app-misc/sl/Manifest | 13 | ||||
| -rw-r--r-- | app-misc/sl/files/Makefile.patch | 29 | ||||
| -rw-r--r-- | app-misc/sl/files/fix_compilation.patch | 22 | ||||
| -rw-r--r-- | app-misc/sl/sl-3.03-r1.ebuild | 54 |
5 files changed, 123 insertions, 6 deletions
diff --git a/app-misc/sl/ChangeLog b/app-misc/sl/ChangeLog index 47d28fb6a457..0d37fd0461e8 100644 --- a/app-misc/sl/ChangeLog +++ b/app-misc/sl/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-misc/sl # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/sl/ChangeLog,v 1.15 2010/01/01 21:21:21 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/sl/ChangeLog,v 1.16 2010/08/09 20:34:19 idl0r Exp $ + +*sl-3.03-r1 (09 Aug 2010) + + 09 Aug 2010; Christian Ruppert <idl0r@gentoo.org> +sl-3.03-r1.ebuild, + +files/Makefile.patch, +files/fix_compilation.patch: + Revision bump. Add Makefile patch to allow the use of the Makefile. Add + patch to fix compiler warnings. Fix HOMEPAGE. Use EAPI 3, some QA fixes + and clean up. Thanks to Diego E. 'Flameeyes' Pettenò + <flameeyes@gentoo.org> for the calloc hint. 01 Jan 2010; Christian Faulhammer <fauli@gentoo.org> sl-3.03.ebuild: Transfer Prefix keywords diff --git a/app-misc/sl/Manifest b/app-misc/sl/Manifest index ba8d67a51362..72210e4349d4 100644 --- a/app-misc/sl/Manifest +++ b/app-misc/sl/Manifest @@ -1,17 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX Makefile.patch 635 RMD160 c0483da060eb4622213a86b82e12c646f6486dae SHA1 fb0d509ca5ef643954a6c745f689cb84ca944df3 SHA256 38a27f6bf08204fd92ce2771ed0e4b3551d3af044fa571192f36bd18c548d65e +AUX fix_compilation.patch 795 RMD160 14d1b70511d8542d5ed11b03bb249463801a47ec SHA1 75da16ee114dc6e0064cf93d166240f843fc4451 SHA256 3d23b582463c44b08a6f7e70f21d548b5a866b57a2727be4714620f78806f1ca AUX sl-3.03-gentoo.diff 308 RMD160 261626931973a2a7c97b114b9f07de872ebbba06 SHA1 1d07468259e8a05b6eee1280c18f8b3b7de66b5c SHA256 1db87cdbd1db94c241e623b6d8d6ffe990ee0e54434db4db7b85c9f0ec88ab4c 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-r1.ebuild 1354 RMD160 96349c9a8abd210f50e252b726744b626933ceb7 SHA1 96868aa15e93a079cf67baa4579c54e9bdf5df7d SHA256 1ee9064fda7678b16254d0fab98c2e420a492ea33f7a26b3a25da427ab1b4089 EBUILD sl-3.03.ebuild 1355 RMD160 8c6a37f229db0b1079bfef1d05eb21bdded5c4fd SHA1 ec1d707f32151f7c8ad892c1ca1c682ee6cf93ae SHA256 a6f7153b9c95c05d27db6035ca78ca71cd90c61016aa1b92e86eb95086811691 -MISC ChangeLog 1806 RMD160 44410f092ba0b13e269328db860d8f16c8b568f0 SHA1 4aceccb4c727920662806050e4f23671ddefaf3a SHA256 c9824191dbcda6f6d590acce096faf3a19d74e5933f552b1d8c27ecfedb60aa2 +MISC ChangeLog 2211 RMD160 26b3c4fa8d8509fa071fe30d94204ffaad877343 SHA1 4c07d77a85142119db8ad7499dc9d5f9957df5a1 SHA256 d31ab7ee7ef5869e8f5f51eb281a4ddc3381ffeb5de4f32c0bfcd8944cc8f4a5 MISC metadata.xml 516 RMD160 17649d964344ee7312fd5b7a08b21a7cc6bdf879 SHA1 115a01d1cd11b8e7990ec6724dd97b8eceb6b9ec SHA256 243910dc47b12e0d580d049912cffc21086be49b01bb7936de3af62fc122176e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAks+Z1gACgkQNQqtfCuFneMq7QCghsbhFo6ssbgaAt4jGGuRX1wd -MH8An3Set+9cNOUH5s64/2SxCf99sors -=8Mz9 +iEYEARECAAYFAkxgZlgACgkQixe2jn+ufTildgCdEAFPV3yle621JnzjM8O2dekX +J5YAnjkyqKtwtWg3kdGhsiFqr6ZcqQW7 +=O+pS -----END PGP SIGNATURE----- diff --git a/app-misc/sl/files/Makefile.patch b/app-misc/sl/files/Makefile.patch new file mode 100644 index 000000000000..2591c4de45f1 --- /dev/null +++ b/app-misc/sl/files/Makefile.patch @@ -0,0 +1,29 @@ +--- sl.orig/Makefile 2010-08-09 21:36:45.483225339 +0200 ++++ sl/Makefile 2010-08-09 21:58:23.915058929 +0200 +@@ -5,13 +5,13 @@ + # Last Modified: 1998/ 7/22 + #========================================== + +-CC = gcc ++CC ?= gcc + + #DEBUGOPTS = -DDEBUG -g + + # For Linux 2.0.x +-LDFLAGS = -lncurses -ltermcap +-CFLAGS = -Wall -O2 -DLINUX20 $(DEBUGOPTS) ++LDLIBS = -lncurses ++CFLAGS ?= -Wall -O2 $(DEBUGOPTS) + + # For Solaris + #LDFLAGS = -lcurses -ltermcap +@@ -19,8 +19,7 @@ CFLAGS = -Wall -O2 -DLINUX20 $(DEBUGOPTS + + all: sl + +-sl: sl.c sl.h header.h Makefile +- $(CC) $(CFLAGS) -o sl sl.c $(LDFLAGS) ++sl: sl.o + + clean: + -rm -f sl sl.o core diff --git a/app-misc/sl/files/fix_compilation.patch b/app-misc/sl/files/fix_compilation.patch new file mode 100644 index 000000000000..5b63a844f9f5 --- /dev/null +++ b/app-misc/sl/files/fix_compilation.patch @@ -0,0 +1,22 @@ +--- sl.orig/sl.c 2010-08-09 21:36:45.483225339 +0200 ++++ sl/sl.c 2010-08-09 22:01:12.462051982 +0200 +@@ -30,6 +30,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <strings.h> ++#include <string.h> + #include <time.h> + #ifdef LINUX20 + #include <ncurses/curses.h> +@@ -186,10 +187,7 @@ int main(int argc, char *argv[]) + scrollok(stdscr, FALSE); + DIREC = RTOL; + p = 3 * COLS / 10; +- pp = (char*)malloc((size_t)(COLS + ALL_LENGTH + 10) * (D51HIGHT + 1) * (D51PATTERNS + 1)); +- for (i = 0; i <= (COLS + ALL_LENGTH + 1) * (D51HIGHT + 1) * D51PATTERNS; ++i) { +- pp[i] = (char)NULL; +- } ++ pp = (char *)calloc(1, (size_t)(COLS + ALL_LENGTH + 10) * (D51HIGHT + 1) * (D51PATTERNS + 1)); + + for (j = 0; j < D51PATTERNS; ++j) { + for (i = 0; i <= D51HIGHT; ++i) { diff --git a/app-misc/sl/sl-3.03-r1.ebuild b/app-misc/sl/sl-3.03-r1.ebuild new file mode 100644 index 000000000000..deaeffac6262 --- /dev/null +++ b/app-misc/sl/sl-3.03-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/sl/sl-3.03-r1.ebuild,v 1.1 2010/08/09 20:34:19 idl0r Exp $ + +EAPI=3 + +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="linguas_ja debug" + +DEPEND="sys-libs/ncurses" + +S=${WORKDIR}/${PN} + +src_prepare() { + epatch "${DISTDIR}/${SL_PATCH}" + epatch "${FILESDIR}/${P}-gentoo.diff" + epatch "${FILESDIR}/Makefile.patch" + epatch "${FILESDIR}/fix_compilation.patch" +} + +src_compile() { + use debug && append-flags -DDEBUG + + emake CC=$(tc-getCC) || die + + if use linguas_ja; then + iconv -f ISO-2022-JP -t EUC-JP sl.1 > sl.ja.1 + fi +} + +src_install() { + dobin sl || die + + 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 +} |