commit: d1e5e76c53b65228c1831a6f865269a26369edf7 Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Mon Apr 9 00:29:39 2018 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Mon Apr 9 00:29:39 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1e5e76c
dev-db/maxscale: Package removal wrt bug 649764 Closes: https://bugs.gentoo.org/649764 dev-db/maxscale/Manifest | 1 - dev-db/maxscale/files/maxscale-1.2.0-rpath.patch | 48 ---------------- dev-db/maxscale/files/maxscale-init.d | 21 ------- dev-db/maxscale/maxscale-1.2.0.ebuild | 70 ------------------------ dev-db/maxscale/metadata.xml | 19 ------- profiles/package.mask | 8 --- 6 files changed, 167 deletions(-) diff --git a/dev-db/maxscale/Manifest b/dev-db/maxscale/Manifest deleted file mode 100644 index a723120c5bb..00000000000 --- a/dev-db/maxscale/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST MaxScale-1.2.0.tar.gz 8747330 BLAKE2B 609e72f42e00e8459f16ce9dce1c2e0ebb2bc8bcb9a8c967b2cc35f2d8031d1ae16da10d7b2331f86ef6f0b77d87911bc336197bc76736196f48c2c4fbac896e SHA512 59988397fc7c8112dc81e77d317b4625e071448c0669805fdee91e156553c2144d802f70ebc047df75aab6f7e0114e22a3f9f68768f779ab2300536196c34a7e diff --git a/dev-db/maxscale/files/maxscale-1.2.0-rpath.patch b/dev-db/maxscale/files/maxscale-1.2.0-rpath.patch deleted file mode 100644 index 76cca09845f..00000000000 --- a/dev-db/maxscale/files/maxscale-1.2.0-rpath.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -aurN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2015-07-15 09:34:27.000000000 -0400 -+++ b/CMakeLists.txt 2015-08-10 22:12:06.021818283 -0400 -@@ -56,7 +56,7 @@ - endif() - endif() - --set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${CMAKE_INSTALL_PREFIX}/${MAXSCALE_LIBDIR}) -+set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${MAXSCALE_LIBDIR}) - - # Make sure the release notes for this release are present if it is a stable one - if(${MAXSCALE_VERSION} MATCHES "-stable") -diff -aurN a/server/modules/filter/hint/CMakeLists.txt b/server/modules/filter/hint/CMakeLists.txt ---- a/server/modules/filter/hint/CMakeLists.txt 2015-07-15 09:34:27.000000000 -0400 -+++ b/server/modules/filter/hint/CMakeLists.txt 2015-08-10 22:12:49.413170068 -0400 -@@ -1,4 +1,3 @@ - add_library(hintfilter SHARED hintfilter.c hintparser.c) --set_target_properties(hintfilter PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${MAXSCALE_LIBDIR}) - target_link_libraries(hintfilter ssl log_manager utils) - install(TARGETS hintfilter DESTINATION ${MAXSCALE_LIBDIR}) -diff -aurN a/server/modules/routing/binlog/CMakeLists.txt b/server/modules/routing/binlog/CMakeLists.txt ---- a/server/modules/routing/binlog/CMakeLists.txt 2015-07-15 09:34:27.000000000 -0400 -+++ b/server/modules/routing/binlog/CMakeLists.txt 2015-08-10 22:12:35.565376937 -0400 -@@ -1,4 +1,3 @@ - add_library(binlogrouter SHARED blr.c blr_master.c blr_cache.c blr_slave.c blr_file.c) --set_target_properties(binlogrouter PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${MAXSCALE_LIBDIR}) - target_link_libraries(binlogrouter ssl pthread log_manager) - install(TARGETS binlogrouter DESTINATION ${MAXSCALE_LIBDIR}) -diff -aurN a/server/modules/routing/maxinfo/CMakeLists.txt b/server/modules/routing/maxinfo/CMakeLists.txt ---- a/server/modules/routing/maxinfo/CMakeLists.txt 2015-07-15 09:34:27.000000000 -0400 -+++ b/server/modules/routing/maxinfo/CMakeLists.txt 2015-08-10 22:12:25.265530805 -0400 -@@ -1,4 +1,3 @@ - add_library(maxinfo SHARED maxinfo.c maxinfo_parse.c maxinfo_error.c maxinfo_exec.c) --set_target_properties(maxinfo PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${MAXSCALE_LIBDIR}) - target_link_libraries(maxinfo pthread log_manager) - install(TARGETS maxinfo DESTINATION ${MAXSCALE_LIBDIR}) -diff -aurN a/server/core/CMakeLists.txt b/server/core/CMakeLists.txt ---- a/server/core/CMakeLists.txt 2015-07-15 09:34:27.000000000 -0400 -+++ b/server/core/CMakeLists.txt 2015-08-10 22:39:22.709368505 -0400 -@@ -8,6 +8,8 @@ - target_link_libraries(fullcore ${CURL_LIBRARIES} utils log_manager pthread ${EMBEDDED_LIB} ${PCRE_LINK_FLAGS} ssl aio rt crypt dl crypto inih z m stdc++) - endif() - -+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -+ - add_executable(maxscale atomic.c buffer.c spinlock.c gateway.c - gw_utils.c utils.c dcb.c load_utils.c session.c service.c server.c - poll.c config.c users.c hashtable.c dbusers.c thread.c gwbitmask.c diff --git a/dev-db/maxscale/files/maxscale-init.d b/dev-db/maxscale/files/maxscale-init.d deleted file mode 100644 index 1eaa046aefe..00000000000 --- a/dev-db/maxscale/files/maxscale-init.d +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/openrc-run - -command=/usr/bin/maxscale -command_args="-U maxscale -P /run/maxscale" -name="MaxScale database proxy" -pidfile="/run/maxscale/maxscale.pid" - -description="MaxScale provides database specific proxy functionality" -extra_started_commands="reload" - -start_pre() { - checkpath -D -o maxscale:maxscale /run/maxscale -} - -reload() -{ - ebegin "Reloading ${name}" - pkill -HUP -F /run/maxscale/maxscale.pid - eend $? -} - diff --git a/dev-db/maxscale/maxscale-1.2.0.ebuild b/dev-db/maxscale/maxscale-1.2.0.ebuild deleted file mode 100644 index bee3d1f390e..00000000000 --- a/dev-db/maxscale/maxscale-1.2.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils cmake-utils multilib user - -MY_PN="MaxScale" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A content aware, plug-able MySQL proxy server" -HOMEPAGE="http://mariadb.com/MaxScale"; -SRC_URI="https://github.com/mariadb-corporation/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="jemalloc rabbitmq tcmalloc" - -REQUIRED_USE="?? ( jemalloc tcmalloc )" - -DEPEND=" - dev-libs/libaio - >=dev-libs/libpcre-8.35 - dev-libs/openssl:0 - net-misc/curl - virtual/mysql[embedded] - jemalloc? ( dev-libs/jemalloc ) - rabbitmq? ( net-libs/rabbitmq-c ) - tcmalloc? ( dev-util/google-perftools:= ) -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}/${PN}-1.2.0-rpath.patch" ) - -pkg_setup() { - enewgroup maxscale - enewuser maxscale -1 -1 -1 maxscale -} - -src_configure() { -# -DEMBEDDED_LIB=/usr/$(get_libdir)/mysql - local mycmakeargs=( - -DSTATIC_EMBEDDED=OFF - -DWITH_SCRIPTS=OFF - $(cmake-utils_use_with jemalloc JEMALLOC) - $(cmake-utils_use_build rabbitmq RABBITMQ) - $(cmake-utils_use_with tcmalloc TCMALLOC) - -DMODULE_INSTALL_PATH=$(get_libdir)/${PN} - ) - cmake-utils_src_configure -} - -src_install() { - local DOCS=( README README.md "${BUILD_DIR}"/Changelog.txt "${BUILD_DIR}"/ReleaseNotes.txt ) - cmake-utils_src_install - # Remove badly placed documents - rm "${D}usr/share/${PN}/README" "${D}usr/share/${PN}/Changelog.txt" \ - "${D}usr/share/${PN}/LICENSE" "${D}usr/share/${PN}/COPYRIGHT" \ - "${D}usr/share/${PN}/ReleaseNotes.txt" || die - newinitd "${FILESDIR}/${PN}-init.d" ${PN} - keepdir /var/log/maxscale /var/lib/maxscale/data \ - /var/cache/maxscale - fowners maxscale:maxscale /var/log/maxscale \ - /var/lib/maxscale/data \ - /var/lib/maxscale \ - /var/cache/maxscale -} diff --git a/dev-db/maxscale/metadata.xml b/dev-db/maxscale/metadata.xml deleted file mode 100644 index 2ca7145c764..00000000000 --- a/dev-db/maxscale/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>grkni...@gentoo.org</email> - <name>Brian Evans</name> - </maintainer> - <maintainer type="project"> - <email>mysql-b...@gentoo.org</email> - <name>MySQL</name> - </maintainer> - <use> - <flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag> - <flag name="rabbitmq">Add support for RabbitMQ message queue</flag> - </use> - <upstream> - <remote-id type="github">mariadb-corporation/MaxScale</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index f27bd8d7789..3a5500e39c4 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -599,14 +599,6 @@ net-p2p/tribler # Dead upstream, no revdeps left. Bug #639358 app-i18n/libguess -# Brian Evans <grkni...@gentoo.org> (06 Mar 2018) -# MariaDB MaxScale 1.x depends on the deprecated libmysqld -# Newer versions bundle software that require git access -# and modify system libraries for their own purposes making -# it exteremely difficult to package. -# Bug 649764 Removal in 30 days. -dev-db/maxscale - # Andreas K. Hüttel <dilfri...@gentoo.org> (03 Mar 2018) # Fails to build without rpc support in glibc (bug 631044); # no maintainer, requires obsolete hardware. Removal in
