[gentoo-commits] proj/mysql:master commit in: dev-db/myodbc/

[gentoo-commits] proj/mysql:master commit in: dev-db/myodbc/

[Brian Evans]

commit:     e6c4cf4c035466d8b015bb23d1d3b2f9f7cc4352
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  2 14:25:16 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Mar  2 14:25:16 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=e6c4cf4c

dev-db/myodbc: Drop $Id$ header

 dev-db/myodbc/myodbc-5.2.7-r1.ebuild | 3 +--
 dev-db/myodbc/myodbc-5.2.7-r2.ebuild | 3 +--
 dev-db/myodbc/myodbc-5.3.4.ebuild    | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
index 59c2005..7887761 100644
--- a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 inherit cmake-multilib eutils flag-o-matic versionator

diff --git a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild b/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
index 65b99da..93cf915 100644
--- a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 inherit cmake-multilib eutils flag-o-matic versionator

diff --git a/dev-db/myodbc/myodbc-5.3.4.ebuild b/dev-db/myodbc/myodbc-5.3.4.ebuild
index 5e86689..876fa6c 100644
--- a/dev-db/myodbc/myodbc-5.3.4.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.4.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 inherit cmake-utils multilib-minimal eutils flag-o-matic versionator

[gentoo-commits] proj/mysql:master commit in: dev-db/myodbc/

[Brian Evans]

commit:     9a8b3c8b18650945c047cda78bbea4c7cc87be28
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 13 15:39:05 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Feb 13 15:39:05 2018 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=9a8b3c8b

dev-db/myodbc: Exclude mariadb from myodbc-5.3.10

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/myodbc/myodbc-5.3.10.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-db/myodbc/myodbc-5.3.10.ebuild b/dev-db/myodbc/myodbc-5.3.10.ebuild
index 9fd6b22..f4ac130 100644
--- a/dev-db/myodbc/myodbc-5.3.10.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.10.ebuild
@@ -21,13 +21,14 @@ SLOT="${MAJOR}"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-# Does not build with mysql-connector-c
+# Does not build with mariadb
 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/mariadb[client-libs(+)]
 "
 DEPEND="${RDEPEND}"
 S=${WORKDIR}/${MY_P}

[gentoo-commits] proj/mysql:master commit in: dev-db/myodbc/

[Brian Evans]

commit:     453b9938c8d1ed1e9494f812e20df8b1e6b862f6
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 18:23:33 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 18:23:33 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=453b9938

dev-db/myodbc: Clean up build process using multilib-minimal; adding die to external commands

Package-Manager: portage-2.2.25
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/myodbc/ChangeLog           | 4 ++++
 dev-db/myodbc/myodbc-5.3.4.ebuild | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dev-db/myodbc/ChangeLog b/dev-db/myodbc/ChangeLog
index 8bc0aea..f9d3054 100644
--- a/dev-db/myodbc/ChangeLog
+++ b/dev-db/myodbc/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  18 Nov 2015; Brian Evans <grknight@gentoo.org> myodbc-5.3.4.ebuild:
+  dev-db/myodbc: Clean up build process using multilib-minimal; adding die to
+  external commands
+
   11 Aug 2015; Brian Evans <grknight@gentoo.org> +files/5.2.7-my_malloc.patch,
   myodbc-5.2.7-r2.ebuild:
   dev-db/myodbc Add patch from bug 548912

diff --git a/dev-db/myodbc/myodbc-5.3.4.ebuild b/dev-db/myodbc/myodbc-5.3.4.ebuild
index 3041ff1..5e86689 100644
--- a/dev-db/myodbc/myodbc-5.3.4.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.4.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit cmake-multilib eutils flag-o-matic versionator
+inherit cmake-utils multilib-minimal eutils flag-o-matic versionator
 
 MAJOR="$(get_version_component_range 1-2 $PV)"
 MY_PN="mysql-connector-odbc"
