more cleanups, and version bump thanks to: Richard Brown <mynamewasgone@gmail.com> in bug #87243

(Portage version: 1.585-cvs)

5 files changed, 62 insertions, 14 deletions

diff --git a/dev-db/sqsh/ChangeLog b/dev-db/sqsh/ChangeLog
index d3a600611315..a3f43d5cb6be 100644
--- a/dev-db/sqsh/ChangeLog
+++ b/dev-db/sqsh/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-db/sqsh
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqsh/ChangeLog,v 1.13 2005/04/06 20:50:37 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqsh/ChangeLog,v 1.14 2005/04/06 21:09:33 seemant Exp $
+
+*sqsh-2.1.3 (06 Apr 2005)
+
+  06 Apr 2005; Seemant Kulleen <seemant@gentoo.org> sqsh-2.1-r1.ebuild,
+  +sqsh-2.1.3.ebuild:
+  more cleanups, and version bump thanks to: Richard Brown
+  <mynamewasgone@gmail.com> in bug #87243  Now, by the way, upstream (whoever
+  the hell they are) should invest an hour or two figuring out how to use the
+  autotools properly.  Possibly, if I'm steaming about this a little later on
+  this week/month, I'll fix it up a bit, but damn.
 
   06 Apr 2005; Seemant Kulleen <seemant@gentoo.org> -files/config.patch,
   sqsh-2.1-r1.ebuild:
diff --git a/dev-db/sqsh/Manifest b/dev-db/sqsh/Manifest
index 2736b5ad347b..7bc53648d6f2 100644
--- a/dev-db/sqsh/Manifest
+++ b/dev-db/sqsh/Manifest
@@ -1,4 +1,6 @@
-MD5 b2c415410813ae4da4afc5429ae9ca80 sqsh-2.1-r1.ebuild 1109
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
 MD5 09484968d96709a3449f875b4e2744c3 ChangeLog 1606
+MD5 b2c415410813ae4da4afc5429ae9ca80 sqsh-2.1-r1.ebuild 1109
+MD5 e6525fdd9c1a0c35dce2ca294aff7a53 sqsh-2.1.3.ebuild 1137
 MD5 19272f9055a78c6035e2f605dad0268c files/digest-sqsh-2.1-r1 64
+MD5 dd2d4502b402ce862b6f636d95e90f0a files/digest-sqsh-2.1.3 62
diff --git a/dev-db/sqsh/files/digest-sqsh-2.1.3 b/dev-db/sqsh/files/digest-sqsh-2.1.3
new file mode 100644
index 000000000000..4524e6edf4d0
--- /dev/null
+++ b/dev-db/sqsh/files/digest-sqsh-2.1.3
@@ -0,0 +1 @@
+MD5 baa61acdfe04eebf1f2fc7ed27810218 sqsh-2.1.3.tar.gz 408940
diff --git a/dev-db/sqsh/sqsh-2.1-r1.ebuild b/dev-db/sqsh/sqsh-2.1-r1.ebuild
index d38d4c95ef61..f4aaef9b3b23 100644
--- a/dev-db/sqsh/sqsh-2.1-r1.ebuild
+++ b/dev-db/sqsh/sqsh-2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqsh/sqsh-2.1-r1.ebuild,v 1.10 2005/04/06 20:50:37 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqsh/sqsh-2.1-r1.ebuild,v 1.11 2005/04/06 21:09:33 seemant Exp $
 
 inherit eutils
 
@@ -36,16 +36,7 @@ src_compile() {
 }
 
 src_install () {
-	make \
-		DESTDIR=${D} \
-		RPM_BUILD_ROOT=${D} \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install install.man || die
-	# fix the silly placement of sqshrc
-	dodir /etc
-	mv ${D}/usr/etc/sqshrc ${D}/etc/
-	rmdir ${D}/usr/etc
+	einstall SQSHRC_GLOBAL=${D}/etc/sqshrc || die
+	make man_dir=${D}/usr/share/man install.man || die
 	dodoc COPYING INSTALL README doc/*
 }
diff --git a/dev-db/sqsh/sqsh-2.1.3.ebuild b/dev-db/sqsh/sqsh-2.1.3.ebuild
new file mode 100644
index 000000000000..78fb76135b5d
--- /dev/null
+++ b/dev-db/sqsh/sqsh-2.1.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqsh/sqsh-2.1.3.ebuild,v 1.1 2005/04/06 21:09:33 seemant Exp $
+
+inherit eutils
+
+DESCRIPTION="Replacement for the venerable 'isql' program supplied by Sybase."
+HOMEPAGE="http://sourceforge.net/projects/sqsh/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="readline X motif"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND="dev-db/freetds
+	readline? ( sys-libs/readline )
+	X? ( virtual/x11 )
+	motif? ( x11-libs/openmotif )
+	virtual/libc"
+
+src_compile() {
+	export SYBASE=/usr
+
+	local myconf
+
+	use motif && myconf="--with-motif"
+
+	econf \
+		$(use_with readline) \
+		$(use_with X x) \
+		${myconf} || die
+		
+	emake \
+		SQSHRC_GLOBAL=/etc/sqshrc || die
+}
+
+src_install () {
+	einstall \
+		SQSHRC_GLOBAL=${D}/etc/sqshrc || die
+
+	make man_dir=${D}/usr/share/man install.man || die
+	dodoc COPYING INSTALL README doc/*
+}