From: Markos Chandras Date: Tue, 13 Apr 2010 17:49:42 +0000 (+0000) Subject: Fixes bug 314497 and other fixes. Thanks to Nathan Phillip Brink (ohnobinki) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8e748bf47ff633cfad7200e91c6d79aa8de676e2;p=gentoo.git Fixes bug 314497 and other fixes. Thanks to Nathan Phillip Brink (ohnobinki) Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/dev-lang/squirrel/ChangeLog b/dev-lang/squirrel/ChangeLog index 7b7cf0bcf75a..8d460e4fd7ef 100644 --- a/dev-lang/squirrel/ChangeLog +++ b/dev-lang/squirrel/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for dev-lang/squirrel # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/squirrel/ChangeLog,v 1.1 2010/03/05 18:45:30 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/squirrel/ChangeLog,v 1.2 2010/04/13 17:49:42 hwoarang Exp $ + +*squirrel-2.2.4-r1 (13 Apr 2010) + + 13 Apr 2010; Markos Chandras + +squirrel-2.2.4-r1.ebuild, files/squirrel-2.2.4-autotools.patch: + Fixes bug 314497 by using the --docdir ./configure + option. Support EAPI=3 (prefix reviewd by ABCD). Actually support + advertised useflags by expanding autotools patch. + Enable removal of static archive and libtool archives on USE=-static-libs. + Thanks to Nathan Phillip Brink (ohnobinki) *squirrel-2.2.4 (05 Mar 2010) diff --git a/dev-lang/squirrel/Manifest b/dev-lang/squirrel/Manifest index f311fe60ab2d..af2d9d0a900e 100644 --- a/dev-lang/squirrel/Manifest +++ b/dev-lang/squirrel/Manifest @@ -1,7 +1,8 @@ -AUX squirrel-2.2.4-autotools.patch 6858 RMD160 49870b93ba65523058e71192877815af843c59ea SHA1 64a921e2c6fe49a930a19124623455b2d8b9a5c4 SHA256 16c80fae4b35b6d52528c17ff96d1a8450f01868c7b48ca79c8efbbd43c9a3dc +AUX squirrel-2.2.4-autotools.patch 7721 RMD160 26d9a20e5d70bab2d915ad144945beff9ce94bf7 SHA1 149e77bb3dcf5877db6b53dc6a07f4b1d066e6e7 SHA256 59e04a170ebbe0a6441ca6accaca7509151f42053f82eab4857e5954871869f5 AUX squirrel-2.2.4-stdint.h.patch 2081 RMD160 95be6e1293eb80b672682e32ce37e7d24cf46be4 SHA1 4dbd8d28aec53c53190ecfb5db4e9831dfeb8e67 SHA256 fc7faf678fee7d4d3ed6895dbe7d95ca955dbd2d6525b0792fb0b66c88aeb948 AUX squirrel-2.2.4-supertux-const.patch 1285 RMD160 c27f6a9e583ab2611108488aeedbfdc175ad5aa3 SHA1 fbf455f2351c0fd032ff97699af009e46ffbc53a SHA256 0c33695d6704bd84fcecc2ec89885da2f05698c73f9f2b300131206ae700ef98 DIST squirrel_2.2.4_stable.tar.gz 419567 RMD160 61c56903041f2e0395c2caf6890b983860415295 SHA1 ab439332916cf6028504c790b28e01089d35d843 SHA256 936ca05469ab19f16a730685ef4ad1ca5a3838195765d47935a4ba9052d8b2d4 +EBUILD squirrel-2.2.4-r1.ebuild 1119 RMD160 b6bc291de85c64483c6216f72dec7ea9ebc990d5 SHA1 cdc4651a2e77796d914bf71f677ae33e0de10255 SHA256 b783857bb3b7ba48a8a127d7028bfe53d3400d9f5082b98ba089b5898d49617c EBUILD squirrel-2.2.4.ebuild 862 RMD160 aa0c5881eaaa3d49693a4f745a840c2041383fb6 SHA1 306d049853f383037ef4b24d3c6d6028212a94c5 SHA256 a27be6f306e1b54d575f7c87982469a3c3334f98ace76c88aa03e1f31af9a34e -MISC ChangeLog 619 RMD160 c8b9056840e03c24dc6ba7901a1c42778d271e46 SHA1 e77202e3091bef1aa022bbebca5647903f6c34d9 SHA256 7f538516997dbbbf9e479f541e1f6010ee24071917a6f09bd2bf5ad1150fbfd1 +MISC ChangeLog 1071 RMD160 7fb44a1dc749facf6f71a652f41acbd5e6dacaa2 SHA1 1d2ccd609a032cebb429aa4fff6d481e416872f8 SHA256 059f38ab487d39e18966d781bd8cba4b210712909b065b59f703b0248aaa1ce4 MISC metadata.xml 466 RMD160 c394eccf547c5239a900b78e2f80cf149b167953 SHA1 089f57b168894b3591c124e45bc49275531c1c1f SHA256 57261cfb510344840511d52cf6247eb6426d1260f91d071ac4182f25f9e537c0 diff --git a/dev-lang/squirrel/files/squirrel-2.2.4-autotools.patch b/dev-lang/squirrel/files/squirrel-2.2.4-autotools.patch index ab17050a0479..e39ddedc9eb3 100644 --- a/dev-lang/squirrel/files/squirrel-2.2.4-autotools.patch +++ b/dev-lang/squirrel/files/squirrel-2.2.4-autotools.patch @@ -1,4 +1,9 @@ -diff -r d6d89bbc08e5 -r 2ef7f06a679f Makefile +Author: Nathan Phillip Brink +Purpose: Makes squirrel buildable and installable using autotools, a buildsystem everybody is comfortable with. +Source: http://ohnopub.net/hg/SQUIRREL2 +Generate with: hg diff -r 0 -r -1 -I '**Makefile*' -I configure.ac -I '**.in' + +diff -r d6d89bbc08e5 -r c89309f5be40 Makefile --- a/Makefile Thu Feb 11 15:08:35 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ @@ -20,22 +25,25 @@ diff -r d6d89bbc08e5 -r 2ef7f06a679f Makefile - cd squirrel; $(MAKE) sq64 - cd sqstdlib; $(MAKE) sq64 - cd sq; $(MAKE) sq64 -diff -r d6d89bbc08e5 -r 2ef7f06a679f Makefile.am +diff -r d6d89bbc08e5 -r c89309f5be40 Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/Makefile.am Wed Feb 17 01:30:01 2010 -0500 -@@ -0,0 +1,84 @@ ++++ b/Makefile.am Sat Apr 10 11:25:40 2010 -0400 +@@ -0,0 +1,89 @@ +# autoreconf variables, recommended by libtoolize +ACLOCAL_FLAGS = -I m4 + -+AM_CPPFLAGS = -Iinclude ++AM_CPPFLAGS = -I$(top_srcdir)/include + +# custom installation directories +examplesdir = $(docdir)/examples +pkgconfigdir = $(libdir)/pkgconfig + +# installed things ++if ENABLE_DOC +dist_doc_DATA = doc/sqstdlib2.pdf \ + doc/squirrel2.pdf ++endif ++if ENABLE_EXAMPLES +dist_examples_DATA = samples/ackermann.nut \ + samples/array.nut \ + samples/class.nut \ @@ -52,6 +60,8 @@ diff -r d6d89bbc08e5 -r 2ef7f06a679f Makefile.am + samples/metamethods.nut \ + samples/methcall.nut \ + samples/tailstate.nut ++endif ++ +nodist_pkgconfig_DATA = libsqstdlib.pc \ + libsquirrel.pc +bin_PROGRAMS = sq/sq @@ -108,10 +118,10 @@ diff -r d6d89bbc08e5 -r 2ef7f06a679f Makefile.am + doc/sqstdlib2.chm doc/squirrel2.chm \ + squirrel.dsw sq/sq.dsp squirrel/squirrel.dsp sqstdlib/sqstdlib.dsp \ + etc/minimal.c etc/test.nut -diff -r d6d89bbc08e5 -r 2ef7f06a679f configure.ac +diff -r d6d89bbc08e5 -r c89309f5be40 configure.ac --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/configure.ac Wed Feb 17 01:30:01 2010 -0500 -@@ -0,0 +1,15 @@ ++++ b/configure.ac Sat Apr 10 11:25:40 2010 -0400 +@@ -0,0 +1,29 @@ +AC_INIT([squirrel],[2.2.4],[http://squirrel-lang.org/]) + +# recommended by libtoolize: @@ -123,13 +133,27 @@ diff -r d6d89bbc08e5 -r 2ef7f06a679f configure.ac +AC_PROG_CC_C_O +AC_PROG_CXX + ++AC_ARG_ENABLE([doc], ++ [AS_HELP_STRING([--disable-doc], [Control whether or not the API docs (pdfs) are installed.])], ++ [enable_docs=$enableval], ++ [enable_docs=yes]) ++AM_CONDITIONAL([ENABLE_DOC], ++ [test "x$enable_docs" = "xyes"]) ++ ++AC_ARG_ENABLE([examples], ++ [AS_HELP_STRING([--disable-exampels], [Control whether or not examples of libsquirrel use are installed.])], ++ [enable_examples=$enableval], ++ [enable_examples=yes]) ++AM_CONDITIONAL([ENABLE_EXAMPLES], ++ [test "x$enable_examples" = "xyes"]) ++ +AC_CONFIG_FILES([Makefile +libsquirrel.pc +libsqstdlib.pc]) +AC_OUTPUT -diff -r d6d89bbc08e5 -r 2ef7f06a679f libsqstdlib.pc.in +diff -r d6d89bbc08e5 -r c89309f5be40 libsqstdlib.pc.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/libsqstdlib.pc.in Wed Feb 17 01:30:01 2010 -0500 ++++ b/libsqstdlib.pc.in Sat Apr 10 11:25:40 2010 -0400 @@ -0,0 +1,14 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -145,9 +169,9 @@ diff -r d6d89bbc08e5 -r 2ef7f06a679f libsqstdlib.pc.in +# dependency so it's justified. +Libs.private: -lsquirrel +Cflags: -I${includedir} -diff -r d6d89bbc08e5 -r 2ef7f06a679f libsquirrel.pc.in +diff -r d6d89bbc08e5 -r c89309f5be40 libsquirrel.pc.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/libsquirrel.pc.in Wed Feb 17 01:30:01 2010 -0500 ++++ b/libsquirrel.pc.in Sat Apr 10 11:25:40 2010 -0400 @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -160,7 +184,7 @@ diff -r d6d89bbc08e5 -r 2ef7f06a679f libsquirrel.pc.in +URL: @PACKAGE_BUGREPORT@ +Libs: -L${libdir} -lsquirrel +Cflags: -I${includedir} -diff -r d6d89bbc08e5 -r 2ef7f06a679f sq/Makefile +diff -r d6d89bbc08e5 -r c89309f5be40 sq/Makefile --- a/sq/Makefile Thu Feb 11 15:08:35 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ @@ -186,7 +210,7 @@ diff -r d6d89bbc08e5 -r 2ef7f06a679f sq/Makefile -sq64: - g++ -O2 -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB) \ No newline at end of file -diff -r d6d89bbc08e5 -r 2ef7f06a679f sqstdlib/Makefile +diff -r d6d89bbc08e5 -r c89309f5be40 sqstdlib/Makefile --- a/sqstdlib/Makefile Thu Feb 11 15:08:35 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ @@ -220,7 +244,7 @@ diff -r d6d89bbc08e5 -r 2ef7f06a679f sqstdlib/Makefile - gcc -O2 -D_SQ64 -fno-rtti -Wall -c $(SRCS) $(INCZ) - ar rc $(OUT) *.o - rm *.o -diff -r d6d89bbc08e5 -r 2ef7f06a679f squirrel/Makefile +diff -r d6d89bbc08e5 -r c89309f5be40 squirrel/Makefile --- a/squirrel/Makefile Thu Feb 11 15:08:35 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ diff --git a/dev-lang/squirrel/squirrel-2.2.4-r1.ebuild b/dev-lang/squirrel/squirrel-2.2.4-r1.ebuild new file mode 100644 index 000000000000..52bb8a87a0f6 --- /dev/null +++ b/dev-lang/squirrel/squirrel-2.2.4-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/squirrel/squirrel-2.2.4-r1.ebuild,v 1.1 2010/04/13 17:49:42 hwoarang Exp $ + +EAPI=3 + +inherit autotools eutils multilib + +MY_P="${PN}_${PV}_stable" +DESCRIPTION="A interpreted language mainly used for games" +HOMEPAGE="http://squirrel-lang.org/" +SRC_URI="mirror://sourceforge/${PN}/${PN}${PV:0:1}/${MY_P}/${MY_P}.tar.gz" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples static-libs" + +# /usr/bin/sq conflicts +RDEPEND="!app-text/ispell" + +S="${WORKDIR}/SQUIRREL${PV:0:1}" + +src_prepare() { + epatch "${FILESDIR}"/${P}-autotools.patch + epatch "${FILESDIR}"/${P}-supertux-const.patch + epatch "${FILESDIR}"/${P}-stdint.h.patch + + eautoreconf +} + +src_configure() { + econf --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + $(use_enable doc) \ + $(use_enable examples) \ + $(use_enable static-libs static) +} + +src_install() { + emake DESTDIR="${D}" install || die + if ! use static-libs; then + rm -v "${ED}"/usr/$(get_libdir)/*.la || die + fi + + dodoc HISTORY README || die +}