summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-12-15 20:06:31 +0000
committerJustin Lecher <jlec@gentoo.org>2010-12-15 20:06:31 +0000
commit76cd3aabf1999acea77dd628477767426770c34c (patch)
treefcfb0cd6fc3ffce92ab7f630bce42e2f1f31164c /dev-tcltk
parentVersion bump as requested by bug #339034. Thanks to Zoltan Karcagi. (diff)
downloadhistorical-76cd3aabf1999acea77dd628477767426770c34c.tar.gz
historical-76cd3aabf1999acea77dd628477767426770c34c.tar.bz2
historical-76cd3aabf1999acea77dd628477767426770c34c.zip
Anothe linking fix
Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64
Diffstat (limited to 'dev-tcltk')
-rw-r--r--dev-tcltk/tcl-sql/ChangeLog8
-rw-r--r--dev-tcltk/tcl-sql/Manifest12
-rw-r--r--dev-tcltk/tcl-sql/files/ldflags.patch2
-rw-r--r--dev-tcltk/tcl-sql/tcl-sql-20000114-r2.ebuild (renamed from dev-tcltk/tcl-sql/tcl-sql-20000114-r1.ebuild)7
4 files changed, 18 insertions, 11 deletions
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/Manifest b/dev-tcltk/tcl-sql/Manifest
index 959123b35b48..05ea1de271aa 100644
--- a/dev-tcltk/tcl-sql/Manifest
+++ b/dev-tcltk/tcl-sql/Manifest
@@ -2,15 +2,15 @@
Hash: SHA1
AUX fix-const.patch 3665 RMD160 baff94f61dd7465ddee4bee1a259703e0b292476 SHA1 38262897fadc184af981364aa4cc8cdb25dd97e2 SHA256 9bcf417079b91a28b04593099ffdceb516058b150c3cbca4f01622e616e1f1f7
-AUX ldflags.patch 822 RMD160 2c458e77a500178d18fd79d8897f1cd76654f6c3 SHA1 df38b13e62066ab0d990f8cffa68f82dd1d0177f SHA256 bb4566d22bcc39d5db921e624a767a57d95528f2c6694c0ea647aba776e1a3fa
+AUX ldflags.patch 828 RMD160 5c2477463d207cf3fdff949f04827baeeacf4f6a SHA1 e43325dab25756378fe462833a1df603ac5bd17d SHA256 ebd61f4bd26ccd8d7fc453394cf534ef61965784008f81cb3fc2899597522c09
DIST tcl-sql-20000114.tgz 159365 RMD160 3691fa6b76199b7e287878af185270869320e5fa SHA1 a6c5c83fb5c4216727a1152ffbc42240d17240af SHA256 203acb2dac5589bd730482995887f328efc40d8881ea1365d96d4340fdcdb53b
-EBUILD tcl-sql-20000114-r1.ebuild 892 RMD160 195b50b5a9462f0b6c8b92db948dfa3447a5e139 SHA1 468683f508ee64a8a1e570e00706a941c65a8301 SHA256 6994033bfd3019a816595b51e3707ec1e311558904d5b70eed4d916bc3c26c96
-MISC ChangeLog 883 RMD160 8879061908f11ae19adb689668de7f295594763f SHA1 0d609e2356afefe4b2a263fe438a9191d771e76e SHA256 f63772c4d738fa0193755b6a4e511f08f958109cd50ace623eaebf6c1537a151
+EBUILD tcl-sql-20000114-r2.ebuild 922 RMD160 044985ef30c676491d4f252f862b9d752d0b4e95 SHA1 ffde044f6a072f30dc0ad4a865d8a293b98db17d SHA256 24226b257469d69ccb7ca92a402984d557ab98b01ca81ad383e9c027eaeffe05
+MISC ChangeLog 1069 RMD160 ce82217d2f81bf3378d21ab0c385326a031e9b28 SHA1 48134d4badd9de961e1ccb77760ca6608fc28fe6 SHA256 527235910c01b67af7c520e6517d525d5968abcdc547237ab40d0131da30b968
MISC metadata.xml 262 RMD160 8bff0f72a9e0faf3f41d6683f24de0a262e033e8 SHA1 2b5141431b42618207e03cdbfdd982f42d64a7c1 SHA256 0f4c79b4a7d91745d256de13505027e1463e5418d0991ac82a9896cdee098602
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iEUEARECAAYFAkz+g/0ACgkQgAnW8HDreRai4ACfZ5bv3eWMuVc/It5NfwkMQXSj
-LSoAl2LJmoi+kIiLsX/UrP+3tEVcoB0=
-=l9/N
+iEYEARECAAYFAk0JH8wACgkQgAnW8HDreRbMfgCgifw8RDJvboWs47/bPvaXlV9M
+cW0AnjS44xQwCIe8YXRyg0MPN5LG9M9a
+=8qCC
-----END PGP SIGNATURE-----
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-r2.ebuild
index 1aaf9af2e67b..6edc5d265153 100644
--- a/dev-tcltk/tcl-sql/tcl-sql-20000114-r1.ebuild
+++ b/dev-tcltk/tcl-sql/tcl-sql-20000114-r2.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $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"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/tcl-sql/${PN}-${PV}.tgz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
DEPEND="
@@ -31,7 +31,8 @@ src_prepare() {
}
src_install() {
- dolib.so sql.so || die
+ 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
}