[gentoo-commits] dev/blueness:master commit in: app-shells/squirrelsh/, app-shells/squirrelsh/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] dev/blueness:master commit in: app-shells/squirrelsh/, app-shells/squirrelsh/files/
@ 2012-03-13  2:11 Anthony G. Basile
  0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2012-03-13  2:11 UTC (permalink / raw
  To: gentoo-commits

commit:     3b8b4dd0a361c2b1e048b878c5c103a6bc93fac5
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 13 02:11:18 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 02:11:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=3b8b4dd0

app-shells/squirrelsh: testing version bump with lots of changes

---
 app-shells/squirrelsh/Manifest                     |    8 +
 .../files/squirrelsh-fix-in_LDFLAGS.patch          |   12 ++
 .../squirrelsh/files/squirrelsh-no-docs.patch      |   25 ++++
 .../squirrelsh/files/squirrelsh-no-strip.patch     |   19 +++
 .../files/squirrelsh-remove-forced-abi.patch       |   21 +++
 .../files/squirrelsh-rename-LDFLAGS.patch          |  140 ++++++++++++++++++++
 app-shells/squirrelsh/metadata.xml                 |   13 ++
 app-shells/squirrelsh/squirrelsh-1.2.6.ebuild      |   49 +++++++
 8 files changed, 287 insertions(+), 0 deletions(-)

diff --git a/app-shells/squirrelsh/Manifest b/app-shells/squirrelsh/Manifest
new file mode 100644
index 0000000..40b17f8
--- /dev/null
+++ b/app-shells/squirrelsh/Manifest
@@ -0,0 +1,8 @@
+AUX squirrelsh-fix-in_LDFLAGS.patch 511 RMD160 fa05ea83da4f71de3506bb134115f8f06c14da71 SHA1 af129e3e232ce670a22ed18ad44e29264efbd030 SHA256 3b9ebe885871ed22a6fc068024f01f6326a8bee7c51133ff8255275496686f7b
+AUX squirrelsh-no-docs.patch 885 RMD160 77cb826ae403879879b805674e5c32555af01fd9 SHA1 0b26d50ac7a385ca5ffd964d18d516f4ec9afed0 SHA256 3941b2d1822925feaefb2bd6f110dfa101812f4f1818632972fd3021b4c9dfeb
+AUX squirrelsh-no-strip.patch 903 RMD160 2f464bccb8cc122e553556994c4aa36b746fd656 SHA1 792fc537e4a41b940e4b8e52d5c062ccdfcdf33d SHA256 790185bd22e539f8e03391fa88a1cd2f5a63cbbedc3740357507a96d2869fb9c
+AUX squirrelsh-remove-forced-abi.patch 653 RMD160 01d3806059f88db2e32cd5bb46bb913e44dd52d3 SHA1 d646d473131d264e707e5d9746f80f140c039231 SHA256 291eb29d5753b102427218f5381eb7b9db82057a0aa73b450458dc63c58537f9
+AUX squirrelsh-rename-LDFLAGS.patch 4981 RMD160 51fc76253c559054916ab1a9c0c1e8e83c2ec5d9 SHA1 e7b0619042554a2fa05d82f967a4e65af18856c0 SHA256 734a2a673918d56d7140d24fae1c2eff8a93380f53229980d61355755f95f772
+DIST squirrelsh-1.2.6-src.tar.bz2 651733 RMD160 81803ca66a56f44b62c5aad72e3abbb4176c787e SHA1 6b7ab3f7e2b8420dbe3d6bb814d2cd874e41cea3 SHA256 ba8ce82853b3bf1610408242ed47f52e36471b95e42cbf75474c37478439ca3a
+EBUILD squirrelsh-1.2.6.ebuild 1357 RMD160 b079376d97a46f461ed9c773cd7a448f54aa610b SHA1 771ec422387760042dda355c3e97b7b1dce95181 SHA256 a30ffe1a0a53df4f9cf79d1ad31d9b8f2b66f7a42e3941f171148fa81fa3e373
+MISC metadata.xml 377 RMD160 bbffd30cba61aa9e8a7b2243f729ae6607cafbe0 SHA1 4cb20e367a818a517b219e3d322503f912617eea SHA256 e7f05e550e59eb327bc61f0ece05b29bdbaa7bf3a1df1e109ea31b361a6bd402

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 0000000..71319c0
--- /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 0000000..2ed4d01
--- /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 0000000..cf0286c
--- /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 0000000..d9a5f0b
--- /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 0000000..0c36d75
--- /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/metadata.xml b/app-shells/squirrelsh/metadata.xml
new file mode 100644
index 0000000..03d9319
--- /dev/null
+++ b/app-shells/squirrelsh/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+		<description>Proxy Maintainer</description>
+	</maintainer>
+	<maintainer>
+		<email>eplumlee@yahoo.com</email>
+		<name>Evan Plumlee</name>
+	</maintainer>
+</pkgmetadata>

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 0000000..e1e0ab3
--- /dev/null
+++ b/app-shells/squirrelsh/squirrelsh-1.2.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/squirrelsh/squirrelsh-1.2.3-r1.ebuild,v 1.1 2010/04/10 17:23:55 ken69267 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 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-lang/squirrel
+	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
+}



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: app-shells/squirrelsh/, app-shells/squirrelsh/files/
@ 2012-03-13 11:58 Anthony G. Basile
  0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2012-03-13 11:58 UTC (permalink / raw
  To: gentoo-commits

commit:     4cb2750fc1c88695398bdc134270cd347bf30a12
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 13 11:57:47 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 11:57:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=4cb2750f

app-shells/squirrelsh: tested on amd64/x86/ppc/ppc64 and moved to tree

(Portage version: 2.1.10.44/git/Linux x86_64, unsigned Manifest commit)

---
 app-shells/squirrelsh/Manifest                     |    8 -
 .../files/squirrelsh-fix-in_LDFLAGS.patch          |   12 --
 .../squirrelsh/files/squirrelsh-no-docs.patch      |   25 ----
 .../squirrelsh/files/squirrelsh-no-strip.patch     |   19 ---
 .../files/squirrelsh-remove-forced-abi.patch       |   21 ---
 .../files/squirrelsh-rename-LDFLAGS.patch          |  140 --------------------
 app-shells/squirrelsh/metadata.xml                 |   13 --
 app-shells/squirrelsh/squirrelsh-1.2.6.ebuild      |   48 -------
 8 files changed, 0 insertions(+), 286 deletions(-)

diff --git a/app-shells/squirrelsh/Manifest b/app-shells/squirrelsh/Manifest
deleted file mode 100644
index a3557f0..0000000
--- a/app-shells/squirrelsh/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX squirrelsh-fix-in_LDFLAGS.patch 511 RMD160 fa05ea83da4f71de3506bb134115f8f06c14da71 SHA1 af129e3e232ce670a22ed18ad44e29264efbd030 SHA256 3b9ebe885871ed22a6fc068024f01f6326a8bee7c51133ff8255275496686f7b
-AUX squirrelsh-no-docs.patch 885 RMD160 77cb826ae403879879b805674e5c32555af01fd9 SHA1 0b26d50ac7a385ca5ffd964d18d516f4ec9afed0 SHA256 3941b2d1822925feaefb2bd6f110dfa101812f4f1818632972fd3021b4c9dfeb
-AUX squirrelsh-no-strip.patch 903 RMD160 2f464bccb8cc122e553556994c4aa36b746fd656 SHA1 792fc537e4a41b940e4b8e52d5c062ccdfcdf33d SHA256 790185bd22e539f8e03391fa88a1cd2f5a63cbbedc3740357507a96d2869fb9c
-AUX squirrelsh-remove-forced-abi.patch 653 RMD160 01d3806059f88db2e32cd5bb46bb913e44dd52d3 SHA1 d646d473131d264e707e5d9746f80f140c039231 SHA256 291eb29d5753b102427218f5381eb7b9db82057a0aa73b450458dc63c58537f9
-AUX squirrelsh-rename-LDFLAGS.patch 4981 RMD160 51fc76253c559054916ab1a9c0c1e8e83c2ec5d9 SHA1 e7b0619042554a2fa05d82f967a4e65af18856c0 SHA256 734a2a673918d56d7140d24fae1c2eff8a93380f53229980d61355755f95f772
-DIST squirrelsh-1.2.6-src.tar.bz2 651733 RMD160 81803ca66a56f44b62c5aad72e3abbb4176c787e SHA1 6b7ab3f7e2b8420dbe3d6bb814d2cd874e41cea3 SHA256 ba8ce82853b3bf1610408242ed47f52e36471b95e42cbf75474c37478439ca3a
-EBUILD squirrelsh-1.2.6.ebuild 1338 RMD160 bf8a69f8175c126dc7c423172116613073755c1c SHA1 9c7f90bcfe3e5a999865bca738e8c0f93bc8adb0 SHA256 224cf6d046d9ecbfbbaadd7ff226b3972e7f14fe1456ff55a309e454998dd3fd
-MISC metadata.xml 377 RMD160 bbffd30cba61aa9e8a7b2243f729ae6607cafbe0 SHA1 4cb20e367a818a517b219e3d322503f912617eea SHA256 e7f05e550e59eb327bc61f0ece05b29bdbaa7bf3a1df1e109ea31b361a6bd402

diff --git a/app-shells/squirrelsh/files/squirrelsh-fix-in_LDFLAGS.patch b/app-shells/squirrelsh/files/squirrelsh-fix-in_LDFLAGS.patch
deleted file mode 100644
index 71319c0..0000000
--- a/app-shells/squirrelsh/files/squirrelsh-fix-in_LDFLAGS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 2ed4d01..0000000
--- a/app-shells/squirrelsh/files/squirrelsh-no-docs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
index cf0286c..0000000
--- a/app-shells/squirrelsh/files/squirrelsh-no-strip.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index d9a5f0b..0000000
--- a/app-shells/squirrelsh/files/squirrelsh-remove-forced-abi.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 0c36d75..0000000
--- a/app-shells/squirrelsh/files/squirrelsh-rename-LDFLAGS.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-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/metadata.xml b/app-shells/squirrelsh/metadata.xml
deleted file mode 100644
index 03d9319..0000000
--- a/app-shells/squirrelsh/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-		<description>Proxy Maintainer</description>
-	</maintainer>
-	<maintainer>
-		<email>eplumlee@yahoo.com</email>
-		<name>Evan Plumlee</name>
-	</maintainer>
-</pkgmetadata>

diff --git a/app-shells/squirrelsh/squirrelsh-1.2.6.ebuild b/app-shells/squirrelsh/squirrelsh-1.2.6.ebuild
deleted file mode 100644
index abe9835..0000000
--- a/app-shells/squirrelsh/squirrelsh-1.2.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/squirrelsh/squirrelsh-1.2.3-r1.ebuild,v 1.1 2010/04/10 17:23:55 ken69267 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 ~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
-}



^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-03-13 11:58 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-13  2:11 [gentoo-commits] dev/blueness:master commit in: app-shells/squirrelsh/, app-shells/squirrelsh/files/ Anthony G. Basile
  -- strict thread matches above, loose matches on Subject: below --
2012-03-13 11:58 Anthony G. Basile

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox