summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-05-19 20:00:12 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-05-19 20:00:12 +0000
commita58091f2fb56388f8532fa0afe92b4b58fece602 (patch)
tree9f226f411c3dc8c74927495cf60032c9478c8a2e /dev-util
parentUnbreak db_libname and make it multilib-compatible. (diff)
downloadhistorical-a58091f2fb56388f8532fa0afe92b4b58fece602.tar.gz
historical-a58091f2fb56388f8532fa0afe92b4b58fece602.tar.bz2
historical-a58091f2fb56388f8532fa0afe92b4b58fece602.zip
Make sure that the correct includedir and the correct library name is used. Should fix bug #128897.
Package-Manager: portage-2.1_rc1-r3
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/kdevelop/ChangeLog6
-rw-r--r--dev-util/kdevelop/Manifest22
-rw-r--r--dev-util/kdevelop/kdevelop-3.3.2.ebuild7
3 files changed, 20 insertions, 15 deletions
diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index b700cde09172..eb217c84e57f 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/kdevelop
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.116 2006/05/17 10:39:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.117 2006/05/19 20:00:11 flameeyes Exp $
+
+ 19 May 2006; Diego Pettenò <flameeyes@gentoo.org> kdevelop-3.3.2.ebuild:
+ Make sure that the correct includedir and the correct library name is used.
+ Should fix bug #128897.
17 May 2006; Diego Pettenò <flameeyes@gentoo.org> kdevelop-3.3.2.ebuild:
Be less precise with db's dependency, if 4.2 is installed that will be used.
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 15b47347f999..f940caa805cf 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -64,14 +64,14 @@ EBUILD kdevelop-3.3.1.ebuild 2841 RMD160 c4908f8325264fb74944d6c6812a1415d9836cb
MD5 9f79d94a4a2ea9d4457ab62fae6d7f56 kdevelop-3.3.1.ebuild 2841
RMD160 c4908f8325264fb74944d6c6812a1415d9836cb9 kdevelop-3.3.1.ebuild 2841
SHA256 506b6dde63e8680f80b3c697a51a4249f07d664e9fc30679b6e9cdfaa00a657b kdevelop-3.3.1.ebuild 2841
-EBUILD kdevelop-3.3.2.ebuild 3063 RMD160 44403996dabe794930bf9cd18de7782c376ffbdf SHA1 a714bbfaa180dc87f7cab4a79026d7da7a1b6c82 SHA256 42afd239ceb9bed003c838924eb582b2694dc9de5ea65ceb17d3605ddcc47226 size 3063
-MD5 d27ea5b6464ae63dbfa521519fa14bb8 kdevelop-3.3.2.ebuild 3063
-RMD160 44403996dabe794930bf9cd18de7782c376ffbdf kdevelop-3.3.2.ebuild 3063
-SHA256 42afd239ceb9bed003c838924eb582b2694dc9de5ea65ceb17d3605ddcc47226 kdevelop-3.3.2.ebuild 3063
-MISC ChangeLog 17654 RMD160 11431670bef4e001c889dc2546026d2340ec3ed1 SHA1 976451a51643274fb4b09ebf8b6d25e62e732a03 SHA256 0539c9ebba8f67c112c96aee79f47bea3ae44c682e4c3e00fc1b8ee481bec348 size 17654
-MD5 75e64e07b18df75dc74daf72386a86d6 ChangeLog 17654
-RMD160 11431670bef4e001c889dc2546026d2340ec3ed1 ChangeLog 17654
-SHA256 0539c9ebba8f67c112c96aee79f47bea3ae44c682e4c3e00fc1b8ee481bec348 ChangeLog 17654
+EBUILD kdevelop-3.3.2.ebuild 3083 RMD160 775c031d0122162d9cc31f170ac94bf169ba8fee SHA1 6e22747ed6767b13708879e882eee0a747fb9ebd SHA256 c0fe5db3528fd4e17e9151c5baf0f3748ceb357dafbb9fdb370d1cc7504509e8 size 3083
+MD5 7224f0449e38ea40c1347b93c194f78c kdevelop-3.3.2.ebuild 3083
+RMD160 775c031d0122162d9cc31f170ac94bf169ba8fee kdevelop-3.3.2.ebuild 3083
+SHA256 c0fe5db3528fd4e17e9151c5baf0f3748ceb357dafbb9fdb370d1cc7504509e8 kdevelop-3.3.2.ebuild 3083
+MISC ChangeLog 17835 RMD160 456131433ef13267c647e99e00b2ab30b43a5753 SHA1 355dfd0c32e6935fa88a41a029692762949f2e39 SHA256 ba765591f805518b80d9a04da0cce703e0c86f2f6bc048a9934638a4403bc3a6 size 17835
+MD5 7835fbf05848bb06477c635363ffeaba ChangeLog 17835
+RMD160 456131433ef13267c647e99e00b2ab30b43a5753 ChangeLog 17835
+SHA256 ba765591f805518b80d9a04da0cce703e0c86f2f6bc048a9934638a4403bc3a6 ChangeLog 17835
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a size 156
MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -103,7 +103,7 @@ SHA256 ad5fda1edc445e7ac079f96bb484bccb6db6f5ba4cae2d3d30db6c2a04f62452 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
-iD8DBQFEav2XAiZjviIA2XgRAuksAJ9173GSayZBhWaZY+4HOe25b8mATwCdEl0f
-8gczBPhzBKoiJ2ZDZKGpMpo=
-=pZPk
+iD8DBQFEbiPfAiZjviIA2XgRAr+bAKDA6IeUACGWm7yKTs3bHqE1gVNTEwCfa92a
+4V622I/lJ+lt5GL2jtjifF4=
+=lm+o
-----END PGP SIGNATURE-----
diff --git a/dev-util/kdevelop/kdevelop-3.3.2.ebuild b/dev-util/kdevelop/kdevelop-3.3.2.ebuild
index d1bb31fd5361..2823c2bcc0a8 100644
--- a/dev-util/kdevelop/kdevelop-3.3.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-3.3.2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.3.2.ebuild,v 1.5 2006/05/17 10:39:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.3.2.ebuild,v 1.6 2006/05/19 20:00:12 flameeyes Exp $
-inherit kde eutils
+inherit kde eutils db-use
DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
HOMEPAGE="http://www.kdevelop.org"
@@ -51,7 +51,8 @@ src_compile() {
$(use_enable subversion)"
# Explicitly set db include directory (bug 128897)
- myconf="${myconf} --with-db-includedir=${ROOT}/usr/include/db4.1 --with-db-lib=db-4.1"
+ myconf="${myconf} --with-db-includedir=${ROOT}$(db_includedir)
+ --with-db-lib=$(db_libname)"
kde_src_compile
}