From 8d3a3b7f6978b2e3728454d1c288f437fa6a3c8c Mon Sep 17 00:00:00 2001
From: Justin Lecher <jlec@gentoo.org>
Date: Wed, 15 Dec 2010 20:06:31 +0000
Subject: Anothe linking fix

(Portage version: 2.2.0_alpha6/cvs/Linux x86_64)
---
 dev-tcltk/tcl-sql/ChangeLog                  |  8 +++++-
 dev-tcltk/tcl-sql/files/ldflags.patch        |  2 +-
 dev-tcltk/tcl-sql/tcl-sql-20000114-r1.ebuild | 37 ---------------------------
 dev-tcltk/tcl-sql/tcl-sql-20000114-r2.ebuild | 38 ++++++++++++++++++++++++++++
 4 files changed, 46 insertions(+), 39 deletions(-)
 delete mode 100644 dev-tcltk/tcl-sql/tcl-sql-20000114-r1.ebuild
 create mode 100644 dev-tcltk/tcl-sql/tcl-sql-20000114-r2.ebuild

(limited to 'dev-tcltk/tcl-sql')

diff --git a/dev-tcltk/tcl-sql/ChangeLog b/dev-tcltk/tcl-sql/ChangeLog
index cb749d04f070..35782d1e99b7 100644
--- a/dev-tcltk/tcl-sql/ChangeLog
+++ b/dev-tcltk/tcl-sql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tcl-sql
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcl-sql/ChangeLog,v 1.5 2010/12/07 18:58:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcl-sql/ChangeLog,v 1.6 2010/12/15 20:06:31 jlec Exp $
+
+*tcl-sql-20000114-r2 (15 Dec 2010)
+
+  15 Dec 2010; Justin Lecher <jlec@gentoo.org> -tcl-sql-20000114-r1.ebuild,
+  +tcl-sql-20000114-r2.ebuild, files/ldflags.patch:
+  Anothe linking fix
 
 *tcl-sql-20000114-r1 (07 Dec 2010)
 
diff --git a/dev-tcltk/tcl-sql/files/ldflags.patch b/dev-tcltk/tcl-sql/files/ldflags.patch
index 571ff9d0c4d7..2099ed115f95 100644
--- a/dev-tcltk/tcl-sql/files/ldflags.patch
+++ b/dev-tcltk/tcl-sql/files/ldflags.patch
@@ -22,7 +22,7 @@ index 81a80ea..7738920 100644
  
  sql.so:	$(OBJS)
 -	$(LD) $(OBJS) $(EXTRA_LINKS) $(LD_FLAGS) $(EXTRA_LD_FLAGS) -o sql.so
-+	$(CXX) $(LDFLAGS) $(OBJS) $(EXTRA_LINKS) $(LD_FLAGS) $(EXTRA_LD_FLAGS) -o sql.so
++	$(CXX) $(LDFLAGS) $(EXTRA_LINKS) $(OBJS) -o sql.so $(LD_FLAGS) $(EXTRA_LD_FLAGS) -ltcl
  
  clean:
  	@ rm -f *~ $(OBJ_DIR)/*.o sql.so
diff --git a/dev-tcltk/tcl-sql/tcl-sql-20000114-r1.ebuild b/dev-tcltk/tcl-sql/tcl-sql-20000114-r1.ebuild
deleted file mode 100644
index 1aaf9af2e67b..000000000000
--- a/dev-tcltk/tcl-sql/tcl-sql-20000114-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcl-sql/tcl-sql-20000114-r1.ebuild,v 1.2 2010/12/07 18:59:04 jlec Exp $
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A generic Tcl interface to SQL databases."
-HOMEPAGE="http://www.parand.com/tcl-sql/"
-SRC_URI="mirror://sourceforge/tcl-sql/${PN}-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE=""
-
-DEPEND="
-	dev-lang/tcl
-	virtual/mysql"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${PN}
-
-src_prepare() {
-	find . -type f -exec chmod 644 '{}' \; || die
-	epatch \
-		"${FILESDIR}"/fix-const.patch \
-		"${FILESDIR}"/ldflags.patch
-	tc-export CXX
-}
-
-src_install() {
-	dolib.so sql.so || die
-	dodoc CHANGES.txt CODE_DESCRIPTION.txt docs/sample.full.txt docs/sample.simple.txt || die
-	dohtml README.html docs/api.html || die
-}
diff --git a/dev-tcltk/tcl-sql/tcl-sql-20000114-r2.ebuild b/dev-tcltk/tcl-sql/tcl-sql-20000114-r2.ebuild
new file mode 100644
index 000000000000..6edc5d265153
--- /dev/null
+++ b/dev-tcltk/tcl-sql/tcl-sql-20000114-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcl-sql/tcl-sql-20000114-r2.ebuild,v 1.1 2010/12/15 20:06:31 jlec Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A generic Tcl interface to SQL databases."
+HOMEPAGE="http://www.parand.com/tcl-sql/"
+SRC_URI="mirror://sourceforge/tcl-sql/${PN}-${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="
+	dev-lang/tcl
+	virtual/mysql"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}
+
+src_prepare() {
+	find . -type f -exec chmod 644 '{}' \; || die
+	epatch \
+		"${FILESDIR}"/fix-const.patch \
+		"${FILESDIR}"/ldflags.patch
+	tc-export CXX
+}
+
+src_install() {
+	exeinto /usr/$(get_libdir)/${P}
+	doexe sql.so || die
+	dodoc CHANGES.txt CODE_DESCRIPTION.txt docs/sample.full.txt docs/sample.simple.txt || die
+	dohtml README.html docs/api.html || die
+}
-- 
cgit v1.2.3-65-gdbad