From 79619025a7e5a1d71dcb94e827ce52183bf1405b Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Tue, 16 Oct 2018 21:43:25 -0400 Subject: dev-db/myodbc: Drop 5.2.7 versions Signed-off-by: Brian Evans Package-Manager: Portage-2.3.51, Repoman-2.3.11 Manifest-Sign-Key: 0xD1F781EFF9F4A3B6 --- dev-db/myodbc/Manifest | 27 +++--- dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch | 40 --------- dev-db/myodbc/myodbc-5.2.7-r1.ebuild | 118 ------------------------- dev-db/myodbc/myodbc-5.2.7-r2.ebuild | 121 -------------------------- 4 files changed, 13 insertions(+), 293 deletions(-) delete mode 100644 dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch delete mode 100644 dev-db/myodbc/myodbc-5.2.7-r1.ebuild delete mode 100644 dev-db/myodbc/myodbc-5.2.7-r2.ebuild diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest index ca32def..0941e8b 100644 --- a/dev-db/myodbc/Manifest +++ b/dev-db/myodbc/Manifest @@ -1,25 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST mysql-connector-odbc-5.2.7-src.tar.gz 606472 SHA256 0ad8fcccb4c41c7100fe02ec0aa87938d33329d23f7b68d1b9031c87750392c9 SHA512 f54ac8a23ade71da85e1335e95eccdccfd68a8687d17a584ced103812bdc5aee8014769a84eaa22724bb2cb23d34c7188c964d3283723defeaef5157a4b3c60f WHIRLPOOL 928808ac5b623ec345c8c1b8495ca1de7f10e65f0d14720e9bee6ab154ccf818ca690745a57fa7fa1c008ba57b24705657398cd9146fbf2e385c178deca0e499 DIST mysql-connector-odbc-5.3.10-src.tar.gz 2646571 SHA256 e15fe714b0236bdb7adea28a5d14a62511b5657cd83a6be664b45a4ef077fcb5 SHA512 ebe56b95a1690332959a7a37e8ed381b46730fb9f6fbd6522ddc1a6961e4c8cdac59681a957b33abeb6cae12f210278e4063daa59ce952d92acf427bc188e22b WHIRLPOOL e27aa8c51b575972ceb2f82d36ae4146835e1893808d9a5f98c31924fb16ee576880c7ae3393b89beb4f952c5436699d25efb4cd0e0d25b454a31bdfeedea98e DIST mysql-connector-odbc-5.3.4-src.tar.gz 667340 SHA256 a5f7a490f2958f2768d18b8a57f71909f9699a8619c82776b3ad1c02b8abce0d SHA512 1e3a0c06091f6ca34e89f9fc915f34e94b840db8626a93f56d464aff8d1f8a275c4ef494046ac760e8bcf910a05b91e39a8a1842711e4a78adddcc412ff77ec8 WHIRLPOOL 37bbaac3098377c82889cc30a3bd8b088b751e81a0116b87945a0efccd60f5c3a689176ccbaf866f7957404bbb08d08f9a7885ad68448f7a65188da3b33eb9f2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlp/xCZfFIAAAAAALgAo +iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlvGk7xfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2 QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0 -o7axjw/8CvLJt67erbQNFH1HvJ+zWl0U7bNsXZAirgP0Z8qs4tRPLT7QrNI6TaUS -1X31ETYfJ3GlUgvhXnw9UnASJ1DNRMHrRO1GJpOFIAmL+R5ZxKlm6Uvl4EBH3WF6 -rakfNklyx2OPwWqIf/K8IM7QwF+k2uxaXSPKF2lWapEUvxFsjsfcXKqJG4LmT8W1 -23y2RT6rMO2KUhElnM4skCWO2W1nIw8JnZvWfwN8gZnEIR7shv/sPNxaCYjO3EhR -F/XDKoq7H1+Q81/UgxF/47RZZ7GX4yU6ba+kOU/nza/WCN15rGuXZ2HqZeKzcE5l -KRuxNLOJqajdycFksUXHWLonboD0k9UPRJ4qFA2hq1mK3H/fUJQ9NZO8LnR61EO2 -RY052qrGcJ3g1vamH0onqdY5guld9MR3Bh5Gc1kuq6APG6nhaE+rpSTYJ6QYEq7V -m31qFN6Se93j0ED0oDcY77APIVoGRFZMof4X+a9uO/DdwBr2MYG+Sfxnr12xWZmA -ltwxcRjOSBQZbJwmblEl9zyyboivoXqAcrw1rfwBkZsyMgJdvgKs3fSBnUCFSOU+ -ei5DH8vDF9x6Ew6FFGHwpEQd7GULCE8jR+Vc8cyztEGiGHppEX8zhpM4iFgYai5i -Grj19xsQ0wLvQHl/BJ5o8JxMmFryFXpYtmoddEz9xdzd+4KKa0I= -=H5eI +o7YUkRAAsl1lJcDOEH4i3f7i0438IcDzttcMx1T1tLnDG6pBPlD9Bi5igUNJ2x76 +7y8N5CdCJ23aF9UfuqgCVromlxIXIzOzczTHE+cTwRRyeAiDagKfrgkF8Whs+4pD +bMzeZbFOsxlUSPWZXJ8OZXjA1/pILplo+Nc2gvieoR7ykaoRSndVkKxLHzC68QpW +8ZS3kPCQ3U55OIcwMc0T4UNsrEqOW3dC3eRMXuAy+Qy0HYrPSpdvrupm2gi/zOUF +HVm1JfoW+OaBoLxdCp2nnEnrBCEoGB+nu9QDexk1XmHLILmOarVngb83gfEjYW0b +bw0ltQvhf7/AU+27k0lMtv0DbwJ7akbz5nCy7XszcBMZsoqtIs2jNg6lqiwGa4JO +bOQ/eqIPrHYUWd1hq3HMRw30/dVdXGyRmYJWl8y0hucx2NxoEGop4bWWSpB210Fq +PPakT1T6ySjrVGnrMitg4Omug+a9rWoPhGMrYhK1leT5FFoK0sjeZO/rBupTOuSo +9i7g3Old3suvoIF2e2saWHGZS7+E1DH/iEWnu8g+kNcMqmj4Q8+ctC33SIkVll08 +PVpHZ9D1a+mFTpSSQrntsBotIaid3QZgJ9aDEW2DTHG+1iXy/rPRIwEvjW32q/fj +c0P1wKU8Nk/GLR59Vd6aAIPF5ofvywEMBkafa+6GTaTLg/l8vCo= +=5Rnq -----END PGP SIGNATURE----- diff --git a/dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch b/dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch deleted file mode 100644 index 2bdb4a5..0000000 --- a/dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -uarN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake ---- a/cmake/FindMySQL.cmake 2014-06-18 18:50:16.000000000 -0400 -+++ b/cmake/FindMySQL.cmake 2014-08-20 10:05:00.191485304 -0400 -@@ -105,16 +105,16 @@ - # Finally remove the dot - STRING(REGEX REPLACE "[.]" "" MYSQL_NUM_VERSION "${MYSQL_NUM_VERSION}") - -- IF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) -+ IF(MYSQL_CXX_LINKAGE) - EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cxxflags" - OUTPUT_VARIABLE _mysql_config_output - ) - SET(MYSQL_CXX_LINKAGE 1) -- ELSE (MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) -+ ELSE (MYSQL_CXX_LINKAGE) - EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags" - OUTPUT_VARIABLE _mysql_config_output - ) -- ENDIF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) -+ ENDIF(MYSQL_CXX_LINKAGE) - - # Remove the stl4port dependency - STRING(REGEX REPLACE "-library=stlport4" "" _mysql_config_output "${_mysql_config_output}") -diff -aurN mysql-connector-odbc-5.2.7-src.orig/CMakeLists.txt mysql-connector-odbc-5.2.7-src/CMakeLists.txt ---- a/CMakeLists.txt 2014-08-27 13:51:27.050553560 -0400 -+++ b/CMakeLists.txt 2014-08-27 13:55:41.702359680 -0400 -@@ -256,10 +256,9 @@ - SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin") - SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib") - --SET(LIB_SUBDIR "lib") --IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64)") -- SET(LIB_SUBDIR "lib64") --ENDIF() -+IF(NOT LIB_SUBDIR) -+ MESSAGE(ERROR "LIB_SUBDIR is not set") -+ENDIF(NOT LIB_SUBDIR) - MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}") - - INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}) diff --git a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild deleted file mode 100644 index 7887761..0000000 --- a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit cmake-multilib eutils flag-o-matic versionator - -MAJOR="$(get_version_component_range 1-2 $PV)" -MY_PN="mysql-connector-odbc" -MY_P="${MY_PN}-${PV/_p/r}-src" - -DESCRIPTION="ODBC driver for MySQL" -HOMEPAGE="http://www.mysql.com/products/myodbc/" -SRC_URI="mirror://mysql/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz" -RESTRICT="primaryuri" - -LICENSE="GPL-2" -SLOT="${MAJOR}" -KEYWORDS="amd64 ppc x86" -IUSE="" - -RDEPEND=" - dev-db/unixODBC[${MULTILIB_USEDEP}] - >=virtual/mysql-5.5[${MULTILIB_USEDEP}] - abi_x86_32? ( - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - ) -" -DEPEND="${RDEPEND}" -S=${WORKDIR}/${MY_P} - -# Careful! -DRIVER_NAME="${PN}-${SLOT}" - -src_prepare() { - # Remove Tests - sed -i -e "s/ADD_SUBDIRECTORY(test)//" \ - "${S}/CMakeLists.txt" - - # Fix as-needed on the installer binary - echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt" - - # Patch document path so it doesn't install files to /usr - epatch "${FILESDIR}/cmake-doc-path.patch" \ - "${FILESDIR}/${PVR}-cxxlinkage.patch" \ - "${FILESDIR}/${PV}-mariadb-dynamic-array.patch" -} - -multilib_src_configure() { - # The RPM_BUILD flag does nothing except install to /usr/lib64 when "x86_64" - # MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB - mycmakeargs+=( - -DMYSQL_CXX_LINKAGE=0 - -DWITH_UNIXODBC=1 - -DMYSQLCLIENT_LIB_NAME="libmysqlclient_r.so" - -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF} - -DMYSQL_LIB_DIR="${ROOT}/usr/$(get_libdir)" - -DLIB_SUBDIR="$(get_libdir)" - ) - cmake-utils_src_configure -} - -multilib_src_install_all() { - debug-print-function ${FUNCNAME} "$@" - - dodir /usr/share/${PN}-${SLOT} - for i in odbc.ini odbcinst.ini; do - einfo "Building $i" - sed \ - -e "s,__PN__,${DRIVER_NAME},g" \ - -e "s,__PF__,${MAJOR},g" \ - -e "s,libmyodbc3.so,libmyodbc${SLOT:0:1}a.so,g" \ - >"${D}"/usr/share/${PN}-${SLOT}/${i} \ - <"${FILESDIR}"/${i}.m4 \ - || die "Failed to build $i" - done; - mv "${D}/usr/bin/myodbc-installer" \ - "${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary" -} - -pkg_config() { - - [ "${ROOT}" != "/" ] && \ - die 'Sorry, non-standard ROOT setting is not supported :-(' - - local msg='MySQL ODBC driver' - local drivers=$(/usr/bin/odbcinst -q -d) - - if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then - ebegin "Installing ${msg}" - /usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini - rc=$? - eend $rc - [ $rc -ne 0 ] && die - else - einfo "Skipping already installed ${msg}" - fi - - local sources=$(/usr/bin/odbcinst -q -s) - msg='sample MySQL ODBC DSN' - if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then - ebegin "Installing ${msg}" - /usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini - rc=$? - eend $rc - [ $rc -ne 0 ] && die - else - einfo "Skipping already installed ${msg}" - fi -} - -pkg_postinst() { - - elog "If this is a new install, please run the following command" - elog "to configure the MySQL ODBC drivers and sources:" - elog "emerge --config =${CATEGORY}/${PF}" - elog "Please note that the driver name used to form the DSN now includes the SLOT." - elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}" -} diff --git a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild b/dev-db/myodbc/myodbc-5.2.7-r2.ebuild deleted file mode 100644 index 93cf915..0000000 --- a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit cmake-multilib eutils flag-o-matic versionator - -MAJOR="$(get_version_component_range 1-2 $PV)" -MY_PN="mysql-connector-odbc" -MY_P="${MY_PN}-${PV/_p/r}-src" - -DESCRIPTION="ODBC driver for MySQL" -HOMEPAGE="http://www.mysql.com/products/myodbc/" -SRC_URI="mirror://mysql/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz" -RESTRICT="primaryuri" - -LICENSE="GPL-2" -SLOT="${MAJOR}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -# Does not build with mysql-connector-c -RDEPEND=" - dev-db/unixODBC[${MULTILIB_USEDEP}] - ~virtual/libmysqlclient-18[${MULTILIB_USEDEP}] - abi_x86_32? ( - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - ) - !dev-db/mysql-connector-c -" -DEPEND="${RDEPEND}" -S=${WORKDIR}/${MY_P} - -# Careful! -DRIVER_NAME="${PN}-${SLOT}" - -src_prepare() { - # Remove Tests - sed -i -e "s/ADD_SUBDIRECTORY(test)//" \ - "${S}/CMakeLists.txt" - - # Fix as-needed on the installer binary - echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt" - - # Patch document path so it doesn't install files to /usr - epatch "${FILESDIR}/cmake-doc-path.patch" \ - "${FILESDIR}/${PV}-r1-cxxlinkage.patch" \ - "${FILESDIR}/${PV}-mariadb-dynamic-array.patch" \ - "${FILESDIR}/${PV}-my_malloc.patch" -} - -multilib_src_configure() { - # The RPM_BUILD flag does nothing except install to /usr/lib64 when "x86_64" - # MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB - mycmakeargs+=( - -DMYSQL_CXX_LINKAGE=0 - -DWITH_UNIXODBC=1 - -DMYSQLCLIENT_LIB_NAME="libmysqlclient_r.so" - -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF} - -DMYSQL_LIB_DIR="${ROOT}/usr/$(get_libdir)" - -DLIB_SUBDIR="$(get_libdir)" - ) - cmake-utils_src_configure -} - -multilib_src_install_all() { - debug-print-function ${FUNCNAME} "$@" - - dodir /usr/share/${PN}-${SLOT} - for i in odbc.ini odbcinst.ini; do - einfo "Building $i" - sed \ - -e "s,__PN__,${DRIVER_NAME},g" \ - -e "s,__PF__,${MAJOR},g" \ - -e "s,libmyodbc3.so,libmyodbc${SLOT:0:1}a.so,g" \ - >"${D}"/usr/share/${PN}-${SLOT}/${i} \ - <"${FILESDIR}"/${i}.m4 \ - || die "Failed to build $i" - done; - mv "${D}/usr/bin/myodbc-installer" \ - "${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary" -} - -pkg_config() { - - [ "${ROOT}" != "/" ] && \ - die 'Sorry, non-standard ROOT setting is not supported :-(' - - local msg='MySQL ODBC driver' - local drivers=$(/usr/bin/odbcinst -q -d) - - if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then - ebegin "Installing ${msg}" - /usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini - rc=$? - eend $rc - [ $rc -ne 0 ] && die - else - einfo "Skipping already installed ${msg}" - fi - - local sources=$(/usr/bin/odbcinst -q -s) - msg='sample MySQL ODBC DSN' - if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then - ebegin "Installing ${msg}" - /usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini - rc=$? - eend $rc - [ $rc -ne 0 ] && die - else - einfo "Skipping already installed ${msg}" - fi -} - -pkg_postinst() { - - elog "If this is a new install, please run the following command" - elog "to configure the MySQL ODBC drivers and sources:" - elog "emerge --config =${CATEGORY}/${PF}" - elog "Please note that the driver name used to form the DSN now includes the SLOT." - elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}" -} -- cgit v1.2.3-65-gdbad