diff options
Diffstat (limited to 'sys-libs/db')
46 files changed, 974 insertions, 2907 deletions
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest index 317ca5d8dac2..99e1d0be129a 100644 --- a/sys-libs/db/Manifest +++ b/sys-libs/db/Manifest @@ -1,40 +1,3 @@ -DIST db-1.85-r3.1.patch.bz2 14641 BLAKE2B 5ca59487a433a5e5b5fed7a8737c20df041be56733fe9209047f9e53845fa034576c29ad74407509ab96473e4eef0138a3a47de6c348d27209f0e39df85b9f5f SHA512 32b1810515476758ece7415f241378460a4051bf5ee23fb464748f84a90a56ff2c5119ed93028114d64f1b1691b1c694c2301ff825edd89cdee90a870a68b6f4 -DIST db-18.1.32.tar.gz 44244747 BLAKE2B b539d8966a269f6a9440ef442248849f12c6b1eda79b9a41074e1eb0eb4930fd4674dd0e20a114e4020fe2ce19832572c4c86d458835da39a99f639dc3c4e23e SHA512 890b3047c28114ac30794c0234126b0b2a3e699f3ed259831091f02d51885e3583dd10c0ef0cecc215b9b8d80b48a2d3a82a5793cd3816afb45f6cc19ae23f25 -DIST db-18.1.40.tar.gz 30763705 BLAKE2B c7235cbdf82d8e38450c98baa1ff67132f6132d59a43dd2d6ed8bc2672b7924b4cbd93320278a0a3a78e454caff622b4480abe8dcc20c94ae56a78b3569a76fd SHA512 53787164fb8a198a0178c7f58d891c2b0943d1c52b11fe9de525938469327e85664f0bc63e33d740c171bc370954710a6b3e8b9be2a08237fb9757a795c5b19e -DIST db-3.2.9.tar.gz 2085238 BLAKE2B 10cb1c102bf5db52ec16181ccbb02a8c4560f42afd2382689ee4903fcd63bf3ab4802482a065a85b1d34c8fb9f620fceb985155b1390de7ca404c121b6b4b6bc SHA512 5f07b27ae0cbd2832e5db9473cd4f2d4aebeee25ed8245ebd2c297a576571635ca5cf75e63e0967b1e90978128a5b6f5d8112559c56927d5bc5eb0d9fd3a2e95 -DIST db-4.2.52.tar.gz 4073147 BLAKE2B 0bb9649a08df9b425f28471eb65c0efac0b7833b4c5c841b9ef53a142669b549e1f1b78cf42eeceea05ebb271aacd513d115070ea028f77fb1830bb9fcc7c8a9 SHA512 47a4e1353fe4f5c2160952a8f7a09b73fdf2dfcd222a8214e12630cec3139a624907bba83a06f10f8492b4dce328a979e9155ee049b9a88798edaca62cfe60d1 -DIST db-4.3.29.tar.gz 6103264 BLAKE2B eda13cd5c8b9421044f6c8b6b41ec318ff33e19da15f8d5e3075612186e60cfce30069078f712841058224ed58caf69d43960156ac645651670665390eae28e1 SHA512 93d36c040b25739b92c52504e117a9c7f4b671463d61d00029e70d0bc8171311f5d04211f7d966b8a9ef8c2a85a5ebe8cc55e4469c3c7c0e468caa4221f691fc -DIST db-4.4.20-20060110-rpc_server-java.tar.gz 158976 BLAKE2B 91801a784468fe6dabb4e73e7f33217f6b0130ac1774f9785e541bf2843531e5fa1bbb3f1d0bab23233e2d25e1b3ff781dd08cd8b49c43f21b69383a8388fe42 SHA512 d1f04fe512baa0e5c8a11d765cb9040943ab70258f7d07fbaf579b3442c43ca0dfee56267db7543a71abbbd2f056b80fb5f9d2d8bb83b0f5e5ccebf273280e6f -DIST db-4.4.20.tar.gz 7952742 BLAKE2B 683ecbd601541922bba1d1bf0aea16d5ba71f25ad287d292f674639503c32070fdb1c47409b0b7dc741c74b77b45738ff6505aca405bfa6c523a7a39f10b9a38 SHA512 dea85d0aa3cea0539de2f9819e1ebc8a8aba887614bbbd1710a69dbf2cef3fe262414b8b03deb7325c8bfeb3bbbdc3d5ba35377a73aac5e3c63aa1082d3a579e -DIST db-4.5.20.tar.gz 9281894 BLAKE2B 68d6f5a68841adf6240ddff9563fd02c97cdcbc647aa5c7f9d108c7c0195829cda5c32795b137503b46a4c9eae47b9a95a28770f3cd2ca6a1dfa37aad3e3baa1 SHA512 c34907a53323158627971f464c32b9a5b00aff0fa779c67117826ebeea86a4731e272a5dc6dc5ae32f16284ff15c79d93050273795381acaaefd48e18dc2d612 -DIST db-4.6.21.tar.gz 11881885 BLAKE2B 682e0fb1cc471f01f0246761345bacc217e17a7a282d71bd27953fb839e54f58916f89192d50b43f51ec9fc403869304a3b1966dcf49458223ae38c1037693e3 SHA512 8118218e2eaf9d22e445e551ef184f4610406b81f9257794d14f637d9d12a51a007166b48bf820140c5be287ef61d22a62a16f7702f0d29f385108c40b11ce43 -DIST db-4.7.25.tar.gz 13124129 BLAKE2B ae75fbef28d233739e9e05d9058a104366c998219e7b35ddf7ddbcfaf5b54c58bf5ba3b23ec164eca13a86ac6765934877fd41dd4db5cd7016fae031da6c4ecc SHA512 3a0b2bcb210192c7a37b082fab47a8a32da5e7e91058e18be8fb844c8780088cbd4de6234257750505d5a05864517be03afdad95cb1c549f9743386d6129554b DIST db-4.8.30.tar.gz 22887305 BLAKE2B 10487580a371fa97ef5e468e1fcc4af68490934a82467da88b723f7d4ce403cd5f2b77bd95c218dda58161fe30bfef81f5093a8e5176f5ad5f482251c07c6423 SHA512 d1a3c52b0ab54ae3fd6792e6396c9f74d25f36b2eb9e853b67ef9c872508a58c784c7818108d06d184f59601b70cc877916e67dfea6f0ee1ca2b07468c1041f1 -DIST db-5.1.29.tar.gz 32188074 BLAKE2B 6af9e6afc0ebd06a43c0e96fd0b2b3c8e17476507996605aea0c1519b9120140ff410829118a59ea8eff1ab220762131cfab8cf574ffddfa6348128a57721b37 SHA512 b3487161cc09dd0aee6117d685d0bc0a58854cf5e96f9e778969a51d3a61b66f8e007b76e584e4ef73f84e07d4418b89c2f6697e34c1ad4072609b11b7b4c5b0 DIST db-5.3.28.tar.gz 35090431 BLAKE2B 5b77a4ec0945fa96ce6c2b452fb4b029295e037fa64d5ff8dcb3b5e01ee3501fd75d9a73b8f5fa54d8907717d93546fbb5348ee70119e877fa2f17d301ecf50d SHA512 e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090 DIST db-6.0.35.tar.gz 36532251 BLAKE2B 22fbe557ccc13e4b936db8ca7d6ba11ce42e477bbf39f7e472067e06fb5910b1147fa58a44ac944c24a51ea839f1c61edda6bd8f3c450acac0c13d7fdba11e89 SHA512 002db1553def44efa715095b04b2bac2de7450cdc7142586d1d8b5d8ce79ee5e98f824b3bd276cd586ca932dc51ed35a9ffbed95b2b9847264f262cfa092479d -DIST db-6.1.38.tar.gz 37644337 BLAKE2B 32b3f65bef04bb18e45c3c0c9110d5d0bf58f4761bee5bf07949e192f4b9f5fa28117b1696c17863da0affe408bd6c81eeee32c472c46d31c17693519959ff03 SHA512 5760d1e441bea11c371825ac47203b1eb9f188f9cb2ea0e3d547b3d3b15620d27cb0b3333d617eb7b89c53407fb7ed79cad27477d714b5b797869f8bf4b1808b -DIST db-6.2.38.tar.gz 41298311 BLAKE2B a04a3344058b1d9982f39628c1114aded8f8c860753853c8b487e9ea14bd69a0391301620396d22204b3c8f25945c3f5485ea4792567e2d903a657541204d297 SHA512 b357932e4a5856b9cf8cf42050a307977eee8483d24a32ad938611545178fb1e6be597c1542a11466b1fb31ef4ef47b519deea1c5310a6460495281539083a19 -DIST db.1.85.tar.gz 270953 BLAKE2B 7862979b6fe21a67eac7eb5e0d05093f33fa71fa92f9717a65bd39b366727e6928109c821b86ede85d6d2a8013199f3927e760bed19001a5cfd2270819a3b904 SHA512 03bf3a2b0947efdca4e38719542e96378b5eeb57da64d5030dd23ab710773c1826f1c867032d0bea658b7fdd8272db253e97bbc490d198b9437025ffdf9e880e -DIST patch.3.2.9.1 2139 BLAKE2B 7c442311499244d3432a1648294f3b610da827f7d940777de01f98816d6dc8bc50b68cb45900bcc1acf1672207a86009dbc33b6226f8a4fcbefc1bee51961138 SHA512 f410c43ea4af28a39d8ea47f774d38b53bf1183a34abfcf1f27e253eb61b42f4b5e9f0a3a500e174eb796ea342e6dd50a8bb95ff3eb8ee188461489cc994b8f9 -DIST patch.3.2.9.2 495 BLAKE2B a29338b8fd1cdd75833fd4dabcca17106a75e4cc49e7f5198ac723422e0b0ed553969109293d5e83517f2e5bf6478ddcc7e0cdf371e721fb3784dc7d8165e4b6 SHA512 cc75fef11a641d480beaa2b62201177c72d10c4eb20376b5f15769db6e9e1a0da41c0365d79772af19b4cacdaa9f91dad049c735de9f95b98dcfc4f0b611b557 -DIST patch.4.2.52.1 988 BLAKE2B d743a3d798fd80727ff51a0929a6532602d09d1d28840a3012746d9ff81e445b9266be02780e540a3a54ec2ce8ede4522ca6ac0b09b9c97a1dfb5fcbaded99e0 SHA512 67b894678503dc394e50b7c6a875ebbd996d6f78acd21858c04ba2cc4aba118f527aa3aae0793cff4e44bcb17b13fb1eb6a3d895e94cb97270d9759be1bb4bdb -DIST patch.4.2.52.2 1433 BLAKE2B 9c9e40c264170fc9da6ae7ed6b4213d3f3cccee3c3c58cb9777f6a3a78540ef88f6b7427fb4691519dc2c0a5afed2d749ae4ca8f6144ccc7e281c83d14d00e59 SHA512 93c9463e2a795049473a2799186642185b7e2f94c51efa0412031d134088d129ebcf07e6a5f309d6cb37d9d282d8168276305d7420fb4cff6d7acc38a6ba4f00 -DIST patch.4.2.52.3 8672 BLAKE2B ae364cce5cb87287a78f3d19214ffdb33bef661392111d4d736291a6798cfc571f5251c0ea254fe2070f3e6503f97e79b4fb92c1105a83b4aefb710e5c78e9b3 SHA512 234bd96b93aec826c97314b41c8b9231c55598213ee8437a6df7efea44e6c1e8e4844db8214a9468d27bae9a588b028c765747493b5d169235e3d06d0cf107b4 -DIST patch.4.2.52.4 1311 BLAKE2B c1811a0ecdd580cad6f9d68276545f8cb7e42c26de06790df1346df3d65fc6ccd63f28bb206d3d7495db0d5153912284ac8705e9b3468897ecf528a35f97f505 SHA512 e2632944d82f5b6dcbbdfc237bdc37d5db736acd0284edfdb51fc0f3a9ca4fc6bcdb412bab325e62fc30d690f6963dfe53e6120cdda65dc403eff89d3a931287 -DIST patch.4.2.52.5 839 BLAKE2B 7a08473f822a2a0bdb595c817664c138078aca125481ffa7bdaad93e9b8236a9a5ffac7d9391a0fcedfea0abb52a33725402c899f0342ff09975f8e7c15c754d SHA512 5457bc4e433c8f12f34a764fcec1dfc9e832f960f518b21bd9116ec1b1130d9ad12373553e224d844e2b2de254470daf142120ff6d3125683a57f14a42a8e879 -DIST patch.4.3.29.1 835 BLAKE2B ac796fce9fcc4779629c3a77e55a026dd293a05135811ad434b10b9cbd5d05cb3ea7f04cdbf9778d863150978295e195e1b7dacd3f68c1f0815829930f437afe SHA512 c3dda4de68bff744dac5c96d1533032b2c8e8e0945f1a126b8aacdda322e05d1ec2e364eb7432ea1fb7366424ce155a9e58f84b9bee8e1ab4dd05a3313bcd8f7 -DIST patch.4.4.20.1 867 BLAKE2B 321fd297f9466632ddb4bf874221f98fd85856edf66d6f882b6ed9c742982ccc4d0fc00f9e9b6cccab1a573692fc51e700500db2d6a2b4b052dcd10edae73b05 SHA512 0fd501d219eb3de94c59e7b526c5031bba5dcc7dea4174545db5d688f33a5b4324aadd71e0e4eca3781592da0e90c1481c3b2d8f74612dfdff651c18d10eb2d7 -DIST patch.4.4.20.2 721 BLAKE2B 364c72016241ab36f1d086ca4dae62e9f8263aebb7cd758383b0adf8aeee5a0d45b0a7827ac5294c2d2ca8d9c8961959adce8ef23515c56b1253fe14d0fc44fc SHA512 4c497ce01c740c9c32b3a74946638c21b619cf057bbc8acaef24cb9f8d55d0d020d4cbc7775cb0cf07113c44981f076316cea14573fa08b49bc6352770bf5de6 -DIST patch.4.4.20.3 1366 BLAKE2B 4e6c9e4263af2da5debf85a6aa9a64c49c7da23b4fc8d568055c06bb2a6c04e204ccee95a987677ecc043678c7cd373a5d1d8f8f8f6aac79db3f58facc883616 SHA512 2b00acd823342083f0eaaf3b9659c811d05eebba67b39d9a9dbfa4a8fb56cded322e3f9028c57d83c75cb949a79f705cd8584df1630dd8cd3ad22a54c83baa91 -DIST patch.4.4.20.4 837 BLAKE2B f94feaab0190d76cf81b20b18826ca3e71329b4cb02a3666c6f073b3a2e36e4447cf583f554f35d085b3044bf66516e5479daa024cd637bc278269a05577bd10 SHA512 9aa464580cc1b402e594da56cdfc5e4d7c465f125b5f0cb312abbcdf72753bbf9ff14248657e0d354c93d7f1f89c7189e08060242c9a061033bb1016db640ceb -DIST patch.4.5.20.1 984 BLAKE2B a2651bb0807c196a29834c2b7d1979a73fedb715bcbd4fd3fd0e0a108c1c0443715e656e4282c265cf200d61fe9cb4f4eeec4c9c924bb143eb53d0f07a445a5c SHA512 a8aff6f594e5413436a7ae5afe48286b0d397a247b2cd466f192eb6b4870fc68353c1ec1d0209cdd06640e09090b3d84ddb0fb709f8478ff3823e244c7f6cd3e -DIST patch.4.5.20.2 1752 BLAKE2B 1d08a79a502552b842e248fbb214f27eb837bdcc99d61949702153bd245cc00b04ed8f34673543c79ec5da33334e57f8376ae53f8c68e510585c29d7ee08950a SHA512 b6af4b73e03b290595b6823e4d5c27da1b1bb5e66721ed5f0c6ecfec6595bcc56281340ec77fe6fb9432397adec0e292b31a5ee9d01870fb2955b8519017ffb7 -DIST patch.4.6.21.1 2475 BLAKE2B 6f4985d5388d81a4409ea7be4509b0ad695e0c8d3bff9d14cd8060d2dc332eac84f56af50a3b5c7efd09e987a8e1f06c7cae7aba7687cefa6caca95923b03a9c SHA512 9fe4991a59e409cb7df5b507efed7e443c05199b41646ea2d5d52de29513c8d27c2f3bf154a0170f04e12eaee6a622b945ae0f9789c3faaeb2ccea55f7a1ca2d -DIST patch.4.6.21.2 892 BLAKE2B 95e6e6e431a4aeb3ec91df7f35d9c0b75696755249adae58730add46e62bf702916be605f4fc1016acb14ca3433b80ac8b9a7a0d444461bef57d042b7072d29b SHA512 e8570c0bee7522056f74cea73379fc13dae02258cffa78e540ee1c0433f368b3f856a21dc83017798120b3db7987c09e23af448153f0c024217df41a3e027347 -DIST patch.4.6.21.3 1517 BLAKE2B d717f6812ae71f1852ca9a6b558101196cb1f8eb0bb69ff2a385ffd255357f1d48df80ac99240655dd765e1be4d00bf2487a50501be47a22de238a5299be3914 SHA512 4da65c9414bd04d2efddd7d7855235f1276d827258971bf3ae175c73ab9c1b57a4f089b27e22928d1ed869e4e14cfde2f5e7c6a31ddf63c8dc582d0a2384cfcf -DIST patch.4.6.21.4 41501 BLAKE2B 5cd304b53076ddd85a034c4d6313c8ea88b3aa8a202244825743fbd6bdc233f3549fe153b01affb021cf693a36c1b02ca47aa07596f7be80f3909aa40ef0c6aa SHA512 cb7819d7b1742f09af352e7563344abef27f1db1bbf04be049710abd26fb12eda142a08ff3cd3449b0a4a406141e39bbb0535f08bff051efbd261e7fbe5b53be -DIST patch.4.7.25.1 2072 BLAKE2B 773fb96f9c5995cee22931fcd504b9962d0c3407f7b42392358ebcc79b15ad5b4c39526494aa5bac88219d1713b69e0a23f0c8eb5151c7817c1354e20a5e10aa SHA512 6f8618a3acc7ebc2839d2786d66c85904b8a9805319178175298239a9441550f1c61dda544d7994931e2aa412cdf5c209d8bb2f38207cebca341c556b97b9191 -DIST patch.4.7.25.2 2210 BLAKE2B 3e9727a4e006fa8e4502f1481a44144458401d0df0eeea26eb135b1979f330f354cd5016f56b86400118f13fe29a92798b0dcf19581738d3e9cf83b9be1ebb6d SHA512 d57746a527574966606955a8ad6b97742ff3979e85a0d087ae0c33b64b4fc2fd854f3ac145e2efc061b3479de5ee8172a02183cf54ada91fce3e331ab948ff18 -DIST patch.4.7.25.3 8442 BLAKE2B 666b643b3bf0d1e5ef5e445ae03228f436a5528bc197338c3c9bd468d7002bc81a16e295cf34fe6b38903e7f65c2c5c3cd9be0a3227f1122aeda22afc165e2a9 SHA512 815560c45c9c8491fd58d881a0bc1d23a82a13298d4757ed7d2ae4df4b88b278b8e4d6063eb46349a8f6f11ca9aa5b8555f3ce01df025715c2579dfa36241238 -DIST patch.4.7.25.4 5647 BLAKE2B 60ecb24fb137f7aeacb9689d8edc41791f78f96d1aa15c7fa47032371533d668c5dc12a5e1641945402f0e21f4e596cebb5010ac170ef462279b2efb887be020 SHA512 df9810034773a9d0556cbd174e4f131f0461402bf3f476ae5da1deb92f3e2e9ef789687c5cc5c2df6385f6b14251e893be225ffacd895d71dfb305b9de32567e diff --git a/sys-libs/db/db-1.85-r5.ebuild b/sys-libs/db/db-1.85-r5.ebuild deleted file mode 100644 index 3efe710bb3e8..000000000000 --- a/sys-libs/db/db-1.85-r5.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs multilib - -DESCRIPTION="old berk db kept around for really old packages" -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -SRC_URI="http://download.oracle.com/berkeley-db/db.${PV}.tar.gz - mirror://gentoo/${P}-r3.1.patch.bz2" -# The patch used by Gentoo is from Fedora, and includes all 5 patches found on -# the Oracle page, plus others. - -LICENSE="Sleepycat" -SLOT="1" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" -IUSE="" - -DEPEND="" - -S="${WORKDIR}/db.${PV}" - -PATCHES=( - "${WORKDIR}"/${P}-r3.1.patch - "${FILESDIR}"/${P}-gentoo-paths.patch -) - -src_prepare() { - default - - sed -i \ - -e "s:@GENTOO_LIBDIR@:$(get_libdir):" \ - PORT/linux/Makefile || die -} - -src_compile() { - tc-export CC AR RANLIB - emake -C PORT/linux OORG="${CFLAGS}" -} - -src_install() { - make -C PORT/linux install DESTDIR="${ED}" || die - - # binary compat symlink - dosym libdb1.so.2 /usr/$(get_libdir)/libdb.so.2 - - sed -e "s:<db.h>:<db1/db.h>:" \ - -i "${ED}"/usr/include/db1/ndbm.h || die - dosym db1/ndbm.h /usr/include/ndbm.h - - dodoc changelog README - newdoc hash/README README.hash - docinto ps - dodoc docs/*.ps -} diff --git a/sys-libs/db/db-18.1.32-r1.ebuild b/sys-libs/db/db-18.1.32-r1.ebuild deleted file mode 100644 index ba0c4dac5df2..000000000000 --- a/sys-libs/db/db-18.1.32-r1.ebuild +++ /dev/null @@ -1,247 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal eapi7-ver toolchain-funcs - -#Number of official patches -#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` -PATCHNO=${PV/*.*.*_p} -if [[ ${PATCHNO} == "${PV}" ]] ; then - MY_PV=${PV} - MY_P=${P} - PATCHNO=0 -else - MY_PV=${PV/_p${PATCHNO}} - MY_P=${PN}-${MY_PV} -fi - -RESTRICT="!test? ( test )" - -S_BASE="${WORKDIR}/${MY_P}" -S="${S_BASE}/dist" -DESCRIPTION="Oracle Berkeley DB" -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -SRC_URI="https://download.oracle.com/otn/berkeley-db/${MY_P}.tar.gz - mirror://gentoo/${MY_P}.tar.gz" -for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - SRC_URI+=" http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" -done - -LICENSE="AGPL-3" -SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="doc java cxx tcl test" - -REQUIRED_USE="test? ( tcl )" - -# the entire testsuite needs the TCL functionality -DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jdk-1.8 ) - >=sys-devel/binutils-2.16.1" -RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.8 )" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/db$(ver_cut 1-2)/db.h -) - -PATCHES=( - # bug #510506 - "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch - - # use the includes from the prefix - "${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.patch - "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch - - # sqlite configure call has an extra leading .. - # upstreamed:5.2.36, missing in 5.3.x/6.x - # still needs to be patched in 6.0.20 - "${FILESDIR}"/${PN}-18.1.25-sqlite-configure-path.patch - - # The upstream testsuite copies .lib and the binaries for each parallel test - # core, ~300MB each. This patch uses links instead, saves a lot of space. - "${FILESDIR}"/${PN}-18.1.25-test-link.patch -) - -src_prepare() { - cd "${WORKDIR}"/"${MY_P}" - for (( i=1 ; i<=${PATCHNO} ; i++ )) - do - eapply "${DISTDIR}"/patch."${MY_PV}"."${i}" - done - - default - - # Upstream release script grabs the dates when the script was run, so lets - # end-run them to keep the date the same. - export REAL_DB_RELEASE_DATE="$(awk \ - '/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \ - "${S_BASE}"/dist/configure)" - sed -r -i \ - -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \ - "${S_BASE}"/dist/RELEASE || die - - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r -i \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - "${S_BASE}"/dist/Makefile.in || die - - cd "${S_BASE}"/dist || die - rm -f aclocal/libtool.m4 - sed -i \ - -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ - configure.ac || die - sed -i \ - -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ - aclocal/programs.m4 || die - AT_M4DIR="aclocal aclocal_java" eautoreconf - # Upstream sucks - they do autoconf and THEN replace the version variables. - . ./RELEASE - for v in \ - DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \ - DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \ - DB_VERSION \ - DB_RELEASE_DATE ; do - local ev="__EDIT_${v}__" - sed -i -e "s/${ev}/${!v}/g" configure || die - done - - # This is a false positive skip in the tests as the test-reviewer code - # looks for 'Skipping\s' - sed -i \ - -e '/db_repsite/s,Skipping:,Skipping,g' \ - "${S_BASE}"/test/tcl/reputils.tcl || die -} - -multilib_src_configure() { - # sql_compat will cause a collision with sqlite3 - # --enable-sql_compat - # Don't --enable-sql* because we don't want to use bundled sqlite. - # See Gentoo bug #605688 - local myeconfargs=( - --enable-compat185 - --enable-dbm - --enable-o_direct - # Requires openssl-1.0 - --with-repmgr-ssl=no - --without-uniquename - --disable-sql - --disable-sql_codegen - --disable-sql_compat - $([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) - $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) - $(use_enable cxx) - $(use_enable cxx stl) - $(multilib_native_use_enable java) - $(use_enable test) - ) - - tc-ld-force-bfd #470634 #729510 - - # compilation with -O0 fails on amd64, see bug #171231 - if [[ ${ABI} == amd64 ]]; then - local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} - replace-flags -O0 -O2 - is-flagq -O[s123] || append-flags -O2 - fi - - # Add linker versions to the symbols. Easier to do, and safer than header file - # mumbo jumbo. - if use userland_GNU ; then - append-ldflags -Wl,--default-symver - fi - - # use `set` here since the java opts will contain whitespace - if multilib_is_native_abi && use java ; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - - # Bug #270851: test needs TCL support - if use tcl || use test ; then - myeconfargs+=( - --enable-tcl - --with-tcl="${EPREFIX}/usr/$(get_libdir)" - ) - else - myeconfargs+=(--disable-tcl ) - fi - - ECONF_SOURCE="${S_BASE}"/dist \ - STRIP="true" \ - econf "${myeconfargs[@]}" -} - -multilib_src_install() { - emake install DESTDIR="${D}" - - db_src_install_headerslot - - db_src_install_usrlibcleanup - - if multilib_is_native_abi && use java; then - java-pkg_regso "${ED%/}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED%/}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED%/}"/usr/"$(get_libdir)"/*.jar - fi -} - -multilib_src_install_all() { - db_src_install_usrbinslot - - db_src_install_doc - - dodir /usr/sbin - # This file is not always built, and no longer exists as of db-4.8 - if [[ -f "${ED%/}"/usr/bin/berkeley_db_svc ]] ; then - mv "${ED%/}"/usr/bin/berkeley_db_svc \ - "${ED%/}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die - fi -} - -pkg_postinst() { - multilib_foreach_abi db_fix_so -} - -pkg_postrm() { - multilib_foreach_abi db_fix_so -} - -src_test() { - # db_repsite is impossible to build, as upstream strips those sources. - # db_repsite is used directly in the setup_site_prog, - # setup_site_prog is called from open_site_prog - # which is called only from tests in the multi_repmgr group. - #sed -ri \ - # -e '/set subs/s,multi_repmgr,,g' \ - # "${S_BASE}/test/testparams.tcl" - sed -ri \ - -e '/multi_repmgr/d' \ - "${S_BASE}/test/tcl/test.tcl" || die - - # This is the only failure in 5.2.28 so far, and looks like a false positive. - # Repmgr018 (btree): Test of repmgr stats. - # Repmgr018.a: Start a master. - # Repmgr018.b: Start a client. - # Repmgr018.c: Run some transactions at master. - # Rep_test: btree 20 key/data pairs starting at 0 - # Rep_test.a: put/get loop - # FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1 - sed -ri \ - -e '/set parms.*repmgr018/d' \ - -e 's/repmgr018//g' \ - "${S_BASE}/test/tcl/test.tcl" || die - - multilib-minimal_src_test -} - -multilib_src_test() { - multilib_is_native_abi || return - - S=${BUILD_DIR} db_src_test -} diff --git a/sys-libs/db/db-18.1.40-r1.ebuild b/sys-libs/db/db-18.1.40-r1.ebuild deleted file mode 100644 index 0ec531491511..000000000000 --- a/sys-libs/db/db-18.1.40-r1.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal eapi7-ver toolchain-funcs - -#Number of official patches -#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` -PATCHNO=${PV/*.*.*_p} -if [[ ${PATCHNO} == "${PV}" ]] ; then - MY_PV=${PV} - MY_P=${P} - PATCHNO=0 -else - MY_PV=${PV/_p${PATCHNO}} - MY_P=${PN}-${MY_PV} -fi - -RESTRICT="fetch - !test? ( test )" - -S_BASE="${WORKDIR}/${MY_P}" -S="${S_BASE}/dist" -DESCRIPTION="Oracle Berkeley DB" -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -SRC_URI="https://download.oracle.com/otn/berkeley-db/${MY_P}.tar.gz" -for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - SRC_URI+=" http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" -done - -LICENSE="AGPL-3" -SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -IUSE="doc java cxx tcl test" - -REQUIRED_USE="test? ( tcl )" - -# the entire testsuite needs the TCL functionality -DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jdk-1.8 ) - >=sys-devel/binutils-2.16.1" -RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.8 )" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/db$(ver_cut 1-2)/db.h -) - -PATCHES=( - # bug #510506 - "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch - - # use the includes from the prefix - "${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.patch - "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch - - # The upstream testsuite copies .lib and the binaries for each parallel test - # core, ~300MB each. This patch uses links instead, saves a lot of space. - "${FILESDIR}"/${PN}-18.1.25-test-link.patch - - "${FILESDIR}"/${PN}-18.1.40-fix-docs.patch -) - -src_prepare() { - cd "${WORKDIR}"/"${MY_P}" - for (( i=1 ; i<=${PATCHNO} ; i++ )) - do - eapply "${DISTDIR}"/patch."${MY_PV}"."${i}" - done - - default - - # Upstream release script grabs the dates when the script was run, so lets - # end-run them to keep the date the same. - export REAL_DB_RELEASE_DATE="$(awk \ - '/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \ - "${S_BASE}"/dist/configure)" - sed -r -i \ - -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \ - "${S_BASE}"/dist/RELEASE || die - - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r -i \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - "${S_BASE}"/dist/Makefile.in || die - - cd "${S_BASE}"/dist || die - rm -f aclocal/libtool.m4 - sed -i \ - -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ - configure.ac || die - sed -i \ - -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ - aclocal/programs.m4 || die - AT_M4DIR="aclocal aclocal_java" eautoreconf - # Upstream sucks - they do autoconf and THEN replace the version variables. - . ./RELEASE - for v in \ - DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \ - DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \ - DB_VERSION \ - DB_RELEASE_DATE ; do - local ev="__EDIT_${v}__" - sed -i -e "s/${ev}/${!v}/g" configure || die - done - - # This is a false positive skip in the tests as the test-reviewer code - # looks for 'Skipping\s' - sed -i \ - -e '/db_repsite/s,Skipping:,Skipping,g' \ - "${S_BASE}"/test/tcl/reputils.tcl || die -} - -multilib_src_configure() { - # sql_compat will cause a collision with sqlite3 - # --enable-sql_compat - # Don't --enable-sql* because we don't want to use bundled sqlite. - # See Gentoo bug #605688 - local myeconfargs=( - --enable-compat185 - --enable-dbm - --enable-o_direct - # Requires openssl-1.0 - --with-repmgr-ssl=no - --without-uniquename - --disable-sql - --disable-sql_codegen - --disable-sql_compat - $([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) - $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) - $(use_enable cxx) - $(use_enable cxx stl) - $(multilib_native_use_enable java) - $(use_enable test) - ) - - tc-ld-force-bfd #470634 #729510 - - # compilation with -O0 fails on amd64, see bug #171231 - if [[ ${ABI} == amd64 ]]; then - local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} - replace-flags -O0 -O2 - is-flagq -O[s123] || append-flags -O2 - fi - - # Add linker versions to the symbols. Easier to do, and safer than header file - # mumbo jumbo. - if use userland_GNU ; then - append-ldflags -Wl,--default-symver - fi - - # use `set` here since the java opts will contain whitespace - if multilib_is_native_abi && use java ; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - - # Bug #270851: test needs TCL support - if use tcl || use test ; then - myeconfargs+=( - --enable-tcl - --with-tcl="${EPREFIX}/usr/$(get_libdir)" - ) - else - myeconfargs+=(--disable-tcl ) - fi - - ECONF_SOURCE="${S_BASE}"/dist \ - STRIP="true" \ - econf "${myeconfargs[@]}" -} - -multilib_src_install() { - emake install DESTDIR="${D}" - - db_src_install_headerslot - - db_src_install_usrlibcleanup - - if multilib_is_native_abi && use java; then - java-pkg_regso "${ED%/}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED%/}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED%/}"/usr/"$(get_libdir)"/*.jar - fi -} - -multilib_src_install_all() { - db_src_install_usrbinslot - - db_src_install_doc - - dodir /usr/sbin - # This file is not always built, and no longer exists as of db-4.8 - if [[ -f "${ED%/}"/usr/bin/berkeley_db_svc ]] ; then - mv "${ED%/}"/usr/bin/berkeley_db_svc \ - "${ED%/}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die - fi -} - -pkg_postinst() { - multilib_foreach_abi db_fix_so -} - -pkg_postrm() { - multilib_foreach_abi db_fix_so -} - -src_test() { - # db_repsite is impossible to build, as upstream strips those sources. - # db_repsite is used directly in the setup_site_prog, - # setup_site_prog is called from open_site_prog - # which is called only from tests in the multi_repmgr group. - #sed -ri \ - # -e '/set subs/s,multi_repmgr,,g' \ - # "${S_BASE}/test/testparams.tcl" - sed -ri \ - -e '/multi_repmgr/d' \ - "${S_BASE}/test/tcl/test.tcl" || die - - # This is the only failure in 5.2.28 so far, and looks like a false positive. - # Repmgr018 (btree): Test of repmgr stats. - # Repmgr018.a: Start a master. - # Repmgr018.b: Start a client. - # Repmgr018.c: Run some transactions at master. - # Rep_test: btree 20 key/data pairs starting at 0 - # Rep_test.a: put/get loop - # FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1 - sed -ri \ - -e '/set parms.*repmgr018/d' \ - -e 's/repmgr018//g' \ - "${S_BASE}/test/tcl/test.tcl" || die - - multilib-minimal_src_test -} - -multilib_src_test() { - multilib_is_native_abi || return - - S=${BUILD_DIR} db_src_test -} diff --git a/sys-libs/db/db-3.2.9_p2-r2.ebuild b/sys-libs/db/db-3.2.9_p2-r2.ebuild deleted file mode 100644 index 09e4131d8b99..000000000000 --- a/sys-libs/db/db-3.2.9_p2-r2.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit db flag-o-matic multilib - -#Number of official patches -#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` -PATCHNO="${PV/*.*.*_p}" -if [[ ${PATCHNO} == "${PV}" ]] ; then - MY_PV="${PV}" - MY_P="${P}" - PATCHNO=0 -else - MY_PV="${PV/_p${PATCHNO}}" - MY_P="${PN}-${MY_PV}" -fi - -DESCRIPTION="Berkeley DB for transaction support in MySQL" -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" -for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" -done - -LICENSE="Sleepycat" -SLOT="3" -# This ebuild is to be the compatibility ebuild for when db4 is put -# in the tree. -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" -IUSE="doc" -RESTRICT="!test? ( test )" - -DEPEND="${RDEPEND} - =sys-libs/db-1.85*" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - # Get db to link libdb* to correct dependencies ... for example if we use - # NPTL or NGPT, db detects usable mutexes, and should link against - # libpthread, but does not do so ... - # <azarah@gentoo.org> (23 Feb 2003) - "${FILESDIR}"/${MY_P}-fix-dep-link.patch - - "${FILESDIR}"/${MY_P}-gcc43.patch -) - -pkg_setup() { - # This doesn't build without exceptions - replace-flags -fno-exceptions -fexceptions -} - -src_prepare() { - for (( i=1 ; i<=${PATCHNO} ; i++ )) - do - eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" - done - - default - - # We should get dump185 to link against system db1 .. - # <azarah@gentoo.org> (23 Feb 2003) - mv dist/Makefile.in{,.orig} || die - sed \ - -e 's:DB185INC=:DB185INC= -I/usr/include/db1:' \ - -e 's:DB185LIB=:DB185LIB= -ldb1:' \ - dist/Makefile.in.orig \ - > dist/Makefile.in || die - - cd dist || die - # remove config.guess else we have problems with gcc-3.2 - rm config.guess || die - sed -i "s,\(-D_GNU_SOURCE\),\1 ${CFLAGS}," configure || die -} - -src_configure() { - local conf=( - --host=${CHOST} - --build=${CHOST} - --enable-cxx - --enable-compat185 - --enable-dump185 - ) - - local conf_shared=( - --disable-static - --enable-shared - - # --enable-rpc DOES NOT BUILD - # Robin H. Johnson <robbat2@gentoo.org> (18 Oct 2003) - --enable-dynamic - ) - - local conf_static=( - --disable-shared - --enable-static - ) - - # TCL support is also broken - # Robin H. Johnson <robbat2@gentoo.org> (18 Oct 2003) - # conf_shared="${conf_shared} - # `use_enable tcl tcl` - # `use_with tcl tcl /usr/$(get_libdir)`" - - # NOTE: we should not build both shared and static versions - # of the libraries in the same build root! - - einfo "Configuring ${P} (static)..." - mkdir build-static || die - pushd build-static &>/dev/null || die - strip="${EPREFIX}"/bin/true \ - ECONF_SOURCE="${S}"/dist \ - econf "${conf[@]}" "${conf_static[@]}" - popd &>/dev/null || die - - einfo "Configuring ${P} (shared)..." - mkdir build-shared || die - pushd build-shared &>/dev/null || die - strip="${EPREFIX}"/bin/true \ - ECONF_SOURCE="${S}"/dist \ - econf "${conf[@]}" "${conf_shared[@]}" - popd &>/dev/null || die -} - -src_compile() { - # Parallel make does not work - MAKEOPTS="${MAKEOPTS} -j1" - - einfo "Building ${P} (static)..." - pushd "${S}"/build-static &>/dev/null || die - emake strip="${EPREFIX}"/bin/true - popd &>/dev/null || die - - einfo "Building ${P} (shared)..." - pushd build-shared &>/dev/null || die - emake strip="${EPREFIX}"/bin/true - popd &>/dev/null || die -} - -src_install() { - pushd build-shared &>/dev/null || die - # build system does not support DESTDIR - emake \ - libdb=libdb-3.2.a \ - libcxx=libcxx_3.2.a \ - DESTDIR="${D}" \ - prefix="${ED}"/usr \ - libdir="${ED}"/usr/$(get_libdir) \ - strip="${EPREFIX}"/bin/true \ - install - popd &>/dev/null || die - - pushd build-static &>/dev/null || die - newlib.a libdb.a libdb-3.2.a - newlib.a libdb_cxx.a libdb_cxx-3.2.a - popd &>/dev/null || die - - db_src_install_headerslot || die "db_src_install_headerslot failed!" - - # this is now done in the db eclass, function db_fix_so and db_src_install_usrlibcleanup - #cd "${D}"/usr/lib - #ln -s libdb-3.2.so libdb.so.3 - - # For some reason, db.so's are *not* readable by group or others, - # resulting in no one but root being able to use them!!! - # This fixes it -- DR 15 Jun 2001 - pushd "${ED}"/usr/$(get_libdir) &>/dev/null || die - chmod go+rx *.so - # The .la's aren't readable either - chmod go+r *.la - popd &>/dev/null || die - - dodoc README - - db_src_install_doc || die "db_src_install_doc failed!" - - db_src_install_usrbinslot || die "db_src_install_usrbinslot failed!" - - db_src_install_usrlibcleanup || die "db_src_install_usrlibcleanup failed!" -} - -pkg_postinst() { - db_fix_so -} - -pkg_postrm() { - db_fix_so -} - -src_test() { - if use test; then - eerror "We'd love to be able to test, but the testsuite is broken in the 3.2.9 series" - fi -} diff --git a/sys-libs/db/db-4.2.52_p5-r4.ebuild b/sys-libs/db/db-4.2.52_p5-r4.ebuild deleted file mode 100644 index 47066904ed2e..000000000000 --- a/sys-libs/db/db-4.2.52_p5-r4.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools db flag-o-matic java-pkg-opt-2 multilib - -#Number of official patches -#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` -PATCHNO="${PV/*.*.*_p}" -if [[ ${PATCHNO} == "${PV}" ]] ; then - MY_PV="${PV}" - MY_P="${P}" - PATCHNO=0 -else - MY_PV="${PV/_p${PATCHNO}}" - MY_P="${PN}-${MY_PV}" -fi - -S="${WORKDIR}/${MY_P}/build_unix" -DESCRIPTION="Oracle Berkeley DB" -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" -for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" -done - -LICENSE="Sleepycat" -SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos" -IUSE="tcl java doc cxx" -RESTRICT="!test? ( test )" - -DEPEND="tcl? ( >=dev-lang/tcl-8.4 ) - java? ( >=virtual/jdk-1.8 )" -RDEPEND="tcl? ( dev-lang/tcl ) - java? ( >=virtual/jre-1.8 )" - -PATCHES=( - "${FILESDIR}"/"${PN}"-4.2.52_p2-TXN.patch - "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch - - # use the includes from the prefix - "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch - "${FILESDIR}"/"${PN}"-"${SLOT}"-listen-to-java-options.patch - "${FILESDIR}"/"${PN}"-4.0.14-fix-dep-link.patch -) - -# Required to avoid unpack attempt of patches -src_unpack() { - unpack ${MY_P}.tar.gz -} - -src_prepare() { - pushd "${WORKDIR}/${MY_P}" &>/dev/null || die - for (( i=1 ; i<=${PATCHNO} ; i++ )) - do - eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" - done - - default - - sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" \ - -i dist/RELEASE || die - - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - -i dist/Makefile.in || die - - # START of 4.5+earlier specific - # Upstream sucks, they normally concat these - local i j - for j in dist/aclocal{,_java} ; do - pushd ${j} &>/dev/null || die - for i in * ; do - ln -s ${i} ${i%.ac}.m4 || die - done - popd &>/dev/null || die - done - # END of 4.5+earlier specific - pushd dist &>/dev/null || die - rm aclocal/libtool.{m4,ac} || die - sed \ - -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ - -i configure.ac || die - sed \ - -e '/^AC_PATH_TOOL/s/ sh, missing_sh/ bash, missing_sh/' \ - -i aclocal/programs.m4 || die - - AT_M4DIR="aclocal aclocal_java" eautoreconf - - # Upstream sucks - they do autoconf and THEN replace the version variables. - . ./RELEASE - sed \ - -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ - -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ - -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ - -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ - -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ - -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \ - -i configure || die - - popd &>/dev/null || die - popd &>/dev/null || die -} - -src_configure() { - local myconf=( - --enable-compat185 - --with-uniquename - --disable-rpc - --host="${CHOST}" - - $(usex amd64 '--with-mutex=x86/gcc-assembly' '') - $(use_enable cxx) - $(use_enable tcl) - $(usex tcl "--with-tcl=${EPREFIX}/usr/$(get_libdir)" '') #" - $(use_enable java) - ) - - if use java; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - - # the entire testsuite needs the TCL functionality - if use tcl && use test; then - myconf+=( --enable-test ) - else - myconf+=( --disable-test ) - fi - - ECONF_SOURCE="${S}"/../dist \ - econf "${myconf[@]}" -} - -src_compile() { - # This isn't safe for prefix (Darwin should be .jnilib), but I can't get the - # build system to behave itself, it generates libtool too late. - sed \ - -e 's/-shrext $(SOFLAGS)/-shrext .so $(SOFLAGS)/g' \ - -i Makefile || die - emake -} - -src_install() { - emake \ - DESTDIR="${D}" \ - libdir="${EPREFIX}/usr/$(get_libdir)" \ - strip="${EPREFIX}/bin/strip" \ - install - - db_src_install_usrbinslot - - db_src_install_headerslot - - db_src_install_doc - - db_src_install_usrlibcleanup - - dodir /usr/sbin - # This file is not always built, and no longer exists as of db-4.8 - if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then - mv "${ED}"/usr/bin/berkeley_db_svc \ - "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die - fi - - if use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar - fi -} - -pkg_postinst() { - db_fix_so -} - -pkg_postrm() { - db_fix_so -} diff --git a/sys-libs/db/db-4.3.29_p1-r4.ebuild b/sys-libs/db/db-4.3.29_p1-r4.ebuild deleted file mode 100644 index c8c2b701e139..000000000000 --- a/sys-libs/db/db-4.3.29_p1-r4.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools db flag-o-matic java-pkg-opt-2 multilib - -#Number of official patches -#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` -PATCHNO="${PV/*.*.*_p}" -if [[ ${PATCHNO} == "${PV}" ]] ; then - MY_PV="${PV}" - MY_P="${P}" - PATCHNO=0 -else - MY_PV="${PV/_p${PATCHNO}}" - MY_P="${PN}-${MY_PV}" -fi - -S="${WORKDIR}/${MY_P}/build_unix" -DESCRIPTION="Oracle Berkeley DB" -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" -for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" -done - -LICENSE="Sleepycat" -SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86" -IUSE="tcl java doc cxx" -RESTRICT="!test? ( test )" - -DEPEND="tcl? ( >=dev-lang/tcl-8.4 ) - java? ( >=virtual/jdk-1.8 )" -RDEPEND="tcl? ( dev-lang/tcl ) - java? ( >=virtual/jre-1.8 )" - -PATCHES=( - "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch - - # use the includes from the prefix - "${FILESDIR}"/"${PN}"-4.2-jni-check-prefix-first.patch - "${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch - - "${FILESDIR}"/"${PN}"-4.3.27-fix-dep-link.patch -) - -# Required to avoid unpack attempt of patches -src_unpack() { - unpack "${MY_P}".tar.gz -} - -src_prepare() { - pushd "${WORKDIR}"/"${MY_P}" &>/dev/null || die - for (( i=1 ; i<=${PATCHNO} ; i++ )) - do - eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" - done - - default - - sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" \ - -i dist/RELEASE || die - - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - -i dist/Makefile.in || die - - # START of 4.5+earlier specific - # Upstream sucks, they normally concat these - local i j - for j in dist/aclocal{,_java} ; do - pushd ${j} &>/dev/null || die - for i in * ; do - ln -s ${i} ${i%.ac}.m4 || die - done - popd &>/dev/null || die - done - # END of 4.5+earlier specific - - pushd dist &>/dev/null || die - rm aclocal/libtool.{m4,ac} || die - sed \ - -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ - -i configure.ac || die - sed \ - -e '/^AC_PATH_TOOL/s/ sh, missing_sh/ bash, missing_sh/' \ - -i aclocal/programs.m4 || die - - AT_M4DIR="aclocal aclocal_java" eautoreconf - - # Upstream sucks - they do autoconf and THEN replace the version variables. - . ./RELEASE - sed \ - -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ - -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ - -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ - -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ - -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ - -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \ - -i configure || die - popd &>/dev/null || die - popd &>/dev/null || die -} - -src_configure() { - local myconf=( - --enable-compat185 - --enable-o_direct - --without-uniquename - --disable-rpc - --host="${CHOST}" - - $(usex amd64 '--with-mutex=x86/gcc-assembly' '') - $(use_enable cxx) - $(use_enable tcl) - $(usex tcl "--with-tcl=${EPREFIX}/usr/$(get_libdir)" '') #" - $(use_enable java) - ) - - if use java; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - - # the entire testsuite needs the TCL functionality - if use tcl && use test ; then - myconf+=( --enable-test ) - else - myconf+=( --disable-test ) - fi - - # Add linker versions to the symbols. Easier to do, and safer than header - # file mumbo jumbo. - if use userland_GNU; then - append-ldflags -Wl,--default-symver - fi - - ECONF_SOURCE="${S}"/../dist \ - econf "${myconf[@]}" -} - -src_install() { - emake \ - DESTDIR="${D}" \ - libdir="${EPREFIX}/usr/$(get_libdir)" \ - strip="${EPREFIX}/bin/strip" \ - install - - db_src_install_usrbinslot - - db_src_install_headerslot - - db_src_install_doc - - db_src_install_usrlibcleanup - - dodir /usr/sbin - # This file is not always built, and no longer exists as of db-4.8 - if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then - mv "${ED}"/usr/bin/berkeley_db_svc \ - "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die - fi - - if use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar - fi -} - -pkg_postinst() { - db_fix_so -} - -pkg_postrm() { - db_fix_so -} diff --git a/sys-libs/db/db-4.4.20_p4-r4.ebuild b/sys-libs/db/db-4.4.20_p4-r4.ebuild deleted file mode 100644 index f2d903b73540..000000000000 --- a/sys-libs/db/db-4.4.20_p4-r4.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools db flag-o-matic java-pkg-opt-2 multilib - -#Number of official patches -#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` -PATCHNO="${PV/*.*.*_p}" -if [[ ${PATCHNO} == "${PV}" ]] ; then - MY_PV="${PV}" - MY_P="${P}" - PATCHNO=0 -else - MY_PV="${PV/_p${PATCHNO}}" - MY_P="${PN}-${MY_PV}" -fi - -S="${WORKDIR}/${MY_P}/build_unix" -DESCRIPTION="Oracle Berkeley DB" -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz - mirror://gentoo/${MY_P}-20060110-rpc_server-java.tar.gz" -for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" -done - -LICENSE="Sleepycat BSD" -SLOT="$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="tcl java doc cxx" -RESTRICT="!test? ( test )" - -DEPEND="tcl? ( >=dev-lang/tcl-8.4 ) - java? ( >=virtual/jdk-1.8 )" -RDEPEND="tcl? ( dev-lang/tcl ) - java? ( >=virtual/jre-1.8 )" - -PATCHES=( - "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch - - # use the includes from the prefix - "${FILESDIR}"/"${PN}"-4.2-jni-check-prefix-first.patch - "${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch -) - -# Required to avoid unpack attempt of patches -src_unpack() { - unpack "${MY_P}".tar.gz - unpack "${MY_P}-20060110-rpc_server-java".tar.gz -} - -src_prepare() { - pushd "${WORKDIR}"/"${MY_P}" &>/dev/null || die - for (( i=1 ; i<=${PATCHNO} ; i++ )) - do - eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" - done - - default - - sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" \ - -i dist/RELEASE || die - - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - -i dist/Makefile.in || die - - # START of 4.5+earlier specific - # Upstream sucks, they normally concat these - local i j - for j in dist/aclocal{,_java} ; do - pushd ${j} &>/dev/null || die - for i in * ; do - ln -s ${i} ${i%.ac}.m4 || die - done - popd &>/dev/null || die - done - # END of 4.5+earlier specific - pushd dist &>/dev/null || die - rm aclocal/libtool.{m4,ac} || die - - AT_M4DIR="aclocal aclocal_java" eautoreconf - - # Upstream sucks - they do autoconf and THEN replace the version variables. - . ./RELEASE - sed \ - -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ - -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ - -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ - -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ - -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ - -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \ - -i configure || die - - popd &>/dev/null || die - popd &>/dev/null || die -} - -src_configure() { - local myconf=( - --enable-compat185 - --enable-o_direct - --without-uniquename - --disable-rpc - --host="${CHOST}" - - $(usex amd64 '--with-mutex=x86/gcc-assembly' '') - $(use_enable cxx) - $(use_enable tcl) - $(usex tcl "--with-tcl=${EPREFIX}/usr/$(get_libdir)" '') #" - $(use_enable java) - ) - - if use java; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - - # the entire testsuite needs the TCL functionality - if use tcl && use test ; then - myconf+=( --enable-test ) - else - myconf+=( --disable-test ) - fi - - # Add linker versions to the symbols. Easier to do, and safer than header file - # mumbo jumbo. - if use userland_GNU; then - append-ldflags -Wl,--default-symver - fi - - ECONF_SOURCE="${S}"/../dist \ - econf "${myconf[@]}" -} - -src_install() { - emake \ - DESTDIR="${D}" \ - libdir="${EPREFIX}/usr/$(get_libdir)" \ - strip="${EPREFIX}/bin/strip" \ - install - - db_src_install_usrbinslot - - db_src_install_headerslot - - db_src_install_doc - - db_src_install_usrlibcleanup - - dodir /usr/sbin - # This file is not always built, and no longer exists as of db-4.8 - if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then - mv "${ED}"/usr/bin/berkeley_db_svc \ - "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die - fi - - if use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar - fi -} - -pkg_postinst() { - db_fix_so -} - -pkg_postrm() { - db_fix_so -} diff --git a/sys-libs/db/db-4.5.20_p2-r6.ebuild b/sys-libs/db/db-4.5.20_p2-r6.ebuild deleted file mode 100644 index 72f1d68b26d8..000000000000 --- a/sys-libs/db/db-4.5.20_p2-r6.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools db flag-o-matic java-pkg-opt-2 multilib - -#Number of official patches -#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` -PATCHNO="${PV/*.*.*_p}" -if [[ ${PATCHNO} == "${PV}" ]] ; then - MY_PV="${PV}" - MY_P="${P}" - PATCHNO=0 -else - MY_PV="${PV/_p${PATCHNO}}" - MY_P="${PN}-${MY_PV}" -fi - -S="${WORKDIR}/${MY_P}/build_unix" -DESCRIPTION="Oracle Berkeley DB" -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" -for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" -done - -LICENSE="Sleepycat" -SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" -IUSE="tcl java doc cxx" -RESTRICT="!test? ( test )" - -DEPEND="tcl? ( >=dev-lang/tcl-8.4 ) - java? ( >=virtual/jdk-1.8 )" -RDEPEND="tcl? ( dev-lang/tcl ) - java? ( >=virtual/jre-1.8 )" - -PATCHES=( - "${FILESDIR}"/"${PN}"-4.4-libtool.patch - - # use the includes from the prefix - "${FILESDIR}"/"${PN}"-4.2-jni-check-prefix-first.patch - "${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch -) - -# Required to avoid unpack attempt of patches -src_unpack() { - unpack "${MY_P}".tar.gz -} - -src_prepare() { - pushd "${WORKDIR}"/"${MY_P}" &>/dev/null || die - for (( i=1 ; i<=${PATCHNO} ; i++ )) - do - eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" - done - - default - - sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" \ - -i dist/RELEASE || die - - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - -i dist/Makefile.in || die - - # START of 4.5+earlier specific - # Upstream sucks, they normally concat these - local i j - for j in dist/aclocal{,_java} ; do - pushd ${j} &>/dev/null || die - for i in * ; do - ln -s ${i} ${i%.ac}.m4 || die - done - popd &>/dev/null || die - done - # END of 4.5+earlier specific - pushd dist &>/dev/null || die - rm aclocal/libtool.{m4,ac} || die - sed \ - -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ - -i configure.ac || die - sed \ - -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ - -i aclocal/programs.m4 || die - - AT_M4DIR="aclocal aclocal_java" eautoreconf - - # Upstream sucks - they do autoconf and THEN replace the version variables. - . ./RELEASE - sed \ - -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ - -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ - -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ - -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ - -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ - -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \ - -i configure || die - - popd &>/dev/null || die - popd &>/dev/null || die -} - -src_configure() { - # compilation with -O0 fails on amd64, see bug #171231 - if use amd64 ; then - replace-flags -O0 -O2 - is-flagq -O[s123] || append-flags -O2 - fi - - local myconf=( - --enable-compat185 - --enable-o_direct - --without-uniquename - --disable-rpc - --disable-static - --host="${CHOST}" - - $(usex amd64 '--with-mutex=x86/gcc-assembly' '') - $(use_enable cxx) - $(use_enable tcl) - $(usex tcl "--with-tcl=${EPREFIX}/usr/$(get_libdir)" '') #" - $(use_enable java) - ) - - if use java; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - - # the entire testsuite needs the TCL functionality - if use tcl && use test ; then - myconf+=( --enable-test ) - else - myconf+=( --disable-test ) - fi - - # Add linker versions to the symbols. Easier to do, and safer than header file - # mumbo jumbo. - if use userland_GNU; then - append-ldflags -Wl,--default-symver - fi - - ECONF_SOURCE="${S}"/../dist \ - econf "${myconf[@]}" - - sed -e "s,\(^STRIP *=\).*,\1\"true\"," -i Makefile || die -} - -src_install() { - emake \ - DESTDIR="${D}" \ - libdir="${EPREFIX}/usr/$(get_libdir)" \ - STRIP="true" \ - install - - db_src_install_usrbinslot - - db_src_install_headerslot - - db_src_install_doc - - db_src_install_usrlibcleanup - - dodir /usr/sbin - # This file is not always built, and no longer exists as of db-4.8 - if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then - mv "${ED}"/usr/bin/berkeley_db_svc \ - "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die - fi - - if use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar - fi - - # no static libraries - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - db_fix_so -} - -pkg_postrm() { - db_fix_so -} diff --git a/sys-libs/db/db-4.6.21_p4-r5.ebuild b/sys-libs/db/db-4.6.21_p4-r5.ebuild deleted file mode 100644 index cf27b50dca2e..000000000000 --- a/sys-libs/db/db-4.6.21_p4-r5.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools db flag-o-matic java-pkg-opt-2 multilib - -#Number of official patches -#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` -PATCHNO="${PV/*.*.*_p}" -if [[ ${PATCHNO} == "${PV}" ]] ; then - MY_PV="${PV}" - MY_P="${P}" - PATCHNO=0 -else - MY_PV="${PV/_p${PATCHNO}}" - MY_P="${PN}-${MY_PV}" -fi - -S="${WORKDIR}/${MY_P}/build_unix" -DESCRIPTION="Oracle Berkeley DB" -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" -for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" -done - -LICENSE="Sleepycat" -SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" -IUSE="tcl java doc cxx" -RESTRICT="!test? ( test )" - -DEPEND="tcl? ( >=dev-lang/tcl-8.4 ) - java? ( >=virtual/jdk-1.8 )" -RDEPEND="tcl? ( dev-lang/tcl ) - java? ( >=virtual/jre-1.8 )" - -PATCHES=( - "${FILESDIR}"/"${PN}"-4.4-libtool.patch - - # use the includes from the prefix - "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch - "${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch -) - -# Required to avoid unpack attempt of patches -src_unpack() { - unpack "${MY_P}".tar.gz -} - -src_prepare() { - pushd "${WORKDIR}"/"${MY_P}" &>/dev/null || die - for (( i=1 ; i<=${PATCHNO} ; i++ )) - do - eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" - done - - default - - sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" \ - -i dist/RELEASE || die - - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - -i dist/Makefile.in || die - - pushd dist &>/dev/null || die - rm aclocal/libtool.m4 || die - sed \ - -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ - -i configure.ac || die - sed \ - -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ - -i aclocal/programs.m4 || die - - AT_M4DIR="aclocal aclocal_java" eautoreconf - - # Upstream sucks - they do autoconf and THEN replace the version variables. - . ./RELEASE - sed \ - -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ - -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ - -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ - -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ - -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ - -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \ - -i configure || die - - popd &>/dev/null || die - popd &>/dev/null || die -} - -src_configure() { - # compilation with -O0 fails on amd64, see bug #171231 - if use amd64 ; then - replace-flags -O0 -O2 - is-flagq -O[s123] || append-flags -O2 - fi - - local myconf=( - --enable-compat185 - --enable-o_direct - --without-uniquename - --disable-rpc - --disable-static - --host="${CHOST}" - - $(usex amd64 '--with-mutex=x86/gcc-assembly' '') - $(use_enable cxx) - $(use_enable tcl) - $(usex tcl "--with-tcl=${EPREFIX}/usr/$(get_libdir)" '') #" - $(use_enable java) - ) - - if use java; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - - # the entire testsuite needs the TCL functionality - if use tcl && use test ; then - myconf+=( --enable-test ) - else - myconf+=( --disable-test ) - fi - - # Add linker versions to the symbols. Easier to do, and safer than header file - # mumbo jumbo. - if use userland_GNU; then - append-ldflags -Wl,--default-symver - fi - - ECONF_SOURCE="${S}"/../dist \ - econf "${myconf[@]}" - - sed -e "s,\(^STRIP *=\).*,\1\"true\"," -i Makefile || die -} - -src_install() { - emake \ - DESTDIR="${D}" \ - libdir="${EPREFIX}/usr/$(get_libdir)" \ - STRIP="true" \ - install - - db_src_install_usrbinslot - - db_src_install_headerslot - - db_src_install_doc - - db_src_install_usrlibcleanup - - dodir /usr/sbin - # This file is not always built, and no longer exists as of db-4.8 - if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then - mv "${ED}"/usr/bin/berkeley_db_svc \ - "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die - fi - - if use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar - fi - - # no static libraries - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - db_fix_so -} - -pkg_postrm() { - db_fix_so -} diff --git a/sys-libs/db/db-4.8.30-r6.ebuild b/sys-libs/db/db-4.8.30-r8.ebuild index e26ebc8ebfa8..7d3883eeb360 100644 --- a/sys-libs/db/db-4.8.30-r6.ebuild +++ b/sys-libs/db/db-4.8.30-r8.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools db flag-o-matic java-pkg-opt-2 multilib multilib-minimal toolchain-funcs +inherit autotools db flag-o-matic multilib-minimal toolchain-funcs -#Number of official patches +# Number of official patches #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` PATCHNO="${PV/*.*.*_p}" if [[ ${PATCHNO} == "${PV}" ]] ; then @@ -17,44 +17,38 @@ else MY_P="${PN}-${MY_PV}" fi -RESTRICT="!test? ( test )" - S="${WORKDIR}/${MY_P}/build_unix" DESCRIPTION="Oracle Berkeley DB" HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" + SRC_URI+=" http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" done LICENSE="Sleepycat" SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" -IUSE="doc java cxx tcl test" - +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~s390 sparc x86" +IUSE="doc cxx tcl test" +RESTRICT="!test? ( test )" REQUIRED_USE="test? ( tcl )" -# the entire testsuite needs the TCL functionality +# The entire testsuite needs the TCL functionality DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jdk-1.8 )" -RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.8 )" + test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" +RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" +# Need binutils for tc-ld-force-bfd +BDEPEND="sys-devel/binutils:*" PATCHES=( "${FILESDIR}"/${PN}-4.8-libtool.patch - "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch "${FILESDIR}"/${PN}-4.8.30-rename-atomic-compare-exchange.patch - - # use the includes from the prefix - "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch - "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch + "${FILESDIR}"/${PN}-4.8-wformat-security.patch + "${FILESDIR}"/${PN}-4.8.30-clang16.patch ) src_prepare() { cd "${WORKDIR}"/"${MY_P}" || die - for (( i=1 ; i<=${PATCHNO} ; i++ )) - do + for (( i=1 ; i<=${PATCHNO} ; i++ )); do eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" done @@ -63,12 +57,6 @@ src_prepare() { sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE \ || die - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - -i dist/Makefile.in || die - cd dist || die rm aclocal/libtool.m4 || die sed \ @@ -78,9 +66,9 @@ src_prepare() { -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ -i aclocal/programs.m4 || die - AT_M4DIR="aclocal aclocal_java" eautoreconf + AT_M4DIR="aclocal" eautoreconf - # Upstream sucks - they do autoconf and THEN replace the version variables. + # They do autoconf and THEN replace the version variables :( . ./RELEASE sed \ -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ @@ -92,21 +80,25 @@ src_prepare() { -i configure || die } +src_configure() { + # Force bfd before calling multilib_toolchain_setup + tc-ld-force-bfd #470634 #729510 + multilib-minimal_src_configure +} + multilib_src_configure() { local myconf=( --enable-compat185 --enable-o_direct --without-uniquename --disable-static + --disable-java $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) $(use_enable cxx) $(use_enable cxx stl) - $(multilib_native_use_enable java) $(use_enable test) ) - tc-ld-force-bfd #470634 #729510 - # compilation with -O0 fails on amd64, see bug #171231 if [[ ${ABI} == amd64 ]]; then local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} @@ -116,17 +108,7 @@ multilib_src_configure() { # Add linker versions to the symbols. Easier to do, and safer than header file # mumbo jumbo. - if use userland_GNU ; then - append-ldflags -Wl,--default-symver - fi - - # use `set` here since the java opts will contain whitespace - if multilib_is_native_abi && use java ; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi + append-ldflags -Wl,--default-symver # Bug #270851: test needs TCL support if use tcl || use test ; then @@ -138,9 +120,7 @@ multilib_src_configure() { myconf+=(--disable-tcl ) fi - ECONF_SOURCE="${S}"/../dist \ - STRIP="true" \ - econf "${myconf[@]}" + ECONF_SOURCE="${S}"/../dist STRIP="true" econf "${myconf[@]}" # The embedded assembly on ARM does not work on newer hardware # so you CANNOT use --with-mutex=ARM/gcc-assembly anymore. @@ -163,12 +143,6 @@ multilib_src_install() { db_src_install_headerslot db_src_install_usrlibcleanup - - if multilib_is_native_abi && use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar - fi } multilib_src_install_all() { diff --git a/sys-libs/db/db-4.7.25_p4-r5.ebuild b/sys-libs/db/db-4.8.30-r9.ebuild index 81a4d83f617d..ac50491119bd 100644 --- a/sys-libs/db/db-4.7.25_p4-r5.ebuild +++ b/sys-libs/db/db-4.8.30-r9.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools db flag-o-matic java-pkg-opt-2 multilib +inherit autotools db flag-o-matic multilib-minimal toolchain-funcs -#Number of official patches +# Number of official patches #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` PATCHNO="${PV/*.*.*_p}" if [[ ${PATCHNO} == "${PV}" ]] ; then @@ -17,60 +17,48 @@ else MY_P="${PN}-${MY_PV}" fi -RESTRICT="!test? ( test )" - S="${WORKDIR}/${MY_P}/build_unix" DESCRIPTION="Oracle Berkeley DB" HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" + SRC_URI+=" http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" done LICENSE="Sleepycat" SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86" -IUSE="doc java cxx tcl test" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="doc cxx tcl test" +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( tcl )" -# the entire testsuite needs the TCL functionality -DEPEND="tcl? ( >=dev-lang/tcl-8.4 ) - test? ( >=dev-lang/tcl-8.4 ) - java? ( >=virtual/jdk-1.8 )" -RDEPEND="tcl? ( dev-lang/tcl ) - java? ( >=virtual/jre-1.8 )" +# The entire testsuite needs the TCL functionality +DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) + test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" +RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" +# Need binutils for tc-ld-force-bfd +BDEPEND="sys-devel/binutils:*" PATCHES=( - "${FILESDIR}"/"${PN}"-4.4-libtool.patch - - # use the includes from the prefix - "${FILESDIR}"/"${PN}"-4.6-jni-check-prefix-first.patch - "${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch + "${FILESDIR}"/${PN}-4.8-libtool.patch + "${FILESDIR}"/${PN}-4.8.30-rename-atomic-compare-exchange.patch + "${FILESDIR}"/${PN}-4.8-wformat-security.patch + "${FILESDIR}"/${PN}-4.8.30-clang16.patch + "${FILESDIR}"/${PN}-4.8.30-tls-configure.patch ) -# Required to avoid unpack attempt of patches -src_unpack() { - unpack "${MY_P}".tar.gz -} - src_prepare() { - pushd "${WORKDIR}"/"${MY_P}" &>/dev/null || die - for (( i=1 ; i<=${PATCHNO} ; i++ )) - do + cd "${WORKDIR}"/"${MY_P}" || die + for (( i=1 ; i<=${PATCHNO} ; i++ )); do eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" done default - sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" \ - -i dist/RELEASE || die + sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE \ + || die - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - -i dist/Makefile.in || die - - pushd dist &>/dev/null || die + cd dist || die rm aclocal/libtool.m4 || die sed \ -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ @@ -79,9 +67,9 @@ src_prepare() { -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ -i aclocal/programs.m4 || die - AT_M4DIR="aclocal aclocal_java" eautoreconf + AT_M4DIR="aclocal" eautoreconf - # Upstream sucks - they do autoconf and THEN replace the version variables. + # They do autoconf and THEN replace the version variables :( . ./RELEASE sed \ -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ @@ -91,77 +79,77 @@ src_prepare() { -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \ -i configure || die - - popd &>/dev/null || die - popd &>/dev/null || die } src_configure() { - # compilation with -O0 fails on amd64, see bug #171231 - if use amd64 ; then - replace-flags -O0 -O2 - is-flagq -O[s123] || append-flags -O2 - fi + # Force bfd before calling multilib_toolchain_setup + tc-ld-force-bfd #470634 #729510 + multilib-minimal_src_configure +} +multilib_src_configure() { local myconf=( --enable-compat185 --enable-o_direct --without-uniquename - --disable-rpc --disable-static - - $(usex amd64 '--with-mutex=x86/gcc-assembly' '') + --disable-java + $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) $(use_enable cxx) - $(use_enable tcl) - $(usex tcl "--with-tcl=${EPREFIX}/usr/$(get_libdir)" '') #" - $(use_enable java) + $(use_enable cxx stl) $(use_enable test) ) - if use java; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - - # Bug #270851: test needs TCL support - if use tcl && use test ; then - myconf+=( --enable-test ) - else - myconf+=( --disable-test ) + # compilation with -O0 fails on amd64, see bug #171231 + if [[ ${ABI} == amd64 ]]; then + local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} + replace-flags -O0 -O2 + is-flagq -O[s123] || append-flags -O2 fi # Add linker versions to the symbols. Easier to do, and safer than header file # mumbo jumbo. - if use userland_GNU ; then - append-ldflags -Wl,--default-symver + append-ldflags -Wl,--default-symver + + # Bug #270851: test needs TCL support + if use tcl || use test ; then + myconf+=( + --enable-tcl + --with-tcl="${EPREFIX}/usr/$(get_libdir)" + ) + else + myconf+=(--disable-tcl ) fi - ECONF_SOURCE="${S}"/../dist \ - STRIP="true" \ - econf "${myconf[@]}" + ECONF_SOURCE="${S}"/../dist STRIP="true" econf "${myconf[@]}" # The embedded assembly on ARM does not work on newer hardware # so you CANNOT use --with-mutex=ARM/gcc-assembly anymore. # Specifically, it uses the SWPB op, which was deprecated: # http://www.keil.com/support/man/docs/armasm/armasm_dom1361289909499.htm - # The op ALSO cannot be used in ARM-Thumb mode. # Trust the compiler instead. # >=db-6.1 uses LDREX instead. } -src_install() { - emake DESTDIR="${D}" install +multilib_src_test() { + multilib_is_native_abi || return - db_src_install_usrbinslot + S="${BUILD_DIR}" db_src_test +} - db_src_install_headerslot +multilib_src_install() { + emake install DESTDIR="${D}" - db_src_install_doc + db_src_install_headerslot db_src_install_usrlibcleanup +} + +multilib_src_install_all() { + db_src_install_usrbinslot + + db_src_install_doc dodir /usr/sbin # This file is not always built, and no longer exists as of db-4.8 @@ -170,20 +158,14 @@ src_install() { "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die fi - if use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar - fi - # no static libraries find "${ED}" -name '*.la' -delete || die } pkg_postinst() { - db_fix_so + multilib_foreach_abi db_fix_so } pkg_postrm() { - db_fix_so + multilib_foreach_abi db_fix_so } diff --git a/sys-libs/db/db-5.3.28-r8.ebuild b/sys-libs/db/db-5.3.28-r10.ebuild index 982f14a543a5..a25371a07960 100644 --- a/sys-libs/db/db-5.3.28-r8.ebuild +++ b/sys-libs/db/db-5.3.28-r10.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools db flag-o-matic java-pkg-opt-2 multilib multilib-minimal toolchain-funcs +inherit autotools db flag-o-matic multilib-minimal toolchain-funcs #Number of official patches #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` @@ -24,35 +24,32 @@ DESCRIPTION="Oracle Berkeley DB" HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" + SRC_URI+=" http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" done LICENSE="Sleepycat" SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="doc java cxx tcl test" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="doc cxx tcl test" REQUIRED_USE="test? ( tcl )" # the entire testsuite needs the TCL functionality DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jdk-1.7 )" -RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.7 )" + test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" +RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" +# bug #841698 +# Need binutils for tc-ld-force-bfd +BDEPEND=" + dev-build/autoconf-archive + sys-devel/binutils:* +" MULTILIB_WRAPPED_HEADERS=( /usr/include/db${SLOT}/db.h ) PATCHES=( - # bug #510506 - "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch - - # use the includes from the prefix - "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch - "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch - # sqlite configure call has an extra leading .. # upstreamed:5.2.36, missing in 5.3.x "${FILESDIR}"/${PN}-5.2.28-sqlite-configure-path.patch @@ -63,6 +60,8 @@ PATCHES=( # Needed when compiling with clang "${FILESDIR}"/${PN}-5.1.29-rename-atomic-compare-exchange.patch + "${FILESDIR}"/${PN}-5.3.28-clang16.patch + "${FILESDIR}"/${PN}-4.8.30-tls-configure.patch ) src_prepare() { @@ -83,12 +82,6 @@ src_prepare() { -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \ -i dist/RELEASE || die - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - -i dist/Makefile.in || die - cd dist || die rm aclocal/libtool.m4 || die sed \ @@ -98,9 +91,9 @@ src_prepare() { -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ -i aclocal/programs.m4 || die - AT_M4DIR="aclocal aclocal_java" eautoreconf + AT_M4DIR="aclocal" eautoreconf - # Upstream sucks - they do autoconf and THEN replace the version variables. + # They do autoconf and THEN replace the version variables :( . ./RELEASE local v ev for v in \ @@ -119,6 +112,12 @@ src_prepare() { -i "${S_BASE}"/test/tcl/reputils.tcl || die } +src_configure() { + # Force bfd before calling multilib_toolchain_setup + tc-ld-force-bfd #470634 #729510 + multilib-minimal_src_configure +} + multilib_src_configure() { local myconf=( # sql_compat will cause a collision with sqlite3 @@ -133,15 +132,13 @@ multilib_src_configure() { --disable-sql_codegen --disable-sql_compat --disable-static + --disable-java $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) $(use_enable cxx) $(use_enable cxx stl) - $(multilib_native_use_enable java) $(use_enable test) ) - tc-ld-force-bfd #470634 #729510 - # compilation with -O0 fails on amd64, see bug #171231 if [[ ${ABI} == amd64 ]]; then local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" @@ -151,16 +148,7 @@ multilib_src_configure() { # Add linker versions to the symbols. Easier to do, and safer than header file # mumbo jumbo. - if use userland_GNU ; then - append-ldflags -Wl,--default-symver - fi - - if multilib_is_native_abi && use java ; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi + append-ldflags -Wl,--default-symver # Bug #270851: test needs TCL support if use tcl || use test ; then @@ -191,12 +179,6 @@ multilib_src_install() { db_src_install_headerslot db_src_install_usrlibcleanup - - if multilib_is_native_abi && use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar - fi } multilib_src_install_all() { diff --git a/sys-libs/db/db-5.1.29-r3.ebuild b/sys-libs/db/db-5.3.28-r9.ebuild index 7a6a8cb141cd..09d3ce82c642 100644 --- a/sys-libs/db/db-5.1.29-r3.ebuild +++ b/sys-libs/db/db-5.3.28-r9.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools db flag-o-matic java-pkg-opt-2 multilib toolchain-funcs +inherit autotools db flag-o-matic multilib-minimal toolchain-funcs #Number of official patches #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` @@ -24,37 +24,43 @@ DESCRIPTION="Oracle Berkeley DB" HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" + SRC_URI+=" http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" done LICENSE="Sleepycat" SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="doc java cxx tcl test" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="doc cxx tcl test" REQUIRED_USE="test? ( tcl )" # the entire testsuite needs the TCL functionality -DEPEND="tcl? ( >=dev-lang/tcl-8.4:0 ) - test? ( >=dev-lang/tcl-8.4:0 ) - java? ( >=virtual/jdk-1.8 )" -RDEPEND="tcl? ( dev-lang/tcl:0 ) - java? ( >=virtual/jre-1.8 )" +DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) + test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" +RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" +# bug #841698 +# Need binutils for tc-ld-force-bfd +BDEPEND=" + dev-build/autoconf-archive + sys-devel/binutils:* +" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/db${SLOT}/db.h +) PATCHES=( - "${FILESDIR}"/${PN}-4.8-libtool.patch - "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch - - # use the includes from the prefix - "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch - "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch + # sqlite configure call has an extra leading .. + # upstreamed:5.2.36, missing in 5.3.x + "${FILESDIR}"/${PN}-5.2.28-sqlite-configure-path.patch - # upstream autoconf fails to build DBM when it's supposed to - # merged upstream in 5.0.26 - #"${FILESDIR}"/${PN}-5.0.21-enable-dbm-autoconf.patch + # The upstream testsuite copies .lib and the binaries for each parallel test + # core, ~300MB each. This patch uses links instead, saves a lot of space. + "${FILESDIR}"/${PN}-6.0.20-test-link.patch # Needed when compiling with clang - "${FILESDIR}"/${P}-rename-atomic-compare-exchange.patch + "${FILESDIR}"/${PN}-5.1.29-rename-atomic-compare-exchange.patch + "${FILESDIR}"/${PN}-5.3.28-clang16.patch ) src_prepare() { @@ -75,12 +81,6 @@ src_prepare() { -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \ -i dist/RELEASE || die - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - -i dist/Makefile.in || die - cd dist || die rm aclocal/libtool.m4 || die sed \ @@ -90,9 +90,9 @@ src_prepare() { -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ -i aclocal/programs.m4 || die - AT_M4DIR="aclocal aclocal_java" eautoreconf + AT_M4DIR="aclocal" eautoreconf - # Upstream sucks - they do autoconf and THEN replace the version variables. + # They do autoconf and THEN replace the version variables :( . ./RELEASE local v ev for v in \ @@ -112,41 +112,42 @@ src_prepare() { } src_configure() { + # Force bfd before calling multilib_toolchain_setup + tc-ld-force-bfd #470634 #729510 + multilib-minimal_src_configure +} + +multilib_src_configure() { local myconf=( + # sql_compat will cause a collision with sqlite3 + #--enable-sql_compat + # Don't --enable-sql* because we don't want to use bundled sqlite. + # See Gentoo bug #605688 --enable-compat185 --enable-dbm --enable-o_direct --without-uniquename - --enable-sql - --enable-sql_codegen + --disable-sql + --disable-sql_codegen --disable-sql_compat - $(use amd64 && echo --with-mutex=x86/gcc-assembly) + --disable-static + --disable-java + $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) $(use_enable cxx) $(use_enable cxx stl) - $(use_enable java) $(use_enable test) ) - tc-ld-force-bfd #470634 #729510 - # compilation with -O0 fails on amd64, see bug #171231 - if use amd64; then + if [[ ${ABI} == amd64 ]]; then + local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" replace-flags -O0 -O2 is-flagq -O[s123] || append-flags -O2 fi - if use java ; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - # Add linker versions to the symbols. Easier to do, and safer than header file # mumbo jumbo. - if use userland_GNU ; then - append-ldflags -Wl,--default-symver - fi + append-ldflags -Wl,--default-symver # Bug #270851: test needs TCL support if use tcl || use test ; then @@ -155,13 +156,9 @@ src_configure() { --with-tcl="${EPREFIX}/usr/$(get_libdir)" ) else - myconf+=( --disable-tcl ) + myconf+=(--disable-tcl ) fi - # sql_compat will cause a collision with sqlite3 - # --enable-sql_compat - cd "${S}" || die - ECONF_SOURCE="${S_BASE}"/dist \ STRIP="true" \ econf "${myconf[@]}" @@ -175,16 +172,18 @@ src_configure() { # >=db-6.1 uses LDREX instead. } -src_install() { +multilib_src_install() { emake DESTDIR="${D}" install - db_src_install_usrbinslot - db_src_install_headerslot - db_src_install_doc - db_src_install_usrlibcleanup +} + +multilib_src_install_all() { + db_src_install_usrbinslot + + db_src_install_doc dodir /usr/sbin # This file is not always built, and no longer exists as of db-4.8 @@ -193,19 +192,16 @@ src_install() { "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die fi - if use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar - fi + # no static libraries + find "${ED}" -name '*.la' -delete || die } pkg_postinst() { - db_fix_so + multilib_foreach_abi db_fix_so } pkg_postrm() { - db_fix_so + multilib_foreach_abi db_fix_so } src_test() { @@ -220,5 +216,24 @@ src_test() { -e '/multi_repmgr/d' \ -i "${S_BASE}/test/tcl/test.tcl" || die - db_src_test + # This is the only failure in 5.2.28 so far, and looks like a false positive. + # Repmgr018 (btree): Test of repmgr stats. + # Repmgr018.a: Start a master. + # Repmgr018.b: Start a client. + # Repmgr018.c: Run some transactions at master. + # Rep_test: btree 20 key/data pairs starting at 0 + # Rep_test.a: put/get loop + # FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1 + sed -r \ + -e '/set parms.*repmgr018/d' \ + -e 's/repmgr018//g' \ + -i "${S_BASE}/test/tcl/test.tcl" || die + + multilib-minimal_src_test +} + +multilib_src_test() { + multilib_is_native_abi || return + + S="${BUILD_DIR}" db_src_test } diff --git a/sys-libs/db/db-6.0.35-r4.ebuild b/sys-libs/db/db-6.0.35-r4.ebuild index 282cf0680da4..422b7e8188a8 100644 --- a/sys-libs/db/db-6.0.35-r4.ebuild +++ b/sys-libs/db/db-6.0.35-r4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools db flag-o-matic java-pkg-opt-2 multilib multilib-minimal toolchain-funcs +inherit autotools db flag-o-matic multilib-minimal toolchain-funcs #Number of official patches #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` @@ -24,35 +24,28 @@ DESCRIPTION="Oracle Berkeley DB" HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" + SRC_URI+=" http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" done LICENSE="AGPL-3" SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="doc java cxx tcl test" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="doc cxx tcl test" REQUIRED_USE="test? ( tcl )" # the entire testsuite needs the TCL functionality DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jdk-1.7:* )" -RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.7:* )" + test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" +RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" +# Need binutils for tc-ld-force-bfd +BDEPEND="sys-devel/binutils:*" MULTILIB_WRAPPED_HEADERS=( /usr/include/db${SLOT}/db.h ) PATCHES=( - # bug #510506 - "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch - - # use the includes from the prefix - "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch - "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch - # sqlite configure call has an extra leading .. # upstreamed:5.2.36, missing in 5.3.x/6.x # still needs to be patched in 6.0.20 @@ -81,12 +74,6 @@ src_prepare() { -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \ -i dist/RELEASE || die - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - -i dist/Makefile.in || die - cd dist || die rm aclocal/libtool.m4 || die sed \ @@ -96,9 +83,9 @@ src_prepare() { -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ -i aclocal/programs.m4 || die - AT_M4DIR="aclocal aclocal_java" eautoreconf + AT_M4DIR="aclocal" eautoreconf - # Upstream sucks - they do autoconf and THEN replace the version variables. + # They do autoconf and THEN replace the version variables :( . ./RELEASE local v ev for v in \ @@ -117,6 +104,12 @@ src_prepare() { -i "${S_BASE}"/test/tcl/reputils.tcl || die } +src_configure() { + # Force bfd before calling multilib_toolchain_setup + tc-ld-force-bfd #470634 #729510 + multilib-minimal_src_configure +} + multilib_src_configure() { local myconf=( --enable-compat185 @@ -127,15 +120,13 @@ multilib_src_configure() { --disable-sql_codegen --disable-sql_compat --disable-static + --disable-java $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) $(use_enable cxx) $(use_enable cxx stl) - $(multilib_native_use_enable java) $(use_enable test) ) - tc-ld-force-bfd #470634 #729510 - # compilation with -O0 fails on amd64, see bug #171231 if [[ ${ABI} == amd64 ]]; then local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} @@ -145,17 +136,7 @@ multilib_src_configure() { # Add linker versions to the symbols. Easier to do, and safer than header file # mumbo jumbo. - if use userland_GNU ; then - append-ldflags -Wl,--default-symver - fi - - # use `set` here since the java opts will contain whitespace - if multilib_is_native_abi && use java ; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi + append-ldflags -Wl,--default-symver # Bug #270851: test needs TCL support if use tcl || use test ; then @@ -190,12 +171,6 @@ multilib_src_install() { db_src_install_headerslot db_src_install_usrlibcleanup - - if multilib_is_native_abi && use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar - fi } multilib_src_install_all() { diff --git a/sys-libs/db/db-6.1.38-r1.ebuild b/sys-libs/db/db-6.0.35-r5.ebuild index 9c01f35ac797..f59d3811f5a4 100644 --- a/sys-libs/db/db-6.1.38-r1.ebuild +++ b/sys-libs/db/db-6.0.35-r5.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal eapi7-ver toolchain-funcs +EAPI=7 +inherit autotools db flag-o-matic multilib-minimal toolchain-funcs #Number of official patches #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` -PATCHNO=${PV/*.*.*_p} +PATCHNO="${PV/*.*.*_p}" if [[ ${PATCHNO} == "${PV}" ]] ; then - MY_PV=${PV} - MY_P=${P} + MY_PV="${PV}" + MY_P="${P}" PATCHNO=0 else - MY_PV=${PV/_p${PATCHNO}} - MY_P=${PN}-${MY_PV} + MY_PV="${PV/_p${PATCHNO}}" + MY_P="${PN}-${MY_PV}" fi RESTRICT="!test? ( test )" @@ -24,51 +24,45 @@ DESCRIPTION="Oracle Berkeley DB" HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" + SRC_URI+=" http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" done LICENSE="AGPL-3" -SLOT="$(get_version_component_range 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="doc java cxx tcl test" +SLOT="$(ver_cut 1-2)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="doc cxx tcl test" REQUIRED_USE="test? ( tcl )" # the entire testsuite needs the TCL functionality DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jdk-1.8 ) - >=sys-devel/binutils-2.16.1" -RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.8 )" + test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" +RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" +# Need binutils for tc-ld-force-bfd +BDEPEND="sys-devel/binutils:*" MULTILIB_WRAPPED_HEADERS=( - /usr/include/db$(ver_cut 1-2)/db.h + /usr/include/db${SLOT}/db.h ) PATCHES=( - # bug #510506 - "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch - - # use the includes from the prefix - "${FILESDIR}"/${PN}-6.2-jni-check-prefix-first.patch - "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch - # sqlite configure call has an extra leading .. # upstreamed:5.2.36, missing in 5.3.x/6.x # still needs to be patched in 6.0.20 - "${FILESDIR}"/${PN}-6.1.19-sqlite-configure-path.patch + "${FILESDIR}"/${PN}-6.0.35-sqlite-configure-path.patch # The upstream testsuite copies .lib and the binaries for each parallel test # core, ~300MB each. This patch uses links instead, saves a lot of space. "${FILESDIR}"/${PN}-6.0.20-test-link.patch + + "${FILESDIR}"/${PN}-4.8.30-tls-configure.patch ) src_prepare() { - cd "${WORKDIR}"/"${MY_P}" + cd "${S_BASE}" || die for (( i=1 ; i<=${PATCHNO} ; i++ )) do - eapply "${DISTDIR}"/patch."${MY_PV}"."${i}" + eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" done default @@ -78,49 +72,48 @@ src_prepare() { export REAL_DB_RELEASE_DATE="$(awk \ '/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \ "${S_BASE}"/dist/configure)" - sed -r -i \ + sed -r \ -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \ - "${S_BASE}"/dist/RELEASE || die - - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r -i \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - "${S_BASE}"/dist/Makefile.in || die + -i dist/RELEASE || die - cd "${S_BASE}"/dist || die - rm -f aclocal/libtool.m4 - sed -i \ + cd dist || die + rm aclocal/libtool.m4 || die + sed \ -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ - configure.ac || die - sed -i \ + -i configure.ac || die + sed \ -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ - aclocal/programs.m4 || die - AT_M4DIR="aclocal aclocal_java" eautoreconf - # Upstream sucks - they do autoconf and THEN replace the version variables. + -i aclocal/programs.m4 || die + + AT_M4DIR="aclocal" eautoreconf + + # They do autoconf and THEN replace the version variables :( . ./RELEASE + local v ev for v in \ DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \ DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \ DB_VERSION \ DB_RELEASE_DATE ; do - local ev="__EDIT_${v}__" - sed -i -e "s/${ev}/${!v}/g" configure || die + ev="__EDIT_${v}__" + sed -e "s/${ev}/${!v}/g" -i configure || die done # This is a false positive skip in the tests as the test-reviewer code # looks for 'Skipping\s' - sed -i \ + sed \ -e '/db_repsite/s,Skipping:,Skipping,g' \ - "${S_BASE}"/test/tcl/reputils.tcl || die + -i "${S_BASE}"/test/tcl/reputils.tcl || die +} + +src_configure() { + # Force bfd before calling multilib_toolchain_setup + tc-ld-force-bfd #470634 #729510 + multilib-minimal_src_configure } multilib_src_configure() { - # sql_compat will cause a collision with sqlite3 - # --enable-sql_compat - # Don't --enable-sql* because we don't want to use bundled sqlite. - # See Gentoo bug #605688 - local myeconfargs=( + local myconf=( --enable-compat185 --enable-dbm --enable-o_direct @@ -129,16 +122,13 @@ multilib_src_configure() { --disable-sql_codegen --disable-sql_compat --disable-static - $([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) + --disable-java $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) $(use_enable cxx) $(use_enable cxx stl) - $(multilib_native_use_enable java) $(use_enable test) ) - tc-ld-force-bfd #470634 #729510 - # compilation with -O0 fails on amd64, see bug #171231 if [[ ${ABI} == amd64 ]]; then local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} @@ -148,45 +138,41 @@ multilib_src_configure() { # Add linker versions to the symbols. Easier to do, and safer than header file # mumbo jumbo. - if use userland_GNU ; then - append-ldflags -Wl,--default-symver - fi - - # use `set` here since the java opts will contain whitespace - if multilib_is_native_abi && use java ; then - myeconfargs+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi + append-ldflags -Wl,--default-symver # Bug #270851: test needs TCL support if use tcl || use test ; then - myeconfargs+=( + myconf+=( --enable-tcl --with-tcl="${EPREFIX}/usr/$(get_libdir)" ) else - myeconfargs+=(--disable-tcl ) + myconf+=(--disable-tcl ) fi + # sql_compat will cause a collision with sqlite3 + # --enable-sql_compat + # Don't --enable-sql* because we don't want to use bundled sqlite. + # See Gentoo bug #605688 ECONF_SOURCE="${S_BASE}"/dist \ STRIP="true" \ - econf "${myeconfargs[@]}" + econf "${myconf[@]}" + + # The embedded assembly on ARM does not work on newer hardware + # so you CANNOT use --with-mutex=ARM/gcc-assembly anymore. + # Specifically, it uses the SWPB op, which was deprecated: + # http://www.keil.com/support/man/docs/armasm/armasm_dom1361289909499.htm + # The op ALSO cannot be used in ARM-Thumb mode. + # Trust the compiler instead. + # >=db-6.1 uses LDREX instead. } multilib_src_install() { - emake install DESTDIR="${D}" + emake DESTDIR="${D}" install db_src_install_headerslot db_src_install_usrlibcleanup - - if multilib_is_native_abi && use java; then - java-pkg_regso "${ED%/}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED%/}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED%/}"/usr/"$(get_libdir)"/*.jar - fi } multilib_src_install_all() { @@ -196,9 +182,9 @@ multilib_src_install_all() { dodir /usr/sbin # This file is not always built, and no longer exists as of db-4.8 - if [[ -f "${ED%/}"/usr/bin/berkeley_db_svc ]] ; then - mv "${ED%/}"/usr/bin/berkeley_db_svc \ - "${ED%/}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die + if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then + mv "${ED}"/usr/bin/berkeley_db_svc \ + "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die fi # no static libraries @@ -218,12 +204,12 @@ src_test() { # db_repsite is used directly in the setup_site_prog, # setup_site_prog is called from open_site_prog # which is called only from tests in the multi_repmgr group. - #sed -ri \ + #sed -r \ # -e '/set subs/s,multi_repmgr,,g' \ - # "${S_BASE}/test/testparams.tcl" - sed -ri \ + # -i "${S_BASE}/test/testparams.tcl" + sed -r \ -e '/multi_repmgr/d' \ - "${S_BASE}/test/tcl/test.tcl" || die + -i "${S_BASE}/test/tcl/test.tcl" || die # This is the only failure in 5.2.28 so far, and looks like a false positive. # Repmgr018 (btree): Test of repmgr stats. @@ -233,10 +219,10 @@ src_test() { # Rep_test: btree 20 key/data pairs starting at 0 # Rep_test.a: put/get loop # FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1 - sed -ri \ + sed -r \ -e '/set parms.*repmgr018/d' \ -e 's/repmgr018//g' \ - "${S_BASE}/test/tcl/test.tcl" || die + -i "${S_BASE}/test/tcl/test.tcl" || die multilib-minimal_src_test } @@ -244,5 +230,5 @@ src_test() { multilib_src_test() { multilib_is_native_abi || return - S=${BUILD_DIR} db_src_test + S="${BUILD_DIR}" db_src_test } diff --git a/sys-libs/db/db-6.2.38-r1.ebuild b/sys-libs/db/db-6.2.38-r1.ebuild deleted file mode 100644 index 786041b37bd1..000000000000 --- a/sys-libs/db/db-6.2.38-r1.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal eapi7-ver toolchain-funcs - -#Number of official patches -#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` -PATCHNO=${PV/*.*.*_p} -if [[ ${PATCHNO} == "${PV}" ]] ; then - MY_PV=${PV} - MY_P=${P} - PATCHNO=0 -else - MY_PV=${PV/_p${PATCHNO}} - MY_P=${PN}-${MY_PV} -fi - -RESTRICT="!test? ( test )" - -S_BASE="${WORKDIR}/${MY_P}" -S="${S_BASE}/build_unix" -DESCRIPTION="Oracle Berkeley DB" -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" -for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" -done - -LICENSE="AGPL-3" -SLOT="$(get_version_component_range 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc java cxx tcl test" - -REQUIRED_USE="test? ( tcl )" - -# the entire testsuite needs the TCL functionality -DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jdk-1.8 ) - kernel_linux? ( >=sys-devel/binutils-2.16.1 ) - kernel_SunOS? ( >=sys-devel/binutils-2.16.1 )" -RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.8 )" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/db$(ver_cut 1-2)/db.h -) - -PATCHES=( - # bug #510506 - "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch - - # use the includes from the prefix - "${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.patch - "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch - - # sqlite configure call has an extra leading .. - # upstreamed:5.2.36, missing in 5.3.x/6.x - # still needs to be patched in 6.0.20 - "${FILESDIR}"/${PN}-6.1.19-sqlite-configure-path.patch - - # The upstream testsuite copies .lib and the binaries for each parallel test - # core, ~300MB each. This patch uses links instead, saves a lot of space. - "${FILESDIR}"/${PN}-6.0.20-test-link.patch -) - -src_prepare() { - cd "${WORKDIR}"/"${MY_P}" - for (( i=1 ; i<=${PATCHNO} ; i++ )) - do - eapply "${DISTDIR}"/patch."${MY_PV}"."${i}" - done - - default - - # Upstream release script grabs the dates when the script was run, so lets - # end-run them to keep the date the same. - export REAL_DB_RELEASE_DATE="$(awk \ - '/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \ - "${S_BASE}"/dist/configure)" - sed -r -i \ - -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \ - "${S_BASE}"/dist/RELEASE || die - - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r -i \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - "${S_BASE}"/dist/Makefile.in || die - - cd "${S_BASE}"/dist || die - rm -f aclocal/libtool.m4 - sed -i \ - -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ - configure.ac || die - sed -i \ - -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ - aclocal/programs.m4 || die - AT_M4DIR="aclocal aclocal_java" eautoreconf - # Upstream sucks - they do autoconf and THEN replace the version variables. - . ./RELEASE - for v in \ - DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \ - DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \ - DB_VERSION \ - DB_RELEASE_DATE ; do - local ev="__EDIT_${v}__" - sed -i -e "s/${ev}/${!v}/g" configure || die - done - - # This is a false positive skip in the tests as the test-reviewer code - # looks for 'Skipping\s' - sed -i \ - -e '/db_repsite/s,Skipping:,Skipping,g' \ - "${S_BASE}"/test/tcl/reputils.tcl || die -} - -multilib_src_configure() { - # sql_compat will cause a collision with sqlite3 - # --enable-sql_compat - # Don't --enable-sql* because we don't want to use bundled sqlite. - # See Gentoo bug #605688 - local myeconfargs=( - --enable-compat185 - --enable-dbm - --enable-o_direct - --without-uniquename - --disable-sql - --disable-sql_codegen - --disable-sql_compat - --disable-static - $([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) - $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) - $(use_enable cxx) - $(use_enable cxx stl) - $(multilib_native_use_enable java) - $(use_enable test) - ) - - tc-ld-force-bfd #470634 #729510 - - # compilation with -O0 fails on amd64, see bug #171231 - if [[ ${ABI} == amd64 ]]; then - local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} - replace-flags -O0 -O2 - is-flagq -O[s123] || append-flags -O2 - fi - - # Add linker versions to the symbols. Easier to do, and safer than header file - # mumbo jumbo. - if use kernel_linux || use kernel_SunOS; then - append-ldflags -Wl,--default-symver - fi - - # use `set` here since the java opts will contain whitespace - if multilib_is_native_abi && use java ; then - myeconfargs+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - - # Bug #270851: test needs TCL support - if use tcl || use test ; then - myeconfargs+=( - --enable-tcl - --with-tcl="${EPREFIX}/usr/$(get_libdir)" - ) - else - myeconfargs+=(--disable-tcl ) - fi - - ECONF_SOURCE="${S_BASE}"/dist \ - STRIP="true" \ - econf "${myeconfargs[@]}" -} - -multilib_src_install() { - emake install DESTDIR="${D}" - - db_src_install_headerslot - - db_src_install_usrlibcleanup - - if multilib_is_native_abi && use java; then - java-pkg_regso "${ED%/}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED%/}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED%/}"/usr/"$(get_libdir)"/*.jar - fi -} - -multilib_src_install_all() { - db_src_install_usrbinslot - - db_src_install_doc - - dodir /usr/sbin - # This file is not always built, and no longer exists as of db-4.8 - if [[ -f "${ED%/}"/usr/bin/berkeley_db_svc ]] ; then - mv "${ED%/}"/usr/bin/berkeley_db_svc \ - "${ED%/}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die - fi - - # no static libraries - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - multilib_foreach_abi db_fix_so -} - -pkg_postrm() { - multilib_foreach_abi db_fix_so -} - -src_test() { - # db_repsite is impossible to build, as upstream strips those sources. - # db_repsite is used directly in the setup_site_prog, - # setup_site_prog is called from open_site_prog - # which is called only from tests in the multi_repmgr group. - #sed -ri \ - # -e '/set subs/s,multi_repmgr,,g' \ - # "${S_BASE}/test/testparams.tcl" - sed -ri \ - -e '/multi_repmgr/d' \ - "${S_BASE}/test/tcl/test.tcl" || die - - # This is the only failure in 5.2.28 so far, and looks like a false positive. - # Repmgr018 (btree): Test of repmgr stats. - # Repmgr018.a: Start a master. - # Repmgr018.b: Start a client. - # Repmgr018.c: Run some transactions at master. - # Rep_test: btree 20 key/data pairs starting at 0 - # Rep_test.a: put/get loop - # FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1 - sed -ri \ - -e '/set parms.*repmgr018/d' \ - -e 's/repmgr018//g' \ - "${S_BASE}/test/tcl/test.tcl" || die - - multilib-minimal_src_test -} - -multilib_src_test() { - multilib_is_native_abi || return - - S=${BUILD_DIR} db_src_test -} diff --git a/sys-libs/db/files/db-1.85-gentoo-paths.patch b/sys-libs/db/files/db-1.85-gentoo-paths.patch deleted file mode 100644 index 8154300f67bc..000000000000 --- a/sys-libs/db/files/db-1.85-gentoo-paths.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/PORT/linux/Makefile -+++ b/PORT/linux/Makefile -@@ -1,12 +1,12 @@ - # @(#)Makefile 8.9 (Berkeley) 7/14/94 - --LIBDB= libdb.a --LIBDBSO=libdb.so -+LIBDB= libdb1.a -+LIBDBSO=libdb1.so - SOVER=2 - SONAME=$(LIBDBSO).$(SOVER) - LIBNDBM=libndbm.a - LIBNDBMSO=libndbm.so --PROG= db_dump185 -+PROG= db1_dump185 - OBJ1= hash.o hash_bigkey.o hash_buf.o hash_func.o hash_log2.o hash_page.o \ - ndbm.o - OBJ2= bt_close.o bt_conv.o bt_debug.o bt_delete.o bt_get.o bt_open.o \ -@@ -27,8 +27,8 @@ - DESTDIR = - prefix = /usr - bindir = $(prefix)/bin --libdir = $(prefix)/lib --includedir = $(prefix)/include -+libdir = $(prefix)/@GENTOO_LIBDIR@ -+includedir = $(prefix)/include/db1 - - all: $(LIBDB) $(LIBDBSO) $(PROG) - diff --git a/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch b/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch deleted file mode 100644 index 40570cafe210..000000000000 --- a/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- db-18.1.25/dist/aclocal/sql.m4 -+++ db-18.1.25/dist/aclocal/sql.m4 -@@ -99,7 +99,7 @@ - if test "$db_cv_debug" = "yes"; then - CPPFLAGS="$CPPFLAGS -g" - fi --(cd sql && eval "\$SHELL ../$sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline --enable-editline=$with_editline" && cat build_config.h >> config.h) || exit 1 -+(cd sql && eval "\$SHELL $sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline --enable-editline=$with_editline" && cat build_config.h >> config.h) || exit 1 - - # Configure JDBC if --enable-jdbc - if test "$db_cv_jdbc" != "no"; then diff --git a/sys-libs/db/files/db-18.1.25-test-link.patch b/sys-libs/db/files/db-18.1.25-test-link.patch deleted file mode 100644 index dc3d8ae93c5a..000000000000 --- a/sys-libs/db/files/db-18.1.25-test-link.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- db-18.1.25/test/tcl/parallel.tcl -+++ db-18.1.25/test/tcl/parallel.tcl -@@ -296,17 +296,26 @@ - [eval glob -nocomplain {$dir/$buildpath/db_{reptest,repsite,replicate}$EXE}] \ - $destdir/$buildpath} - } -+ catch { -+ set l [eval glob {$dir/.libs} {$dir/db_{checkpoint,deadlock}$EXE} \ -+ {$dir/db_{dump,load,printlog,recover,stat,upgrade}$EXE} \ -+ {$dir/db_{archive,verify,hotbackup,log_verify}$EXE}] -+ foreach fn $l { -+ set fbasename [file tail $fn] -+ eval file link {$destdir/$fbasename} $fn -+ } -+ } -+ # we will be modifying this file, so we must copy, not link - catch {eval file copy \ -- [eval glob {$dir/{.libs,include.tcl}}] $destdir} -+ [eval glob {$dir/include.tcl}] $destdir} - # catch {eval file copy $dir/$queuedir $destdir} -- catch {eval file copy \ -- [eval glob {$dir/db_{checkpoint,deadlock}$EXE} \ -- {$dir/db_{dump,load,printlog,recover}$EXE} \ -- {$dir/db_{stat,upgrade,archive,verify}$EXE} \ -- {$dir/db_{hotbackup,log_verify,tuner}$EXE}] \ -- $destdir} -- catch {eval file copy \ -- [eval glob -nocomplain {$dir/db_{reptest,repsite,replicate}$EXE}] $destdir} -+ catch { -+ set l [eval glob -nocomplain {$dir/db_{reptest,repsite,replicate}$EXE}] -+ foreach fn $l { -+ set fbasename [file tail $fn] -+ eval file link {$destdir/$fbasename} $fn -+ } -+ } - - # Create modified copies of include.tcl in parallel - # directories so paths still work. diff --git a/sys-libs/db/files/db-18.1.40-fix-docs.patch b/sys-libs/db/files/db-18.1.40-fix-docs.patch deleted file mode 100644 index 7bed9f1cbca0..000000000000 --- a/sys-libs/db/files/db-18.1.40-fix-docs.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fixes - - cp: cannot stat 'bdb-sql': No such file or directory - cp: cannot stat 'gsg_db_server': No such file or directory - ---- a/dist/Makefile.in -+++ b/dist/Makefile.in -@@ -1299,8 +1299,8 @@ uninstall_utilities: - - # We install csharp docs even on UNIX so we don't have a - # broken link on the landing page. --DOCLIST=api_reference articles bdb-sql collections csharp gsg \ -- gsg_db_rep gsg_db_server gsg_txn index.html installation \ -+DOCLIST=api_reference articles collections csharp gsg \ -+ gsg_db_rep gsg_txn index.html installation \ - java license porting programmer_reference upgrading - - install_docs: - diff --git a/sys-libs/db/files/db-3.2.9-fix-dep-link.patch b/sys-libs/db/files/db-3.2.9-fix-dep-link.patch deleted file mode 100644 index cdf6599b0d55..000000000000 --- a/sys-libs/db/files/db-3.2.9-fix-dep-link.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- db-3.2.9/dist/Makefile.in.orig 2003-02-23 23:41:13.000000000 +0200 -+++ db-3.2.9/dist/Makefile.in 2003-02-23 23:42:07.000000000 +0200 -@@ -240,19 +240,19 @@ - - $(libso_target): $(OBJS) - $(SOLINK) $(SOFLAGS) -o $(libso_target) \ -- $(OBJS) $(LDFLAGS) $(LIBSO_LIBS) -+ $(OBJS) $(LDFLAGS) $(LIBS) $(LIBSO_LIBS) - - $(libxso_target): $(COBJS) $(OBJS) - $(SOLINK) $(SOFLAGS) -o $(libxso_target) \ -- $(COBJS) $(OBJS) $(LDFLAGS) $(LIBXSO_LIBS) -+ $(COBJS) $(OBJS) $(LDFLAGS) $(LIBS) $(LIBXSO_LIBS) - - $(libjso_target): $(JOBJS) $(OBJS) - $(SOLINK) $(SOFLAGS) -o $(libjso_target) \ -- $(JOBJS) $(OBJS) $(LDFLAGS) $(LIBJSO_LIBS) -+ $(JOBJS) $(OBJS) $(LDFLAGS) $(LIBS) $(LIBJSO_LIBS) - - $(libtso_target): $(TOBJS) $(OBJS) - $(SOLINK) $(SOFLAGS) -o $(libtso_target) \ -- $(TOBJS) $(OBJS) $(LDFLAGS) $(LIBTSO_LIBS) -+ $(TOBJS) $(OBJS) $(LDFLAGS) $(LIBS) $(LIBTSO_LIBS) - - ################################################## - # Creating individual dependencies and actions for building class diff --git a/sys-libs/db/files/db-3.2.9-gcc43.patch b/sys-libs/db/files/db-3.2.9-gcc43.patch deleted file mode 100644 index 17bdddf3d8df..000000000000 --- a/sys-libs/db/files/db-3.2.9-gcc43.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nuar db-3.2.9.orig/include/db_cxx.h db-3.2.9/include/db_cxx.h ---- db-3.2.9.orig/include/db_cxx.h 2001-01-11 10:28:55.000000000 -0800 -+++ db-3.2.9/include/db_cxx.h 2008-08-16 16:10:48.474699646 -0700 -@@ -49,7 +49,12 @@ - // Forward declarations - // - -+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) -+using namespace std; -+#include <iostream> -+#else - #include <iostream.h> -+#endif - #include <stdarg.h> - #include "db.h" - diff --git a/sys-libs/db/files/db-4.0.14-fix-dep-link.patch b/sys-libs/db/files/db-4.0.14-fix-dep-link.patch deleted file mode 100644 index f54f064640e6..000000000000 --- a/sys-libs/db/files/db-4.0.14-fix-dep-link.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- db-4.0.14/dist/Makefile.in.orig 2003-08-16 06:21:53.763400112 +0200 -+++ db-4.0.14/dist/Makefile.in 2003-08-16 06:23:16.036892640 +0200 -@@ -58,7 +58,7 @@ - - LDFLAGS= @LDFLAGS@ - LIBS= @LIBS@ --LIBSO_LIBS= @LIBSO_LIBS@ -+LIBSO_LIBS= @LIBSO_LIBS@ $(LIBS) - - libdb= libdb.a - libso_base= libdb -@@ -77,7 +77,7 @@ - CXX= @MAKEFILE_CXX@ - CXXLINK= @MAKEFILE_CXXLINK@ - XSOLINK= @MAKEFILE_XSOLINK@ --LIBXSO_LIBS= @LIBXSO_LIBS@ -+LIBXSO_LIBS= @LIBXSO_LIBS@ $(LIBS) - - libcxx= libdb_cxx.a - libxso_base= libdb_cxx -@@ -93,7 +93,7 @@ - # Java support is optional and requires shared librarires. - ################################################## - CLASSPATH= $(JAVA_CLASSTOP) --LIBJSO_LIBS= @LIBJSO_LIBS@ -+LIBJSO_LIBS= @LIBJSO_LIBS@ $(LIBS) - - JAR= @JAR@ - JAVAC= env CLASSPATH="$(CLASSPATH)" @JAVAC@ -@@ -121,7 +121,7 @@ - # Tcl support is optional and requires shared libraries. - ################################################## - TCFLAGS= @TCFLAGS@ --LIBTSO_LIBS= @LIBTSO_LIBS@ -+LIBTSO_LIBS= @LIBTSO_LIBS@ $(LIBS) - libtso_base= libdb_tcl - libtso= $(libtso_base)-$(SOVERSION).@SOSUFFIX@ - libtso_static= $(libtso_base)-$(SOVERSION).a diff --git a/sys-libs/db/files/db-4.2-jni-check-prefix-first.patch b/sys-libs/db/files/db-4.2-jni-check-prefix-first.patch deleted file mode 100644 index 0777c706d0bf..000000000000 --- a/sys-libs/db/files/db-4.2-jni-check-prefix-first.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/dist/aclocal_java/ac_jni_include_dirs.ac -+++ b/dist/aclocal_java/ac_jni_include_dirs.ac -@@ -43,14 +43,19 @@ - *) AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);; - esac - --_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") --_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` --case "$host_os" in -- darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -- _JINC="$_JTOPDIR/Headers";; -- *) _JINC="$_JTOPDIR/include";; --esac -- -+# If JAVAPREFIX is defined, look there first -+if test -r "$JAVAPREFIX/include/jni.h"; then -+ _JTOPDIR="$JAVAPREFIX" -+ _JINC="$JAVAPREFIX/include" -+else -+ _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") -+ _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` -+ case "$host_os" in -+ darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -+ _JINC="$_JTOPDIR/Headers";; -+ *) _JINC="$_JTOPDIR/include";; -+ esac -+fi - # If we find jni.h in /usr/include, then it's not a java-only tree, so - # don't add /usr/include or subdirectories to the list of includes. - # An extra -I/usr/include can foul things up with newer gcc's. diff --git a/sys-libs/db/files/db-4.2-libtool.patch b/sys-libs/db/files/db-4.2-libtool.patch deleted file mode 100644 index a4a9db7f4557..000000000000 --- a/sys-libs/db/files/db-4.2-libtool.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ./dist/configure.orig 2004-09-22 22:58:48.421632944 -0700 -+++ ./dist/configure 2004-09-22 23:02:55.068136976 -0700 -@@ -5657,7 +5657,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. --case `"$LD" -v 2>&1 </dev/null` in -+case `$LD -v 2>&1 </dev/null` in - *GNU* | *'with BFD'*) - lt_cv_prog_gnu_ld=yes - ;; -@@ -11135,7 +11135,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. --case `"$LD" -v 2>&1 </dev/null` in -+case `$LD -v 2>&1 </dev/null` in - *GNU* | *'with BFD'*) - lt_cv_prog_gnu_ld=yes - ;; diff --git a/sys-libs/db/files/db-4.2-listen-to-java-options.patch b/sys-libs/db/files/db-4.2-listen-to-java-options.patch deleted file mode 100644 index f1f701de1261..000000000000 --- a/sys-libs/db/files/db-4.2-listen-to-java-options.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/dist/configure.ac -+++ b/dist/configure.ac -@@ -385,6 +385,7 @@ - # A classpath that includes . is needed to check for Java - CLASSPATH=".:$CLASSPATH" - export CLASSPATH -+ AC_JAVA_OPTIONS - AC_PROG_JAVAC - AC_PROG_JAR - AC_PROG_JAVA diff --git a/sys-libs/db/files/db-4.2.52_p2-TXN.patch b/sys-libs/db/files/db-4.2.52_p2-TXN.patch deleted file mode 100644 index a9ca9ef132f3..000000000000 --- a/sys-libs/db/files/db-4.2.52_p2-TXN.patch +++ /dev/null @@ -1,68 +0,0 @@ -This patch is intended to be applied to Berkeley DB 4.2.52 and, -if applied, will automatically be used by slapd(8) back-bdb/hdb. -Without this patch the BDB DB_LOG_AUTOREMOVE option will not work, -nor will db_archive allow any transaction log files to be removed -while slapd is running. - -The patch can be applied to the BDB source using patch(1) as follows - cd db-4.2.52 - patch -p0 < openldap-src/build/BerkeleyDB42.patch - -(modify directory paths as necessary), then recompile and reinstall -the BerkeleyDB 4.2 library, and then build and install OpenLDAP -Software. - -The patch should not be applied to Berkeley DB 4.3. - - -Index: dbinc/db.in -=================================================================== -RCS file: /var/CVSROOT/bdb42/dbinc/db.in,v -retrieving revision 1.1.1.1 -retrieving revision 1.2 -diff -u -r1.1.1.1 -r1.2 ---- a/dbinc/db.in 25 Nov 2003 21:58:02 -0000 1.1.1.1 -+++ b/dbinc/db.in 17 Jul 2004 16:07:23 -0000 1.2 -@@ -839,6 +839,7 @@ - #define TXN_NOWAIT 0x040 /* Do not wait on locks. */ - #define TXN_RESTORED 0x080 /* Transaction has been restored. */ - #define TXN_SYNC 0x100 /* Sync on prepare and commit. */ -+#define TXN_NOLOG 0x200 /* Do not log this transaction. */ - u_int32_t flags; - }; - -Index: txn/txn.c -=================================================================== -RCS file: /var/CVSROOT/bdb42/txn/txn.c,v -retrieving revision 1.1.1.2 -retrieving revision 1.2 -diff -u -r1.1.1.2 -r1.2 ---- a/txn/txn.c 17 Dec 2003 21:43:53 -0000 1.1.1.2 -+++ b/txn/txn.c 17 Jul 2004 16:07:27 -0000 1.2 -@@ -127,7 +127,7 @@ - if ((ret = __db_fchk(dbenv, - "txn_begin", flags, - DB_DIRTY_READ | DB_TXN_NOWAIT | -- DB_TXN_NOSYNC | DB_TXN_SYNC)) != 0) -+ DB_TXN_NOSYNC | DB_TXN_SYNC | DB_TXN_NOT_DURABLE)) != 0) - return (ret); - if ((ret = __db_fcchk(dbenv, - "txn_begin", flags, DB_TXN_NOSYNC, DB_TXN_SYNC)) != 0) -@@ -193,6 +193,8 @@ - F_SET(txn, TXN_SYNC); - if (LF_ISSET(DB_TXN_NOWAIT)) - F_SET(txn, TXN_NOWAIT); -+ if (LF_ISSET(DB_TXN_NOT_DURABLE)) -+ F_SET(txn, TXN_NOLOG); - - if ((ret = __txn_begin_int(txn, 0)) != 0) - goto err; -@@ -328,7 +330,7 @@ - * We should set this value when we write the first log record, not - * here. - */ -- if (DBENV_LOGGING(dbenv)) -+ if (DBENV_LOGGING(dbenv) && !F_ISSET(txn, TXN_NOLOG)) - __log_txn_lsn(dbenv, &begin_lsn, NULL, NULL); - else - ZERO_LSN(begin_lsn); diff --git a/sys-libs/db/files/db-4.3-libtool.patch b/sys-libs/db/files/db-4.3-libtool.patch deleted file mode 100644 index c594f73c748f..000000000000 --- a/sys-libs/db/files/db-4.3-libtool.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/dist/configure -+++ b/dist/configure -@@ -5684,7 +5684,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. --case `$LD -v 2>&1 </dev/null` in -+case `"$LD" -v 2>&1 </dev/null` in - *GNU* | *'with BFD'*) - lt_cv_prog_gnu_ld=yes - ;; -@@ -8461,7 +8461,7 @@ - tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_cmds="$tmp_archive_cmds" - supports_anon_versioning=no -- case `$LD -v 2>/dev/null` in -+ case `"$LD" -v 2>/dev/null` in - *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -@@ -11383,7 +11383,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. --case `$LD -v 2>&1 </dev/null` in -+case `"$LD" -v 2>&1 </dev/null` in - *GNU* | *'with BFD'*) - lt_cv_prog_gnu_ld=yes - ;; -@@ -15353,7 +15353,7 @@ - tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_cmds_F77="$tmp_archive_cmds" - supports_anon_versioning=no -- case `$LD -v 2>/dev/null` in -+ case `"$LD" -v 2>/dev/null` in - *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -@@ -17695,7 +17695,7 @@ - tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_cmds_GCJ="$tmp_archive_cmds" - supports_anon_versioning=no -- case `$LD -v 2>/dev/null` in -+ case `"$LD" -v 2>/dev/null` in - *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... diff --git a/sys-libs/db/files/db-4.3.27-fix-dep-link.patch b/sys-libs/db/files/db-4.3.27-fix-dep-link.patch deleted file mode 100644 index 1d14e83d078c..000000000000 --- a/sys-libs/db/files/db-4.3.27-fix-dep-link.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- db-4.3.27/dist/Makefile.in.chris 2005-02-01 23:40:34.447945464 +0100 -+++ db-4.3.27/dist/Makefile.in 2005-02-01 23:42:21.635650456 +0100 -@@ -58,7 +58,7 @@ - LDFLAGS= @LDFLAGS@ - LIBS= @LIBS@ - TEST_LIBS= @TEST_LIBS@ --LIBSO_LIBS= @LIBSO_LIBS@ -+LIBSO_LIBS= @LIBSO_LIBS@ $(LIBS) - - libdb_base= libdb - libdb= $(libdb_base).a -@@ -77,7 +77,7 @@ - CXX= @MAKEFILE_CXX@ - CXXLINK= @MAKEFILE_CXXLINK@ @CXXFLAGS@ - XSOLINK= @MAKEFILE_XSOLINK@ @CXXFLAGS@ --LIBXSO_LIBS= @LIBXSO_LIBS@ -+LIBXSO_LIBS= @LIBXSO_LIBS@ $(LIBS) - - libcxx_base= libdb_cxx - libcxx= $(libcxx_base).a -@@ -93,7 +93,7 @@ - # Java support is optional and requires shared librarires. - ################################################## - CLASSPATH= $(JAVA_CLASSTOP) --LIBJSO_LIBS= @LIBJSO_LIBS@ -+LIBJSO_LIBS= @LIBJSO_LIBS@ $(LIBS) - - JAR= @JAR@ - JAVAC= env CLASSPATH="$(CLASSPATH)" @JAVAC@ -@@ -126,7 +126,7 @@ - # Tcl support is optional and requires shared libraries. - ################################################## - TCFLAGS= @TCFLAGS@ --LIBTSO_LIBS= @LIBTSO_LIBS@ -+LIBTSO_LIBS= @LIBTSO_LIBS@ $(LIBS) - libtso_base= libdb_tcl - libtso= $(libtso_base)-$(LIBVERSION)@MODSUFFIX@ - libtso_static= $(libtso_base)-$(LIBVERSION).a diff --git a/sys-libs/db/files/db-4.4-libtool.patch b/sys-libs/db/files/db-4.4-libtool.patch deleted file mode 100644 index b4d2fc8d73cf..000000000000 --- a/sys-libs/db/files/db-4.4-libtool.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/dist/configure -+++ b/dist/configure -@@ -5765,7 +5765,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # I'd rather use --version here, but apparently some GNU lds only accept -v. --case `$LD -v 2>&1 </dev/null` in -+case `"$LD" -v 2>&1 </dev/null` in - *GNU* | *'with BFD'*) - lt_cv_prog_gnu_ld=yes - ;; -@@ -8753,7 +8753,7 @@ - whole_archive_flag_spec= - fi - supports_anon_versioning=no -- case `$LD -v 2>/dev/null` in -+ case `"$LD" -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -@@ -11855,7 +11855,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # I'd rather use --version here, but apparently some GNU lds only accept -v. --case `$LD -v 2>&1 </dev/null` in -+case `"$LD" -v 2>&1 </dev/null` in - *GNU* | *'with BFD'*) - lt_cv_prog_gnu_ld=yes - ;; -@@ -15842,7 +15842,7 @@ - whole_archive_flag_spec_F77= - fi - supports_anon_versioning=no -- case `$LD -v 2>/dev/null` in -+ case `"$LD" -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -@@ -18300,7 +18300,7 @@ - whole_archive_flag_spec_GCJ= - fi - supports_anon_versioning=no -- case `$LD -v 2>/dev/null` in -+ case `"$LD" -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... diff --git a/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch b/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch deleted file mode 100644 index a0b2800d1286..000000000000 --- a/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/dist/aclocal_java/ac_jni_include_dirs.m4 -+++ b/dist/aclocal_java/ac_jni_include_dirs.m4 -@@ -43,14 +43,19 @@ - *) AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);; - esac - --_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") --_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` --case "$host_os" in -- darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -- _JINC="$_JTOPDIR/Headers";; -- *) _JINC="$_JTOPDIR/include";; --esac -- -+# If JAVAPREFIX is defined, look there first -+if test -r "$JAVAPREFIX/include/jni.h"; then -+ _JTOPDIR="$JAVAPREFIX" -+ _JINC="$JAVAPREFIX/include" -+else -+ _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") -+ _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` -+ case "$host_os" in -+ darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -+ _JINC="$_JTOPDIR/Headers";; -+ *) _JINC="$_JTOPDIR/include";; -+ esac -+fi - # If we find jni.h in /usr/include, then it's not a java-only tree, so - # don't add /usr/include or subdirectories to the list of includes. - # An extra -I/usr/include can foul things up with newer gcc's. diff --git a/sys-libs/db/files/db-4.8-wformat-security.patch b/sys-libs/db/files/db-4.8-wformat-security.patch new file mode 100644 index 000000000000..4db5bada0d9f --- /dev/null +++ b/sys-libs/db/files/db-4.8-wformat-security.patch @@ -0,0 +1,43 @@ +https://bugs.gentoo.org/632628 +--- a/repmgr/repmgr_net.c ++++ b/repmgr/repmgr_net.c +@@ -1331,7 +1331,7 @@ __repmgr_listen(env) + } + + ret = net_errno; +- __db_err(env, ret, why); ++ __db_err(env, ret, "%s", why); + clean: if (s != INVALID_SOCKET) + (void)closesocket(s); + return (ret); +--- a/crypto/aes_method.c ++++ b/crypto/aes_method.c +@@ -267,6 +267,6 @@ __aes_err(env, err) + errstr = "AES error unrecognized"; + break; + } +- __db_errx(env, errstr); ++ __db_errx(env, "%s", errstr); + return; + } +--- a/txn/txn.c ++++ b/txn/txn.c +@@ -168,7 +168,7 @@ __txn_begin(env, ip, parent, txnpp, flag + + *txnpp = NULL; + if ((ret = __os_calloc(env, 1, sizeof(DB_TXN), &txn)) != 0) { +- __db_errx(env, TxnAlloc); ++ __db_errx(env, "%s", TxnAlloc); + return (ret); + } + +@@ -315,7 +315,7 @@ __txn_compensate_begin(env, txnpp) + int ret; + + if ((ret = __os_calloc(env, 1, sizeof(DB_TXN), &txn)) != 0) { +- __db_errx(env, TxnAlloc); ++ __db_errx(env, "%s", TxnAlloc); + return (ret); + } + + diff --git a/sys-libs/db/files/db-4.8.24-java-manifest-location.patch b/sys-libs/db/files/db-4.8.24-java-manifest-location.patch deleted file mode 100644 index 9cebadc52064..000000000000 --- a/sys-libs/db/files/db-4.8.24-java-manifest-location.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar db-4.8.24.orig/dist/Makefile.in db-4.8.24/dist/Makefile.in ---- db-4.8.24.orig/dist/Makefile.in 2009-09-19 23:39:45.286001896 +0000 -+++ db-4.8.24/dist/Makefile.in 2009-09-19 23:41:13.079326882 +0000 -@@ -830,7 +830,7 @@ - $(JAVA) -classpath $(JAVA_CLASSTOP) \ - com.sleepycat.persist.model.ClassEnhancer $(JAVA_CLASSTOP) - cd $(JAVA_CLASSTOP) && \ -- $(JAR) cfm ../$(libj_jarfile) ../$(JAVA_MANIFEST) ./com/sleepycat -+ $(JAR) cfm ../$(libj_jarfile) $(JAVA_MANIFEST) ./com/sleepycat - - $(libj_exjarfile): $(libj_jarfile) $(JAVA_EXSRCS) - @test -d $(JAVA_EXCLASSTOP) || \ diff --git a/sys-libs/db/files/db-4.8.30-clang16.patch b/sys-libs/db/files/db-4.8.30-clang16.patch new file mode 100644 index 000000000000..b28eb145e4a8 --- /dev/null +++ b/sys-libs/db/files/db-4.8.30-clang16.patch @@ -0,0 +1,281 @@ +https://bugs.gentoo.org/883413 +--- a/dist/aclocal/clock.m4 ++++ b/dist/aclocal/clock.m4 +@@ -20,12 +20,14 @@ esac + # existence to mean the clock really exists. + AC_CACHE_CHECK([for clock_gettime monotonic clock], db_cv_clock_monotonic, [ + AC_TRY_RUN([ ++#include <time.h> + #include <sys/time.h> +-main() { ++int main(void) { + struct timespec t; + return (clock_gettime(CLOCK_MONOTONIC, &t) != 0); + }], db_cv_clock_monotonic=yes, db_cv_clock_monotonic=no, + AC_TRY_LINK([ ++#include <time.h> + #include <sys/time.h>], [ + struct timespec t; + clock_gettime(CLOCK_MONOTONIC, &t); +--- a/dist/aclocal/mutex.m4 ++++ b/dist/aclocal/mutex.m4 +@@ -3,8 +3,9 @@ + # POSIX pthreads tests: inter-process safe and intra-process only. + AC_DEFUN(AM_PTHREADS_SHARED, [ + AC_TRY_RUN([ ++#include <stdlib.h> + #include <pthread.h> +-main() { ++int main(void) { + pthread_cond_t cond; + pthread_mutex_t mutex; + pthread_condattr_t condattr; +@@ -24,6 +25,7 @@ main() { + pthread_mutexattr_destroy(&mutexattr)); + }], [db_cv_mutex="$1"],, + AC_TRY_LINK([ ++#include <stdlib.h> + #include <pthread.h>],[ + pthread_cond_t cond; + pthread_mutex_t mutex; +@@ -45,8 +47,9 @@ AC_TRY_LINK([ + ], [db_cv_mutex="$1"]))]) + AC_DEFUN(AM_PTHREADS_PRIVATE, [ + AC_TRY_RUN([ ++#include <stdlib.h> + #include <pthread.h> +-main() { ++int main(void) { + pthread_cond_t cond; + pthread_mutex_t mutex; + pthread_condattr_t condattr; +@@ -64,6 +67,7 @@ main() { + pthread_mutexattr_destroy(&mutexattr)); + }], [db_cv_mutex="$1"],, + AC_TRY_LINK([ ++#include <stdlib.h> + #include <pthread.h>],[ + pthread_cond_t cond; + pthread_mutex_t mutex; +@@ -158,6 +162,7 @@ if test "$db_cv_mutex" = no; then + # LWP threads: _lwp_XXX + if test "$db_cv_mutex" = no; then + AC_TRY_LINK([ ++ #include <stdlib.h> + #include <synch.h>],[ + static lwp_mutex_t mi = SHAREDMUTEX; + static lwp_cond_t ci = SHAREDCV; +@@ -174,6 +179,7 @@ if test "$db_cv_mutex" = no; then + LIBS="$LIBS -lthread" + AC_TRY_LINK([ + #include <thread.h> ++ #include <stdlib.h> + #include <synch.h>],[ + mutex_t mutex; + cond_t cond; +@@ -189,6 +195,7 @@ if test "$db_cv_mutex" = no; then + if test "$db_cv_mutex" = no -o "$db_cv_mutex" = ui_only; then + AC_TRY_LINK([ + #include <thread.h> ++ #include <stdlib.h> + #include <synch.h>],[ + mutex_t mutex; + cond_t cond; +@@ -213,7 +220,7 @@ if test "$db_cv_mutex" = no; then + # x86/gcc: FreeBSD, NetBSD, BSD/OS, Linux + AC_TRY_COMPILE(,[ + #if (defined(i386) || defined(__i386__)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -222,7 +229,7 @@ if test "$db_cv_mutex" = no; then + # x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux + AC_TRY_COMPILE(,[ + #if (defined(x86_64) || defined(__x86_64__)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -245,7 +252,7 @@ if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__sparc__) && defined(__GNUC__) + asm volatile ("membar #StoreStore|#StoreLoad|#LoadStore"); +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -287,7 +294,7 @@ AC_TRY_LINK([ + msem_init(&x, 0); + msem_lock(&x, 0); + msem_unlock(&x, 0); +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -304,7 +311,7 @@ AC_TRY_LINK([ + msem_init(&x, 0); + msem_lock(&x, 0); + msem_unlock(&x, 0); +- exit(0); ++ return 0; + ], [db_cv_mutex=UNIX/msem_init]) + fi + +@@ -326,7 +333,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__USLC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -383,7 +390,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__alpha) && defined(__DECC) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -394,7 +401,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__alpha) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -405,7 +412,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__arm__) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -416,7 +423,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if (defined(__mips) || defined(__mips__)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -427,7 +434,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if (defined(__hppa) || defined(__hppa__)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -438,7 +445,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if (defined(__powerpc__) || defined(__ppc__)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -449,7 +456,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if (defined(mc68020) || defined(sun3)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -460,7 +467,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__MVS__) && defined(__IBMC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -471,7 +478,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__s390__) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -482,7 +489,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__ia64) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -493,7 +500,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(_UTS) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -814,9 +821,9 @@ fi + if test "$db_cv_atomic" = no; then + AC_TRY_COMPILE(,[ + #if ((defined(i386) || defined(__i386__)) && defined(__GNUC__)) +- exit(0); ++ return 0; + #elif ((defined(x86_64) || defined(__x86_64__)) && defined(__GNUC__)) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -825,6 +832,7 @@ fi + + if test "$db_cv_atomic" = no; then + AC_TRY_LINK([ ++#include <stdlib.h> + #include <sys/atomic.h>],[ + volatile unsigned val = 1; + exit (atomic_inc_uint_nv(&val) != 2 || +--- a/dist/aclocal/sequence.m4 ++++ b/dist/aclocal/sequence.m4 +@@ -43,7 +43,9 @@ AC_DEFUN(AM_SEQUENCE_CONFIGURE, [ + # test, which won't test for the appropriate printf format strings. + if test "$db_cv_build_sequence" = "yes"; then + AC_TRY_RUN([ +- main() { ++ #include <stdio.h> ++ #include <string.h> ++ int main(void) { + $db_cv_seq_type l; + unsigned $db_cv_seq_type u; + char buf@<:@100@:>@; +@@ -59,7 +61,10 @@ AC_DEFUN(AM_SEQUENCE_CONFIGURE, [ + return (1); + return (0); + }],, [db_cv_build_sequence="no"], +- AC_TRY_LINK(,[ ++ AC_TRY_LINK([ ++ #include <stdio.h> ++ #include <string.h> ++ ],[ + $db_cv_seq_type l; + unsigned $db_cv_seq_type u; + char buf@<:@100@:>@; diff --git a/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch b/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch index c53160a82970..99a26e15fbfb 100644 --- a/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch +++ b/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch @@ -1,5 +1,3 @@ -diff --git a/dbinc/atomic.h b/dbinc/atomic.h -index 0034dcc..fa7ba93 100644 --- a/dbinc/atomic.h +++ b/dbinc/atomic.h @@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; diff --git a/sys-libs/db/files/db-4.8.30-tls-configure.patch b/sys-libs/db/files/db-4.8.30-tls-configure.patch new file mode 100644 index 000000000000..e6aaa3259e19 --- /dev/null +++ b/sys-libs/db/files/db-4.8.30-tls-configure.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/898074 +https://bugs.gentoo.org/918936 + +-ignoreme: warning: incompatible pointer to integer conversion passing 'pthread_key_t *' (aka 'unsigned int *') to parameter of type 'pthread_key_t' (aka 'unsigned int'); remove & [-Wint-conversion] ++ignoreme: error: incompatible pointer to integer conversion passing 'pthread_key_t *' (aka 'unsigned int *') to parameter of type 'pthread_key_t' (aka 'unsigned int'); remove & [-Wint-conversion] + 34 | return (void *)pthread_getspecific(&key); + | ^~~~ + /usr/include/pthread.h:1305:49: note: passing argument to parameter '__key' here + 1305 | extern void *pthread_getspecific (pthread_key_t __key) __THROW; + | ^ +-ignoreme: warning: incompatible pointer to integer conversion passing 'pthread_key_t *' (aka 'unsigned int *') to parameter of type 'pthread_key_t' (aka 'unsigned int'); remove & [-Wint-conversion] ++ignoreme: error: incompatible pointer to integer conversion passing 'pthread_key_t *' (aka 'unsigned int *') to parameter of type 'pthread_key_t' (aka 'unsigned int'); remove & [-Wint-conversion] + 37 | pthread_setspecific(&key, p); + | ^~~~ + /usr/include/pthread.h:1308:47: note: passing argument to parameter '__key' here + 1308 | extern int pthread_setspecific (pthread_key_t __key, +--- a/dist/aclocal/tls.m4 ++++ b/dist/aclocal/tls.m4 +@@ -42,10 +42,10 @@ AC_DEFUN([AX_TLS], [ + pthread_key_create(&key, NULL); + } + static void *get_tls() { +- return (void *)pthread_getspecific(&key); ++ return (void *)pthread_getspecific(key); + } + static void set_tls(void *p) { +- pthread_setspecific(&key, p); ++ pthread_setspecific(key, p); + }], [], + [ac_cv_tls=pthread]) + fi diff --git a/sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch b/sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch index ad3da2786c88..252a6213b30f 100644 --- a/sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch +++ b/sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch @@ -1,5 +1,3 @@ -diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h -index 0034dcc..fa7ba93 100644 --- a/src/dbinc/atomic.h +++ b/src/dbinc/atomic.h @@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; diff --git a/sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch b/sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch index ff7abbe1fd79..cfbe2a7ffd01 100644 --- a/sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch +++ b/sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch @@ -1,6 +1,5 @@ -diff -Nuar db-5.2.28.orig//dist/aclocal/sql.m4 db-5.2.28//dist/aclocal/sql.m4 ---- db-5.2.28.orig//dist/aclocal/sql.m4 2011-06-10 09:50:45.000000000 -0700 -+++ db-5.2.28//dist/aclocal/sql.m4 2011-07-15 17:02:54.646521189 -0700 +--- a/dist/aclocal/sql.m4 ++++ b/dist/aclocal/sql.m4 @@ -91,7 +91,7 @@ # !!! END COPIED from autoconf distribution diff --git a/sys-libs/db/files/db-5.3.28-clang16.patch b/sys-libs/db/files/db-5.3.28-clang16.patch new file mode 100644 index 000000000000..aab73d87a06b --- /dev/null +++ b/sys-libs/db/files/db-5.3.28-clang16.patch @@ -0,0 +1,325 @@ +https://bugs.gentoo.org/883413 +--- a/dist/aclocal/clock.m4 ++++ b/dist/aclocal/clock.m4 +@@ -20,12 +20,14 @@ esac + # existence to mean the clock really exists. + AC_CACHE_CHECK([for clock_gettime monotonic clock], db_cv_clock_monotonic, [ + AC_TRY_RUN([ ++#include <time.h> + #include <sys/time.h> +-main() { ++int main(void) { + struct timespec t; + return (clock_gettime(CLOCK_MONOTONIC, &t) != 0); + }], db_cv_clock_monotonic=yes, db_cv_clock_monotonic=no, + AC_TRY_LINK([ ++#include <time.h> + #include <sys/time.h>], [ + struct timespec t; + clock_gettime(CLOCK_MONOTONIC, &t); +--- a/dist/aclocal/mmap.m4 ++++ b/dist/aclocal/mmap.m4 +@@ -29,6 +29,7 @@ if test "$mmap_ok" = "yes" ; then + * system to system. + */ + #include <stdio.h> ++ #include <stdlib.h> + #include <string.h> + #include <sys/types.h> + #include <sys/stat.h> +@@ -42,13 +43,12 @@ if test "$mmap_ok" = "yes" ; then + #define MAP_FAILED (-1) + #endif + +- int catch_sig(sig) +- int sig; ++ void catch_sig(int sig) + { + exit(1); + } + +- main() { ++ int main(void) { + const char *underlying; + unsigned gapsize; + char *base; +--- a/dist/aclocal/mutex.m4 ++++ b/dist/aclocal/mutex.m4 +@@ -5,7 +5,7 @@ AC_DEFUN(AM_PTHREADS_SHARED, [ + AC_TRY_RUN([ + #include <stdlib.h> + #include <pthread.h> +-main() { ++int main(void) { + pthread_cond_t cond; + pthread_mutex_t mutex; + pthread_condattr_t condattr; +@@ -49,7 +49,7 @@ AC_DEFUN(AM_PTHREADS_PRIVATE, [ + AC_TRY_RUN([ + #include <stdlib.h> + #include <pthread.h> +-main() { ++int main(void) { + pthread_cond_t cond; + pthread_mutex_t mutex; + pthread_condattr_t condattr; +@@ -89,7 +89,7 @@ AC_DEFUN(AM_PTHREADS_CONDVAR_DUPINITCHK, [ + AC_TRY_RUN([ + #include <stdlib.h> + #include <pthread.h> +-main() { ++int main(void) { + pthread_cond_t cond; + pthread_condattr_t condattr; + exit(pthread_condattr_init(&condattr) || +@@ -110,7 +110,7 @@ AC_DEFUN(AM_PTHREADS_RWLOCKVAR_DUPINITCHK, [ + AC_TRY_RUN([ + #include <stdlib.h> + #include <pthread.h> +-main() { ++int main(void) { + pthread_rwlock_t rwlock; + pthread_rwlockattr_t rwlockattr; + exit(pthread_rwlockattr_init(&rwlockattr) || +@@ -227,6 +227,7 @@ if test "$db_cv_mutex" = no; then + # LWP threads: _lwp_XXX + if test "$db_cv_mutex" = no; then + AC_TRY_LINK([ ++ #include <stdlib.h> + #include <synch.h>],[ + static lwp_mutex_t mi = SHAREDMUTEX; + static lwp_cond_t ci = SHAREDCV; +@@ -243,6 +244,7 @@ if test "$db_cv_mutex" = no; then + LIBS="$LIBS -lthread" + AC_TRY_LINK([ + #include <thread.h> ++ #include <stdlib.h> + #include <synch.h>],[ + mutex_t mutex; + cond_t cond; +@@ -258,6 +260,7 @@ if test "$db_cv_mutex" = no; then + if test "$db_cv_mutex" = no -o "$db_cv_mutex" = ui_only; then + AC_TRY_LINK([ + #include <thread.h> ++ #include <stdlib.h> + #include <synch.h>],[ + mutex_t mutex; + cond_t cond; +@@ -282,7 +285,7 @@ if test "$db_cv_mutex" = no; then + # x86/gcc: FreeBSD, NetBSD, BSD/OS, Linux + AC_TRY_COMPILE(,[ + #if (defined(i386) || defined(__i386__)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -291,7 +294,7 @@ if test "$db_cv_mutex" = no; then + # x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux + AC_TRY_COMPILE(,[ + #if (defined(x86_64) || defined(__x86_64__)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -314,7 +317,7 @@ if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__sparc__) && defined(__GNUC__) + asm volatile ("membar #StoreStore|#StoreLoad|#LoadStore"); +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -356,7 +359,7 @@ AC_TRY_LINK([ + msem_init(&x, 0); + msem_lock(&x, 0); + msem_unlock(&x, 0); +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -373,7 +376,7 @@ AC_TRY_LINK([ + msem_init(&x, 0); + msem_lock(&x, 0); + msem_unlock(&x, 0); +- exit(0); ++ return 0; + ], [db_cv_mutex=UNIX/msem_init]) + fi + +@@ -395,7 +398,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__USLC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -452,7 +455,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__alpha) && defined(__DECC) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -463,7 +466,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__alpha) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -474,7 +477,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__arm__) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -485,7 +488,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if (defined(__mips) || defined(__mips__)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -496,7 +499,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if (defined(__hppa) || defined(__hppa__)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -507,7 +510,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if (defined(__powerpc__) || defined(__ppc__)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -518,7 +521,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if (defined(mc68020) || defined(sun3)) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -529,7 +532,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__MVS__) && defined(__IBMC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -540,7 +543,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__s390__) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -551,7 +554,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(__ia64) && defined(__GNUC__) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -562,7 +565,7 @@ fi + if test "$db_cv_mutex" = no; then + AC_TRY_COMPILE(,[ + #if defined(_UTS) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -910,9 +913,9 @@ fi + if test "$db_cv_atomic" = no; then + AC_TRY_COMPILE(,[ + #if ((defined(i386) || defined(__i386__)) && defined(__GNUC__)) +- exit(0); ++ return 0; + #elif ((defined(x86_64) || defined(__x86_64__)) && defined(__GNUC__)) +- exit(0); ++ return 0; + #else + FAIL TO COMPILE/LINK + #endif +@@ -921,6 +924,7 @@ fi + + if test "$db_cv_atomic" = no; then + AC_TRY_LINK([ ++#include <stdlib.h> + #include <sys/atomic.h>],[ + volatile unsigned val = 1; + exit (atomic_inc_uint_nv(&val) != 2 || +--- a/dist/aclocal/sequence.m4 ++++ b/dist/aclocal/sequence.m4 +@@ -43,7 +43,9 @@ AC_DEFUN(AM_SEQUENCE_CONFIGURE, [ + # test, which won't test for the appropriate printf format strings. + if test "$db_cv_build_sequence" = "yes"; then + AC_TRY_RUN([ +- main() { ++ #include <stdio.h> ++ #include <string.h> ++ int main(void) { + $db_cv_seq_type l; + unsigned $db_cv_seq_type u; + char buf@<:@100@:>@; +@@ -59,7 +61,10 @@ AC_DEFUN(AM_SEQUENCE_CONFIGURE, [ + return (1); + return (0); + }],, [db_cv_build_sequence="no"], +- AC_TRY_LINK(,[ ++ AC_TRY_LINK([ ++ #include <stdio.h> ++ #include <string.h> ++ ],[ + $db_cv_seq_type l; + unsigned $db_cv_seq_type u; + char buf@<:@100@:>@; +--- a/dist/aclocal/types.m4 ++++ b/dist/aclocal/types.m4 +@@ -69,7 +69,7 @@ AC_SUBST(stdint_h_decl) + AC_MSG_CHECKING(for stdint.h) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ + #include <stdint.h> +- int main() { ++ int main(void) { + uint_least8_t x=0; + return x; + }])],[AC_MSG_RESULT(yes) +@@ -77,7 +77,7 @@ if test "$db_cv_cxx" = "yes"; then + AC_MSG_CHECKING([if stdint.h can be used by C++]) + AC_LANG_PUSH(C++) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include <stdint.h> +- int main() { ++ int main(void) { + uint_least8_t x=0; + return x; + }])],[AC_MSG_RESULT(yes) diff --git a/sys-libs/db/files/db-6.0.20-test-link.patch b/sys-libs/db/files/db-6.0.20-test-link.patch index 8aceaa4d6f8c..5fc6669465c6 100644 --- a/sys-libs/db/files/db-6.0.20-test-link.patch +++ b/sys-libs/db/files/db-6.0.20-test-link.patch @@ -1,6 +1,5 @@ -diff -Nuar db-6.0.20.orig/test/tcl/parallel.tcl db-6.0.20/test/tcl/parallel.tcl ---- db-6.0.20.orig/test/tcl/parallel.tcl 2013-07-04 15:49:43.408348040 +0000 -+++ db-6.0.20/test/tcl/parallel.tcl 2013-07-04 17:40:07.147943377 +0000 +--- a/test/tcl/parallel.tcl ++++ b/test/tcl/parallel.tcl @@ -289,16 +289,26 @@ [eval glob -nocomplain {$dir/$buildpath/db_{reptest,repsite,replicate}$EXE}] \ $destdir/$buildpath} diff --git a/sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch b/sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch index c239bb118a82..66bdcf9fe130 100644 --- a/sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch +++ b/sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch @@ -1,5 +1,5 @@ ---- db-6.0.35/dist/aclocal/sql.m4 -+++ db-6.0.35/dist/aclocal/sql.m4 +--- a/dist/aclocal/sql.m4 ++++ b/dist/aclocal/sql.m4 @@ -96,7 +96,7 @@ if test "$db_cv_build_cryptography" = "yes"; then CPPFLAGS="$CPPFLAGS -DSQLITE_HAS_CODEC=1" diff --git a/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch b/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch deleted file mode 100644 index 25854c53e160..000000000000 --- a/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- db-6.1.19/dist/aclocal/sql.m4 -+++ db-6.1.19/dist/aclocal/sql.m4 -@@ -96,6 +96,6 @@ - if test "$db_cv_build_cryptography" = "yes"; then - CPPFLAGS="$CPPFLAGS -DSQLITE_HAS_CODEC=1" - fi --(cd sql && eval "\$SHELL ../$sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline " && cat build_config.h >> config.h) || exit 1 -+(cd sql && eval "\$SHELL $sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline " && cat build_config.h >> config.h) || exit 1 - - # Configure JDBC if --enable-jdbc diff --git a/sys-libs/db/files/db-6.2-jni-check-prefix-first.patch b/sys-libs/db/files/db-6.2-jni-check-prefix-first.patch deleted file mode 100644 index 963b01380c23..000000000000 --- a/sys-libs/db/files/db-6.2-jni-check-prefix-first.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- db-6.2.23/dist/aclocal_java/ac_jni_include_dirs.m4 -+++ db-6.2.23/dist/aclocal_java/ac_jni_include_dirs.m4 -@@ -43,18 +43,23 @@ - *) AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);; - esac - --_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") --_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` --case "$host_os" in -- darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -- if test -d "$_JTOPDIR/include"; then -- _JINC="$_JTOPDIR/include" -- else -- _JINC="$_JTOPDIR/Headers" -- fi;; -- *) _JINC="$_JTOPDIR/include";; --esac -- -+# If JAVAPREFIX is defined, look there first -+if test -r "$JAVAPREFIX/include/jni.h"; then -+ _JTOPDIR="$JAVAPREFIX" -+ _JINC="$JAVAPREFIX/include" -+else -+ _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") -+ _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` -+ case "$host_os" in -+ darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -+ if test -d "$_JTOPDIR/include"; then -+ _JINC="$_JTOPDIR/include" -+ else -+ _JINC="$_JTOPDIR/Headers" -+ fi;; -+ *) _JINC="$_JTOPDIR/include";; -+ esac -+fi - # If we find jni.h in /usr/include, then it's not a java-only tree, so - # don't add /usr/include or subdirectories to the list of includes. - # An extra -I/usr/include can foul things up with newer gcc's. diff --git a/sys-libs/db/files/db-6.2.32-jni-check-prefix-first.patch b/sys-libs/db/files/db-6.2.32-jni-check-prefix-first.patch deleted file mode 100644 index 0a320d7f9336..000000000000 --- a/sys-libs/db/files/db-6.2.32-jni-check-prefix-first.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- db-6.2.32/dist/aclocal_java/ac_jni_include_dirs.m4 -+++ db-6.2.32/dist/aclocal_java/ac_jni_include_dirs.m4 -@@ -43,21 +43,26 @@ - *) AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);; - esac - --_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") --_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` --case "$host_os" in -- darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -- if test -d "$_JTOPDIR/include"; then -- _JINC="$_JTOPDIR/include" -- else -- _JINC="`$_JTOPDIR/Commands/java_home`/include" -- fi;; -- *) if test ! -r "$_JTOPDIR/include/jni.h"; then -- _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -- fi -- _JINC="$_JTOPDIR/include";; --esac -- -+# If JAVAPREFIX is defined, look there first -+if test -r "$JAVAPREFIX/include/jni.h"; then -+ _JTOPDIR="$JAVAPREFIX" -+ _JINC="$JAVAPREFIX/include" -+else -+ _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") -+ _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` -+ case "$host_os" in -+ darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -+ if test -d "$_JTOPDIR/include"; then -+ _JINC="$_JTOPDIR/include" -+ else -+ _JINC="`$_JTOPDIR/Commands/java_home`/include" -+ fi;; -+ *) if test ! -r "$_JTOPDIR/include/jni.h"; then -+ _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -+ fi -+ _JINC="$_JTOPDIR/include";; -+ esac -+fi - # If we find jni.h in /usr/include, then it's not a java-only tree, so - # don't add /usr/include or subdirectories to the list of includes. - # An extra -I/usr/include can foul things up with newer gcc's. diff --git a/sys-libs/db/metadata.xml b/sys-libs/db/metadata.xml index 4b0876002621..153a5bb94686 100644 --- a/sys-libs/db/metadata.xml +++ b/sys-libs/db/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>base-system@gentoo.org</email> |