diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2010-06-10 19:07:33 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2010-06-10 19:07:33 +0000 |
| commit | 34c006bdb579843c85e2d32ac906696d6c17ba81 (patch) | |
| tree | a9e1cc02dbee0d7b16bf34e51b33448874c06d0d /dev-libs/Ice | |
| parent | Automated update of use.local.desc (diff) | |
| download | historical-34c006bdb579843c85e2d32ac906696d6c17ba81.tar.gz historical-34c006bdb579843c85e2d32ac906696d6c17ba81.tar.bz2 historical-34c006bdb579843c85e2d32ac906696d6c17ba81.zip | |
non-maintainer commit: Fixing compilation against sys-libs/db:4.8 (see bug #312869)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/Ice')
| -rw-r--r-- | dev-libs/Ice/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/Ice/Ice-3.4.0.ebuild | 6 | ||||
| -rw-r--r-- | dev-libs/Ice/Manifest | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/dev-libs/Ice/ChangeLog b/dev-libs/Ice/ChangeLog index 54eb33338cf8..12cb46fe9321 100644 --- a/dev-libs/Ice/ChangeLog +++ b/dev-libs/Ice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/Ice # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.2 2010/06/09 20:22:51 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.3 2010/06/10 19:07:33 polynomial-c Exp $ + + 10 Jun 2010; Lars Wendler <polynomial-c@gentoo.org> Ice-3.4.0.ebuild: + non-maintainer commit: Fixing compilation against sys-libs/db:4.8 (see bug + #312869) *Ice-3.4.0 (09 Jun 2010) *Ice-3.3.1-r2 (09 Jun 2010) diff --git a/dev-libs/Ice/Ice-3.4.0.ebuild b/dev-libs/Ice/Ice-3.4.0.ebuild index 4e49862ff434..ffa07fe67958 100644 --- a/dev-libs/Ice/Ice-3.4.0.ebuild +++ b/dev-libs/Ice/Ice-3.4.0.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-libs/Ice/Ice-3.4.0.ebuild,v 1.1 2010/06/09 20:22:51 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.4.0.ebuild,v 1.2 2010/06/10 19:07:33 polynomial-c Exp $ EAPI="2" @@ -94,13 +94,13 @@ src_configure() { use ncurses && OPTIONS="${MAKE_RULES} USE_READLINE=yes" || MAKE_RULES="${MAKE_RULES} USE_READLINE=no" use debug && OPTIONS"${MAKE_RULES} OPTIMIZE=no" || MAKE_RULES="${MAKE_RULES} OPTIMIZE=yes" - MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I/usr/include/db4.6" + MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I/usr/include/db4.8" sed -i \ -e "s|c++|$(tc-getCXX)|" \ -e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \ -e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \ -e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \ - -e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-4.6|" \ + -e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-4.8|" \ cpp/config/Make.rules{,.Linux} py/config/Make.rules || die "sed failed" if use python ; then diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest index cc7218d90d08..cfaca030a987 100644 --- a/dev-libs/Ice/Manifest +++ b/dev-libs/Ice/Manifest @@ -18,6 +18,6 @@ EBUILD Ice-3.2.1.ebuild 1650 RMD160 c75d19140759039b3d70199030dd438beb8a6ec2 SHA EBUILD Ice-3.3.1-r1.ebuild 1583 RMD160 efc68597f4f8d4ac3a8b736709e16d8f46882716 SHA1 fe376e253609e919dc334fbc342f172ee4a9908c SHA256 7505eaa0e8dc36c1a3298a1e57c52f6bf82fbdda514411c6d83a9f5f705f24e4 EBUILD Ice-3.3.1-r2.ebuild 5981 RMD160 e68a18ca6b807d33a85c1fa7f8df42d094a18337 SHA1 f5b236c53bb8b0a3b73b6b95b1401d16fab74a25 SHA256 64d9452537fd3b8fbaf830095e562c5bbe2185b38c9fbfc0f3bdeca529429d90 EBUILD Ice-3.3.1.ebuild 1562 RMD160 9385ec0615907af14caf37a9a69b78d3e172b8cd SHA1 4a874c1779529adccfa1960c660b586970366bf9 SHA256 091ff845f78d8795e4d0b3980df51efac6c4c8fca94404debbcdfe1a6938c086 -EBUILD Ice-3.4.0.ebuild 6132 RMD160 4cfb7bdd1236789dcad57f0d84cf2f82abe7a406 SHA1 c6b56b699b2d4752d597aa22a75565319dfd7187 SHA256 b5735b53527728ba11484f12c9e67959545854f611b89afed2ad06a706134eba -MISC ChangeLog 7239 RMD160 621aee75835ac9a84ae470d60d5f3a439d3f9dac SHA1 f361263abcb5af0685fb2c3030370e3066838681 SHA256 4f16afaa2357d9d5c7a83fc10052aa25d17a88d7460a5491f7ef4b3eece4188e +EBUILD Ice-3.4.0.ebuild 6136 RMD160 4a652a1b76466d45302906c20538f92b0a0a19c9 SHA1 8e1836b3b568af2b723314d58e53bfeccf9bcf7e SHA256 f00185d6b18e9ece2f1c54a1021a671457b46335742596724b54e9a9ed105d74 +MISC ChangeLog 7404 RMD160 b90be86aa1d3299df262bcb12193f47dc8a8d00f SHA1 b28eb779c79dac120c6058f3ea613fd2ed9519f9 SHA256 d73b9700269aa2cb3e9cdcd5b459c05379ed0face29fb1aa9916d57813c53c96 MISC metadata.xml 339 RMD160 f92a68fdab5aad40e9c173ebd1ed26b5963acf9f SHA1 3dfd85c450884b0fb534b7d54cfb6837dfa5c764 SHA256 dec27f6d803819a7791826c1a98a83a1c21a23df0a3384234ac68abf8b8466a3 |