summaryrefslogtreecommitdiff
path: root/dev-db/libdbi
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-09-30 17:27:54 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-09-30 17:27:54 +0100
commitf70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch)
treee907cb121b30e3c1df1710719c0ddf4029597a47 /dev-db/libdbi
parentdb063b515939ab15261136b24e4bc44386335c0c (diff)
gentoo resync : 30.09.2020
Diffstat (limited to 'dev-db/libdbi')
-rw-r--r--dev-db/libdbi/Manifest2
-rw-r--r--dev-db/libdbi/libdbi-0.9.0.ebuild24
2 files changed, 11 insertions, 15 deletions
diff --git a/dev-db/libdbi/Manifest b/dev-db/libdbi/Manifest
index 2c728b2560db..3e384a2c304d 100644
--- a/dev-db/libdbi/Manifest
+++ b/dev-db/libdbi/Manifest
@@ -1,5 +1,5 @@
AUX dbi.pc.in 244 BLAKE2B b42f4a78c39034fe1ff4f2cf1ffc8bd252eb17e68dc50e03fd47ecd9838c37d00d5c4eb4a4b5ae5b3dd66ad63ba2c313923203b5514bf1161e405cd21e4fa4ce SHA512 6865b37e8d84d7a95b0ae482d9b1cb486ab7abbe726e699099ea4368d418f64b6d8cb02ecd4d1473f643aa5d715c57817a9496bd8950461921d5db4ff4272ef9
AUX libdbi-0.9.0-doc-build-fix.patch 662 BLAKE2B 652bdba6b0e9b04bee87f48f0db1fba774bf153bd73f925b3d1111823c14e82ccf3202f8023736e3b0a91e00c28c6aca14ca5ffcad3126723c7f02cbc30a7049 SHA512 db18d3697be13ef416914843d0933caead3b1f57c13790373ec435318212f0ccfb599514f8bd6f1c603e09f13bd526b62322ff92e68512e43020b31f8d0dec55
DIST libdbi-0.9.0.tar.gz 1194284 BLAKE2B 36ee5d9ec0a9b088735173cfa9a85e30ee595d6781aafeb994271e7745d259dbe983bea037182c471dc35ae36486a5fb8690e9c716e2e08a4a3964d90abd64f0 SHA512 ee8777195af43057409d051a6055ec0467cd926d48da076458b09f91d2f0995a1cc4bc071762e401b7bdcd8a4173fd8ea3472db3a1518e34b4c5b5ed24e4e2ce
-EBUILD libdbi-0.9.0.ebuild 1350 BLAKE2B 3980625877ac1cf4962f0e47c1dbe2928528625e42086f2db69d1f623dc316aaebc03473043b7530180c2eaa4041d1aa618b4f8576a868670259e4a44e9de49a SHA512 54e710ed0a52fc260a2541219e918e6350f8462dddbc07c7d5bd45de994ea4e943bbadd9a974c0b921d950a15987ba508a8789972d6fb95e524cd21ee654bb3e
+EBUILD libdbi-0.9.0.ebuild 1205 BLAKE2B 83b3fe6b73d9fe7753f55f480f9f4d26bc5795ac8409c29282a5b499de594461be8ee243bcb3e573c66f7cc017f8f9e307d55f82bd68230e5ed039fa71d7fba9 SHA512 0df73652fd32c98ef8184d0490880a3abfa707d82d025e1083d9f2cb42ed32a771ee632b59bebcd8ef57ca685c65d8fc4fd6bfe809ae1d77097df496fa1c3c5a
MISC metadata.xml 294 BLAKE2B 1d9ff5692cbe4272918f7c3a8a5f9f1e564fd2ac3d5e5878be44f916557ecdefb843ad3b56e778d2833361609ac8cc9dec2939c04bab59687b4a7d2c25f4c750 SHA512 acb2d7a1ab6206a1f489cc8999ae35f014453bc95764000c5a6492a4b8832f2e0cf83bc875aecf50a6a6beb6bedabddb74628a2599f6c84a2d4aded345a39cd1
diff --git a/dev-db/libdbi/libdbi-0.9.0.ebuild b/dev-db/libdbi/libdbi-0.9.0.ebuild
index b1fe05a9a1b5..f042010c2407 100644
--- a/dev-db/libdbi/libdbi-0.9.0.ebuild
+++ b/dev-db/libdbi/libdbi-0.9.0.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
-inherit eutils autotools ltprune multilib
+inherit autotools
DESCRIPTION="A database-independent abstraction layer in C"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -14,7 +14,7 @@ IUSE="doc static-libs"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
SLOT=0
-DOCS="AUTHORS ChangeLog README README.osx TODO"
+DOCS=( AUTHORS ChangeLog README README.osx TODO )
RDEPEND=""
DEPEND="${RDEPEND}
@@ -24,21 +24,17 @@ DEPEND="${RDEPEND}
"
PDEPEND=">=dev-db/libdbi-drivers-0.9.0" # On purpose, libdbi-drivers 0.8.4 does not exist
-src_unpack() {
- unpack ${A}
- chown -R portage:portage "${S}"
-}
-
src_prepare() {
- #epatch "${FILESDIR}"/${PN}-0.9.0-fix-ac-macro.patch
- #epatch "${FILESDIR}"/libdbi-0.8.1-pkg-config.patch
- #cp -f "${FILESDIR}"/dbi.pc.in "${S}"/dbi.pc.in
- epatch "${FILESDIR}"/libdbi-0.9.0-doc-build-fix.patch
+ eapply "${FILESDIR}"/libdbi-0.9.0-doc-build-fix.patch
- # configure.in has been changed
+ mv configure.in configure.ac || die
+
+ # configure.in/ac has been changed
eautoreconf
+
# should append CFLAGS, not replace them
sed -i.orig -e 's/^CFLAGS = /CFLAGS += /g' src/Makefile.in
+ eapply_user
}
src_configure() {
@@ -50,7 +46,7 @@ src_configure() {
src_install() {
default
- prune_libtool_files --all
+ find "${D}" -name '*.la' -delete || die "removing .la files failed"
# syslog-ng requires dbi.pc
insinto /usr/$(get_libdir)/pkgconfig/