Resepct LDFLAGS and QA, #334977

Package-Manager: portage-2.2.0_alpha7/cvs/Linux x86_64

5 files changed, 85 insertions, 41 deletions

diff --git a/dev-tcltk/tcl-sql/ChangeLog b/dev-tcltk/tcl-sql/ChangeLog
index b0c00e21fa20..cb749d04f070 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcl-sql/ChangeLog,v 1.4 2006/11/23 17:37:59 vivo Exp $
+# 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 $
+
+*tcl-sql-20000114-r1 (07 Dec 2010)
+
+  07 Dec 2010; Justin Lecher <jlec@gentoo.org> -tcl-sql-20000114.ebuild,
+  +tcl-sql-20000114-r1.ebuild, +files/ldflags.patch:
+  Resepct LDFLAGS and QA, #334977
 
   23 Nov 2006; Francesco Riosa <vivo@gentoo.org> tcl-sql-20000114.ebuild:
   dev-db/mysql => virtual/mysql
diff --git a/dev-tcltk/tcl-sql/Manifest b/dev-tcltk/tcl-sql/Manifest
index de4129b85c58..57391b3fc569 100644
--- a/dev-tcltk/tcl-sql/Manifest
+++ b/dev-tcltk/tcl-sql/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fix-const.patch 3665 RMD160 baff94f61dd7465ddee4bee1a259703e0b292476 SHA1 38262897fadc184af981364aa4cc8cdb25dd97e2 SHA256 9bcf417079b91a28b04593099ffdceb516058b150c3cbca4f01622e616e1f1f7
+AUX ldflags.patch 822 RMD160 2c458e77a500178d18fd79d8897f1cd76654f6c3 SHA1 df38b13e62066ab0d990f8cffa68f82dd1d0177f SHA256 bb4566d22bcc39d5db921e624a767a57d95528f2c6694c0ea647aba776e1a3fa
 DIST tcl-sql-20000114.tgz 159365 RMD160 3691fa6b76199b7e287878af185270869320e5fa SHA1 a6c5c83fb5c4216727a1152ffbc42240d17240af SHA256 203acb2dac5589bd730482995887f328efc40d8881ea1365d96d4340fdcdb53b
-EBUILD tcl-sql-20000114.ebuild 865 RMD160 d6050bb67f0187d8ddecfbe66591d3a94f1da077 SHA1 215e1bc19f365383b9e14da98d414355f61ce330 SHA256 445df40c281453ed29498cde4800074329026e23ff37b93b9ce3a04d4d21a627
-MISC ChangeLog 686 RMD160 6156e63d92d9357b93b18507d77a72cd98356040 SHA1 b4acb147affe79993e797bd571d8d80ed525cb51 SHA256 e894694c0db4a99c454713d32955a2743573f139ec4a2b4e7c426c8ab486363b
+EBUILD tcl-sql-20000114-r1.ebuild 872 RMD160 3576dd826500eecaea33f7025262b31a5063f8a1 SHA1 55eaac10b1216060307afcfe7067cb5adaf6ff84 SHA256 f7e05f1f144c4108c060e61cbf10ec7754942dbbcd71ff3aca8623d7fdf0dbaf
+MISC ChangeLog 883 RMD160 8879061908f11ae19adb689668de7f295594763f SHA1 0d609e2356afefe4b2a263fe438a9191d771e76e SHA256 f63772c4d738fa0193755b6a4e511f08f958109cd50ace623eaebf6c1537a151
 MISC metadata.xml 262 RMD160 8bff0f72a9e0faf3f41d6683f24de0a262e033e8 SHA1 2b5141431b42618207e03cdbfdd982f42d64a7c1 SHA256 0f4c79b4a7d91745d256de13505027e1463e5418d0991ac82a9896cdee098602
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkz+g88ACgkQgAnW8HDreRa5KACZAeVmvNCqUnHxXAn/nSnZWpE1
+NbkAnR4YTHZXIKuBsgUYuzJWYzFJ0qkH
+=ESes
+-----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tcl-sql/files/ldflags.patch b/dev-tcltk/tcl-sql/files/ldflags.patch
new file mode 100644
index 000000000000..571ff9d0c4d7
--- /dev/null
+++ b/dev-tcltk/tcl-sql/files/ldflags.patch
@@ -0,0 +1,28 @@
+diff --git a/Makefile b/Makefile
+index 81a80ea..7738920 100644
+--- a/Makefile
++++ b/Makefile
+@@ -22,8 +22,8 @@ OBJS	   = $(SRC:%.cc=$(OBJ_DIR)/%.o)
+ 
+ # -- Configurable parameters: ----------------------------
+ # Section II:
+-CC	= g++
+-LD	= g++
++CXX ?= g++
++LD	?= g++
+ FLAGS	= -Wall
+ # include the path to your libmysqlclient as one of the -L's
+ LD_FLAGS = -L/usr/lib/mysql -L/usr/local/mysql/lib \
+@@ -69,10 +69,10 @@ CURDATE = `date +%y%m%d`
+ all:	sql.so
+ 
+ $(OBJ_DIR)/%.o: %.cc
+-	$(CC) -c $(INCLUDE) $(EXTRA_FLAGS) $(FLAGS) -o $@ $<
++	$(CXX) $(CXXFLAGS) -c $(INCLUDE) $(EXTRA_FLAGS) $(FLAGS) -o $@ $<
+ 
+ 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
+ 
+ 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
new file mode 100644
index 000000000000..1328585f54d6
--- /dev/null
+++ b/dev-tcltk/tcl-sql/tcl-sql-20000114-r1.ebuild
@@ -0,0 +1,36 @@
+# 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.1 2010/12/07 18:58:12 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"
+
+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.ebuild b/dev-tcltk/tcl-sql/tcl-sql-20000114.ebuild
deleted file mode 100644
index e52cc862b4a8..000000000000
--- a/dev-tcltk/tcl-sql/tcl-sql-20000114.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.5 2007/07/15 03:37:38 mr_bones_ Exp $
-
-inherit eutils
-
-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="~x86 ~ppc"
-IUSE=""
-
-DEPEND="dev-lang/tcl
-	virtual/mysql"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	chmod +w sql-mysql.cc
-	epatch ${FILESDIR}/fix-const.patch
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	mkdir -p ${D}/usr/lib/tcl-sql
-	cp sql.so ${D}/usr/lib/tcl-sql/libtcl-sql.so
-	dodoc CHANGES.txt CODE_DESCRIPTION.txt LICENSE.txt docs/sample.full.txt docs/sample.simple.txt
-	dohtml README.html docs/api.html
-}