commit: e9b45ab078c416d0d71940cbed737f64600f4e0b
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Thu Dec 13 21:28:22 2018 +0000
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Thu Dec 13 21:53:12 2018 +0000
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=e9b45ab0
[dev-db/mariadb-connector-c] In tree now, removed.
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
.../files/patches/3.0.3/gentoo-layout.patch | 55 ----------------
.../files/patches/9999/gentoo-layout.patch | 55 ----------------
.../mariadb-connector-c-3.0.3.ebuild | 75 ----------------------
.../mariadb-connector-c-9999.ebuild | 75 ----------------------
dev-db/mariadb-connector-c/metadata.xml | 11 ----
5 files changed, 271 deletions(-)
diff --git a/dev-db/mariadb-connector-c/files/patches/3.0.3/gentoo-layout.patch
b/dev-db/mariadb-connector-c/files/patches/3.0.3/gentoo-layout.patch
deleted file mode 100644
index 428c91e..0000000
--- a/dev-db/mariadb-connector-c/files/patches/3.0.3/gentoo-layout.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git 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
-@@ -31,12 +31,12 @@
- ENDIF()
-
- SET(INSTALL_LAYOUT ${INSTALL_LAYOUT} CACHE
-- STRING "Installation layout. Currently supported options are DEFAULT
(tar.gz and zip), RPM and DEB")
-+ STRING "Installation layout. Currently supported options are DEFAULT
(tar.gz and zip), GENTOO, DEB, 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 "DEFAULT|DEB")
-+ ELSEIF(INSTALL_LAYOUT MATCHES "DEFAULT|DEB|GENTOO")
- SET(libmariadb_prefix ${CMAKE_INSTALL_PREFIX})
- ENDIF()
- ENDIF()
-@@ -47,7 +47,7 @@
- ENDIF()
-
- # check if the specified installation layout is valid
--SET(VALID_INSTALL_LAYOUTS "DEFAULT" "RPM" "DEB")
-+SET(VALID_INSTALL_LAYOUTS "DEFAULT" "RPM" "DEB" "GENTOO")
- LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" layout_no)
- IF(layout_no EQUAL -1)
- MESSAGE(FATAL_ERROR "Invalid installation layout ${INSTALL_LAYOUT}. Please
specify one of the following layouts: ${VALID_INSTALL_LAYOUTS}")
-@@ -71,6 +71,16 @@
- SET(INSTALL_PLUGINDIR_DEFAULT "lib/mariadb/plugin")
- SET(LIBMARIADB_STATIC_DEFAULT "mariadbclient")
- #
-+# 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")
-+SET(LIBMARIADB_STATIC_GENTOO "mariadbclient")
-+#
- # RPM layout
- #
- SET(INSTALL_BINDIR_RPM "bin")
-@@ -121,9 +131,6 @@
- SET(INSTALL_PREFIXDIR_${INSTALL_LAYOUT} ${INSTALL_PREFIXDIR})
- ENDIF()
-
--IF(DEFINED INSTALL_SUFFIXDIR)
-- SET(INSTALL_SUFFIXDIR_${INSTALL_LAYOUT} ${INSTALL_SUFFIXDIR})
--ENDIF()
-
- FOREACH(dir "BIN" "LIB" "INCLUDE" "DOCS" "PLUGIN")
- SET(INSTALL_${dir}DIR ${INSTALL_${dir}DIR_${INSTALL_LAYOUT}})
diff --git a/dev-db/mariadb-connector-c/files/patches/9999/gentoo-layout.patch
b/dev-db/mariadb-connector-c/files/patches/9999/gentoo-layout.patch
deleted file mode 100644
index 428c91e..0000000
--- a/dev-db/mariadb-connector-c/files/patches/9999/gentoo-layout.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git 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
-@@ -31,12 +31,12 @@
- ENDIF()
-
- SET(INSTALL_LAYOUT ${INSTALL_LAYOUT} CACHE
-- STRING "Installation layout. Currently supported options are DEFAULT
(tar.gz and zip), RPM and DEB")
-+ STRING "Installation layout. Currently supported options are DEFAULT
(tar.gz and zip), GENTOO, DEB, 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 "DEFAULT|DEB")
-+ ELSEIF(INSTALL_LAYOUT MATCHES "DEFAULT|DEB|GENTOO")
- SET(libmariadb_prefix ${CMAKE_INSTALL_PREFIX})
- ENDIF()
- ENDIF()
-@@ -47,7 +47,7 @@
- ENDIF()
-
- # check if the specified installation layout is valid
--SET(VALID_INSTALL_LAYOUTS "DEFAULT" "RPM" "DEB")
-+SET(VALID_INSTALL_LAYOUTS "DEFAULT" "RPM" "DEB" "GENTOO")
- LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" layout_no)
- IF(layout_no EQUAL -1)
- MESSAGE(FATAL_ERROR "Invalid installation layout ${INSTALL_LAYOUT}. Please
specify one of the following layouts: ${VALID_INSTALL_LAYOUTS}")
-@@ -71,6 +71,16 @@
- SET(INSTALL_PLUGINDIR_DEFAULT "lib/mariadb/plugin")
- SET(LIBMARIADB_STATIC_DEFAULT "mariadbclient")
- #
-+# 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")
-+SET(LIBMARIADB_STATIC_GENTOO "mariadbclient")
-+#
- # RPM layout
- #
- SET(INSTALL_BINDIR_RPM "bin")
-@@ -121,9 +131,6 @@
- SET(INSTALL_PREFIXDIR_${INSTALL_LAYOUT} ${INSTALL_PREFIXDIR})
- ENDIF()
-
--IF(DEFINED INSTALL_SUFFIXDIR)
-- SET(INSTALL_SUFFIXDIR_${INSTALL_LAYOUT} ${INSTALL_SUFFIXDIR})
--ENDIF()
-
- FOREACH(dir "BIN" "LIB" "INCLUDE" "DOCS" "PLUGIN")
- SET(INSTALL_${dir}DIR ${INSTALL_${dir}DIR_${INSTALL_LAYOUT}})
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3.ebuild
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3.ebuild
deleted file mode 100644
index d07b484..0000000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="https://downloads.mariadb.org/f/${MY_PN}-${PV}/${P}-src.tar.gz?serve
-> ${P}-src.tar.gz"
- S="${WORKDIR}"
- KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}/${P}-src"
-fi
-
-inherit cmake-utils multilib-minimal patches ${VCS_INHERIT}
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-
-MULTILIB_WRAPPED_HEADERS+=(
- /usr/include/mariadb/my_config.h
- /usr/include/mariadb/mariadb_version.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}] )
- !dev-db/mariadb
- "
-RDEPEND="
- ${DEPEND}
- mysqlcompat? (
- !dev-db/mysql
- !dev-db/mysql-cluster
- !dev-db/mariadb-galera
- !dev-db/percona-server
- !dev-db/mysql-connector-c
- )
-"
-
-multilib_src_configure() {
- mycmakeargs+=(
- -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
- -DWITH_EXTERNAL_ZLIB=ON
- -DWITH_SSL=$(usex ssl ON OFF)
- -DWITH_MYSQLCOMPAT=$(usex mysqlcompat ON OFF)
- -DINSTALL_LIBDIR=$(get_libdir)
- -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
- -DINSTALL_DOCSDIR=share/docs
- -DINSTALL_BINDIR=bin
- )
- 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 /usr/bin/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 d07b484..0000000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="https://downloads.mariadb.org/f/${MY_PN}-${PV}/${P}-src.tar.gz?serve
-> ${P}-src.tar.gz"
- S="${WORKDIR}"
- KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}/${P}-src"
-fi
-
-inherit cmake-utils multilib-minimal patches ${VCS_INHERIT}
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-
-MULTILIB_WRAPPED_HEADERS+=(
- /usr/include/mariadb/my_config.h
- /usr/include/mariadb/mariadb_version.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}] )
- !dev-db/mariadb
- "
-RDEPEND="
- ${DEPEND}
- mysqlcompat? (
- !dev-db/mysql
- !dev-db/mysql-cluster
- !dev-db/mariadb-galera
- !dev-db/percona-server
- !dev-db/mysql-connector-c
- )
-"
-
-multilib_src_configure() {
- mycmakeargs+=(
- -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
- -DWITH_EXTERNAL_ZLIB=ON
- -DWITH_SSL=$(usex ssl ON OFF)
- -DWITH_MYSQLCOMPAT=$(usex mysqlcompat ON OFF)
- -DINSTALL_LIBDIR=$(get_libdir)
- -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
- -DINSTALL_DOCSDIR=share/docs
- -DINSTALL_BINDIR=bin
- )
- 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 /usr/bin/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>[email protected]</email>
-<name>MySQL</name>
-</maintainer>
-<use>
-<flag name="mysqlcompat">Enable mysqlclient library symbolic links</flag>
-</use>
-</pkgmetadata>
