diff options
Diffstat (limited to 'app-shells')
| -rw-r--r-- | app-shells/squirrelsh/ChangeLog | 11 | ||||
| -rw-r--r-- | app-shells/squirrelsh/files/squirrelsh-fix-in_LDFLAGS.patch | 12 | ||||
| -rw-r--r-- | app-shells/squirrelsh/files/squirrelsh-no-docs.patch | 25 | ||||
| -rw-r--r-- | app-shells/squirrelsh/files/squirrelsh-no-strip.patch | 19 | ||||
| -rw-r--r-- | app-shells/squirrelsh/files/squirrelsh-remove-forced-abi.patch | 21 | ||||
| -rw-r--r-- | app-shells/squirrelsh/files/squirrelsh-rename-LDFLAGS.patch | 140 | ||||
| -rw-r--r-- | app-shells/squirrelsh/squirrelsh-1.2.6.ebuild | 48 |
7 files changed, 275 insertions, 1 deletions
diff --git a/app-shells/squirrelsh/ChangeLog b/app-shells/squirrelsh/ChangeLog index d3da0c4c00b2..198b9dbd1a8c 100644 --- a/app-shells/squirrelsh/ChangeLog +++ b/app-shells/squirrelsh/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-shells/squirrelsh # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/squirrelsh/ChangeLog,v 1.6 2012/03/04 14:18:05 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/squirrelsh/ChangeLog,v 1.7 2012/03/13 11:39:20 blueness Exp $ + +*squirrelsh-1.2.6 (13 Mar 2012) + + 13 Mar 2012; Anthony G. Basile <blueness@gentoo.org> + +squirrelsh-1.2.6.ebuild, +files/squirrelsh-fix-in_LDFLAGS.patch, + +files/squirrelsh-no-docs.patch, +files/squirrelsh-no-strip.patch, + +files/squirrelsh-remove-forced-abi.patch, + +files/squirrelsh-rename-LDFLAGS.patch: + Version bump 04 Mar 2012; Anthony G. Basile <blueness@gentoo.org> metadata.xml: Added myself as proxy maintainer diff --git a/app-shells/squirrelsh/files/squirrelsh-fix-in_LDFLAGS.patch b/app-shells/squirrelsh/files/squirrelsh-fix-in_LDFLAGS.patch new file mode 100644 index 000000000000..71319c0cc7f4 --- /dev/null +++ b/app-shells/squirrelsh/files/squirrelsh-fix-in_LDFLAGS.patch @@ -0,0 +1,12 @@ +diff -Naur squirrelsh-1.2.6.orig//configure squirrelsh-1.2.6/configure +--- squirrelsh-1.2.6.orig//configure 2012-03-12 21:45:25.000000000 -0400 ++++ squirrelsh-1.2.6/configure 2012-03-12 21:50:36.000000000 -0400 +@@ -1138,7 +1138,7 @@ + in_INSTALL_EXE="$installer -c -m 0755 \"\$(target)\" \"$bindir/\$(target_name)\"" + + if [ "$with_pcre" = "local" ] || [ "$with_squirrel" = "local" ]; then +- in_LDFLAGS="-L\"$source_dir/lib\"" ++ in_LDFLAGS="$in_LDFLAGS -L\"$source_dir/lib\"" + fi + + if [ -n "$pkgconfig" ]; then diff --git a/app-shells/squirrelsh/files/squirrelsh-no-docs.patch b/app-shells/squirrelsh/files/squirrelsh-no-docs.patch new file mode 100644 index 000000000000..2ed4d0160bf4 --- /dev/null +++ b/app-shells/squirrelsh/files/squirrelsh-no-docs.patch @@ -0,0 +1,25 @@ +diff -Naur squirrelsh-1.2.6.orig//Makefile.in squirrelsh-1.2.6/Makefile.in +--- squirrelsh-1.2.6.orig//Makefile.in 2011-12-16 13:25:08.000000000 -0500 ++++ squirrelsh-1.2.6/Makefile.in 2012-03-12 21:58:50.000000000 -0400 +@@ -19,14 +19,6 @@ + @MAKE_PCRE@ + @MAKE_SQUIRREL@ + @MAKE_SHELL@ +- @INSTALL@ -d -m 0755 "@DOCDIR@" +- @INSTALL@ -c -m 0644 COPYING "@DOCDIR@" +- @INSTALL@ -c -m 0644 COPYING-squirrel "@DOCDIR@" +- @INSTALL@ -c -m 0644 COPYING-zlib "@DOCDIR@" +- @INSTALL@ -c -m 0644 HISTORY "@DOCDIR@" +- @INSTALL@ -c -m 0644 README "@DOCDIR@" +- @INSTALL@ -c -m 0644 doc/squirrel3.pdf "@DOCDIR@" +- @INSTALL@ -c -m 0644 doc/squirrelsh.pdf "@DOCDIR@" + @INSTALL@ -d -m 0755 "@MANDIR@" + @INSTALL@ -c -m 0644 doc/squirrelsh.1 "@MANDIR@" + @INSTALL_MIME@ +@@ -35,6 +27,5 @@ + @MAKE_PCRE@ + @MAKE_SQUIRREL@ + @MAKE_SHELL@ +- @RMDIR@ "@DOCDIR@" + @RM@ "@MANDIR@/squirrelsh.1" + @UNINSTALL_MIME@ diff --git a/app-shells/squirrelsh/files/squirrelsh-no-strip.patch b/app-shells/squirrelsh/files/squirrelsh-no-strip.patch new file mode 100644 index 000000000000..cf0286c5c562 --- /dev/null +++ b/app-shells/squirrelsh/files/squirrelsh-no-strip.patch @@ -0,0 +1,19 @@ +diff -Naur squirrelsh-1.2.6.orig//configure squirrelsh-1.2.6/configure +--- squirrelsh-1.2.6.orig//configure 2012-03-12 20:19:01.000000000 -0400 ++++ squirrelsh-1.2.6/configure 2012-03-12 20:32:25.000000000 -0400 +@@ -1163,7 +1163,6 @@ + [ -z "$CFLAGS" ] && in_CFLAGS="$in_CFLAGS -fomit-frame-pointer" + [ -z "$CXXFLAGS" ] && in_CXXFLAGS="$in_CXXFLAGS -fomit-frame-pointer" + in_DEFINES="-DNDEBUG" +- [ -z "$LDFLAGS" ] && in_LDFLAGS="$in_LDFLAGS -s" + fi + + if [ "$with_pcre" = "local" ] && [ "$with_libraries" = "static" ]; then +@@ -1233,7 +1232,6 @@ + in_CXXFLAGS_LIB="$in_CXXFLAGS -fPIC" + in_MAKE_LIB="$linker -shared $in_LDFLAGS -o \"\$(target)\" \$(objects)" + in_INSTALL_LIB="$installer -c -m 0755 \"\$(target)\" \"$libdir\"" +- [ "$with_strip" ] && in_INSTALL_LIB="$in_INSTALL_LIB \\&\\& strip --strip-unneeded \"$libdir/\$(target_name)\"" + in_UNINSTALL_LIB="rm -f \"$libdir/\$(target_name)\"" + fi + diff --git a/app-shells/squirrelsh/files/squirrelsh-remove-forced-abi.patch b/app-shells/squirrelsh/files/squirrelsh-remove-forced-abi.patch new file mode 100644 index 000000000000..d9a5f0b34fe1 --- /dev/null +++ b/app-shells/squirrelsh/files/squirrelsh-remove-forced-abi.patch @@ -0,0 +1,21 @@ +diff -Naur squirrelsh-1.2.6.orig//configure squirrelsh-1.2.6/configure +--- squirrelsh-1.2.6.orig//configure 2012-03-12 22:02:40.000000000 -0400 ++++ squirrelsh-1.2.6/configure 2012-03-12 22:05:42.000000000 -0400 +@@ -1172,15 +1172,10 @@ + # ... CFLAGS, CXXFLAGS, DEFINES, LDFLAGS (machine-dependent) + case "$target" in + x86) +- in_CFLAGS="-m32 $in_CFLAGS" +- in_CXXFLAGS="-m32 $in_CXXFLAGS" +- in_LDFLAGS="-m32 $in_LDFLAGS";; ++ :;; + + x86_64) +- in_CFLAGS="-m64 $in_CFLAGS" +- in_CXXFLAGS="-m64 $in_CXXFLAGS" +- in_DEFINES="$in_DEFINES -D_SQ64" +- in_LDFLAGS="-m64 $in_LDFLAGS";; ++ in_DEFINES="$in_DEFINES -D_SQ64";; + + ia64) + in_DEFINES="$in_DEFINES -D_SQ64";; diff --git a/app-shells/squirrelsh/files/squirrelsh-rename-LDFLAGS.patch b/app-shells/squirrelsh/files/squirrelsh-rename-LDFLAGS.patch new file mode 100644 index 000000000000..0c36d7548623 --- /dev/null +++ b/app-shells/squirrelsh/files/squirrelsh-rename-LDFLAGS.patch @@ -0,0 +1,140 @@ +diff -Naur squirrelsh-1.2.6.orig//configure squirrelsh-1.2.6/configure +--- squirrelsh-1.2.6.orig//configure 2010-11-09 13:16:43.000000000 -0500 ++++ squirrelsh-1.2.6/configure 2012-03-12 20:19:01.000000000 -0400 +@@ -55,8 +55,8 @@ + with_ranlib="yes" # yes, no + linker="$cpp_compiler" + +-if [ -n "$LFLAGS" ]; then +- linker_flags="$LFLAGS" ++if [ -n "$LDFLAGS" ]; then ++ linker_flags="$LDFLAGS" + else + linker_flags="-Wl,-O1 -Wl,--as-needed" + fi +@@ -136,7 +136,7 @@ + CFLAGS C compiler options + CXX C++ compiler + CXXFLAGS C++ compiler options +- LFLAGS Linker options ++ LDFLAGS Linker options + __SHEOF__ + closescript + } +@@ -275,7 +275,7 @@ + return 1 + } + +-# getoutput CPPFLAGS LFLAGS ++# getoutput CPPFLAGS LDFLAGS + # Compile C++ code and run the compiled program + getoutput () + { +@@ -824,7 +824,7 @@ + checkforlinkeroption || msg_fail + + # Check for optional linker options +-if [ -z "$LFLAGS" ]; then ++if [ -z "$LDFLAGS" ]; then + checkforlinkeroption "-pipe" || msg_result "no" + checkforlinkeroption "-flto" y || msg_result "no" + fi +@@ -1131,27 +1131,27 @@ + #------ CREATE MAKEFILES -------------------------------------------------------------------------- + + # Define variables for substitution +-# ... CFLAGS, CXXFLAGS, DEFINES, LFLAGS, INSTALL_EXE (machine-independent) ++# ... CFLAGS, CXXFLAGS, DEFINES, LDFLAGS, INSTALL_EXE (machine-independent) + in_CFLAGS="-c $c_compiler_flags" + in_CXXFLAGS="-c $cpp_compiler_flags" +-in_LFLAGS="$linker_flags" ++in_LDFLAGS="$linker_flags" + in_INSTALL_EXE="$installer -c -m 0755 \"\$(target)\" \"$bindir/\$(target_name)\"" + + if [ "$with_pcre" = "local" ] || [ "$with_squirrel" = "local" ]; then +- in_LFLAGS="-L\"$source_dir/lib\"" ++ in_LDFLAGS="-L\"$source_dir/lib\"" + fi + + if [ -n "$pkgconfig" ]; then + if [ "$with_pcre" = "system" ]; then + in_CFLAGS="$in_CFLAGS `$pkgconfig --cflags-only-other libpcre`" + in_CXXFLAGS="$in_CXXFLAGS `$pkgconfig --cflags-only-other libpcre`" +- in_LFLAGS="$in_LFLAGS `$pkgconfig --libs-only-other --libs-only-L libpcre`" ++ in_LDFLAGS="$in_LDFLAGS `$pkgconfig --libs-only-other --libs-only-L libpcre`" + fi + + if [ "$with_squirrel" = "system" ]; then + in_CFLAGS="$in_CFLAGS `$pkgconfig --cflags-only-other libsquirrel`" + in_CXXFLAGS="$in_CXXFLAGS `$pkgconfig --cflags-only-other libsquirrel`" +- in_LFLAGS="$in_LFLAGS `$pkgconfig --libs-only-other --libs-only-L libsquirrel`" ++ in_LDFLAGS="$in_LDFLAGS `$pkgconfig --libs-only-other --libs-only-L libsquirrel`" + fi + fi + +@@ -1163,25 +1163,25 @@ + [ -z "$CFLAGS" ] && in_CFLAGS="$in_CFLAGS -fomit-frame-pointer" + [ -z "$CXXFLAGS" ] && in_CXXFLAGS="$in_CXXFLAGS -fomit-frame-pointer" + in_DEFINES="-DNDEBUG" +- [ -z "$LFLAGS" ] && in_LFLAGS="$in_LFLAGS -s" ++ [ -z "$LDFLAGS" ] && in_LDFLAGS="$in_LDFLAGS -s" + fi + + if [ "$with_pcre" = "local" ] && [ "$with_libraries" = "static" ]; then + in_DEFINES="$in_DEFINES -DPCRE_STATIC" + fi + +-# ... CFLAGS, CXXFLAGS, DEFINES, LFLAGS (machine-dependent) ++# ... CFLAGS, CXXFLAGS, DEFINES, LDFLAGS (machine-dependent) + case "$target" in + x86) + in_CFLAGS="-m32 $in_CFLAGS" + in_CXXFLAGS="-m32 $in_CXXFLAGS" +- in_LFLAGS="-m32 $in_LFLAGS";; ++ in_LDFLAGS="-m32 $in_LDFLAGS";; + + x86_64) + in_CFLAGS="-m64 $in_CFLAGS" + in_CXXFLAGS="-m64 $in_CXXFLAGS" + in_DEFINES="$in_DEFINES -D_SQ64" +- in_LFLAGS="-m64 $in_LFLAGS";; ++ in_LDFLAGS="-m64 $in_LDFLAGS";; + + ia64) + in_DEFINES="$in_DEFINES -D_SQ64";; +@@ -1223,7 +1223,7 @@ + + # Work around Apple's linker behavior ("-L../lib" linker option seems to be ignored) + if [ "$platform" = "macosx" ]; then +- #in_LFLAGS="$in_LFLAGS -search_paths_first" ++ #in_LDFLAGS="$in_LDFLAGS -search_paths_first" + [ "$with_pcre" = "local" ] && in_LIBS=`echo "$in_LIBS" | $sed -e "s@-lpcre@../lib/libpcre$lib_suffix@"` + [ "$with_squirrel" = "local" ] && in_LIBS=`echo "$in_LIBS" | $sed -e "s@-lsquirrel@../lib/libsquirrel$lib_suffix@"` + fi +@@ -1231,7 +1231,7 @@ + in_LIB_EXT="$dll_suffix" + in_CFLAGS_LIB="$in_CFLAGS -fPIC" + in_CXXFLAGS_LIB="$in_CXXFLAGS -fPIC" +- in_MAKE_LIB="$linker -shared $in_LFLAGS -o \"\$(target)\" \$(objects)" ++ in_MAKE_LIB="$linker -shared $in_LDFLAGS -o \"\$(target)\" \$(objects)" + in_INSTALL_LIB="$installer -c -m 0755 \"\$(target)\" \"$libdir\"" + [ "$with_strip" ] && in_INSTALL_LIB="$in_INSTALL_LIB \\&\\& strip --strip-unneeded \"$libdir/\$(target_name)\"" + in_UNINSTALL_LIB="rm -f \"$libdir/\$(target_name)\"" +@@ -1274,7 +1274,7 @@ + s#@LINK@#$linker# + s#@EXE_EXT@#$exe_suffix# + s#@LIB_EXT@#$in_LIB_EXT# +-s#@MAKE_EXE@#$linker $in_LFLAGS -o "\$(target)" \$(objects) $in_LIBS# ++s#@MAKE_EXE@#$linker $in_LDFLAGS -o "\$(target)" \$(objects) $in_LIBS# + s#@MAKE_LIB@#$in_MAKE_LIB# + s#@MAKE_PCRE@#$in_MAKE_PCRE# + s#@MAKE_SHELL@#@cd shell \&\& \$(MAKE) \$@# +@@ -1285,7 +1285,7 @@ + s#@CXXFLAGS_EXE@#$in_CXXFLAGS_EXE# + s#@CFLAGS_LIB@#$in_CFLAGS_LIB# + s#@CXXFLAGS_LIB@#$in_CXXFLAGS_LIB# +-s#@LFLAGS@#$in_LFLAGS# ++s#@LDFLAGS@#$in_LDFLAGS# + s#@DEFINES@#$in_DEFINES# + s#@INCLUDES@#$in_INCLUDES# + s#@LIBS@#$in_LIBS# diff --git a/app-shells/squirrelsh/squirrelsh-1.2.6.ebuild b/app-shells/squirrelsh/squirrelsh-1.2.6.ebuild new file mode 100644 index 000000000000..d2d840a9ba24 --- /dev/null +++ b/app-shells/squirrelsh/squirrelsh-1.2.6.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-shells/squirrelsh/squirrelsh-1.2.6.ebuild,v 1.1 2012/03/13 11:39:20 blueness Exp $ + +EAPI="4" + +inherit eutils multilib toolchain-funcs + +DESCRIPTION="An advanced, cross-platform object oriented scripting shell based +on the squirrel scripting language" +HOMEPAGE="http://squirrelsh.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="doc" + +RDEPEND="dev-libs/libpcre" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-rename-LDFLAGS.patch + epatch "${FILESDIR}"/${PN}-no-strip.patch + epatch "${FILESDIR}"/${PN}-fix-in_LDFLAGS.patch + epatch "${FILESDIR}"/${PN}-remove-forced-abi.patch + epatch "${FILESDIR}"/${PN}-no-docs.patch +} + +src_configure() { + #This package uses a custom written configure script + ./configure --prefix="${D}"/usr \ + --with-cc="$(tc-getCC)" \ + --with-cpp="$(tc-getCXX)" \ + --with-linker="$(tc-getCXX)" \ + --libdir=/usr/"$(get_libdir)" \ + --with-pcre="system" \ + --with-squirrel="local" \ + --with-mime=no || die "configure failed" +} + +src_install() { + emake DESTDIR="${D}" install + doman doc/${PN}.1 + dodoc HISTORY INSTALL README + use doc && dodoc doc/*.pdf +} |