Fixes bug 314497 and other fixes. Thanks to Nathan Phillip Brink (ohnobinki)

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 96 insertions, 16 deletions

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 <hwoarang@gentoo.org>
+  +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/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 <ohnobinki@ohnopublishing.net>
+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
+}