use static libraries and update metadata

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 72 insertions, 15 deletions

diff --git a/app-shells/squirrelsh/ChangeLog b/app-shells/squirrelsh/ChangeLog
index 42c9547b4c89..e004f1eff451 100644
--- a/app-shells/squirrelsh/ChangeLog
+++ b/app-shells/squirrelsh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/squirrelsh
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/squirrelsh/ChangeLog,v 1.3 2009/09/01 06:42:37 fauli Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/squirrelsh/ChangeLog,v 1.4 2010/04/10 17:23:55 ken69267 Exp $
+
+*squirrelsh-1.2.3-r1 (10 Apr 2010)
+
+  10 Apr 2010; Kenneth Prugh <ken69267@gentoo.org>
+  +squirrelsh-1.2.3-r1.ebuild, metadata.xml:
+  Use static libraries and update metadata
 
   01 Sep 2009; Christian Faulhammer <fauli@gentoo.org>
   squirrelsh-1.2.3.ebuild:
diff --git a/app-shells/squirrelsh/Manifest b/app-shells/squirrelsh/Manifest
index 4c3f600ee372..01d50882d338 100644
--- a/app-shells/squirrelsh/Manifest
+++ b/app-shells/squirrelsh/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST squirrelsh-1.2.3-src.tar.bz2 613935 RMD160 d27165640d88145872f31d9c16785ac74dc3fb04 SHA1 a754e32b9736e5c67d3f1707336ef0cc0fde12ec SHA256 9fda1b90e157655839690383cf8856b69526df1a6e2345c4339f7b31dfe3efc6
+EBUILD squirrelsh-1.2.3-r1.ebuild 1993 RMD160 00f33020b6a6798e3e87d2e45ad41618b6762b9b SHA1 ea81f7df3cfa3f78759810913e755b60951d87b6 SHA256 45e76e472e1cbb9a56c9b9744bd144950451a85433226d08ff87f60afdb35bc8
 EBUILD squirrelsh-1.2.3.ebuild 1915 RMD160 b96940eaba9a1a93eb51b66447bcf8a4ab0cbc00 SHA1 d254217a6f308ac5e4ab182902983fecd4cf9221 SHA256 5f143e359a0e3b13b36eead3f83024f6edcf8f4a042bd45e9c006595a07b43f3
-MISC ChangeLog 689 RMD160 38f5cbec4f0a0fb59078939ad7247b81cbd9191a SHA1 fc40275c7dbfa8756d2c37254082a7bb6d221c1d SHA256 f2e0d3d8bc6ff76c49c0c28d1e10c225b4a9e09b4b7452a30a0771dff2932545
-MISC metadata.xml 398 RMD160 30d0e17bd27e69c24b05b8a4d5e74ba73329324a SHA1 0cfeef9b4de2f39ba98769e7378198986c4a8631 SHA256 605e37dc6759ddbca6b041f4c317b2059cb553d9440f7ea9acf67252b7ee4819
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqcwmQACgkQNQqtfCuFnePDKACfSzZVkC2FAQPZGLOTUWYXJcia
-z2EAn30512N3uMio4KFUVjLN3nXEQ4MO
-=1VK7
------END PGP SIGNATURE-----
+MISC ChangeLog 868 RMD160 f5527fd06a0194127504d76396db9f2fd051c1c6 SHA1 717417a2824539c2ada3385f304f5abb75e4c895 SHA256 0f660fd6d3cbc82e0044cffeb1be0b5e9c9e9c2083e4f4e8c73d88b9fe8e8c11
+MISC metadata.xml 395 RMD160 a722e6505f40dd25304c982365939616656785d5 SHA1 d3a7e2db98d277d22329eff9436207c8e8977f6e SHA256 a48e9478eef85679583ad92aca1bec20b7080166acd3c623bfc17e3065db893b
diff --git a/app-shells/squirrelsh/metadata.xml b/app-shells/squirrelsh/metadata.xml
index 2fe424b67766..2337f672a10f 100644
--- a/app-shells/squirrelsh/metadata.xml
+++ b/app-shells/squirrelsh/metadata.xml
@@ -8,7 +8,7 @@
 		<description>Proxy Maintainer</description>
 	</maintainer>
 	<maintainer>
-		<email>ed-209@hellburner.com</email>
+		<email>eplumlee@yahoo.com</email>
 		<name>Evan Plumlee</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-shells/squirrelsh/squirrelsh-1.2.3-r1.ebuild b/app-shells/squirrelsh/squirrelsh-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..1c94db912487
--- /dev/null
+++ b/app-shells/squirrelsh/squirrelsh-1.2.3-r1.ebuild
@@ -0,0 +1,60 @@
+# 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="2"
+
+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"
+
+DEPEND="dev-libs/libpcre"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	#Fix pre-stripping
+	sed -i -e '/in_LFLAGS="-s $in_LFLAGS"/d' configure || die "sed failed"
+	#Fix multilib issues
+	sed -i -e "s:prefix/lib:prefix/$(get_libdir):" configure || die "sed failed"
+	#Fix CFLAG madness
+	sed -i -e "s:-O2 -Os -Wall -ffast-math:${CFLAGS}:" \
+		configure || die "sed failed"
+	sed -i -e "s:\$c_compiler_flags -fno-rtti:${CXXFLAGS}:" \
+		configure || die "sed failed"
+	sed -i -e "s:-fomit-frame-pointer::" configure || die "sed failed"
+	sed -i -e "797,817d" configure || die "sed failed"
+	#Fix compiler madness
+	sed -i -e "s:c_compiler=\"gcc\":c_compiler=\"$(tc-getCC)\":" \
+		configure || die "sed failed"
+	sed -i -e "s:cpp_compiler=\"g++\":cpp_compiler=\"$(tc-getCXX)\":" \
+		configure || die "sed failed"
+	#Remove autoinstallation of docs
+	sed -i -e "/@INSTALL@/d" Makefile.in || die "sed failed"
+	#Fix --with-libraries in configure
+	sed -i -e "s:arg_option:arg_value:" configure || die "sed failed"
+}
+
+src_configure() {
+	#Not autotools, custom rolled
+	#Use static to prevent collision with dev-lang/squirrel
+	./configure --prefix="${D}"/usr \
+		--with-mime=no \
+		--with-libraries=static || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	doman doc/${PN}.1 || die "doman failed"
+	dodoc HISTORY INSTALL README || die "dodoc failed"
+	if use doc ; then
+		dodoc doc/*.pdf || die "dodoc failed"
+	fi
+}