root
4 years ago
parent
aaeee9c2ba
commit
4617350cf7
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,73 @@
|
||||
# Copyright 2018-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python{2_7,3_6} )
|
||||
|
||||
inherit bash-completion-r1 distutils-r1
|
||||
|
||||
DESCRIPTION="Multi-container orchestration for Docker"
|
||||
HOMEPAGE="https://github.com/docker/compose"
|
||||
SRC_URI="https://github.com/docker/compose/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
|
||||
dev-python/paramiko[${PYTHON_USEDEP}]
|
||||
>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
|
||||
>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
|
||||
$(python_gen_cond_dep '>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 'python2_7' )
|
||||
$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
|
||||
$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
|
||||
$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
|
||||
$(python_gen_cond_dep '>=dev-python/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
test? (
|
||||
<dev-python/pytest-4[${PYTHON_USEDEP}]
|
||||
dev-python/ddt[${PYTHON_USEDEP}]
|
||||
$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
|
||||
)"
|
||||
|
||||
S="${WORKDIR}/compose-${PV}"
|
||||
|
||||
PATCHES=(
|
||||
# Bug #679968 -- https://bugs.gentoo.org/679968
|
||||
# Bug #681002 -- https://bugs.gentoo.org/681002
|
||||
"${FILESDIR}"/${PN}-1.25.2-setup-py.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
|
||||
sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
python_test() {
|
||||
distutils_install_for_testing
|
||||
${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
newbashcomp contrib/completion/bash/docker-compose ${PN}
|
||||
|
||||
insinto /usr/share/zsh/site-functions
|
||||
doins contrib/completion/zsh/*
|
||||
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
@ -0,0 +1,71 @@
|
||||
From 19d9b58b97127f24e2280e3119e420393e7d239f Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Pipping <sebastian@pipping.org>
|
||||
Date: Mon, 20 Jan 2020 19:27:46 +0100
|
||||
Subject: [PATCH] setup.py: Drop generic upper version boundaries
|
||||
|
||||
---
|
||||
setup.py | 38 +++++++++++++++++++-------------------
|
||||
1 file changed, 19 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 110441d..3f6a46f 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -30,35 +30,35 @@ def find_version(*file_paths):
|
||||
|
||||
|
||||
install_requires = [
|
||||
- 'cached-property >= 1.2.0, < 2',
|
||||
- 'docopt >= 0.6.1, < 1',
|
||||
- 'PyYAML >= 3.10, < 6',
|
||||
- 'requests >= 2.20.0, < 3',
|
||||
- 'texttable >= 0.9.0, < 2',
|
||||
- 'websocket-client >= 0.32.0, < 1',
|
||||
- 'docker[ssh] >= 3.7.0, < 5',
|
||||
- 'dockerpty >= 0.4.1, < 1',
|
||||
- 'six >= 1.3.0, < 2',
|
||||
- 'jsonschema >= 2.5.1, < 4',
|
||||
+ 'cached-property >= 1.2.0',
|
||||
+ 'docopt >= 0.6.1',
|
||||
+ 'PyYAML >= 3.10',
|
||||
+ 'requests >= 2.20.0',
|
||||
+ 'texttable >= 0.9.0',
|
||||
+ 'websocket-client >= 0.32.0',
|
||||
+ 'docker[ssh] >= 3.7.0',
|
||||
+ 'dockerpty >= 0.4.1',
|
||||
+ 'six >= 1.3.0',
|
||||
+ 'jsonschema >= 2.5.1',
|
||||
]
|
||||
|
||||
|
||||
tests_require = [
|
||||
- 'pytest < 6',
|
||||
+ 'pytest',
|
||||
]
|
||||
|
||||
|
||||
if sys.version_info[:2] < (3, 4):
|
||||
- tests_require.append('mock >= 1.0.1, < 4')
|
||||
+ tests_require.append('mock >= 1.0.1')
|
||||
|
||||
extras_require = {
|
||||
- ':python_version < "3.2"': ['subprocess32 >= 3.5.4, < 4'],
|
||||
- ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
|
||||
- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
|
||||
- ':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0',
|
||||
- 'ipaddress >= 1.0.16, < 2'],
|
||||
- ':sys_platform == "win32"': ['colorama >= 0.4, < 1'],
|
||||
- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
|
||||
+ ':python_version < "3.2"': ['subprocess32 >= 3.5.4'],
|
||||
+ ':python_version < "3.4"': ['enum34 >= 1.0.4'],
|
||||
+ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
|
||||
+ ':python_version < "3.3"': ['backports.shutil_get_terminal_size >= 1.0.0',
|
||||
+ 'ipaddress >= 1.0.16'],
|
||||
+ ':sys_platform == "win32"': ['colorama >= 0.4'],
|
||||
+ 'socks': ['PySocks >= 1.5.6, != 1.5.7'],
|
||||
}
|
||||
|
||||
|
||||
--
|
||||
2.24.1
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -1,3 +1,2 @@
|
||||
DIST repoman-2.3.11.tar.bz2 86807 BLAKE2B f5bf8e9b7bac7816ee9b1139d0e0d30e99fc06da4fb742e430c237d9be0e6261bcf5d8f3412f1c20a34e2766c5acc86176b4731f20adc9554de9949bd5622a5d SHA512 331614554bb7ba49b8b63b8612642426fb458aa84de78bb9958be85d03e43d662fc094ecd2472a6f06c6b4f0368ec0542083b04c25f7d8b6aabb432cd2b32367
|
||||
DIST repoman-2.3.16.tar.bz2 86739 BLAKE2B dc3e3b5e72df751cfacc17e6f5c847160438a4d6f5d86b4dd17ab8a3a69cd0502f2965934c456ea7538f228c40364535e861c489ab2a09a0df14183b111e9a38 SHA512 d0e8bee1e3bd6dd8aecb1278fc7877768552612c4638488b61a9b8856ad9cd7333c7d52f0c334925d90170a1d8af20e9ead6533edbc10cae02baec629dece121
|
||||
DIST repoman-2.3.20.tar.bz2 87313 BLAKE2B cc0ff9b651e01b12202b32d48979f42ffde6e8a7c72095a3f75228a54892bc11c521f015738443133bec223f9ca0faf5687388680ddfd19e07514f873094b0f9 SHA512 edb5564de920156fd89b4df136d86b73401d4d5cf591abc2fbbf97f0ebb7bb43ed17d076560a76a1f3269d19a64c7c52d48540134a9fb86d9fa952d1702e01e2
|
||||
|
||||
@ -1,63 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{6,7} )
|
||||
PYTHON_REQ_USE='bzip2(+)'
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
|
||||
S="${WORKDIR}/${P}/repoman"
|
||||
else
|
||||
SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
|
||||
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
>=sys-apps/portage-2.3.43[${PYTHON_USEDEP}]
|
||||
>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
|
||||
dev-python/pyyaml[${PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
python_test() {
|
||||
esetup.py test
|
||||
}
|
||||
|
||||
python_install() {
|
||||
# Install sbin scripts to bindir for python-exec linking
|
||||
# they will be relocated in pkg_preinst()
|
||||
distutils-r1_python_install \
|
||||
--system-prefix="${EPREFIX}/usr" \
|
||||
--bindir="$(python_get_scriptdir)" \
|
||||
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
|
||||
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
|
||||
--sbindir="$(python_get_scriptdir)" \
|
||||
--sysconfdir="${EPREFIX}/etc" \
|
||||
"${@}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ -z {REPLACING_VERSIONS} ]]; then
|
||||
elog ""
|
||||
elog "This release of repoman is from the new portage/repoman split"
|
||||
elog "release code base."
|
||||
elog "This new repoman code base is still being developed. So its API's"
|
||||
elog "are not to be considered stable and are subject to change."
|
||||
elog "The code released has been tested and considered ready for use."
|
||||
elog "This however does not guarantee it to be completely bug free."
|
||||
elog "Please report any bugs you may encounter."
|
||||
elog ""
|
||||
fi
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST grip-4.2.0.zip 43079 BLAKE2B b7aa31c554d646fdedee88f54e2ad825d56eed26cb18ec364cc0e2638f3d002f2fb3192daa15085b2db5a9d608e37df8c74b19466042c57fa62b80f7bc259eef SHA512 2989a1cc2cb98254e932d5bf6679a205992e74802e68fe45d11cf087747d2379778df254bbf1cf980bb8993dc5568c5112707c645babbb32aae49f443319ff6b
|
||||
DIST grip-4.5.2.tar.gz 145644 BLAKE2B a353a74d55d6496f3dad362b74e434ff22c8130368f6773ab2bfdf66e43c62e8dcba0e3a786157d37b81d7c7e49d0c83a60c847100169684ede9c09f4eb06c3f SHA512 a8937d8ba3633a2d47587eb5c1b0583df7e8a8cacebb87fd50dab3fd2deb91981b38a83a3ed182f4e5e7435c8e2c8d87829e45fa9d32d8823c821f6217c7ccc9
|
||||
|
||||
@ -0,0 +1,27 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them"
|
||||
HOMEPAGE="https://github.com/joeyespo/grip"
|
||||
LICENSE="MIT"
|
||||
|
||||
SLOT="0"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
RDEPEND="
|
||||
>=dev-python/docopt-0.4.0
|
||||
>=dev-python/flask-0.10.1
|
||||
>=dev-python/markdown-2.5.1
|
||||
>=dev-python/path-and-address-2.0.1
|
||||
>=dev-python/pygments-1.6
|
||||
>=dev-python/requests-2.4.1
|
||||
"
|
||||
Binary file not shown.
@ -1,5 +1,2 @@
|
||||
DIST mysql-connector-c++-1.1.11.tar.gz 504872 BLAKE2B 16a265ce291d18d3e76f6654b42271d8c6cc9329f047d9eb0c6cdfaea37e1c13f04932e595e4333882b26154f0940949bc9bdab9d8af8e25d2bfff43be0030fa SHA512 d6839ecda12d1f088f24b20c08f3e9a757e9907d3375dba39e0f247b6a11de59817739644201e74d782d4c900aa18bf60910fe60a9ee98a2c0138104fb55dc22
|
||||
DIST mysql-connector-c++-1.1.12.tar.gz 518615 BLAKE2B 386a4753ca3f03999a49a89507da1b1172b3db89797c38403fee4eea86e7108a5e4f91f24a17de86d585c2a3d9e5742a117fa84d9b14aad649f938a597f3dae9 SHA512 d7e132dbc2efda4a77f8ae00c24006a1ade1d0a50f22d89ece453505e6d206427ee7988df29c0d6ef8b396ad6b8d326b6d263a1d4fa08ef5db0966fb4f1479f4
|
||||
DIST mysql-connector-c++-1.1.9.tar.gz 508255 BLAKE2B e2cd300946a873a94beab13d9d1cb64ecb5bd9a9a56ef2217b1f7aff1643adc9afc0aa22c2ff1e0f6b8318cd34d12a7fe95f0584c96c212307fa9bd0cb54a2a1 SHA512 ec4d6cb7f21d52e786de3bff951e65ea5ad7391ba097b599d0094d3e8356cf17f700dee618e38e79d7a9e562684a6c51cca95fb8e2e225942766d33f8d0a5646
|
||||
DIST mysql-connector-c++-8.0.15-src.tar.gz 2210243 BLAKE2B 45e0ffa2134c9df5a7e311963c7f2c58b5d7cfc0eefd80a5dc323bbe34ba60d40c79154f932e19c5f8e18ae45d0b61d304b7b7daba4955f92f830cf20c718931 SHA512 9a217b8f61babe5dac405be19b12d34b22673e779433d880a3aa31ea2e128f93434599a3fe0c1150b3f7b8c4d03f595d545d8cc33342a60561a2f60bff71ef14
|
||||
DIST mysql-connector-c++-8.0.18-src.tar.gz 3115736 BLAKE2B f28229593d20f4a401a3e9d0e636ee896a90fb7573f06d9b60340540d6c4d577b4f44daa287c7896a03a60d75dec343413cba981e63a22607ce60eb20f4de122 SHA512 f5b202677392bcf5c5bdd4c3433332e57aa20c1a140de81b57ce3ce69709661d572e2466ae022926fc220b20159c90f09f15b5e44f384529103a24fd592de60d
|
||||
DIST mysql-connector-c++-8.0.19-src.tar.gz 3137484 BLAKE2B 82a2900b0daa00bcfd72d562818ada25fe15901991a896a46ecdd9304e03066c4e7a3804287540559df1c74dbd1b3983b450ab783ee8cb7f0d7ec152f3cdc6b0 SHA512 5987ae31cda3a5db18ceded201ccbe66263b8ab7665ceacf70af6bb6b99130377b40514b96644b0768fd809b36ee02580520923c11c1edecccc75da15d7bb0bd
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
https://bugs.mysql.com/bug.php?id=90727
|
||||
|
||||
--- a/FindMySQL.cmake
|
||||
+++ b/FindMySQL.cmake
|
||||
@@ -700,8 +700,10 @@ endif()
|
||||
|
||||
# For dynamic linking use the built-in sys and strings
|
||||
if(NOT MYSQLCLIENT_STATIC_LINKING)
|
||||
+IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
|
||||
list(APPEND SYS_LIBRARIES "mysql_sys")
|
||||
list(APPEND SYS_LIBRARIES "mysql_strings")
|
||||
+endif()
|
||||
list(APPEND SYS_LIBRARIES ${MYSQL_LIBRARIES})
|
||||
SET(MYSQL_LIBRARIES ${SYS_LIBRARIES})
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
diff -aurN a/driver/mysql_connection.cpp b/driver/mysql_connection.cpp
|
||||
--- a/driver/mysql_connection.cpp 2016-12-14 04:58:54.000000000 -0500
|
||||
+++ b/driver/mysql_connection.cpp 2017-01-26 16:33:58.086005627 -0500
|
||||
@@ -1023,6 +1023,7 @@
|
||||
proxy->get_character_set_info(&cs);
|
||||
*(static_cast<int *>(optionValue)) = cs.mbmaxlen;
|
||||
/* mysql_get_option() was added in mysql 5.7.3 version */
|
||||
+#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID )
|
||||
} else if ( proxy->get_server_version() >= 50703 ) {
|
||||
try {
|
||||
if (GET_CONN_OPTION(optionName, optionValue, intOptions)) {
|
||||
@@ -1036,6 +1037,7 @@
|
||||
CPP_ERR_FMT("Unsupported option : %d:(%s) %s", proxy->errNo(), proxy->sqlstate().c_str(), proxy->error().c_str());
|
||||
throw e;
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
/* }}} */
|
||||
@@ -1053,11 +1055,13 @@
|
||||
MY_CHARSET_INFO cs;
|
||||
proxy->get_character_set_info(&cs);
|
||||
return cs.dir ? sql::SQLString(cs.dir) : "";
|
||||
+#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID )
|
||||
} else if ( proxy->get_server_version() >= 50703 ) {
|
||||
const char* optionValue= NULL;
|
||||
if (GET_CONN_OPTION(optionName, &optionValue, stringOptions)) {
|
||||
return optionValue ? sql::SQLString(optionValue) : "";
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
return "";
|
||||
}
|
||||
diff -aurN a/driver/nativeapi/libmysql_static_proxy.cpp b/driver/nativeapi/libmysql_static_proxy.cpp
|
||||
--- a/driver/nativeapi/libmysql_static_proxy.cpp 2017-01-26 16:35:46.256038741 -0500
|
||||
+++ b/driver/nativeapi/libmysql_static_proxy.cpp 2017-01-26 16:28:34.114915809 -0500
|
||||
@@ -319,7 +319,7 @@
|
||||
int
|
||||
LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option, const void *arg)
|
||||
{
|
||||
-#if MYSQL_VERSION_ID >= 50703
|
||||
+#if MYSQL_VERSION_ID >= 50703 && !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID )
|
||||
if (::mysql_get_option(mysql, option, arg)) {
|
||||
throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()");
|
||||
} else {
|
||||
@ -1,307 +0,0 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -666,7 +666,7 @@ set_target_properties(connector PROPERTIES
|
||||
|
||||
|
||||
install(TARGETS connector
|
||||
- CONFIGURATIONS Release RelWithDebInfo
|
||||
+ CONFIGURATIONS Release RelWithDebInfo Gentoo
|
||||
ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT XDevAPIDev
|
||||
RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll
|
||||
LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll
|
||||
@@ -737,6 +737,12 @@ TARGET_LINK_LIBRARIES(try connector)
|
||||
SET_INTERFACE_OPTIONS(try devapi)
|
||||
# ADD_GCOV(try)
|
||||
|
||||
+IF(WITH_SSL STREQUAL "system")
|
||||
+ find_package(OpenSSL REQUIRED)
|
||||
+ TARGET_LINK_LIBRARIES(try ${OPENSSL_LIBRARIES})
|
||||
+ENDIF()
|
||||
+
|
||||
+
|
||||
if(WITH_JDBC)
|
||||
|
||||
add_executable(try_jdbc EXCLUDE_FROM_ALL try_jdbc.cc)
|
||||
--- a/cdk/cmake/install_macros.cmake
|
||||
+++ b/cdk/cmake/install_macros.cmake
|
||||
@@ -327,7 +327,7 @@ FUNCTION(INSTALL_DEBUG_TARGET target)
|
||||
DESTINATION ${ARG_DESTINATION}
|
||||
${RENAME_PARAM}
|
||||
${PERMISSIONS_${target_type}}
|
||||
- CONFIGURATIONS Release RelWithDebInfo
|
||||
+ CONFIGURATIONS Release RelWithDebInfo Gentoo
|
||||
COMPONENT ${ARG_COMPONENT}
|
||||
OPTIONAL)
|
||||
|
||||
@@ -346,7 +346,7 @@ FUNCTION(INSTALL_DEBUG_TARGET target)
|
||||
INSTALL(FILES ${debug_pdb_target_location}
|
||||
DESTINATION ${ARG_PDB_DESTINATION}
|
||||
${PDB_RENAME_PARAM}
|
||||
- CONFIGURATIONS Release RelWithDebInfo
|
||||
+ CONFIGURATIONS Release RelWithDebInfo Gentoo
|
||||
COMPONENT ${ARG_COMPONENT}
|
||||
OPTIONAL)
|
||||
ENDIF()
|
||||
--- a/cdk/cmake/libutils.cmake
|
||||
+++ b/cdk/cmake/libutils.cmake
|
||||
@@ -282,14 +282,7 @@ function(add_library_ex TARGET)
|
||||
endforeach()
|
||||
|
||||
if(libs)
|
||||
-
|
||||
- if(${type} STREQUAL "STATIC")
|
||||
- merge_static_libraries(${TARGET} ${libs})
|
||||
- add_dependencies(${TARGET} ${libs})
|
||||
- else()
|
||||
target_link_libraries(${TARGET} PRIVATE ${libs})
|
||||
- endif()
|
||||
-
|
||||
endif()
|
||||
|
||||
#
|
||||
--- a/cdk/cmake/protobuf.cmake
|
||||
+++ b/cdk/cmake/protobuf.cmake
|
||||
@@ -26,201 +26,8 @@
|
||||
# along with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
-#
|
||||
-# Usage:
|
||||
-#
|
||||
-# INCLUDE(protobuf)
|
||||
-# [USE_FULL_PROTOBUF()]
|
||||
-#
|
||||
-# MYSQLX_PROTOBUF_GENERATE_CPP(SRCS HDRS <protobuf definitions>)
|
||||
-# ADD_LIBRARY(target ... ${SRCS})
|
||||
-#
|
||||
-
|
||||
-if(DEFINED WITH_PROTOBUF)
|
||||
-
|
||||
- #
|
||||
- # If WITH_PROTOBUF is defined, it should point at external location where
|
||||
- # protobuf libraries were built using our CMakeLists.txt (so that
|
||||
- # exports.cmake was produced).
|
||||
- #
|
||||
-
|
||||
- if (NOT EXISTS "${WITH_PROTOBUF}/exports.cmake")
|
||||
- message(FATAL_ERROR
|
||||
- "Valid protobuf build not found at the given location"
|
||||
- " (could not find exports.cmake): ${WITH_PROTOBUF}"
|
||||
- )
|
||||
- endif()
|
||||
-
|
||||
- message("Using protobuf build at: ${WITH_PROTOBUF}")
|
||||
-
|
||||
-else(DEFINED WITH_PROTOBUF)
|
||||
-
|
||||
- #
|
||||
- # If external WITH_PROTOBUF location is not given, then we arrange for
|
||||
- # building of protbuf from bundled sources in ${PROJECT_BINARY_DIR}/protobuf.
|
||||
- #
|
||||
-
|
||||
- message("Configuring Protobuf build using cmake generator: ${CMAKE_GENERATOR}")
|
||||
- file(REMOVE "${PROJECT_BINARY_DIR}/protobuf/CMakeCache.txt")
|
||||
- file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/protobuf")
|
||||
-
|
||||
- #
|
||||
- # Pick build configuration for the protobuf build. Normally we build using the
|
||||
- # same build configuration that is used for building CDK (Release/Debug/etc.).
|
||||
- # But we also support building CDK under non-standard build configuration
|
||||
- # named 'Static' (this is a dirty trick we use to simplify building our MSIs).
|
||||
- # Since protobuf does not know 'Static' build configuration, we build protobuf
|
||||
- # under 'Release' configuration in that case.
|
||||
- #
|
||||
- # We need to handle two cases. For some build systems, like Makefiles,
|
||||
- # the build configuration is specified at cmake time using CMAKE_BUILD_TYPE
|
||||
- # variable. In that case we also set it during protobuf build configuration.
|
||||
- # Another case is a multi-configuration build system like MSVC. In this case
|
||||
- # we use generator expression to pick correct configuration when the build
|
||||
- # command is invoked below.
|
||||
- #
|
||||
-
|
||||
- if(CMAKE_BUILD_TYPE)
|
||||
- if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]")
|
||||
- set(set_build_type -DCMAKE_BUILD_TYPE=Release)
|
||||
- else()
|
||||
- set(set_build_type -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
|
||||
- endif()
|
||||
- endif()
|
||||
-
|
||||
- set(CONFIG_EXPR
|
||||
- $<$<CONFIG:Static>:Release>$<$<NOT:$<CONFIG:Static>>:$<CONFIG>>
|
||||
- )
|
||||
-
|
||||
- execute_process(
|
||||
- COMMAND ${CMAKE_COMMAND}
|
||||
- -G "${CMAKE_GENERATOR}"
|
||||
- ${set_build_type}
|
||||
- -DSTATIC_MSVCRT=${STATIC_MSVCRT}
|
||||
- -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
|
||||
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
|
||||
- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
|
||||
- -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
|
||||
- -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
|
||||
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
|
||||
- -DCMAKE_CXX_FLAGS_MINSIZEREL=${CMAKE_CXX_FLAGS_MINSIZEREL}
|
||||
- -DCMAKE_STATIC_LINKER_FLAGS=${CMAKE_STATIC_LINKER_FLAGS}
|
||||
- ${PROJECT_SOURCE_DIR}/protobuf
|
||||
- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/protobuf
|
||||
- RESULT_VARIABLE protobuf_config
|
||||
- )
|
||||
-
|
||||
- if(protobuf_config)
|
||||
- message(FATAL_ERROR "Could not configure Protobuf build: ${protobuf_config}")
|
||||
- endif()
|
||||
-
|
||||
- set(WITH_PROTOBUF "${PROJECT_BINARY_DIR}/protobuf")
|
||||
-
|
||||
-endif(DEFINED WITH_PROTOBUF)
|
||||
-
|
||||
-# Import targets exported by protobuf
|
||||
-
|
||||
-include(${WITH_PROTOBUF}/exports.cmake)
|
||||
-
|
||||
-#
|
||||
-# Protobuf library targets imported above (pb_protobuf
|
||||
-# and pb_protobuf-lite) are local to the directory from which
|
||||
-# they were imported. This is not good if cdk is used as
|
||||
-# a sub-project of a parent project, because the parent project
|
||||
-# must have access to these targets.
|
||||
-#
|
||||
-# For that reason below we create global protobuf/protobuf-lite targets
|
||||
-# and copy their locations from the imported targets.
|
||||
-#
|
||||
-# Note: we can't use ALIAS library because it does not work with imported
|
||||
-# targets
|
||||
-#
|
||||
-
|
||||
-add_library(protobuf STATIC IMPORTED GLOBAL)
|
||||
-add_library(protobuf-lite STATIC IMPORTED GLOBAL)
|
||||
-
|
||||
-foreach(lib protobuf protobuf-lite)
|
||||
- #message("processing: ${lib}")
|
||||
-
|
||||
- foreach(CONF NOCONFIG DEBUG RELEASE MINSIZEREL RELWITHDEBINFO)
|
||||
- #message("- CONF: ${CONF}")
|
||||
-
|
||||
- get_target_property(LOC pb_${lib} IMPORTED_LOCATION_${CONF})
|
||||
- if(LOC)
|
||||
- #message("- setting imported location to: ${LOC}")
|
||||
- set_target_properties(${lib} PROPERTIES
|
||||
- IMPORTED_LOCATION_${CONF} "${LOC}"
|
||||
- )
|
||||
- set_property(TARGET ${lib} APPEND PROPERTY
|
||||
- IMPORTED_CONFIGURATIONS ${CONF}
|
||||
- )
|
||||
- endif()
|
||||
-
|
||||
- endforeach(CONF)
|
||||
-
|
||||
-endforeach(lib)
|
||||
-
|
||||
-#
|
||||
-# To support 'Static' build configuration the targets imported from the
|
||||
-# Protobuf project need to have IMPORTED_LOCATION_STATIC defined. We use
|
||||
-# 'Release' locations as Protobuf is built using 'Release' configuration in
|
||||
-# that case.
|
||||
-#
|
||||
-
|
||||
-foreach(tgt protobuf protobuf-lite pb_protoc)
|
||||
-
|
||||
- get_target_property(LOC ${tgt} IMPORTED_LOCATION_RELEASE)
|
||||
- set_property(TARGET ${tgt} PROPERTY IMPORTED_LOCATION_STATIC ${LOC})
|
||||
-
|
||||
-endforeach(tgt)
|
||||
-
|
||||
-
|
||||
-# protobuf depends on protobuf-lite
|
||||
-
|
||||
-set_target_properties(protobuf PROPERTIES
|
||||
- INTERFACE_LINK_LIBRARIES "protobuf-lite"
|
||||
-)
|
||||
-
|
||||
-
|
||||
-message("Protobuf include path: ${PROTOBUF_INCLUDE_DIR}")
|
||||
-
|
||||
-set(PROTOBUF_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIR}
|
||||
- CACHE INTERNAL "Protobuf include path" FORCE)
|
||||
-set(PROTOBUF_PROTOC_EXECUTABLE pb_protoc
|
||||
- CACHE INTERNAL "Protobuf compiler" FORCE)
|
||||
-
|
||||
-#
|
||||
-# Custom target build_protobuf ensures that Protobuf project is built.
|
||||
-#
|
||||
-# Note: this depends on Protobuf project generating the stamp file
|
||||
-#
|
||||
-
|
||||
-if(NOT DEFINED PROTOBUF_BUILD_STAMP)
|
||||
- message(FATAL_ERROR "Protobuf build stamp file not defined")
|
||||
-endif()
|
||||
-
|
||||
-
|
||||
-if(CMAKE_VERSION VERSION_LESS 3.0)
|
||||
- add_custom_command(OUTPUT ${PROTOBUF_BUILD_STAMP}
|
||||
- COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIGURATION>
|
||||
- WORKING_DIRECTORY ${WITH_PROTOBUF}
|
||||
- COMMENT "Building protobuf using configuration: $(Configuration)"
|
||||
- )
|
||||
-else()
|
||||
- add_custom_command(OUTPUT ${PROTOBUF_BUILD_STAMP}
|
||||
- COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG_EXPR}
|
||||
- WORKING_DIRECTORY ${WITH_PROTOBUF}
|
||||
- COMMENT "Building protobuf using configuration: $(Configuration)"
|
||||
- )
|
||||
-endif()
|
||||
-
|
||||
-add_custom_target(build_protobuf
|
||||
- DEPENDS ${PROTOBUF_BUILD_STAMP}
|
||||
-)
|
||||
-
|
||||
-add_dependencies(protobuf build_protobuf)
|
||||
-add_dependencies(protobuf-lite build_protobuf)
|
||||
-add_dependencies(pb_protoc build_protobuf)
|
||||
+#SET(Protobuf_USE_STATIC_LIBS ON)
|
||||
+find_package(Protobuf REQUIRED)
|
||||
|
||||
#
|
||||
# Choice between full and lite version of the library.
|
||||
--- a/cdk/protocol/mysqlx/crud.cc
|
||||
+++ b/cdk/protocol/mysqlx/crud.cc
|
||||
@@ -295,7 +295,7 @@ public:
|
||||
class Placeholder_conv_imp
|
||||
: public Args_conv
|
||||
{
|
||||
- map<string, unsigned> m_map;
|
||||
+ std::map<string, unsigned> m_map;
|
||||
|
||||
public:
|
||||
|
||||
@@ -303,7 +303,7 @@ public:
|
||||
|
||||
unsigned conv_placeholder(const string &name)
|
||||
{
|
||||
- map<string, unsigned>::const_iterator it = m_map.find(name);
|
||||
+ std::map<string, unsigned>::const_iterator it = m_map.find(name);
|
||||
if (it == m_map.end())
|
||||
throw_error("Placeholder converter: Placeholder was not defined on args");
|
||||
//throw Generic_error((boost::format("Placeholder %s was not defined on args.")
|
||||
@@ -314,7 +314,7 @@ public:
|
||||
|
||||
void add_placeholder(const string &name)
|
||||
{
|
||||
- map<string, unsigned>::const_iterator it = m_map.find(name);
|
||||
+ std::map<string, unsigned>::const_iterator it = m_map.find(name);
|
||||
if (it != m_map.end())
|
||||
throw_error("Placeholder converter: Redefined placeholder");
|
||||
//throw Generic_error((boost::format("Redifined placeholder %s.")
|
||||
--- a/jdbc.cmake
|
||||
+++ b/jdbc.cmake
|
||||
@@ -66,7 +66,7 @@ if(MYSQL_CONFIG_EXECUTABLE)
|
||||
list(APPEND jdbc_cmake_opts -DMYSQL_CONFIG_EXECUTABLE=${MYSQL_CONFIG_EXECUTABLE})
|
||||
endif()
|
||||
|
||||
-list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=ON)
|
||||
+list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=OFF)
|
||||
|
||||
if(CMAKE_BUILD_TYPE)
|
||||
if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]")
|
||||
@ -0,0 +1,89 @@
|
||||
--- a/cdk/cmake/DepFindSSL.cmake
|
||||
+++ b/cdk/cmake/DepFindSSL.cmake
|
||||
@@ -88,7 +88,7 @@ function(main)
|
||||
|
||||
set(OPENSSL_LIB_DIR "${OPENSSL_LIB_DIR}" CACHE INTERNAL "")
|
||||
|
||||
- if(NOT OPENSSL_VERSION_MAJOR EQUAL 1)
|
||||
+ if(NOT OPENSSL_VERSION_MAJOR VERSION_GREATER_EQUAL 1)
|
||||
message(SEND_ERROR "OpenSSL version 1.x is required but version ${OPENSSL_VERSION} was found")
|
||||
else()
|
||||
message(STATUS "Using OpenSSL version: ${OPENSSL_VERSION}")
|
||||
@@ -182,42 +182,33 @@ function(find_openssl)
|
||||
set(OPENSSL_INCLUDE_DIR "${OPENSSL_INCLUDE_DIR}" PARENT_SCOPE)
|
||||
message("-- found OpenSSL headers at: ${OPENSSL_INCLUDE_DIR}")
|
||||
|
||||
-
|
||||
# Verify version number. Version information looks like:
|
||||
- # #define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1a 20 Nov 2018"
|
||||
-
|
||||
+ # #define OPENSSL_VERSION_NUMBER 0x1000103fL
|
||||
+ # Encoded as MNNFFPPS: major minor fix patch status
|
||||
FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
|
||||
OPENSSL_VERSION_NUMBER
|
||||
- REGEX "#[ ]*define[\t ]+OPENSSL_VERSION_TEXT"
|
||||
+ REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
|
||||
)
|
||||
-
|
||||
- #message("== OPENSSL_VERSION_NUMBER: ${OPENSSL_VERSION_NUMBER}")
|
||||
STRING(REGEX REPLACE
|
||||
- "^.*OPENSSL_VERSION_TEXT[\t ]+\"OpenSSL[\t ]([0-9]+)\\.([0-9]+)\\.([0-9]+)([a-z]*)[\t ].*$"
|
||||
- "\\1;\\2;\\3;\\4"
|
||||
- version_list "${OPENSSL_VERSION_NUMBER}"
|
||||
+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
|
||||
+ OPENSSL_VERSION_MAJOR "${OPENSSL_VERSION_NUMBER}"
|
||||
+ )
|
||||
+ STRING(REGEX REPLACE
|
||||
+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1"
|
||||
+ OPENSSL_VERSION_MINOR "${OPENSSL_VERSION_NUMBER}"
|
||||
+ )
|
||||
+ STRING(REGEX REPLACE
|
||||
+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1"
|
||||
+ OPENSSL_VERSION_FIX "${OPENSSL_VERSION_NUMBER}"
|
||||
)
|
||||
- #message("-- OPENSSL_VERSION: ${version_list}")
|
||||
-
|
||||
- list(GET version_list 0 OPENSSL_VERSION_MAJOR)
|
||||
- math(EXPR OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR})
|
||||
-
|
||||
- list(GET version_list 1 OPENSSL_VERSION_MINOR)
|
||||
- math(EXPR OPENSSL_VERSION_MINOR ${OPENSSL_VERSION_MINOR})
|
||||
-
|
||||
- list(GET version_list 2 OPENSSL_VERSION_FIX)
|
||||
- math(EXPR OPENSSL_VERSION_FIX ${OPENSSL_VERSION_FIX})
|
||||
-
|
||||
- list(GET version_list 3 OPENSSL_VERSION_PATCH)
|
||||
-
|
||||
-
|
||||
|
||||
set(OPENSSL_VERSION
|
||||
- "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH}"
|
||||
+ "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}"
|
||||
PARENT_SCOPE
|
||||
)
|
||||
set(OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR} PARENT_SCOPE)
|
||||
|
||||
+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
|
||||
|
||||
find_library(OPENSSL_LIBRARY
|
||||
NAMES ssl ssleay32 ssleay32MD libssl
|
||||
--- a/cdk/foundation/connection_openssl.cc
|
||||
+++ b/cdk/foundation/connection_openssl.cc
|
||||
@@ -211,7 +211,7 @@ static void throw_ssl_error(SSL* tls, int err)
|
||||
case SSL_ERROR_WANT_CONNECT:
|
||||
case SSL_ERROR_WANT_ACCEPT:
|
||||
case SSL_ERROR_WANT_X509_LOOKUP:
|
||||
-# if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
||||
+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
case SSL_ERROR_WANT_ASYNC:
|
||||
case SSL_ERROR_WANT_ASYNC_JOB:
|
||||
# endif
|
||||
@@ -387,7 +387,7 @@ void TLS_helper::setup(SSL_CTX *ctx)
|
||||
|
||||
SSL_CTX_set_cipher_list(ctx, m_cipher_list.c_str());
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER>=0x1010100fL
|
||||
+#if HAVE_TLS1_3_VERSION
|
||||
|
||||
/*
|
||||
Note: If TLSv1.3 is not enabled, there is no need to restrict
|
||||
@ -1,63 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="7"
|
||||
|
||||
inherit cmake-utils flag-o-matic
|
||||
|
||||
DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
|
||||
HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
|
||||
URI_DIR="Connector-C++"
|
||||
SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86"
|
||||
IUSE="debug examples gcov static-libs"
|
||||
|
||||
DEPEND="dev-db/mysql-connector-c:=
|
||||
dev-libs/boost:=
|
||||
dev-libs/openssl:0=
|
||||
!<dev-db/mysql-connector-c-6.1.8"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-1.1.6-fix-cmake.patch"
|
||||
"${FILESDIR}/${PN}-1.1.11-fix-mariadb.patch"
|
||||
"${FILESDIR}/${PN}-1.1.11-fix-cpp-linking.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
# native lib/wrapper needs this!
|
||||
append-flags "-fno-strict-aliasing"
|
||||
|
||||
local mycmakeargs=(
|
||||
-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF
|
||||
-DMYSQLCPPCONN_ICU_ENABLE=OFF
|
||||
-DMYSQLCPPCONN_TRACE_ENABLE=$(usex debug ON OFF)
|
||||
-DMYSQLCPPCONN_GCOV_ENABLE=$(usex gcov ON OFF)
|
||||
-DINSTALL_DOCS="/usr/share/doc/${PF}"
|
||||
-DMYSQL_CXX_LINKAGE=0
|
||||
-DMYSQL_INCLUDE_DIR=$(mysql_config --variable=pkgincludedir)
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
# static lib has wrong name so we need to rename it
|
||||
if use static-libs; then
|
||||
mv "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
|
||||
"${ED%/}"/usr/$(get_libdir)/libmysqlcppconn.a || die
|
||||
else
|
||||
rm -f "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a
|
||||
fi
|
||||
|
||||
# examples
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins "${S}"/examples/*
|
||||
fi
|
||||
}
|
||||
@ -1,62 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils flag-o-matic
|
||||
|
||||
DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
|
||||
HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
|
||||
URI_DIR="Connector-C++"
|
||||
SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86"
|
||||
IUSE="debug examples gcov static-libs"
|
||||
|
||||
DEPEND="dev-db/mysql-connector-c:=
|
||||
dev-libs/boost:=
|
||||
dev-libs/openssl:0=
|
||||
!<dev-db/mysql-connector-c-6.1.8"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-1.1.6-fix-cmake.patch"
|
||||
"${FILESDIR}/${PN}-1.1.8-fix-mariadb.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
# native lib/wrapper needs this!
|
||||
append-flags "-fno-strict-aliasing"
|
||||
|
||||
local mycmakeargs=(
|
||||
-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF
|
||||
-DMYSQLCPPCONN_ICU_ENABLE=OFF
|
||||
-DUSE_MYSQLCPPCONN_TRACE_ENABLE=$(usex debug ON OFF)
|
||||
-DUSE_MYSQLCPPCONN_GCOV_ENABLE=$(usex gcov ON OFF)
|
||||
-DINSTALL_DOCS="/usr/share/doc/${PF}"
|
||||
-DMYSQL_CXX_LINKAGE=0
|
||||
-DMYSQL_INCLUDE_DIR=$(mysql_config --variable=pkgincludedir)
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
# static lib has wrong name so we need to rename it
|
||||
if use static-libs; then
|
||||
mv "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
|
||||
"${ED}"/usr/$(get_libdir)/libmysqlcppconn.a || die
|
||||
else
|
||||
rm -f "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a
|
||||
fi
|
||||
|
||||
# examples
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins "${S}"/examples/*
|
||||
fi
|
||||
}
|
||||
@ -1,41 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="7"
|
||||
|
||||
CMAKE_MAKEFILE_GENERATOR=emake
|
||||
inherit cmake-utils
|
||||
|
||||
DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
|
||||
HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
|
||||
URI_DIR="Connector-C++"
|
||||
SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"
|
||||
|
||||
LICENSE="Artistic GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="+legacy libressl"
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/protobuf:=
|
||||
legacy? (
|
||||
dev-libs/boost:=
|
||||
>=dev-db/mysql-connector-c-6.1.8:=
|
||||
)
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:0= )"
|
||||
DEPEND="${RDEPEND}"
|
||||
S="${WORKDIR}/${P}-src"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-8.0.15-fix-build.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DWITH_SSL=system
|
||||
-DWITH_JDBC=$(usex legacy ON OFF)
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST mysql-boost-8.0.17.tar.gz 189322239 BLAKE2B f9f46e5fdc3e9869b203626bc09edfbcdbabcd68eba43f9c6a33b9a52cffb3a32f39704c6d22a66899aac16fa2efb271c5dc7af7522768b45542ac8dc615cd8a SHA512 a278ee263670cb1f79d67c4b87c4b88632569c3b20a4297a6e77d550155db20902f22992ea851cf59ea523bb97d5e08707e3457f71a678e9f1ac2fa4ca5b7a2d
|
||||
DIST mysql-boost-8.0.18.tar.gz 194953221 BLAKE2B e3622cccd8f60487a5e643e522e9cdc763d63ad2a5eda86a7a7db37f48a4e1288fea88ef7097c6c4b51bd5e8fd8ba26a5b8aea3501ae847180066e2d0aa2b5dc SHA512 180091ad3e74e2afa28ecb914850e6b4e8c92b8981f32b161f53381b92120d87dbd2c2fc073feb2543bb71702bac7368e9fb992821cfd3e3ca888019423b89f5
|
||||
DIST mysql-boost-8.0.19.tar.gz 264147972 BLAKE2B 61a5ccbef1a7a675c85e4e6bda8e5285bdb931e6ee14d4710bf13dfd9157d1095200db2886dc93ea7251d3d59245f35c0bef5ba88ba6aac209b1e080f3b07dc4 SHA512 5ffc03f005ab2585694902e926b6cb2b10059b2b030549eccd3949f9c3b2f02626d02529f940dec003f2d69683856fd1c720ff12f89dfbdc48befaf24a9c4d01
|
||||
DIST mysql-connector-c-6.1.11-src.tar.gz 3489345 BLAKE2B 813512520ef660521221565a4466e81d902629d0ee731f746b68eed2b9129ea8361fcabe184537ec8ba91aed5a4b02dfb3450b36524c2e98f81fba148eee0cf1 SHA512 271395c888a93b833e0bbe1840b9987ecdb37d0f1cf89904207cc9aa99ed32e538aee8c9529ff39b6533947159776a8f5aa079da86ed51b1d26b086f4ffdd7c6
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
--- a/utilities/CMakeLists.txt
|
||||
+++ b/utilities/CMakeLists.txt
|
||||
@@ -101,15 +101,11 @@ MYSQL_ADD_EXECUTABLE(perror perror.cc)
|
||||
ADD_DEPENDENCIES(perror GenError)
|
||||
TARGET_LINK_LIBRARIES(perror mysys)
|
||||
|
||||
-IF (BUILD_BUNDLED_LZ4)
|
||||
- MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc)
|
||||
- TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY} mysys)
|
||||
-ENDIF()
|
||||
+MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc)
|
||||
+TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY} mysys)
|
||||
|
||||
-IF (BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB)
|
||||
- MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc)
|
||||
- TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys)
|
||||
-ENDIF()
|
||||
+MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc)
|
||||
+TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys)
|
||||
|
||||
IF(WITH_INNOBASE_STORAGE_ENGINE)
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt
|
||||
index c855f8ab..0ebef451 100644
|
||||
--- a/utilities/CMakeLists.txt
|
||||
+++ b/utilities/CMakeLists.txt
|
||||
@@ -27,6 +27,7 @@ IF(NOT CMAKE_CROSSCOMPILING)
|
||||
comp_err.cc
|
||||
COMPONENT Server
|
||||
LINK_LIBRARIES mysys
|
||||
+ SKIP_INSTALL
|
||||
)
|
||||
ENDIF()
|
||||
|
||||
@ -1,111 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-multilib
|
||||
|
||||
# wrap the config script
|
||||
MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
|
||||
|
||||
DESCRIPTION="C client library for MariaDB/MySQL"
|
||||
HOMEPAGE="https://dev.mysql.com/downloads/"
|
||||
LICENSE="GPL-2"
|
||||
|
||||
SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
|
||||
SLOT="0/21"
|
||||
IUSE="ldap libressl static-libs"
|
||||
|
||||
RDEPEND="
|
||||
>=app-arch/lz4-0_p131:=
|
||||
sys-libs/zlib:=[${MULTILIB_USEDEP}]
|
||||
ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
|
||||
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
|
||||
!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
# Avoid file collisions, #692580
|
||||
RDEPEND+=" !<dev-db/mysql-5.6.45-r1"
|
||||
RDEPEND+=" !=dev-db/mysql-5.7.23*"
|
||||
RDEPEND+=" !=dev-db/mysql-5.7.24*"
|
||||
RDEPEND+=" !=dev-db/mysql-5.7.25*"
|
||||
RDEPEND+=" !=dev-db/mysql-5.7.26-r0"
|
||||
RDEPEND+=" !=dev-db/mysql-5.7.27-r0"
|
||||
RDEPEND+=" !<dev-db/percona-server-5.7.26.29-r1"
|
||||
|
||||
DOCS=( README )
|
||||
|
||||
S="${WORKDIR}/mysql-${PV}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-8.0.17-always-build-decompress-utilities.patch
|
||||
"${FILESDIR}"/${PN}-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch
|
||||
"${FILESDIR}"/${PN}-8.0.17-libressl.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "${S}/scripts/CMakeLists.txt" || die
|
||||
|
||||
# All these are for the server only.
|
||||
# Disable rpm call which would trigger sandbox, #692368
|
||||
sed -i \
|
||||
-e '/MYSQL_CHECK_LIBEVENT/d' \
|
||||
-e '/MYSQL_CHECK_RAPIDJSON/d' \
|
||||
-e '/MYSQL_CHECK_ICU/d' \
|
||||
-e '/MYSQL_CHECK_RE2/d' \
|
||||
-e '/MYSQL_CHECK_EDITLINE/d' \
|
||||
-e '/MYSQL_CHECK_CURL/d' \
|
||||
-e '/ADD_SUBDIRECTORY(man)/d' \
|
||||
-e '/ADD_SUBDIRECTORY(share)/d' \
|
||||
-e '/INCLUDE(cmake\/boost/d' \
|
||||
-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
|
||||
CMakeLists.txt || die
|
||||
|
||||
# Skip building clients
|
||||
echo > client/CMakeLists.txt || die
|
||||
|
||||
# Forcefully disable auth plugin
|
||||
if ! use ldap ; then
|
||||
sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die
|
||||
echo > libmysql/authentication_ldap/CMakeLists.txt || die
|
||||
fi
|
||||
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DINSTALL_LAYOUT=RPM
|
||||
-DINSTALL_LIBDIR=$(get_libdir)
|
||||
-DWITH_DEFAULT_COMPILER_OPTIONS=OFF
|
||||
-DWITH_DEFAULT_FEATURE_SET=OFF
|
||||
-DENABLED_LOCAL_INFILE=ON
|
||||
-DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock"
|
||||
-DWITH_ZLIB=system
|
||||
-DWITH_SSL=system
|
||||
-DWITH_NUMA=OFF
|
||||
-DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient
|
||||
-DSHARED_LIB_PATCH_VERSION="0"
|
||||
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
|
||||
-DWITHOUT_SERVER=ON
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
cmake-utils_src_install
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
doman \
|
||||
man/my_print_defaults.1 \
|
||||
man/perror.1 \
|
||||
man/zlib_decompress.1
|
||||
|
||||
if ! use static-libs ; then
|
||||
find "${ED}" -name "*.a" -delete || die
|
||||
fi
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1,155 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
WX_GTK_VER="3.0"
|
||||
|
||||
inherit elisp-common java-pkg-opt-2 systemd wxwidgets
|
||||
|
||||
# NOTE: If you need symlinks for binaries please tell maintainers or
|
||||
# open up a bug to let it be created.
|
||||
|
||||
UPSTREAM_V="$(ver_cut 1-2)"
|
||||
|
||||
DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
|
||||
HOMEPAGE="https://www.erlang.org/"
|
||||
SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
|
||||
http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
|
||||
doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
# We use this subslot because Compiled HiPE Code can be loaded on the exact
|
||||
# same build of ERTS that was used when compiling the code. See
|
||||
# http://erlang.org/doc/system_principles/misc.html for more information.
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
|
||||
IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
|
||||
|
||||
RDEPEND="
|
||||
acct-group/epmd
|
||||
acct-user/epmd
|
||||
sys-libs/ncurses:0
|
||||
sys-libs/zlib
|
||||
emacs? ( >=app-editors/emacs-23.1:* )
|
||||
java? ( >=virtual/jdk-1.8:* )
|
||||
odbc? ( dev-db/unixODBC )
|
||||
sctp? ( net-misc/lksctp-tools )
|
||||
ssl? (
|
||||
!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
)
|
||||
systemd? ( sys-apps/systemd )
|
||||
tk? ( dev-lang/tk:0 )
|
||||
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-lang/perl
|
||||
"
|
||||
|
||||
S="${WORKDIR}/otp-OTP-${PV}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/18.2.1-wx3.0.patch"
|
||||
"${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch"
|
||||
"${FILESDIR}/${PN}-22.2.2-gcc-10.patch"
|
||||
"${FILESDIR}/${PN}-22.1.4-asn1-dep.patch"
|
||||
)
|
||||
|
||||
SITEFILE=50"${PN}"-gentoo.el
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
./otp_build autoconf || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use wxwidgets && setup-wxwidgets
|
||||
|
||||
local myconf=(
|
||||
--disable-builtin-zlib
|
||||
$(use_enable hipe)
|
||||
$(use_enable kpoll kernel-poll)
|
||||
$(use_with java javac)
|
||||
$(use_enable sctp)
|
||||
$(use_with ssl ssl "${EPREFIX}"/usr)
|
||||
$(use_enable ssl dynamic-ssl-lib)
|
||||
$(use_enable systemd)
|
||||
$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
|
||||
)
|
||||
econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
|
||||
if use emacs ; then
|
||||
pushd lib/tools/emacs &>/dev/null || die
|
||||
elisp-compile *.el
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
}
|
||||
|
||||
extract_version() {
|
||||
local path="$1"
|
||||
local var_name="$2"
|
||||
sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local erl_libdir_rel="$(get_libdir)/erlang"
|
||||
local erl_libdir="/usr/${erl_libdir_rel}"
|
||||
local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
|
||||
local erl_erts_ver="$(extract_version erts VSN)"
|
||||
local my_manpath="/usr/share/${PN}/man"
|
||||
|
||||
[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
|
||||
[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
|
||||
|
||||
emake INSTALL_PREFIX="${D}" install
|
||||
|
||||
if use doc ; then
|
||||
local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
|
||||
docompress -x /usr/share/doc/${PF}
|
||||
else
|
||||
local DOCS=("README.md")
|
||||
fi
|
||||
|
||||
einstalldocs
|
||||
|
||||
dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
|
||||
dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
|
||||
dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
|
||||
dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
|
||||
dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
|
||||
|
||||
## Clean up the no longer needed files
|
||||
rm "${ED}/${erl_libdir}/Install" || die
|
||||
|
||||
insinto "${my_manpath}"
|
||||
doins -r "${WORKDIR}"/man/*
|
||||
# extend MANPATH, so the normal man command can find it
|
||||
# see bug 189639
|
||||
newenvd - "90erlang" <<-_EOF_
|
||||
MANPATH="${my_manpath}"
|
||||
_EOF_
|
||||
|
||||
if use emacs ; then
|
||||
elisp-install erlang lib/tools/emacs/*.{el,elc}
|
||||
sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
|
||||
"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
|
||||
elisp-site-file-install "${T}/${SITEFILE}"
|
||||
fi
|
||||
|
||||
newinitd "${FILESDIR}"/epmd.init-r2 epmd
|
||||
newconfd "${FILESDIR}"/epmd.confd-r2 epmd
|
||||
use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1,39 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{6,7,8} )
|
||||
|
||||
inherit distutils-r1 systemd toolchain-funcs
|
||||
|
||||
DESCRIPTION="A library for the Raspberry which allows control of the GPIOs"
|
||||
HOMEPAGE="http://abyz.me.uk/rpi/pigpio/index.html"
|
||||
SRC_URI="https://github.com/joan2937/pigpio/archive/V${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="Unlicense"
|
||||
SLOT="0"
|
||||
KEYWORDS="~arm"
|
||||
IUSE="python"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
src_prepare() {
|
||||
eapply "${FILESDIR}/${PN}-70-makefile.patch"
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=:
|
||||
use python && distutils-r1_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \
|
||||
libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \
|
||||
mandir="${EPREFIX}/usr/share/man" install
|
||||
einstalldocs
|
||||
newinitd "${FILESDIR}"/pigpiod.initd pigpiod
|
||||
newconfd "${FILESDIR}"/pigpiod.confd pigpiod
|
||||
systemd_newunit "${FILESDIR}"/pigpiod.systemd pigpiod.service
|
||||
use python && distutils-r1_src_install
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST spdlog-1.2.1.tar.gz 188284 BLAKE2B c3491a9c44d8a94c51d50c9ef36a2105f77e8fb61bb7b2b81a341609f433abbe3a74e7b4a467dd715a5d906f976740716488d07b4510f366556ab59d160ceefe SHA512 418f91efc207fa227558212d82c41639c0bb59e84ea47447e0b6276c4842e97f1f8aaf5802c071ef15d80ec525e317e70b6a39661a6c96ab39d33d9bd1570da1
|
||||
DIST spdlog-1.3.0.tar.gz 202637 BLAKE2B 97027a3672b826e294dbdc202afa913a42ddae5a02a569ac28c41d79b96128de045ac5df30a76d888d6b3bea5093fb75b006365d7b1b296842750a39f43835d6 SHA512 019a52d4b6c66287ee2a6e8177457ecbbb78e1cb894f4a0a90b83a84d66cd37b397cdf77892d9116e4c34113bd3277d606d578bc96ec6521ae7745f08b1aa54f
|
||||
DIST spdlog-1.3.1.tar.gz 202634 BLAKE2B 2465a8d1a38af1527ae66d92f5dd91ad504d01e44ac47702e315f7448e19f01743627357132f0561e48807315df9b102f337f95cab5a7aae3ec0ae7ceff940b9 SHA512 a851a44b6384f493dd312ae0a611d068af46bbfe8daf1c2f61f13d8836a3801f41b339074fbe8da8e428131c82fa5c4a9e3320a55cbdd4b7aff8bb349dfff7dd
|
||||
DIST spdlog-1.5.0.tar.gz 270416 BLAKE2B bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28 SHA512 78991c943dd95af563c4b29545b9b5d635caf1af5031262dde734ecf70c0b4ae866d954ee77b050f9f0cc089a3bc57ee9583895e51cb00dd1cc6c10ff905ca34
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
|
||||
index 5d039b8c..8107b19a 100644
|
||||
--- a/include/spdlog/fmt/fmt.h
|
||||
+++ b/include/spdlog/fmt/fmt.h
|
||||
@@ -19,9 +19,6 @@
|
||||
#ifndef FMT_USE_WINDOWS_H
|
||||
#define FMT_USE_WINDOWS_H 0
|
||||
#endif
|
||||
-#include "bundled/core.h"
|
||||
-#include "bundled/format.h"
|
||||
-#else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
|
||||
-#include "fmt/core.h"
|
||||
-#include "fmt/format.h"
|
||||
-#endif
|
||||
+#endif // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
|
||||
+#include <fmt/core.h>
|
||||
+#include <fmt/format.h>
|
||||
diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h
|
||||
index 9902898f..5e92a592 100644
|
||||
--- a/include/spdlog/fmt/ostr.h
|
||||
+++ b/include/spdlog/fmt/ostr.h
|
||||
@@ -11,8 +11,6 @@
|
||||
#ifndef FMT_HEADER_ONLY
|
||||
#define FMT_HEADER_ONLY
|
||||
#endif
|
||||
-#include "bundled/ostream.h"
|
||||
-#include "fmt.h"
|
||||
-#else
|
||||
-#include <fmt/ostream.h>
|
||||
#endif
|
||||
+
|
||||
+#include <fmt/ostream.h>
|
||||
diff --git a/src/spdlog.cpp b/src/spdlog.cpp
|
||||
index be91412d..d68dd522 100644
|
||||
--- a/src/spdlog.cpp
|
||||
+++ b/src/spdlog.cpp
|
||||
@@ -104,7 +104,7 @@ template std::shared_ptr<spdlog::logger> spdlog::stderr_logger_st<spdlog::async_
|
||||
// All rights reserved.
|
||||
|
||||
#if !defined(SPDLOG_FMT_EXTERNAL)
|
||||
-#include "spdlog/fmt/bundled/format-inl.h"
|
||||
+#include <fmt/format-inl.h>
|
||||
|
||||
FMT_BEGIN_NAMESPACE
|
||||
template struct internal::basic_data<void>;
|
||||
@ -1,40 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
DESCRIPTION="Very fast, header only, C++ logging library"
|
||||
HOMEPAGE="https://github.com/gabime/spdlog"
|
||||
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/gabime/spdlog"
|
||||
else
|
||||
SRC_URI="https://github.com/gabime/spdlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="amd64"
|
||||
fi
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/1"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
DEPEND="
|
||||
dev-libs/libfmt:0/5
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${PN}-1.0.0-unbundle-fmt.patch" )
|
||||
|
||||
src_configure() {
|
||||
rm -r include/spdlog/fmt/bundled || die
|
||||
|
||||
local mycmakeargs=(
|
||||
-DSPDLOG_BUILD_EXAMPLES=no
|
||||
-DSPDLOG_BUILD_TESTING=$(usex test)
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1,39 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python{2_7,3_6} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="doit tasks for python stuff"
|
||||
HOMEPAGE="https://pythonhosted.org/doit-py/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
DEPEND="test? (
|
||||
dev-python/pyflakes[${PYTHON_USEDEP}]
|
||||
dev-python/coverage[${PYTHON_USEDEP}]
|
||||
virtual/python-singledispatch[${PYTHON_USEDEP}]
|
||||
app-text/hunspell )
|
||||
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
|
||||
RDEPEND="
|
||||
virtual/python-pathlib[${PYTHON_USEDEP}]
|
||||
dev-python/doit[${PYTHON_USEDEP}]
|
||||
dev-python/configclass[${PYTHON_USEDEP}]"
|
||||
|
||||
distutils_enable_tests pytest
|
||||
|
||||
python_compile_all() {
|
||||
use doc && emake -C doc html
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
use doc && local HTML_DOCS=( doc/_build/html/. )
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST doit-0.29.0.tar.gz 222341 BLAKE2B 8489568fe9236af04f87debfb4889840aa162d17d20f82ac0a9a22d1034b4c58976cd6829486a15b941ac1f50e7137c052fe332657c2b3f529fe2345bbcba2fc SHA512 a686457df31b414d0c3797789e0ae1ae5cdfa3674025236419cb59b254f342cd2db07911ef18b2cb576d8d817b44035b9372265b34b786b2779fb7074b394de1
|
||||
DIST doit-0.32.0.tar.gz 1437939 BLAKE2B 39134341582cd964630a1667c78b0e44eeb32406a06e3567123b820fb61cbee0f6a7c8879a84eed750860a365aa4c792e461bb1534c66e4f20a6289522dc8183 SHA512 d5c28a0c6a38648aeef58027b2246fc26360e133e91933f2244bd484f70d6d26110acbfec19c74d53c796e0bbae07a4bf6d76542d45e8b1a6b503c186bf2a68a
|
||||
|
||||
@ -0,0 +1,70 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_6 )
|
||||
DISTUTILS_USE_SETUPTOOLS=rdepend
|
||||
|
||||
inherit eutils distutils-r1
|
||||
|
||||
DESCRIPTION="Automation tool"
|
||||
HOMEPAGE="http://python-doit.sourceforge.net/ https://pypi.org/project/doit/"
|
||||
SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc test"
|
||||
|
||||
RDEPEND="
|
||||
dev-python/cloudpickle[${PYTHON_USEDEP}]
|
||||
dev-python/pyinotify[${PYTHON_USEDEP}]
|
||||
dev-python/six[${PYTHON_USEDEP}]
|
||||
$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7 pypy)
|
||||
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
|
||||
"
|
||||
DEPEND="test? ( ${RDEPEND}
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
dev-python/pyflakes[${PYTHON_USEDEP}]
|
||||
dev-python/coverage[${PYTHON_USEDEP}] )
|
||||
"
|
||||
PDEPEND=">=dev-python/doit-py-0.3.0[${PYTHON_USEDEP}]"
|
||||
|
||||
# Required for test phase
|
||||
DISTUTILS_IN_SOURCE_BUILD=1
|
||||
|
||||
python_prepare_all() {
|
||||
# Disable test failing due to impact on PATH run in a sandbox
|
||||
sed -e s':test_target:_&:' -i tests/test_cmd_strace.py || die
|
||||
|
||||
# Test requires connection to an absent database
|
||||
sed -e s':testIgnoreAll:_&:' -i tests/test_cmd_ignore.py || die
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_compile_all() {
|
||||
use doc && emake -C doc html
|
||||
}
|
||||
|
||||
python_test() {
|
||||
local -x TMPDIR="${T}"
|
||||
# disable tests where pypy's treatment of some tests' use of a db is incompatible
|
||||
|
||||
if [[ "${EPYTHON}" == pypy ]]; then
|
||||
sed -e 's:test_remove_all:_&:' -i tests/test_dependency.py || die
|
||||
sed -e 's:testForgetAll:_&:' -i tests/test_cmd_forget.py || die
|
||||
sed -e 's:test_not_picklable:_&:' \
|
||||
-e 's:test_task_not_picklabe_multiprocess:_&:' \
|
||||
-i tests/test_runner.py || die
|
||||
fi
|
||||
|
||||
py.test || die "Tests failed under ${EPYTHON}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
use doc && HTML_DOCS=( doc/_build/html/. )
|
||||
|
||||
distutils-r1_src_install
|
||||
}
|
||||
@ -0,0 +1,60 @@
|
||||
From c3f6333298c86e5681af282c7210eb1047a991dd Mon Sep 17 00:00:00 2001
|
||||
From: schettino72 <schettino72@gmail.com>
|
||||
Date: Sat, 30 Aug 2014 10:51:26 +0800
|
||||
Subject: [PATCH] install sigledispatch only when required.
|
||||
|
||||
---
|
||||
mergedict.py | 7 +++++--
|
||||
setup.py | 7 ++++++-
|
||||
2 files changed, 11 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/mergedict.py b/mergedict.py
|
||||
index 5dcd994..ad80a16 100644
|
||||
--- a/mergedict.py
|
||||
+++ b/mergedict.py
|
||||
@@ -26,8 +26,11 @@
|
||||
|
||||
import sys
|
||||
import inspect
|
||||
-from singledispatch import singledispatch
|
||||
-
|
||||
+try:
|
||||
+ from functools import singledispatch
|
||||
+# singledispatch was added on python 3.4
|
||||
+except ImportError: # pragma: no cover
|
||||
+ from singledispatch import singledispatch
|
||||
|
||||
class MergeDict(dict):
|
||||
"""Base class for a dict that implements a merge() method.
|
||||
diff --git a/setup.py b/setup.py
|
||||
index b37319e..1966b9a 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -1,6 +1,7 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
+import sys
|
||||
import os
|
||||
import codecs
|
||||
from setuptools import setup
|
||||
@@ -11,6 +12,10 @@
|
||||
long_description = ld_file.read()
|
||||
|
||||
|
||||
+install_requires = []
|
||||
+if sys.version_info[0] < 3 or sys.version_info[1] < 4:
|
||||
+ install_requires.append('singledispatch')
|
||||
+
|
||||
setup (
|
||||
name = 'mergedict',
|
||||
version = '0.2.0',
|
||||
@@ -23,7 +28,7 @@
|
||||
platforms = ['any'],
|
||||
license = 'MIT',
|
||||
py_modules = ['mergedict'],
|
||||
- install_requires = ['singledispatch'],
|
||||
+ install_requires = install_requires,
|
||||
classifiers = [
|
||||
'Development Status :: 4 - Beta',
|
||||
'Intended Audience :: Developers',
|
||||
@ -0,0 +1,24 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="A Python 'dict' with a merge() method"
|
||||
HOMEPAGE="https://github.com/schettino72/mergedict/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="virtual/python-singledispatch[${PYTHON_USEDEP}]"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-py34.patch
|
||||
)
|
||||
@ -1 +1,2 @@
|
||||
DIST path-and-address-1.1.0.zip 7652 BLAKE2B fcf80494a2969d4b59a96ca6cd6f9dbc03a56b11e4374e64ea59fba18859b50eb8621d506b28472713bce8aaec6e8d9f26ba763b82b726df439967aa3c8a75be SHA512 eb60fabce6a71401b4681bcc1db5253c2043c33bd25f9bc8bf678d45aa459e2398ed482166fa0f85a0365ba8762a46e75c6c497ea25b6c1ba5c91d6a37618062
|
||||
DIST path-and-address-2.0.1.zip 6503 BLAKE2B 146e73b5b54ea536f8b94da8ebbb923441564cf2137a55f3938552493b6fffe28c4e90c908a3fef2acb55e76f320519c7f59c0b2c99f144ebb29ca90d32e590a SHA512 11b2352389662412451e1e9f3e2997e81d36acbef7ad18c50328b9e9bb395f2f5fc8bca988ef14a7d9b76f5213cbfa17bb82df0e00f6989671181b104e4f1406
|
||||
|
||||
@ -0,0 +1,20 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Functions for server CLI applications used by humans"
|
||||
HOMEPAGE="https://github.com/joeyespo/path-and-address"
|
||||
LICENSE="MIT"
|
||||
|
||||
SLOT="0"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
BDEPEND="app-arch/unzip"
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
||||
DIST clion-2019.3.tar.gz 499054562 BLAKE2B 5655d39a573915431d296e5cc0a0aee1e0aaa95878e885b578a961b53b001ff8327338cf7e8e9a6eb71d758336cb8d71f7b21d94b4aa72504cc8f73df274dee6 SHA512 9d16ae4e2219d5cecb165934a8c378df2125ae6b14f924d04cad6776b985e19ea1957d1fb15e1c75d078eac56b47eaed2dfed02efedbf0d5ff649bab519ecc1c
|
||||
DIST clion-2019.3.2.tar.gz 504918530 BLAKE2B fd209977752f2e97c42113d082f0e57de0a4c73c3f18d29ba00872f19f753843c719abc96e1e7c1ba2d8afdfd724ef929e803d1ec009019ee9bef735347ae8a0 SHA512 def10008f685c5bac523c2a15920b41482f4877cdfcc26f3aac2dfdfe2cf0e23ebff236750d4f1b04f0076ec6967c127abaf61f0cb1da5a51d873fd0cd029f2a
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue