From 616579b5d773c50af31ee56f00105d96ce641ca2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Aug 2021 10:30:13 +0100 Subject: gentoo resync : 14.08.2021 --- dev-db/qdbm/Manifest | 5 +- dev-db/qdbm/files/qdbm-1.8.78-darwin.patch | 28 ----- dev-db/qdbm/files/qdbm-darwin.patch | 26 ++++ dev-db/qdbm/qdbm-1.8.78-r2.ebuild | 10 +- dev-db/qdbm/qdbm-1.8.78-r3.ebuild | 196 +++++++++++++++++++++++++++++ 5 files changed, 230 insertions(+), 35 deletions(-) delete mode 100644 dev-db/qdbm/files/qdbm-1.8.78-darwin.patch create mode 100644 dev-db/qdbm/files/qdbm-darwin.patch create mode 100644 dev-db/qdbm/qdbm-1.8.78-r3.ebuild (limited to 'dev-db/qdbm') diff --git a/dev-db/qdbm/Manifest b/dev-db/qdbm/Manifest index 6de2fce0f8d5..496b0c6f33ac 100644 --- a/dev-db/qdbm/Manifest +++ b/dev-db/qdbm/Manifest @@ -1,8 +1,9 @@ -AUX qdbm-1.8.78-darwin.patch 1139 BLAKE2B 687d8dc4948fb075ab41a32cb8378da49025f477c23af9be3605f1377fdd8366af4d1225fdf60b597a443054d4cb2b57558bb0fcc7d8b3b8c2e4f84c67590d7f SHA512 45014e917ff16b7295eb7d2d583399779b05f98668418f756710a2e456a86f1366fdcdc006398a19e65465ba1ffec593aa77f398393ea2a543083bf3b7c2532f AUX qdbm-configure.patch 5913 BLAKE2B a899d4d281eddbe974afd5969e4766d5f2eb55dfa545e6187003c4bb12f3224ead704cc1b14fd33841c8a9788832763d641ef04b5e49eee307aa71412d1301a4 SHA512 a15c513243f2b4976acf9a27f8572726bbaa7e55c7314228fa9fbc5899454c12d8c7efbf7ab24f1b3af427e64daded8ace1a5e4af4a227cae7fbb436e875461c +AUX qdbm-darwin.patch 1060 BLAKE2B 76cabc68ade7ab738d99f2f60902a65aa1d2e617b2ca0665ad9281b0956ad02f480302bdbc295f1f04b9b9c67d5fc1e7a983e9444bcf31cbf69190b2a2f3dd73 SHA512 eb249d0fb3b3e91234798de8809ea69e6fb4e57940df8a096a63f0268ffa74656972ebc521398e161fbec8092a3d8ac276d0635bd6f6e1eec43b30a676162427 AUX qdbm-perl.patch 1260 BLAKE2B e180ba6c2d57f6d813bbc6ae01ed787f6262a290eb59253b8950ec6f80ed29964e41cd3297b063db62e8c726a8e57399fe4ee52e67887bcaa74fad829b0b372f SHA512 a7356c2f5a4313e7da2524a6276bca5720459858d8619bfd8e6514cd9c1cd9aa1a2f7f0592e5ad1ee8b05e7e34452761e26be351f8e933e79a75cb4d19c862f3 AUX qdbm-ruby19.patch 10116 BLAKE2B 9a15c5d2e0cf8237edb78e68b2f9fde4868841bcca6abc08a33d110b9f25283e37fcb306c18bcca5495c7e5cedc778e3a2de2fe8414ce46c661a7c40d517cddc SHA512 f3e6c320a600ad3355fc74a333c28fc2dd904a2a52ca91a51f21b3dd14c7527bf312f5040dbc3e4f61d2dbcc0ade185e226333c79f9a04fc05437a156befc0e7 AUX qdbm-runpath.patch 1133 BLAKE2B 9b1c8c211d8e4075a77a34f3d79ca15cb3d833801777bdb328293047539bdd1a51c08031b3400c11d10732aa7864078ca8db02713a95cd90704e1a9e26f5bd10 SHA512 de8bde4a614617d742131e8025fd661019ec81b803817ef32ffca461b2c8b60c20756f6e6f84d6f23124eed3947ab3573b8c4a05b254f8b4d3e53f0cf7bc8452 DIST qdbm-1.8.78.tar.gz 1015429 BLAKE2B 1b985d856ff18ddfeb2d779694ba9a76006908b4b2a7509d4e3668aded80e08bbde28bcc24762ec27048cdc01dc84f9872dbfc221e8eea6f1c68f5e81cdc69d3 SHA512 480549c56071bf82edf714a611aef863599c858ed63702820ae0890fd2c0029d1a231ed94a8090c74420dd648bd3625d270a5c078b113cbb86a12ef509e19037 -EBUILD qdbm-1.8.78-r2.ebuild 3716 BLAKE2B 8a9dcaa0eeb2b571364645ad88086fcfd046a234441c470ef4f58f7f780912f10fbdc8cf8a39224a6420ab697d70255cf8f7195a132443c3f3144de515bea38b SHA512 6ffa7edc9a8b79eb6a10b5ccfca796ecd606641b903452fb9774f0e61aae9d69af8d0909df1951451dc24785f43c3d3e0190805ce813e9815f12c8eda2ce8d5d +EBUILD qdbm-1.8.78-r2.ebuild 3681 BLAKE2B 888a4b4312742a380bb6e7e5cca9f9114dac0579bd71a1c5435ecfc6b098669c66bd4ed77d1c5f2808cb386ebae17f25909c016ec42b74aad71e9984cac233b6 SHA512 c7ef0976be36d203048a7bd2190dd6fa6d34f0ebc56fef67eac4569f07b6731e1b73b0a2f5658ab585139239e4dd64f209e4f44597012fbe7edadcd56d06264a +EBUILD qdbm-1.8.78-r3.ebuild 3688 BLAKE2B 3e49635f8a700e8ee2f71adec95c4f75680559e9a96c4e3bf667c14b1e1363bae9bb0de746ea40f17e3cc9778c1a4eb277a25222b9b30f5310f523676e1a4850 SHA512 d8373f1a8696bacb00fa700ae538d6093dba5fd5f1f608b8f0c27a9e91e799e71873cef0f864bfbfdac2aa6900488c7d3567c45b51281e204cb62d784a05cdc9 MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0 diff --git a/dev-db/qdbm/files/qdbm-1.8.78-darwin.patch b/dev-db/qdbm/files/qdbm-1.8.78-darwin.patch deleted file mode 100644 index de2d33c4ea15..000000000000 --- a/dev-db/qdbm/files/qdbm-1.8.78-darwin.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 2fec03a..2a1c3a3 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -52,18 +52,18 @@ DESTDIR = - # Building binaries - CC = @CC@ - CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(MYHEADDIR) \ -- -I$(HOME)/include -I/usr/local/include @MYDEFS@ \ -+ -I$(HOME)/include @MYDEFS@ \ - -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \ - -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \ - -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG --CFLAGS = -Wall -pedantic -fPIC -fsigned-char -O3 -fomit-frame-pointer -fforce-addr @MYOPTS@ -+CFLAGS = -Wall -pedantic -fPIC -fsigned-char -fforce-addr @MYOPTS@ - LD = @LD@ - LIBS = -lqdbm @LIBS@ --LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@ --LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS) -+LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib @LIBS@ -+LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib $(LIBS) - AR = @AR@ - ARFLAGS = rcsv --RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib -+RUNENV = LD_LIBRARY_PATH=./:$(MYLIBDIR):$(HOME)/lib - - - diff --git a/dev-db/qdbm/files/qdbm-darwin.patch b/dev-db/qdbm/files/qdbm-darwin.patch new file mode 100644 index 000000000000..be2e9de3e48a --- /dev/null +++ b/dev-db/qdbm/files/qdbm-darwin.patch @@ -0,0 +1,26 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -52,18 +52,18 @@ + # Building binaries + CC = @CC@ + CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(MYHEADDIR) \ +- -I$(HOME)/include -I/usr/local/include @MYDEFS@ \ ++ -I$(HOME)/include @MYDEFS@ \ + -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \ + -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \ + -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG +-CFLAGS = -Wall -pedantic -fPIC -fsigned-char -O3 -fomit-frame-pointer -fforce-addr @MYOPTS@ ++CFLAGS = -Wall -pedantic -fPIC -fsigned-char -fforce-addr @MYOPTS@ + LD = @LD@ + LIBS = -lqdbm @LIBS@ +-LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@ +-LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS) ++LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib @LIBS@ ++LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib $(LIBS) + AR = @AR@ + ARFLAGS = rcsv +-RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib ++RUNENV = LD_LIBRARY_PATH=./:$(MYLIBDIR):$(HOME)/lib + + + diff --git a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild index 89721f95d92a..8f010ce95b7b 100644 --- a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild +++ b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild @@ -32,7 +32,7 @@ PATCHES=( "${FILESDIR}"/${PN}-perl.patch "${FILESDIR}"/${PN}-ruby19.patch "${FILESDIR}"/${PN}-runpath.patch - "${FILESDIR}"/${PN}-1.8.78-darwin.patch + "${FILESDIR}"/${PN}-darwin.patch ) HTML_DOCS=( doc/. ) @@ -169,19 +169,19 @@ src_install() { qdbm_foreach_api use static-libs || find "${ED}" -name '*.a' -delete || die - rm -rf "${ED}"/usr/share/${PN} || die + rm -rf "${ED}"/usr/share/${PN} if use java; then java-pkg_dojar "${ED}"/usr/$(get_libdir)/*.jar - rm -f "${ED}"/usr/$(get_libdir)/*.jar || die + rm -f "${ED}"/usr/$(get_libdir)/*.jar fi if use perl; then perl_delete_module_manpages perl_fix_packlist fi - rm -f "${ED}"/usr/bin/*test || die - rm -f "${ED}"/usr/share/man/man1/*test.1* || die + rm -f "${ED}"/usr/bin/*test + rm -f "${ED}"/usr/share/man/man1/*test.1* } each_ruby_install() { diff --git a/dev-db/qdbm/qdbm-1.8.78-r3.ebuild b/dev-db/qdbm/qdbm-1.8.78-r3.ebuild new file mode 100644 index 000000000000..e3abbce65c86 --- /dev/null +++ b/dev-db/qdbm/qdbm-1.8.78-r3.ebuild @@ -0,0 +1,196 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +USE_RUBY="ruby25 ruby26 ruby27 ruby30" +RUBY_OPTIONAL="yes" + +inherit autotools flag-o-matic java-pkg-opt-2 perl-functions ruby-ng + +DESCRIPTION="Quick Database Manager" +HOMEPAGE="https://fallabs.com/qdbm/" +SRC_URI="https://fallabs.com/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="bzip2 cxx debug java lzo perl ruby static-libs zlib" + +RDEPEND="bzip2? ( app-arch/bzip2 ) + java? ( >=virtual/jre-1.8:* ) + lzo? ( dev-libs/lzo ) + perl? ( dev-lang/perl ) + ruby? ( $(ruby_implementations_depend) ) + zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND} + java? ( >=virtual/jdk-1.8:* )" +S="${WORKDIR}/all/${P}" +RUBY_S="${P}/ruby" + +PATCHES=( + "${FILESDIR}"/${PN}-configure.patch + "${FILESDIR}"/${PN}-perl.patch + "${FILESDIR}"/${PN}-ruby19.patch + "${FILESDIR}"/${PN}-runpath.patch + "${FILESDIR}"/${PN}-darwin.patch +) +HTML_DOCS=( doc/. ) + +AT_NOELIBTOOLIZE="yes" + +pkg_setup() { + java-pkg-opt-2_pkg_setup + use ruby && ruby-ng_pkg_setup +} + +qdbm_foreach_api() { + local u + for u in cxx java perl ruby; do + if ! use "${u}"; then + continue + fi + einfo "${EBUILD_PHASE} ${u}" + if [[ "${u}" == "cxx" ]]; then + u="plus" + fi + if [[ "${u}" != "ruby" ]]; then + cd "${u}" + case "${EBUILD_PHASE}" in + prepare) + mv configure.{in,ac} + eautoreconf + ;; + configure) + case "${u}" in + cgi|java|plus) + econf $(use_enable debug) + ;; + *) + econf + ;; + esac + ;; + compile) + emake + ;; + test) + emake check + ;; + install) + emake DESTDIR="${D}" MYDATADIR=/usr/share/doc/${P}/html install + esac + cd - >/dev/null + else + PATCHES= ruby-ng_src_${EBUILD_PHASE} + fi + done +} + +src_prepare() { + default + java-pkg-opt-2_src_prepare + + # fix build with >=sys-devel/gcc-7, bug #638878 + append-cflags $(test-flags-CC -fno-tree-vrp) + + sed -i \ + -e "/^CFLAGS/s|$| ${CFLAGS}|" \ + -e "/^OPTIMIZE/s|$| ${CFLAGS}|" \ + -e "/^CXXFLAGS/s|$| ${CXXFLAGS}|" \ + -e "/^JAVACFLAGS/s|$| ${JAVACFLAGS}|" \ + -e 's/make\( \|$\)/$(MAKE)\1/g' \ + -e '/^debug/,/^$/s/LDFLAGS="[^"]*" //' \ + Makefile.in {cgi,java,perl,plus,ruby}/Makefile.in || die + find -name "*~" -delete || die + + mv configure.{in,ac} || die + eautoreconf + qdbm_foreach_api +} + +each_ruby_prepare() { + sed -i \ + -e "s|ruby |${RUBY} |" \ + -e "s|\.\./\.\.|${WORKDIR}/all/${P}|" \ + {Makefile,configure}.in {curia,depot,villa}/extconf.rb || die + + mv configure.{in,ac} || die + eautoreconf +} + +src_configure() { + econf \ + $(use_enable bzip2 bzip) \ + $(use_enable debug) \ + $(use_enable lzo) \ + $(use_enable zlib) \ + --enable-iconv \ + --enable-pthread + qdbm_foreach_api +} + +each_ruby_configure() { + econf +} + +src_compile() { + if [[ ${CHOST} == *darwin* ]] ; then + emake mac + else + default + qdbm_foreach_api + fi +} + +each_ruby_compile() { + emake +} + +src_test() { + if [[ ${CHOST} == *darwin* ]] ; then + emake check-mac + else + default + qdbm_foreach_api + fi +} + +each_ruby_test() { + emake check +} + +src_install() { + if [[ ${CHOST} == *darwin* ]] ; then + emake install-mac + else + default + fi + + qdbm_foreach_api + use static-libs || find "${ED}" -name '*.a' -delete || die + + rm -rf "${ED}"/usr/share/${PN} + + if use java; then + java-pkg_dojar "${ED}"/usr/$(get_libdir)/*.jar + rm -f "${ED}"/usr/$(get_libdir)/*.jar + fi + if use perl; then + perl_delete_module_manpages + perl_fix_packlist + fi + + rm -f "${ED}"/usr/bin/*test + rm -f "${ED}"/usr/share/man/man1/*test.1* +} + +each_ruby_install() { + local m + for m in curia depot villa; do + emake -C "${m}" DESTDIR="${D}" install + done +} + +all_ruby_install() { + dodoc -r rb*.html rbapidoc +} -- cgit v1.2.3