@@ -35,10 +35,10 @@ DRIVER_NAME="${PN}-${SLOT}"
 src_prepare() {
 	# Remove Tests
 	sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
-		"${S}/CMakeLists.txt"
+		"${S}/CMakeLists.txt" || die
 
 	# Fix as-needed on the installer binary
-	echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt"
+	echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt" || die
 
 	# Patch document path so it doesn't install files to /usr
 	epatch "${FILESDIR}/cmake-doc-path.patch" \
@@ -51,7 +51,7 @@ multilib_src_configure() {
 	# MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB
 
 #	append-ldflags
-	mycmakeargs+=(
+	local mycmakeargs=(
 		-DMYSQL_CXX_LINKAGE=0
 		-DWITH_UNIXODBC=1
 		-DMYSQLCLIENT_LIB_NAME="libmysqlclient.so"

[gentoo-commits] proj/mysql:master commit in: dev-db/myodbc/

[Brian Evans]

commit:     7515e4ec76382418d4746c5c22c150e27360f8a1
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Thu Apr 17 20:18:56 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Thu Apr 17 20:18:56 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=7515e4ec

[myodbc] Version bump

Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>

---
 dev-db/myodbc/Manifest                                     | 2 +-
 dev-db/myodbc/{myodbc-5.2.5.ebuild => myodbc-5.2.6.ebuild} | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index ed3dbfb..f52d0b6 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1 +1 @@
-DIST mysql-connector-odbc-5.2.5-src.tar.gz 581313 SHA256 54e35c646bb4d972bc18fba40d486059aac336d838269bef8049d1d78ebfb96a SHA512 a503df647690073e5b6b02ea49b3db380e6524388addd37b9993dcc0d0fb325c0d1e0954bbbc5a01e5d59c1ee20aab021dce731f89debfe07e61f9caad31e5cc WHIRLPOOL f3c0e42760142436c84756f2c75c2351185be7ade9101d0ff6ecdd762d6421f01d8ce333673edef4a84c6b2c832a52e5ac47ec8403df376ba15df8e60480bed1
+DIST mysql-connector-odbc-5.2.6-src.tar.gz 595963 SHA256 005bba26358819bb5db48d23e8eb4a94cc234dfa103dd47a6c2602e7e70ad17b SHA512 9732b3034bdeb24700d0369d066fb43ca6f0327c2d3a3f1fff77d51ab37a83139536a7caae377791d979132c9640d67fddb4040095478924f4c8139ec6f404a5 WHIRLPOOL d8f0fc2cc7ec0b7602a2e6434d2680174dd50fe1d16dd03e0370ba1ec7807b09a83411e62aca3d68d540c1a564c759cbfea63c2d3adb6b642286a49d4dfc1330

diff --git a/dev-db/myodbc/myodbc-5.2.5.ebuild b/dev-db/myodbc/myodbc-5.2.6.ebuild
similarity index 96%
rename from dev-db/myodbc/myodbc-5.2.5.ebuild
rename to dev-db/myodbc/myodbc-5.2.6.ebuild
index 0dfdd64..7d1ee67 100644
--- a/dev-db/myodbc/myodbc-5.2.5.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.6.ebuild
@@ -43,7 +43,9 @@ src_prepare() {
 
 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
 		-DRPM_BUILD=1
 		-DMYSQL_LIB="$(mysql_config --variable=pkglibdir)/libmysqlclient_r.so"

[gentoo-commits] proj/mysql:master commit in: dev-db/myodbc/

[Jorge Manuel B. S. Vicetto]

commit:     cf7c4a3e059f3ceb7f9b6042d4eb834982cef530
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  5 11:38:44 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Sep  5 11:38:44 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=cf7c4a3e

Change indenting and whitespace

---
 dev-db/myodbc/myodbc-5.2.5.ebuild | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/dev-db/myodbc/myodbc-5.2.5.ebuild b/dev-db/myodbc/myodbc-5.2.5.ebuild
index 9661e94..0dfdd64 100644
--- a/dev-db/myodbc/myodbc-5.2.5.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.5.ebuild
@@ -3,21 +3,26 @@
 # $Header: $
 
 EAPI=5
-inherit flag-o-matic eutils versionator cmake-utils
+inherit cmake-utils 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=">=virtual/mysql-4.1
-		 dev-db/unixODBC"
+
+RDEPEND="
+	dev-db/unixODBC
+	>=virtual/mysql-4.1
+"
 DEPEND="${DEPEND} ${RDEPEND}"
 S=${WORKDIR}/${MY_P}
 
@@ -28,21 +33,28 @@ 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"
 }
 
 src_configure() {
 	# The RPM_BUILD flag does nothing except install to /usr/lib64 when "x86_64"
-	mycmakeargs+=( -DWITH_UNIXODBC=1 -DRPM_BUILD=1 
-		-DMYSQL_LIB="$(mysql_config --variable=pkglibdir)/libmysqlclient_r.so" )
+	mycmakeargs+=(
+		-DWITH_UNIXODBC=1
+		-DRPM_BUILD=1
+		-DMYSQL_LIB="$(mysql_config --variable=pkglibdir)/libmysqlclient_r.so"
+	)
+
 	cmake-utils_src_configure
 }
 
 src_install() {
 	cmake-utils_src_install
+
 	dodir /usr/share/${PN}-${SLOT}
 	for i in odbc.ini odbcinst.ini; do
 		einfo "Building $i"
@@ -57,11 +69,13 @@ src_install() {
 }
 
 pkg_config() {
+
 	[ "${ROOT}" != "/" ] && \
-	die 'Sorry, non-standard ROOT setting is not supported :-('
+		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
@@ -86,6 +100,7 @@ pkg_config() {
 }
 
 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}"

[gentoo-commits] proj/mysql:master commit in: dev-db/myodbc/

[Brian Evans]

commit:     0af92599c900298290cab56bb568f868e89bf938
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Sat Jul 27 16:35:58 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Sat Jul 27 16:35:58 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=0af92599

[myodbc] Fix detection of mysql library location by using mysql_config

---
 dev-db/myodbc/myodbc-5.2.5.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-db/myodbc/myodbc-5.2.5.ebuild b/dev-db/myodbc/myodbc-5.2.5.ebuild
index 7b16467..9661e94 100644
--- a/dev-db/myodbc/myodbc-5.2.5.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.5.ebuild
@@ -35,8 +35,9 @@ src_prepare() {
 }
 
 src_configure() {
-	# The RPM_BUILD flag does nothing except detect /usr/lib64 when "x86_64"
-	mycmakeargs+=( -DWITH_UNIXODBC=1 -DRPM_BUILD=1 )
+	# The RPM_BUILD flag does nothing except install to /usr/lib64 when "x86_64"
+	mycmakeargs+=( -DWITH_UNIXODBC=1 -DRPM_BUILD=1 
+		-DMYSQL_LIB="$(mysql_config --variable=pkglibdir)/libmysqlclient_r.so" )
 	cmake-utils_src_configure
 }
 

[gentoo-commits] proj/mysql:master commit in: dev-db/myodbc/

[Brian Evans]

commit:     84ce35afa95d41d6a0edbc4b1402b62b849a9790
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Wed Jul 24 17:00:42 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Jul 24 17:00:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=84ce35af

[myodbc] Remove as-needed hack by adding a library to installer/CMakeLists.txt

Package-Manager: portage-2.1.12.2

---
 dev-db/myodbc/ChangeLog           | 3 +++
 dev-db/myodbc/myodbc-5.2.5.ebuild | 8 +++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dev-db/myodbc/ChangeLog b/dev-db/myodbc/ChangeLog
index 5fd9f8c..0bc92e4 100644
--- a/dev-db/myodbc/ChangeLog
+++ b/dev-db/myodbc/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.33 2013/05/10 08:17:39 patrick Exp $
 
+  24 Jul 2013; Brian Evans <grknight@lavabit.com> myodbc-5.2.5.ebuild:
+  [myodbc] Remove as-needed hack by adding a library to installer/CMakeLists.txt
+
   10 May 2013; Patrick Lauer <patrick@gentoo.org> myodbc-5.1.6.ebuild:
   Fix src_prepare
 

diff --git a/dev-db/myodbc/myodbc-5.2.5.ebuild b/dev-db/myodbc/myodbc-5.2.5.ebuild
index e31444e..7b16467 100644
--- a/dev-db/myodbc/myodbc-5.2.5.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.5.ebuild
@@ -24,15 +24,13 @@ S=${WORKDIR}/${MY_P}
 # Careful!
 DRIVER_NAME="${PN}-${SLOT}"
 
-pkg_setup() {
-	# TODO: find out how to not have this and fix the CMake build
-	append-ldflags $(no-as-needed)
-}
-
 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"
 }