diff options
12 files changed, 122 insertions, 173 deletions
diff --git a/dev-db/mariadb-native-client/ChangeLog b/dev-db/mariadb-connector-c/ChangeLog index 22829b2..22829b2 100644 --- a/dev-db/mariadb-native-client/ChangeLog +++ b/dev-db/mariadb-connector-c/ChangeLog diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest new file mode 100644 index 0000000..273846d --- /dev/null +++ b/dev-db/mariadb-connector-c/Manifest @@ -0,0 +1 @@ +DIST mariadb_client-2.0.0-src.tar.gz 1923436 SHA256 fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60 SHA512 7be7454dedc218bb5cdeae5d54c461129cc4611d0e380c4d2bf60bc276e85ea0ae52b0dcf8a41edef0e0e678e1392c2ddcebb9c4a75ad4625808fd0cc7522c75 WHIRLPOOL be699bbda7d86a8708347fcfdc0ebdc17f1fe6ee6e4d1b839e849673450849ab4838eee8d6995a45009a899dbe88d63f7e09dc94933b598b16709db92958aa55 diff --git a/dev-db/mariadb-native-client/files/fix-libdir.patch b/dev-db/mariadb-connector-c/files/fix-libdir.patch index c7ade92..c7ade92 100644 --- a/dev-db/mariadb-native-client/files/fix-libdir.patch +++ b/dev-db/mariadb-connector-c/files/fix-libdir.patch diff --git a/dev-db/mariadb-native-client/files/fix-mariadb_config.patch b/dev-db/mariadb-connector-c/files/fix-mariadb_config.patch index ae12801..444c877 100644 --- a/dev-db/mariadb-native-client/files/fix-mariadb_config.patch +++ b/dev-db/mariadb-connector-c/files/fix-mariadb_config.patch @@ -1,6 +1,6 @@ -diff -aurN mariadb_config.orig/CMakeLists.txt mariadb_config/CMakeLists.txt ---- mariadb_config.orig/CMakeLists.txt 2014-04-29 12:44:35.309693578 -0400 -+++ mariadb_config/CMakeLists.txt 2014-04-29 12:43:25.511924411 -0400 +diff -aurN a/mariadb_config/CMakeLists.txt b/mariadb_config/CMakeLists.txt +--- a/mariadb_config/CMakeLists.txt 2014-04-29 12:44:35.309693578 -0400 ++++ b/mariadb_config/CMakeLists.txt 2014-04-29 12:43:25.511924411 -0400 @@ -19,7 +19,8 @@ SEARCH_LIBRARY(LIBDL dlopen "dl") SEARCH_LIBRARY(LIBM floor m) @@ -11,9 +11,9 @@ diff -aurN mariadb_config.orig/CMakeLists.txt mariadb_config/CMakeLists.txt ENDFOREACH() IF(WITH_SQLITE) SET(extra_dynamic_LDFLAGS "${extra_dynamic_LDFLAGS} -lsqlite") -diff -aurN mariadb_config.orig/mariadb_config.c.in mariadb_config/mariadb_config.c.in ---- mariadb_config.orig/mariadb_config.c.in 2014-04-29 12:44:22.320108741 -0400 -+++ mariadb_config/mariadb_config.c.in 2014-04-29 12:41:54.934819014 -0400 +diff -aurN a/mariadb_config/mariadb_config.c.in b/mariadb_config/mariadb_config.c.in +--- a/mariadb_config/mariadb_config.c.in 2014-04-29 12:44:22.320108741 -0400 ++++ b/mariadb_config/mariadb_config.c.in 2014-04-29 12:41:54.934819014 -0400 @@ -6,7 +6,7 @@ #define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/include/mariadb" #define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@ -lmariadb" \ diff --git a/dev-db/mariadb-native-client/files/multilib-install.patch b/dev-db/mariadb-connector-c/files/multilib-install.patch index 6dfa270..6dfa270 100644 --- a/dev-db/mariadb-native-client/files/multilib-install.patch +++ b/dev-db/mariadb-connector-c/files/multilib-install.patch diff --git a/dev-db/mariadb-native-client/mariadb-native-client-2.0.0.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-2.0.0-r1.ebuild index c689e17..7207484 100644 --- a/dev-db/mariadb-native-client/mariadb-native-client-2.0.0.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-2.0.0-r1.ebuild @@ -5,11 +5,16 @@ EAPI=5 VCS_INHERIT="" -MY_PN="mariadb_client" if [[ "${PV}" == 9999 ]] ; then - VCS_INHERIT="bzr" - EBZR_REPO_URI="lp:${PN}" + VCS_INHERIT="git-r3" + EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git" else + MY_PN="mariadb_client" + SRC_URI=" + http://ftp.osuosl.org/pub/mariadb/client-native-${PV}/src/${MY_PN}-${PV}-src.tar.gz + http://mirrors.fe.up.pt/pub/mariadb/client-native${PV}/src/${MY_PN}-${PV}-src.tar.gz + http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/client-native-${PV}/src/${MY_PN}-${PV}-src.tar.gz + " S="${WORKDIR}/${MY_PN}-${PV}-src" fi @@ -21,35 +26,31 @@ MULTILIB_WRAPPED_HEADERS+=( DESCRIPTION="C client library for MariaDB/MySQL" HOMEPAGE="http://mariadb.org/" -SRC_URI=" - http://ftp.osuosl.org/pub/mariadb/client-native-${PV}/src/${MY_PN}-${PV}-src.tar.gz - http://mirrors.fe.up.pt/pub/mariadb/client-native${PV}/src/${MY_PN}-${PV}-src.tar.gz - http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/client-native-${PV}/src/${MY_PN}-${PV}-src.tar.gz - " LICENSE="LGPL-2.1" SLOT="0/2" KEYWORDS="~amd64 ~x86" IUSE="doc +mysqlcompat +ssl static-libs" -RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] +CDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] virtual/libiconv:=[${MULTILIB_USEDEP}] - ssl? ( dev-libs/openssl:= - amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs ) ) - ) - mysqlcompat? ( - !dev-db/mysql - !dev-db/mysql-cluster - !dev-db/mariadb - !dev-db/mariadb-galera - !dev-db/percona-server - )" -DEPEND="${RDEPEND} + ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) + " +# Block server packages due to /usr/bin/mariadb_config symlink there +# TODO: make server package block only when mysqlcompat is enabled +RDEPEND="${CDEPEND} + !dev-db/mysql + !dev-db/mysql-cluster + !dev-db/mariadb + !dev-db/mariadb-galera + !dev-db/percona-server + " +DEPEND="${CDEPEND} doc? ( app-text/xmlto )" src_prepare() { - epatch "${FILESDIR}/fix-libdir.patch" - epatch "${FILESDIR}/fix-mariadb_config.patch" + epatch "${FILESDIR}/fix-libdir.patch" \ + "${FILESDIR}/fix-mariadb_config.patch" } src_configure() { @@ -63,15 +64,17 @@ src_configure() { cmake-multilib_src_configure } -src_install() { - strip_static_libraries() { - rm "${ED}/usr/$(get_libdir)/libmariadbclient.a" - use mysqlcompat && rm "${ED}/usr/$(get_libdir)/libmysqlclient.a" - } - - cmake-multilib_src_install +multilib_src_install() { + cmake-utils_src_install if ! use static-libs ; then - multilib_foreach_abi strip_static_libraries + rm "${ED}/usr/$(get_libdir)/libmariadbclient.a" || die + use mysqlcompat && rm "${ED}/usr/$(get_libdir)/libmysqlclient.a" || die + fi +} + +multilib_src_install_all() { + if use mysqlcompat ; then + dosym mariadb_config /usr/bin/mysql_config + dosym mariadb /usr/include/mysql fi - dodoc README } diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild new file mode 100644 index 0000000..bf6f0f9 --- /dev/null +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +VCS_INHERIT="" +if [[ "${PV}" == 9999 ]] ; then + VCS_INHERIT="git-r3" + EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git" +else + MY_PN="mariadb_client" + SRC_URI=" + http://ftp.osuosl.org/pub/mariadb/client-native-${PV}/src/${MY_PN}-${PV}-src.tar.gz + http://mirrors.fe.up.pt/pub/mariadb/client-native${PV}/src/${MY_PN}-${PV}-src.tar.gz + http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/client-native-${PV}/src/${MY_PN}-${PV}-src.tar.gz + " + S="${WORKDIR}/${MY_PN}-${PV}-src" +fi + +inherit cmake-multilib eutils "${VCS_INHERIT}" + +MULTILIB_WRAPPED_HEADERS+=( + /usr/include/mariadb/my_config.h +) + +DESCRIPTION="C client library for MariaDB/MySQL" +HOMEPAGE="http://mariadb.org/" +LICENSE="LGPL-2.1" + +SLOT="0/2" +KEYWORDS="~amd64 ~x86" +IUSE="doc +mysqlcompat +ssl static-libs" + +CDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] + virtual/libiconv:=[${MULTILIB_USEDEP}] + ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) + " +# Block server packages due to /usr/bin/mariadb_config symlink there +# TODO: make server package block only when mysqlcompat is enabled +RDEPEND="${CDEPEND} + !dev-db/mysql + !dev-db/mysql-cluster + !dev-db/mariadb + !dev-db/mariadb-galera + !dev-db/percona-server + " +DEPEND="${CDEPEND} + doc? ( app-text/xmlto )" + +src_prepare() { + epatch "${FILESDIR}/fix-libdir.patch" + sed -i "s/INCLUDE(CPack)//" CMakeLists.txt || die "sed failed" +} + +src_configure() { + mycmakeargs+=( + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DWITH_EXTERNAL_ZLIB=ON + $(cmake-utils_use_with ssl OPENSSL) + $(cmake-utils_use_with mysqlcompat MYSQLCOMPAT) + $(cmake-utils_use_build doc DOCS) + ) + cmake-multilib_src_configure +} + +multilib_src_install() { + cmake-utils_src_install + if ! use static-libs ; then + rm "${ED}/usr/$(get_libdir)/libmariadbclient.a" || die + use mysqlcompat && rm "${ED}/usr/$(get_libdir)/libmysqlclient.a" || die + fi +} + +multilib_src_install_all() { + if use mysqlcompat ; then + dosym mariadb_config /usr/bin/mysql_config + dosym mariadb /usr/include/mysql + fi +} diff --git a/dev-db/mariadb-native-client/metadata.xml b/dev-db/mariadb-connector-c/metadata.xml index 069fbde..069fbde 100644 --- a/dev-db/mariadb-native-client/metadata.xml +++ b/dev-db/mariadb-connector-c/metadata.xml diff --git a/dev-db/mariadb-native-client/Manifest b/dev-db/mariadb-native-client/Manifest deleted file mode 100644 index 934e091..0000000 --- a/dev-db/mariadb-native-client/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST mariadb-native-client.tar.gz 548121 SHA256 848c45ec1e685412abe020d934eee45d17cf81e7cbfa79ef6317343eb8557354 SHA512 ece36c3333cf6dbd4fc4f2be54542d05d7fe44a9387586afc0367356fdadae5d24c41d977b1d5f829156d6a54c9e89afc3d18d3f4b1510fcea2527ac701fa6af WHIRLPOOL 48a92dd2dc0655455a68aab91860a218463d95feec21b00fb43b406efc185838fb97d40880cba39d44bfff2f8c0ae4af85a4459a57cb050550b0d8809a0bb3bc -DIST mariadb_client-2.0.0-src.tar.gz 3874667 SHA256 0da402597d249399f1cf81c58d70dc880e3f0c0ae4eeebbbac7ad662fafee16b SHA512 0f77f9d58f61e10c39bc7876be346ba78e4f1d341cfdc8f5d2649b182bb2201da0a9a86088026f7688444dc28aa902105ecc76e1b2062e759f9e9c4aff8ade66 WHIRLPOOL 06e2a18cbb8f306ed61acdb6abe7b67e9c8105f5a99d96544798e39721e05a9e4c7a58da76c7b8b3a52462f1276aedf4de1f61490258a79467ed3b8316df1f59 diff --git a/dev-db/mariadb-native-client/mariadb-native-client-1.0.ebuild b/dev-db/mariadb-native-client/mariadb-native-client-1.0.ebuild deleted file mode 100644 index 54a2766..0000000 --- a/dev-db/mariadb-native-client/mariadb-native-client-1.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -VCS_INHERIT="" -if [[ "${PV}" == 9999 ]] ; then - VCS_INHERIT="bzr" - EBZR_REPO_URI="lp:${PN}" -else - S="${WORKDIR}/${PN}" -fi - -inherit cmake-multilib eutils "${VCS_INHERIT}" - -DESCRIPTION="C client library for MariaDB/MySQL" -HOMEPAGE="http://mariadb.org/" -SRC_URI=" - http://ftp.osuosl.org/pub/mariadb/${PN}/Source/${PN}.tar.gz - http://mirrors.fe.up.pt/pub/mariadb/${PN}/Source/${PN}.tar.gz - http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/${PN}/Source/${PN}.tar.gz - " -LICENSE="LGPL-2.1" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc static-libs" - -RDEPEND=" - dev-libs/openssl:= - amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs ) )" -DEPEND="${RDEPEND} - doc? ( app-text/xmlto )" - -src_prepare() { - epatch "${FILESDIR}/multilib-install.patch" -} - -src_configure() { - mycmakeargs+=( - -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" - $(cmake-utils_use_build doc DOCS) - ) - cmake-multilib_src_configure -} - -src_install() { - strip_static_libraries() { - einfo "IN ${T}/usr/$(get_libdir)" - rm "${T}/usr/$(get_libdir)/mariadb/libmariadbclient.a" - } - - cmake-multilib_src_install - if ! use static-libs ; then - multilib_foreach_abi strip_static_libraries - fi -} diff --git a/dev-db/mariadb-native-client/mariadb-native-client-9999.ebuild b/dev-db/mariadb-native-client/mariadb-native-client-9999.ebuild deleted file mode 100644 index a7ab9ce..0000000 --- a/dev-db/mariadb-native-client/mariadb-native-client-9999.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -VCS_INHERIT="" -if [[ "${PV}" == 9999 ]] ; then - VCS_INHERIT="bzr" - EBZR_REPO_URI="lp:${PN}" -else - S="${WORKDIR}/${PN}" -fi - -inherit cmake-multilib eutils "${VCS_INHERIT}" - -MULTILIB_WRAPPED_HEADERS+=( - /usr/include/mariadb/my_config.h -) - -DESCRIPTION="C client library for MariaDB/MySQL" -HOMEPAGE="http://mariadb.org/" -SRC_URI=" - http://ftp.osuosl.org/pub/mariadb/${PN}/Source/${PN}.tar.gz - http://mirrors.fe.up.pt/pub/mariadb/${PN}/Source/${PN}.tar.gz - http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/${PN}/Source/${PN}.tar.gz - " -LICENSE="LGPL-2.1" - -SLOT="0" -KEYWORDS="" -IUSE="doc +mysqlcompat +ssl static-libs" - -RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] - ssl? ( dev-libs/openssl:= - amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs ) ) - ) - mysqlcompat? ( - !dev-db/mysql - !dev-db/mysql-cluster - !dev-db/mariadb - !dev-db/mariadb-galera - !dev-db/percona-server - )" -DEPEND="${RDEPEND} - doc? ( app-text/xmlto )" - -src_prepare() { - sed -i -e "s~DESTINATION \"lib/mariadb~DESTINATION \"\$\{CMAKE_INSTALL_LIBDIR\}~" \ - -e "s~DESTINATION lib/mariadb~DESTINATION \$\{CMAKE_INSTALL_LIBDIR\}~" \ - "${S}/libmariadb/CMakeLists.txt" -} - -src_configure() { - mycmakeargs+=( - -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" - -DWITH_EXTERNAL_ZLIB=ON - $(cmake-utils_use_with ssl OPENSSL) - $(cmake-utils_use_with mysqlcompat MYSQLCOMPAT) - $(cmake-utils_use_build doc DOCS) - ) - cmake-multilib_src_configure -} - -src_install() { - strip_static_libraries() { - rm "${ED}/usr/$(get_libdir)/libmariadbclient.a" - use mysqlcompat && rm "${ED}/usr/$(get_libdir)/libmysqlclient.a" - } - - cmake-multilib_src_install - if ! use static-libs ; then - multilib_foreach_abi strip_static_libraries - fi - dodoc README -} diff --git a/profiles/updates/3Q-2014 b/profiles/updates/3Q-2014 new file mode 100644 index 0000000..000e61b --- /dev/null +++ b/profiles/updates/3Q-2014 @@ -0,0 +1 @@ +move dev-db/mariadb-native-client dev-db/mariadb-connector-c |