Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/, dev-db/mariadb-connector-c/files/
Date: Sun, 06 Jan 2019 20:52:53
Message-Id: 1546807952.2427a4f5f2d0c0a6b8d79d7dab3ccd13dd09b5c4.whissi@gentoo
1 commit: 2427a4f5f2d0c0a6b8d79d7dab3ccd13dd09b5c4
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 6 20:52:21 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 6 20:52:32 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2427a4f5
7
8 dev-db/mariadb-connector-c: bump to v3.0.8
9
10 Package-Manager: Portage-2.3.53, Repoman-2.3.12
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 dev-db/mariadb-connector-c/Manifest | 1 +
14 ...ariadb-connector-c-3.0.8-fix-pkconfig-file.patch | 21 +++++++++++++++++++++
15 ...9999.ebuild => mariadb-connector-c-3.0.8.ebuild} | 6 +++---
16 .../mariadb-connector-c-9999.ebuild | 6 +++---
17 4 files changed, 28 insertions(+), 6 deletions(-)
18
19 diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
20 index 46ec03744d9..7d29a1f9d0f 100644
21 --- a/dev-db/mariadb-connector-c/Manifest
22 +++ b/dev-db/mariadb-connector-c/Manifest
23 @@ -1,2 +1,3 @@
24 DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a SHA512 6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e
25 DIST mariadb-connector-c-3.0.7-src.tar.gz 667274 BLAKE2B 75d2d548d51889aecc8af56cbeb61f5eaf21e60924b70dd0559214de464eae209743febdb5d443797f853bc902352f7333aefe84cb367f61f7bf2c341a4a8ac2 SHA512 70facae6234f180d94c0526845a3bf7723d6de3b6871544cb8cea35311fec0537c6342fbf4f024d0dca58ee618642c38748ae73628fcba334064a3c15d307219
26 +DIST mariadb-connector-c-3.0.8-src.tar.gz 674455 BLAKE2B eca5972f8443c78cdc9f450e7e88ee1c69e2a004664916a0f7dfd9a1ab8242c9e11d3cafcd95323262223fba5d68c5d489d4f61fdddb8369cf603cdd563cfe51 SHA512 d9f970c7ac164ef7d8dd748bf2f749cc1f877a9c8f68a1d57e9ff62d95046bb9505619feca1f1d0d1cdefc1ac49489742aadf4ad9e47c8e6a9b8b40c56eed788
27
28 diff --git a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch
29 new file mode 100644
30 index 00000000000..1a16a2c0101
31 --- /dev/null
32 +++ b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch
33 @@ -0,0 +1,21 @@
34 +--- a/mariadb_config/libmariadb.pc.in
35 ++++ b/mariadb_config/libmariadb.pc.in
36 +@@ -7,13 +7,12 @@
37 + #
38 +
39 + prefix=@CMAKE_INSTALL_PREFIX@
40 +-includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@
41 +-libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@
42 ++includedir=${prefix}/include
43 ++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
44 +
45 + Name: libmariadb
46 + Version: @CPACK_PACKAGE_VERSION@
47 ++URL: https://mariadb.com/kb/en/library/mariadb-connector-c/
48 + Description: MariaDB Connector/C dynamic library
49 +-Cflags: -I${includedir}
50 +-Libs: -L${libdir} -lmariadb @extra_dynamic_LDFLAGS@
51 +-
52 +-
53 ++Cflags: -I${includedir}/mariadb
54 ++Libs: -L${libdir} -lmariadb
55
56 diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.8.ebuild
57 similarity index 94%
58 copy from dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
59 copy to dev-db/mariadb-connector-c/mariadb-connector-c-3.0.8.ebuild
60 index 2e5ed26b63e..c957edaec2d 100644
61 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
62 +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.8.ebuild
63 @@ -1,4 +1,4 @@
64 -# Copyright 1999-2018 Gentoo Authors
65 +# Copyright 1999-2019 Gentoo Authors
66 # Distributed under the terms of the GNU General Public License v2
67
68 EAPI=6
69 @@ -12,7 +12,7 @@ else
70 MY_PV=${PV/_b/-b}
71 SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
72 S="${WORKDIR%/}/${PN}-${MY_PV}-src"
73 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86"
74 + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
75 fi
76
77 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
78 @@ -55,7 +55,7 @@ RDEPEND="${DEPEND}
79 "
80 PATCHES=(
81 "${FILESDIR}"/gentoo-layout-3.0.patch
82 - "${FILESDIR}"/${PN}-3.0.7-fix-pkconfig-file.patch
83 + "${FILESDIR}"/${PN}-3.0.8-fix-pkconfig-file.patch
84 )
85
86 src_configure() {
87
88 diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
89 index 2e5ed26b63e..c957edaec2d 100644
90 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
91 +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
92 @@ -1,4 +1,4 @@
93 -# Copyright 1999-2018 Gentoo Authors
94 +# Copyright 1999-2019 Gentoo Authors
95 # Distributed under the terms of the GNU General Public License v2
96
97 EAPI=6
98 @@ -12,7 +12,7 @@ else
99 MY_PV=${PV/_b/-b}
100 SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
101 S="${WORKDIR%/}/${PN}-${MY_PV}-src"
102 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86"
103 + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
104 fi
105
106 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
107 @@ -55,7 +55,7 @@ RDEPEND="${DEPEND}
108 "
109 PATCHES=(
110 "${FILESDIR}"/gentoo-layout-3.0.patch
111 - "${FILESDIR}"/${PN}-3.0.7-fix-pkconfig-file.patch
112 + "${FILESDIR}"/${PN}-3.0.8-fix-pkconfig-file.patch
113 )
114
115 src_configure() {