summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db/mariadb-connector-c')
-rw-r--r--dev-db/mariadb-connector-c/ChangeLog40
-rw-r--r--dev-db/mariadb-connector-c/Manifest23
-rw-r--r--dev-db/mariadb-connector-c/files/fix-libdir.patch58
-rw-r--r--dev-db/mariadb-connector-c/files/fix-mariadb_config-2.1.0.patch12
-rw-r--r--dev-db/mariadb-connector-c/files/fix-mariadb_config.patch25
-rw-r--r--dev-db/mariadb-connector-c/files/gentoo-layout-2.2.2.patch24
-rw-r--r--dev-db/mariadb-connector-c/files/gentoo-layout-3.0.patch9
-rw-r--r--dev-db/mariadb-connector-c/files/gentoo-layout.patch60
-rw-r--r--dev-db/mariadb-connector-c/files/multilib-install.patch16
-rw-r--r--dev-db/mariadb-connector-c/mariadb-connector-c-2.2.2.ebuild71
-rw-r--r--dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild76
-rw-r--r--dev-db/mariadb-connector-c/metadata.xml11
12 files changed, 0 insertions, 425 deletions
diff --git a/dev-db/mariadb-connector-c/ChangeLog b/dev-db/mariadb-connector-c/ChangeLog
deleted file mode 100644
index 3c5efcc..0000000
--- a/dev-db/mariadb-connector-c/ChangeLog
+++ /dev/null
@@ -1,40 +0,0 @@
- 25 Apr 2017; Brian Evans <grknight@gentoo.org>
- mariadb-connector-c-3.0.1_beta.ebuild:
- dev-db/mariadb-connector-c: Fix up mysqlcompat USE installs
-
-*mariadb-connector-c-3.0.1_beta (25 Apr 2017)
-
- 25 Apr 2017; Brian Evans <grknight@gentoo.org> +files/gentoo-layout-3.0.patch,
- +mariadb-connector-c-3.0.1_beta.ebuild:
- dev-db/mariadb-connector-c: Version bump to 3.0.1_beta
-
-*mariadb-connector-c-2.2.2 (13 Feb 2016)
-
- 13 Feb 2016; Brian Evans <grknight@gentoo.org>
- +files/gentoo-layout-2.2.2.patch, +mariadb-connector-c-2.2.2.ebuild:
- dev-db/mariadb-connector-c: Version bump
-
- 15 Aug 2015; Brian Evans <grknight@gentoo.org>
- mariadb-connector-c-2.0.0-r1.ebuild, mariadb-connector-c-2.1.0.ebuild,
- mariadb-connector-c-9999.ebuild:
- dev-db/mariadb-connector-c: fix QA inherit wrt bug 557730
-
-*mariadb-native-client-2.0.0 (29 Apr 2014)
-
- 29 Apr 2014; Brian Evans <grknight@tuffmail.com> +files/fix-libdir.patch,
- +files/fix-mariadb_config.patch, +mariadb-native-client-2.0.0.ebuild:
- Version bump for 2.0.0
-
-*mariadb-native-client-9999 (26 Jun 2013)
-
- 26 Jun 2013; Brian Evans <grknight@lavabit.com>
- +mariadb-native-client-9999.ebuild, mariadb-native-client-1.0.ebuild,
- metadata.xml:
- Add live ebuild with mysqlcompat feature, optional ssl support and external
- zlib
-
-*mariadb-native-client-1.0 (22 May 2013)
-
- 22 May 2013; <grknight@lavabit.com> +files/multilib-install.patch,
- +mariadb-native-client-1.0.ebuild, +metadata.xml:
- Add new C library for MySQL
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
deleted file mode 100644
index 96c1c73..0000000
--- a/dev-db/mariadb-connector-c/Manifest
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST mariadb-connector-c-2.2.2-src.tar.gz 519724 SHA256 93f56ad9f08bbaf0da8ef03bc96f7093c426ae40dede60575d485e1b99e6406b SHA512 8e7b35345de3ae3902b74613646c17641e441548ec87eb97c635c98dcddb0862411a625d9e82ba62324babe21d0d099a241b074826f0b396b425a80e714dd355 WHIRLPOOL e09d535186726cad6c880327e2045176a8bc773675381262bcff071ecccbdaa6b2fc802250cedf9d3a5f8848fa178fba9a8e236e3d3d988800826176376b91b1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlvGkfJfFIAAAAAALgAo
-aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
-QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
-o7aOZg/+N0nU88jEV2GjbwsxV98LaGTSYNlNzGT84WL9G2dHjxXodI6eli7tfjXf
-BufXEXqrS6VahipTya6JCG4P/z+06AvpA7ZHCUZkJ/m88gnDQ5vdMnjFYVfm7iVO
-ODA4mzPcdJ1ah6OeRYsk1kqFqFLhr40weDSMwTjbLAm1771RVzJSkz0L7acRF+WE
-F960IK1WaWY9K0D/nRb0VgCckfcLOHQBUsNmQru/QopI196thCP9wnaQQWFyqjIL
-pbduyvBc3rPmTeBo+Gm3R2F2rqy2tyxccmYpoYERbYNomuUnSo9Lgo9qe+yRhKXf
-hleNchUqUFNYnwvCAx42SU2CNxzBufTVJyTvCvFq1PcUwlVGq+3VIaElwcspzo5f
-8eiORT66BM5lV79eG1Tqj4P+ctwIKp3Mq89pfwT9IjgZljDukz56fgZQvDFZQkqs
-dZhQoyV7rLx+VKwj/s4k58B8o7kS7IDrCqMhTcwsZJ/gn2xRqeIMUxWxJgnndAZE
-5lPHf+/johpj8Zffhd4ehFSe9A4oyAP3BUdndScSixqY58F+f4S5MN32ZHELLng3
-3NO/a4kUcMZ0nF8B4LXygQciKBqMJVp3N+xUL3sKH33ZfJl+PHv5JEvKkaa4JZLT
-zbIg5aV+znJR7sdyQWcBE31NYnyJphcz6riROk9KK78d2Zvp3s8=
-=BD3O
------END PGP SIGNATURE-----
diff --git a/dev-db/mariadb-connector-c/files/fix-libdir.patch b/dev-db/mariadb-connector-c/files/fix-libdir.patch
deleted file mode 100644
index c7ade92..0000000
--- a/dev-db/mariadb-connector-c/files/fix-libdir.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -aurN mariadb_client-2.0.0-src/CMakeLists.txt mariadb_client-2.0.0-src.new/CMakeLists.txt
---- mariadb_client-2.0.0-src/CMakeLists.txt 2014-04-01 11:14:40.000000000 -0400
-+++ mariadb_client-2.0.0-src.new/CMakeLists.txt 2014-04-03 16:12:55.163032445 -0400
-@@ -27,8 +27,19 @@
-
- OPTION(WITH_SQLITE "Enables Sqlite support" OFF)
- OPTION(WITH_EXTERNAL_ZLIB "Enables use of external zlib" OFF)
-+OPTION(INSTALL_LIBDIR "Library install location" OFF)
- ###############
-
-+IF(NOT INSTALL_LIBDIR)
-+ # Some distros can set this in a global cmake config
-+ IF(CMAKE_INSTALL_LIBDIR)
-+ SET(INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
-+ ELSE()
-+ # Provide a sane default
-+ SET(INSTALL_LIBDIR "lib/mariadb")
-+ ENDIF()
-+ENDIF()
-+
- IF(WITH_RTC)
- SET(RTC_OPTIONS "/RTC1 /RTCc")
- ENDIF()
-diff -aurN mariadb_client-2.0.0-src/libmariadb/CMakeLists.txt mariadb_client-2.0.0-src.new/libmariadb/CMakeLists.txt
---- mariadb_client-2.0.0-src/libmariadb/CMakeLists.txt 2014-03-18 11:01:05.000000000 -0400
-+++ mariadb_client-2.0.0-src.new/libmariadb/CMakeLists.txt 2014-04-03 16:15:49.417626907 -0400
-@@ -210,15 +210,15 @@
-
- INSTALL(TARGETS
- libmariadb mariadbclient
-- RUNTIME DESTINATION "lib/mariadb"
-- LIBRARY DESTINATION "lib/mariadb"
-- ARCHIVE DESTINATION "lib/mariadb")
-+ RUNTIME DESTINATION "${INSTALL_LIBDIR}"
-+ LIBRARY DESTINATION "${INSTALL_LIBDIR}"
-+ ARCHIVE DESTINATION "${INSTALL_LIBDIR}")
- IF(NOT WIN32 AND WITH_MYSQLCOMPAT)
- INSTALL(FILES "${CMAKE_BINARY_DIR}/libmariadb/libmysql${CMAKE_SHARED_LIBRARY_SUFFIX}"
- "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX}"
- "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX}"
- "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX}"
-- DESTINATION lib/mariadb)
-+ DESTINATION ${INSTALL_LIBDIR})
- ENDIF()
-
- INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/
-diff -aurN mariadb_client-2.0.0-src/mariadb_config/mariadb_config.c.in mariadb_client-2.0.0-src.new/mariadb_config/mariadb_config.c.in
---- mariadb_client-2.0.0-src/mariadb_config/mariadb_config.c.in 2014-03-18 11:01:05.000000000 -0400
-+++ mariadb_client-2.0.0-src.new/mariadb_config/mariadb_config.c.in 2014-04-03 16:16:52.455669572 -0400
-@@ -4,7 +4,7 @@
- #include <stdio.h>
-
- #define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/include/mariadb"
--#define LIBS "-L@CMAKE_INSTALL_PREFIX@/lib/mariadb -lmariadb" \
-+#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@ -lmariadb" \
- "@extra_dynamic_LDFLAGS@"
- #define CFLAGS INCLUDE "@CMAKE_C_FLAGS@"
- #define VERSION "@MYSQL_CLIENT_VERSION@"
diff --git a/dev-db/mariadb-connector-c/files/fix-mariadb_config-2.1.0.patch b/dev-db/mariadb-connector-c/files/fix-mariadb_config-2.1.0.patch
deleted file mode 100644
index e5bbce3..0000000
--- a/dev-db/mariadb-connector-c/files/fix-mariadb_config-2.1.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aruN a/mariadb_config/mariadb_config.c.in b/mariadb_config/mariadb_config.c.in
---- a/mariadb_config/mariadb_config.c.in 2015-01-29 13:21:48.000000000 -0500
-+++ b/mariadb_config/mariadb_config.c.in 2015-01-30 13:03:01.312548413 -0500
-@@ -6,7 +6,7 @@
- #define INCLUDE "-I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@/mysql"
- #define LIBS "-L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb" \
- "@extra_dynamic_LDFLAGS@"
--#define CFLAGS INCLUDE " @CMAKE_C_FLAGS@"
-+#define CFLAGS INCLUDE
- #define VERSION "@MYSQL_CLIENT_VERSION@"
- #define PLUGIN_DIR "@PREFIX_INSTALL_DIR@/@PLUGIN_INSTALL_DIR@"
- #define SOCKET "@MYSQL_UNIX_ADDR@"
diff --git a/dev-db/mariadb-connector-c/files/fix-mariadb_config.patch b/dev-db/mariadb-connector-c/files/fix-mariadb_config.patch
deleted file mode 100644
index 444c877..0000000
--- a/dev-db/mariadb-connector-c/files/fix-mariadb_config.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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)
- FOREACH(lib ${EXTRA_LIBS})
-- SET(extra_dynamic_LDFLAGS "${extra_dynamic_LDFLAGS} -l${lib}")
-+ STRING(REPLACE "-l" "" clean_lib ${lib})
-+ SET(extra_dynamic_LDFLAGS "${extra_dynamic_LDFLAGS} -l${clean_lib}")
- ENDFOREACH()
- IF(WITH_SQLITE)
- SET(extra_dynamic_LDFLAGS "${extra_dynamic_LDFLAGS} -lsqlite")
-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" \
- "@extra_dynamic_LDFLAGS@"
--#define CFLAGS INCLUDE "@CMAKE_C_FLAGS@"
-+#define CFLAGS INCLUDE " @CMAKE_C_FLAGS@"
- #define VERSION "@MYSQL_CLIENT_VERSION@"
- #define SOCKET "@MYSQL_UNIX_ADDR@"
- #define PORT "@MYSQL_PORT@"
diff --git a/dev-db/mariadb-connector-c/files/gentoo-layout-2.2.2.patch b/dev-db/mariadb-connector-c/files/gentoo-layout-2.2.2.patch
deleted file mode 100644
index dd43133..0000000
--- a/dev-db/mariadb-connector-c/files/gentoo-layout-2.2.2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -aurN a/cmake/install.cmake b/cmake/install.cmake
---- a/cmake/install.cmake 2015-12-08 02:50:35.000000000 -0500
-+++ b/cmake/install.cmake 2016-02-12 21:40:46.599011426 -0500
-@@ -120,12 +120,6 @@
- SET(PREFIX_INSTALL_DIR_${INSTALL_LAYOUT} ${PREFIX_INSTALL_DIR})
- ENDIF()
-
--IF(NOT SUFFIX_INSTALL_DIR)
-- SET(SUFFIX_INSTALL_DIR_${INSTALL_LAYOUT} "mariadb")
--ELSE()
-- SET(SUFFIX_INSTALL_DIR_${INSTALL_LAYOUT} ${SUFFIX_INSTALL_DIR})
--ENDIF()
--
- FOREACH(dir "BIN" "LIB" "INCLUDE" "DOCS" "PREFIX" "SUFFIX" "PLUGIN")
- SET(${dir}_INSTALL_DIR ${${dir}_INSTALL_DIR_${INSTALL_LAYOUT}})
- MARK_AS_ADVANCED(${dir}_INSTALL_DIR)
---- a/mariadb_config/CMakeLists.txt 2016-02-12 21:21:06.981021227 -0500
-+++ b/mariadb_config/CMakeLists.txt 2016-02-12 22:06:02.397130410 -0500
-@@ -33,4 +33,4 @@
- # Installation
- #
- INSTALL(TARGETS mariadb_config
-- DESTINATION "bin")
-+ DESTINATION ${BIN_INSTALL_DIR})
diff --git a/dev-db/mariadb-connector-c/files/gentoo-layout-3.0.patch b/dev-db/mariadb-connector-c/files/gentoo-layout-3.0.patch
deleted file mode 100644
index b57b7ab..0000000
--- a/dev-db/mariadb-connector-c/files/gentoo-layout-3.0.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/mariadb_config/CMakeLists.txt 2016-02-12 21:21:06.981021227 -0500
-+++ b/mariadb_config/CMakeLists.txt 2016-02-12 22:06:02.397130410 -0500
-@@ -40,5 +44,5 @@
- # Installation
- #
- INSTALL(TARGETS mariadb_config
-- DESTINATION "bin"
-+ DESTINATION ${INSTALL_BINDIR}
- COMPONENT Development)
diff --git a/dev-db/mariadb-connector-c/files/gentoo-layout.patch b/dev-db/mariadb-connector-c/files/gentoo-layout.patch
deleted file mode 100644
index 5663a37..0000000
--- a/dev-db/mariadb-connector-c/files/gentoo-layout.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -uarN a/cmake/install.cmake b/cmake/install.cmake
---- a/cmake/install.cmake 2015-01-29 13:21:48.000000000 -0500
-+++ b/cmake/install.cmake 2015-03-18 14:43:14.682768210 -0400
-@@ -39,12 +39,14 @@
- ENDIF()
-
- SET(INSTALL_LAYOUT ${INSTALL_LAYOUT} CACHE
-- STRING "Installation layout. Currently supported options are DEFAULT (tar.gz and zip) and RPM")
-+ STRING "Installation layout. Currently supported options are DEFAULT (tar.gz and zip), GENTOO, and RPM")
-
- # On Windows we only provide zip and .msi. Latter one uses a different packager.
- IF(UNIX)
- IF(INSTALL_LAYOUT MATCHES "RPM")
- SET(libmariadb_prefix "/usr")
-+ ELSEIF(INSTALL_LAYOUT MATCHES "GENTOO")
-+ SET(libmariadb_prefix ${CMAKE_INSTALL_PREFIX})
- ELSEIF(INSTALL_LAYOUT MATCHES "DEFAULT")
- SET(libmariadb_prefix ${CMAKE_INSTALL_PREFIX})
- ENDIF()
-@@ -55,7 +57,7 @@
- ENDIF()
-
- # check if the specified installation layout is valid
--SET(VALID_INSTALL_LAYOUTS "DEFAULT" "RPM")
-+SET(VALID_INSTALL_LAYOUTS "DEFAULT" "RPM" "GENTOO")
- LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" layout_no)
- IF(layout_no EQUAL -1)
- MESSAGE(FATAL_ERROR "Invalid installation layout. Please specify one of the following layouts: ${VALID_INSTALL_LAYOUTS}")
-diff -uarN a/cmake/install.cmake b/cmake/install.cmake
---- a/cmake/install.cmake 2015-01-29 13:21:48.000000000 -0500
-+++ b/cmake/install.cmake 2015-03-18 14:39:35.240617655 -0400
-@@ -79,6 +79,16 @@
- SET(PLUGIN_INSTALL_DIR_DEFAULT "lib/plugin")
-
- #
-+# Gentoo layout
-+#
-+SET(SUFFIX_INSTALL_DIR_GENTOO "")
-+SET(BIN_INSTALL_DIR_GENTOO "bin")
-+SET(LIB_INSTALL_DIR_GENTOO "lib")
-+SET(INCLUDE_INSTALL_DIR_GENTOO "include/mariadb")
-+SET(DOCS_INSTALL_DIR_GENTOO "share/docs")
-+SET(PLUGIN_INSTALL_DIR_GENTOO "lib/mariadb/plugin")
-+
-+#
- # RPM layout
- #
- SET(SUFFIX_INSTALL_DIR_RPM "mariadb")
-diff -uarN a/cmake/install.cmake b/cmake/install.cmake
---- a/cmake/install.cmake 2015-01-29 13:21:48.000000000 -0500
-+++ b/cmake/install.cmake 2015-03-18 14:31:56.156920869 -0400
-@@ -118,8 +118,5 @@
- SET(PREFIX_INSTALL_DIR_${INSTALL_LAYOUT} ${libmariadb_prefix})
- ENDIF()
-
--IF(NOT SUFFIX_INSTALL_DIR)
-- SET(SUFFIX_INSTALL_DIR_${INSTALL_LAYOUT} "mariadb")
--ENDIF()
-
- FOREACH(dir "BIN" "LIB" "INCLUDE" "DOCS" "PREFIX" "SUFFIX" "PLUGIN")
diff --git a/dev-db/mariadb-connector-c/files/multilib-install.patch b/dev-db/mariadb-connector-c/files/multilib-install.patch
deleted file mode 100644
index 6dfa270..0000000
--- a/dev-db/mariadb-connector-c/files/multilib-install.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -aruN a/CMakeLists.txt b/CMakeLists.txt
---- a/libmysql/CMakeLists.txt 2013-05-17 14:16:47.621519747 -0400
-+++ b/libmysql/CMakeLists.txt 2013-05-17 14:18:04.570428917 -0400
-@@ -166,9 +166,9 @@
-
- INSTALL(TARGETS
- libmariadb mariadbclient
-- RUNTIME DESTINATION "lib"
-- LIBRARY DESTINATION "lib"
-- ARCHIVE DESTINATION "lib")
-+ RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-
- INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include
- DESTINATION mariadbclient)
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-2.2.2.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-2.2.2.ebuild
deleted file mode 100644
index 882ee60..0000000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-2.2.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VCS_INHERIT=""
-if [[ "${PV}" == 9999 ]] ; then
- VCS_INHERIT="git-r3"
- EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git"
- KEYWORDS=""
-else
- MY_PN=${PN#mariadb-}
- SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV}/${P}-src.tar.gz?serve -> ${P}-src.tar.gz"
- S="${WORKDIR}"
- KEYWORDS="~amd64 ~x86"
-fi
-
-inherit cmake-utils multilib-minimal ${VCS_INHERIT}
-
-MULTILIB_CHOST_TOOLS=( /usr/sbin/mariadb_config )
-
-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"
-IUSE="mysqlcompat +ssl static-libs"
-
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
- virtual/libiconv:=[${MULTILIB_USEDEP}]
- ssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
- "
-RDEPEND="${DEPEND}
- mysqlcompat? (
- !dev-db/mysql
- !dev-db/mysql-cluster
- !dev-db/mariadb
- !dev-db/mariadb-galera
- !dev-db/percona-server
- !dev-db/mysql-connector-c )
- "
-PATCHES=( "${FILESDIR}/fix-mariadb_config-2.1.0.patch"
- "${FILESDIR}/gentoo-layout-2.2.2.patch" )
-
-multilib_src_configure() {
- mycmakeargs+=(
- -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
- -DWITH_EXTERNAL_ZLIB=ON
- -DWITH_OPENSSL=$(usex ssl ON OFF)
- -DWITH_MYSQLCOMPAT=$(usex mysqlcompat ON OFF)
- -DLIB_INSTALL_DIR=$(get_libdir)
- -DPLUGIN_INSTALL_DIR=$(get_libdir)/mariadb/plugin
- -DDOCS_INSTALL_DIR=share/docs
- -DBIN_INSTALL_DIR=sbin
- )
- cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
- if ! use static-libs ; then
- find "${D}" -name "*.a" -delete || die
- fi
- if use mysqlcompat ; then
- dosym ../sbin/mariadb_config /usr/bin/mysql_config
- dosym mariadb /usr/include/mysql
- fi
-}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
deleted file mode 100644
index c45c245..0000000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VCS_INHERIT=""
-if [[ "${PV}" == 9999 ]] ; then
- VCS_INHERIT="git-r3"
- EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
- KEYWORDS=""
-else
- MY_PN=${PN#mariadb-}
- SRC_URI="
- http://ftp.osuosl.org/pub/mariadb/${MY_PN}-${PV}/source-tgz/${P}-src.tar.gz
- http://mirrors.fe.up.pt/pub/mariadb/${MY_PN}-${PV}/source-tgz/${P}-src.tar.gz
- http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/${MY_PN}-${PV}/source-tgz/${P}-src.tar.gz
- "
- S="${WORKDIR}/${P}-src"
- KEYWORDS="~amd64 ~x86"
-fi
-
-inherit cmake-utils multilib-minimal ${VCS_INHERIT}
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-
-MULTILIB_WRAPPED_HEADERS+=(
- /usr/include/mariadb/my_config.h
-)
-
-PATCHES=( "${FILESDIR}/fix-mariadb_config-2.1.0.patch"
- "${FILESDIR}/gentoo-layout.patch" )
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="http://mariadb.org/"
-LICENSE="LGPL-2.1"
-
-SLOT="0/2"
-IUSE="mysqlcompat +ssl static-libs"
-
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
- virtual/libiconv:=[${MULTILIB_USEDEP}]
- ssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
- "
-# Block server packages due to /usr/bin/mariadb_config symlink there
-# TODO: make server package block only when mysqlcompat is enabled
-RDEPEND="${DEPEND}
- !dev-db/mysql
- !dev-db/mysql-cluster
- !dev-db/mariadb
- !dev-db/mariadb-galera
- !dev-db/percona-server
- mysqlcompat? ( !dev-db/mysql-connector-c )
- "
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
- -DWITH_EXTERNAL_ZLIB=ON
- -DOPENSSL=$(usex ssl ON OFF)
- -DMYSQLCOMPAT=$(usex mysqlcompat ON OFF)
- -DLIB_INSTALL_DIR=$(get_libdir)
- -DPLUGIN_INSTALL_DIR=$(get_libdir)/mariadb/plugin
- -DINSTALL_LAYOUT=GENTOO
- )
- cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
- if ! use static-libs ; then
- find "${D}" -name "*.a" -delete || die
- fi
- if use mysqlcompat ; then
- dosym mariadb_config /usr/bin/mysql_config
- dosym mariadb /usr/include/mysql
- fi
-}
diff --git a/dev-db/mariadb-connector-c/metadata.xml b/dev-db/mariadb-connector-c/metadata.xml
deleted file mode 100644
index 9c4d844..0000000
--- a/dev-db/mariadb-connector-c/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>mysql-bugs@gentoo.org</email>
-<name>MySQL</name>
-</maintainer>
-<use>
-<flag name="mysqlcompat">Enable mysqlclient library symbolic links</flag>
-</use>
-</pkgmetadata>