From 05c0ee08ac8cb69045389e7c9188fa673ca25f69 Mon Sep 17 00:00:00 2001 From: Sergey Popov Date: Wed, 22 Mar 2017 10:32:35 +0300 Subject: [PATCH] app-mobilephone/gammu: sync with portage tree, due to deprecation of python.eclass --- app-mobilephone/gammu/Manifest | 3 +- .../files/gammu-1.36.8-bashcompdir.patch | 12 ++ app-mobilephone/gammu/gammu-1.31.90.ebuild | 107 ----------------- app-mobilephone/gammu/gammu-1.32.0.ebuild | 108 ------------------ app-mobilephone/gammu/gammu-1.36.8.ebuild | 85 ++++++++++++++ 5 files changed, 98 insertions(+), 217 deletions(-) create mode 100644 app-mobilephone/gammu/files/gammu-1.36.8-bashcompdir.patch delete mode 100644 app-mobilephone/gammu/gammu-1.31.90.ebuild delete mode 100644 app-mobilephone/gammu/gammu-1.32.0.ebuild create mode 100644 app-mobilephone/gammu/gammu-1.36.8.ebuild diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest index 75a6276..4e9f44a 100644 --- a/app-mobilephone/gammu/Manifest +++ b/app-mobilephone/gammu/Manifest @@ -1,2 +1 @@ -DIST gammu-1.31.90.tar.bz2 6292651 SHA256 086135cbce9a0ae29913df4b4e6da2410ef4db8ed93f22a7e03219db58ba27a4 -DIST gammu-1.32.0.tar.bz2 6296184 SHA256 de67caa102aa4c8fbed5300e5a0262e40411c4cc79f4379a8d34eed797968fc3 SHA512 8758085c3c3ecb34710513d04ec0e686c8bf06f2c3b60c618eaf77e42eba047f0dbc2898cfbc0c31c0811f30a6c2955cc372e3cb819e7ff41224f55ef1df187d WHIRLPOOL 717ca87674639429a45759b56859c49420e612a8f703003671ca00232ae99ad1424b012d525a65a306baf0ed856d8a61e72105bc89537fcfc12d7bd1210626a4 +DIST gammu-1.36.8.tar.bz2 2095289 SHA256 0ed9c91b4cc5844cad04531e765bc1194cb02bc3e69e6658cd88bfb1cad74f80 SHA512 4ac86b783570db0105e18ef05fc9408e85d1234ab7de720a232a416ad867d3afbe89db7ed408c06d57f8bb38a2e272f86386f11a89e56f1d750da9e9b579ba09 WHIRLPOOL 36172cbf129647b2de48dbbe14122e71fc4f46e2f6ddb29ce546a1e37ea5c2ee0cad28ee37b29b7ddfb9605e6984c6d80d50108bfe0962417da35a1c5b2688ef diff --git a/app-mobilephone/gammu/files/gammu-1.36.8-bashcompdir.patch b/app-mobilephone/gammu/files/gammu-1.36.8-bashcompdir.patch new file mode 100644 index 0000000..aceef3d --- /dev/null +++ b/app-mobilephone/gammu/files/gammu-1.36.8-bashcompdir.patch @@ -0,0 +1,12 @@ +diff -BurpN gammu-1.36.8.orig/contrib/CMakeLists.txt gammu-1.36.8/contrib/CMakeLists.txt +--- gammu-1.36.8.orig/contrib/CMakeLists.txt 2015-12-08 13:38:11.000000000 +0300 ++++ gammu-1.36.8/contrib/CMakeLists.txt 2016-01-16 15:49:45.870431342 +0300 +@@ -85,7 +85,7 @@ endif (INSTALL_PHP_EXAMPLES) + if (INSTALL_BASH_COMPLETION) + macro_optional_find_package (BashCompletion) + if (NOT BASH_COMPLETION_FOUND) +- set (BASH_COMPLETION_COMPLETIONSDIR "/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d") ++ set (BASH_COMPLETION_COMPLETIONSDIR "/usr/share/bash-completion/completions" CACHE PATH "Location of bash_completion.d") + endif (NOT BASH_COMPLETION_FOUND) + install ( + FILES bash-completion/gammu diff --git a/app-mobilephone/gammu/gammu-1.31.90.ebuild b/app-mobilephone/gammu/gammu-1.31.90.ebuild deleted file mode 100644 index 788cf4d..0000000 --- a/app-mobilephone/gammu/gammu-1.31.90.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.30.0.ebuild,v 1.2 2011/08/13 07:15:53 xarthisius Exp $ - -EAPI="3" - -PYTHON_DEPEND="python? 2" - -inherit eutils cmake-utils python - -DESCRIPTION="A tool to handle your cellular phone" -HOMEPAGE="http://www.wammu.eu/" -SRC_URI="http://dl.cihar.com/gammu/releases/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="bash-completion curl debug bluetooth irda mysql postgres dbi nls python usb" - -RDEPEND="bluetooth? ( net-wireless/bluez ) - curl? ( net-misc/curl ) - usb? ( virtual/libusb:1 ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql-server ) - dbi? ( >=dev-db/libdbi-0.8.3 ) - dev-util/dialog - !dev-python/python-gammu" # needs to be removed from the tree -DEPEND="${RDEPEND} - irda? ( virtual/os-headers ) - nls? ( sys-devel/gettext ) - dev-util/cmake" - -# sys-devel/gettext is needed for creating .mo files -# Supported languages and translated documentation -# Be sure all languages are prefixed with a single space! -MY_AVAILABLE_LINGUAS=" af bg ca cs da de el es et fi fr gl he hu id it ko nl pl pt_BR ru sk sv sw zh_CN zh_TW" -IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}" - -pkg_setup() { - if use python; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-skip-locktest.patch - epatch "${FILESDIR}"/${PN}-motorola-l7-features.patch - - local lang support_linguas=no - for lang in ${MY_AVAILABLE_LINGUAS} ; do - if use linguas_${lang} ; then - support_linguas=yes - break - fi - done - # install all languages when all selected LINGUAS aren't supported - if [ "${support_linguas}" = "yes" ]; then - for lang in ${MY_AVAILABLE_LINGUAS} ; do - if ! use linguas_${lang} ; then - rm -rf locale/${lang} || die - fi - done - fi -} - -src_configure() { - # debug flag is used inside cmake-utils.eclass - local mycmakeargs="$(cmake-utils_use_with bluetooth Bluez) \ - $(cmake-utils_use_with irda IRDA) \ - $(cmake-utils_use_with curl CURL) \ - $(cmake-utils_use_with usb USB) \ - $(cmake-utils_use_with python PYTHON) \ - $(cmake-utils_use_with mysql MySQL) \ - $(cmake-utils_use_with postgres Postgres) \ - $(cmake-utils_use_with dbi LibDBI) \ - $(cmake-utils_use_with nls GettextLibs) \ - $(cmake-utils_use_with nls Iconv) \ - -DBUILD_SHARED_LIBS=ON -DINSTALL_DOC_DIR=share/doc/${PF}" - if ! use bash-completion; then - mycmakeargs="${mycmakeargs} -DINSTALL_BASH_COMPLETION=OFF" - fi - if use python; then - mycmakeargs="${mycmakeargs} -DBUILD_PYTHON=$(PYTHON -a)" - fi - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_test() { - LD_LIBRARY_PATH="${WORKDIR}"/${PN}_build/common cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install -} - -pkg_postinst() { - use python && python_mod_optimize gammu -} - -pkg_postrm() { - use python && python_mod_cleanup gammu -} diff --git a/app-mobilephone/gammu/gammu-1.32.0.ebuild b/app-mobilephone/gammu/gammu-1.32.0.ebuild deleted file mode 100644 index 391f3a3..0000000 --- a/app-mobilephone/gammu/gammu-1.32.0.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" - -PYTHON_DEPEND="python? 2" - -inherit eutils cmake-utils python - -DESCRIPTION="A tool to handle your cellular phone" -HOMEPAGE="http://www.wammu.eu/" -SRC_URI="http://dl.cihar.com/gammu/releases/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="bash-completion bluetooth curl dbi debug irda mysql nls postgres python usb" - -RDEPEND="bluetooth? ( net-wireless/bluez ) - curl? ( net-misc/curl ) - usb? ( virtual/libusb:1 ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql-server ) - dbi? ( >=dev-db/libdbi-0.8.3 ) - dev-util/dialog" -DEPEND="${RDEPEND} - irda? ( virtual/os-headers ) - nls? ( sys-devel/gettext )" - -# sys-devel/gettext is needed for creating .mo files -# Supported languages and translated documentation -# Be sure all languages are prefixed with a single space! -MY_AVAILABLE_LINGUAS=" af ar bg ca cs da de el en_GB es et fi fr gl he hu id it ko nl pl pt_BR ru sk sv sw tr zh_CN zh_TW" -IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}" - -pkg_setup() { - if use python; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-skip-locktest.patch - epatch "${FILESDIR}"/${PN}-motorola-l7-features.patch - - local lang support_linguas=no - for lang in ${MY_AVAILABLE_LINGUAS} ; do - if use linguas_${lang} ; then - support_linguas=yes - break - fi - done - # install all languages when all selected LINGUAS aren't supported - if [ "${support_linguas}" = "yes" ]; then - for lang in ${MY_AVAILABLE_LINGUAS} ; do - if ! use linguas_${lang} ; then - rm -rf locale/${lang} || die - fi - done - fi -} - -src_configure() { - # debug flag is used inside cmake-utils.eclass - local mycmakeargs=( - $(cmake-utils_use_with bluetooth Bluez) \ - $(cmake-utils_use_with irda IRDA) \ - $(cmake-utils_use_with curl CURL) \ - $(cmake-utils_use_with usb USB) \ - $(cmake-utils_use_with python PYTHON) \ - $(cmake-utils_use_with mysql MySQL) \ - $(cmake-utils_use_with postgres Postgres) \ - $(cmake-utils_use_with dbi LibDBI) \ - $(cmake-utils_use_with nls GettextLibs) \ - $(cmake-utils_use_with nls Iconv) \ - -DBUILD_SHARED_LIBS=ON \ - -DINSTALL_DOC_DIR="share/doc/${PF}" - ) - if ! use bash-completion; then - mycmakeargs+=( -DINSTALL_BASH_COMPLETION=OFF ) - fi - if use python; then - mycmakeargs+=( -DBUILD_PYTHON="$(PYTHON -a)" ) - fi - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_test() { - LD_LIBRARY_PATH="${WORKDIR}/${PN}_build/common" cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install -} - -pkg_postinst() { - use python && python_mod_optimize gammu -} - -pkg_postrm() { - use python && python_mod_cleanup gammu -} diff --git a/app-mobilephone/gammu/gammu-1.36.8.ebuild b/app-mobilephone/gammu/gammu-1.36.8.ebuild new file mode 100644 index 0000000..05480fe --- /dev/null +++ b/app-mobilephone/gammu/gammu-1.36.8.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit eutils cmake-utils + +DESCRIPTION="A tool to handle your cellular phone" +HOMEPAGE="http://wammu.eu/gammu/" +SRC_URI="http://dl.cihar.com/${PN}/releases/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="bluetooth curl dbi debug irda mysql nls postgres usb" + +COMMON_DEPEND=" + dev-libs/glib:2= + virtual/libgudev:= + bluetooth? ( net-wireless/bluez:= ) + curl? ( net-misc/curl:= ) + dbi? ( >=dev-db/libdbi-0.8.3:= ) + mysql? ( virtual/mysql:= ) + postgres? ( dev-db/postgresql:= ) + usb? ( virtual/libusb:1= ) +" +DEPEND=" + ${COMMON_DEPEND} + irda? ( virtual/os-headers ) + nls? ( sys-devel/gettext ) +" +RDEPEND=" + ${COMMON_DEPEND} + dev-util/dialog +" + +# sys-devel/gettext is needed for creating .mo files +# Supported languages and translated documentation +# Be sure all languages are prefixed with a single space! +MY_AVAILABLE_LINGUAS=" af ar bg bn ca cs da de el en_GB es et fi fr gl he hu id it ko nl pl pt_BR ro ru sk sv sw tr zh_CN zh_TW" +IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}" + +src_prepare() { + epatch "${FILESDIR}/${PN}-skip-locktest.patch" \ + "${FILESDIR}/${PN}-1.36.8-bashcompdir.patch" \ + "${FILESDIR}/${PN}-motorola-l7-features.patch" + + local lang support_linguas=no + for lang in ${MY_AVAILABLE_LINGUAS} ; do + if use linguas_${lang} ; then + support_linguas=yes + break + fi + done + # install all languages when all selected LINGUAS aren't supported + if [ "${support_linguas}" = "yes" ]; then + for lang in ${MY_AVAILABLE_LINGUAS} ; do + if ! use linguas_${lang} ; then + rm -rf locale/${lang} || die + fi + done + fi +} + +src_configure() { + # debug flag is used inside cmake-utils.eclass + local mycmakeargs=( + $(cmake-utils_use_with bluetooth Bluez) + $(cmake-utils_use_with irda IRDA) + $(cmake-utils_use_with curl CURL) + $(cmake-utils_use_with usb USB) + $(cmake-utils_use_with mysql MySQL) + $(cmake-utils_use_with postgres Postgres) + $(cmake-utils_use_with dbi LibDBI) + $(cmake-utils_use_with nls GettextLibs) + $(cmake-utils_use_with nls Iconv) + -DBUILD_SHARED_LIBS=ON + -DINSTALL_DOC_DIR="share/doc/${PF}" + ) + cmake-utils_src_configure +} + +src_test() { + LD_LIBRARY_PATH="${WORKDIR}/${PN}_build/common" cmake-utils_src_test +}