commit: 451cbc767eab1cd57bc32c875170f8703fd584db
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 07:19:51 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 07:26:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=451cbc76
app-misc/g15daemon: Convert to python-r1
...on-9999.ebuild => g15daemon-1.9.5.3-r13.ebuild} | 60 ++++++----------------
...on-9999.ebuild => g15daemon-1.9.5.3-r21.ebuild} | 56 +++++---------------
app-misc/g15daemon/g15daemon-9999.ebuild | 32 +++---------
3 files changed, 37 insertions(+), 111 deletions(-)
diff --git a/app-misc/g15daemon/g15daemon-9999.ebuild
b/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild
similarity index 76%
copy from app-misc/g15daemon/g15daemon-9999.ebuild
copy to app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild
index e881884..ff12695 100644
--- a/app-misc/g15daemon/g15daemon-9999.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild
@@ -1,41 +1,39 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
GENTOO_DEPEND_ON_PERL="no"
-PYTHON_DEPEND="python? *"
-SUPPORT_PYTHON_ABIS="1"
-ESVN_PROJECT=${PN}/trunk
-ESVN_REPO_URI="https://${PN}.svn.sourceforge.net/svnroot/${ESVN_PROJECT}/${PN}-wip";
-inherit eutils linux-info perl-module python base subversion autotools
+inherit eutils linux-info perl-module python-r1 base
DESCRIPTION="G15daemon takes control of the G15 keyboard, through the linux
kernel uinput device driver"
HOMEPAGE="http://g15daemon.sourceforge.net/";
-[[ ${PV} = *9999* ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="perl python static-libs"
DEPEND="virtual/libusb:0
- >=dev-libs/libg15-9999
- >=dev-libs/libg15render-9999
+ >=dev-libs/libg15-1.2.4
+ >=dev-libs/libg15render-1.2
perl? (
dev-lang/perl
dev-perl/GDGraph
>=dev-perl/Inline-0.4
- )"
+ )
+ python? ( ${PYTHON_DEPS} )"
RDEPEND="${DEPEND}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
PATCHES=(
- "${FILESDIR}/${PN}-1.9.5.3-g510-keys.patch"
+ "${FILESDIR}/${P}-forgotten-open-mode.patch"
+ "${FILESDIR}/${P}-overflow-fix.patch"
)
-# "${FILESDIR}/${PN}-1.9.5.3-forgotten-open-mode.patch"
-# "${FILESDIR}/${PN}-1.9.5.3-overflow-fix.patch"
-
uinput_check() {
ebegin "Checking for uinput support"
local rc=1
@@ -56,17 +54,10 @@ uinput_check() {
pkg_setup() {
linux-info_pkg_setup
uinput_check
- if use python; then
- python_pkg_setup
- fi
}
src_unpack() {
- if [[ ${PV} = *9999* ]]; then
- subversion_src_unpack
- else
- unpack ${A}
- fi
+ unpack ${A}
if use perl; then
unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
fi
@@ -76,9 +67,6 @@ src_unpack() {
}
src_prepare() {
- if [[ ${PV} = *9999* ]]; then
- subversion_wc_info
- fi
if use perl; then
perl-module_src_prepare
sed -i \
@@ -88,9 +76,6 @@ src_prepare() {
# perl-module_src_prepare always calls base_src_prepare
base_src_prepare
fi
- if [[ ${PV} = *9999* ]]; then
- eautoreconf
- fi
}
src_configure() {
@@ -152,11 +137,7 @@ src_install() {
ebegin "Installing Python Bindings (g15daemon.py)"
cd "${WORKDIR}/pyg15daemon"
- installation() {
- insinto $(python_get_sitedir)
- doins g15daemon.py
- }
- python_execute_function installation
+ python_foreach_impl python_domodule g15daemon.py
docinto python
dodoc AUTHORS
@@ -164,11 +145,6 @@ src_install() {
}
pkg_postinst() {
- if use python; then
- python_mod_optimize g15daemon.py
- echo ""
- fi
-
elog "To use g15daemon, you need to add g15daemon to the default
runlevel."
elog "This can be done with:"
elog "# /sbin/rc-update add g15daemon default"
@@ -183,9 +159,3 @@ pkg_postinst() {
elog "Adding keycodes to an existing xmodmap:"
elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
}
-
-pkg_postrm() {
- if use python; then
- python_mod_cleanup g15daemon.py
- fi
-}
diff --git a/app-misc/g15daemon/g15daemon-9999.ebuild
b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild
similarity index 76%
copy from app-misc/g15daemon/g15daemon-9999.ebuild
copy to app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild
index e881884..9149ee0 100644
--- a/app-misc/g15daemon/g15daemon-9999.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
GENTOO_DEPEND_ON_PERL="no"
-PYTHON_DEPEND="python? *"
-SUPPORT_PYTHON_ABIS="1"
-ESVN_PROJECT=${PN}/trunk
-ESVN_REPO_URI="https://${PN}.svn.sourceforge.net/svnroot/${ESVN_PROJECT}/${PN}-wip";
-inherit eutils linux-info perl-module python base subversion autotools
+inherit eutils linux-info perl-module python-r1 base
DESCRIPTION="G15daemon takes control of the G15 keyboard, through the linux
kernel uinput device driver"
HOMEPAGE="http://g15daemon.sourceforge.net/";
-[[ ${PV} = *9999* ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
@@ -22,19 +20,21 @@ IUSE="perl python static-libs"
DEPEND="virtual/libusb:0
>=dev-libs/libg15-9999
- >=dev-libs/libg15render-9999
+ >=dev-libs/libg15render-1.2
perl? (
dev-lang/perl
dev-perl/GDGraph
>=dev-perl/Inline-0.4
- )"
+ )
+ python? ( ${PYTHON_DEPS} )"
RDEPEND="${DEPEND}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
PATCHES=(
- "${FILESDIR}/${PN}-1.9.5.3-g510-keys.patch"
+ "${FILESDIR}/${P}-forgotten-open-mode.patch"
+ "${FILESDIR}/${P}-overflow-fix.patch"
+ "${FILESDIR}/${P}-g510-keys.patch"
)
-# "${FILESDIR}/${PN}-1.9.5.3-forgotten-open-mode.patch"
-# "${FILESDIR}/${PN}-1.9.5.3-overflow-fix.patch"
uinput_check() {
ebegin "Checking for uinput support"
@@ -56,17 +56,10 @@ uinput_check() {
pkg_setup() {
linux-info_pkg_setup
uinput_check
- if use python; then
- python_pkg_setup
- fi
}
src_unpack() {
- if [[ ${PV} = *9999* ]]; then
- subversion_src_unpack
- else
- unpack ${A}
- fi
+ unpack ${A}
if use perl; then
unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
fi
@@ -76,9 +69,6 @@ src_unpack() {
}
src_prepare() {
- if [[ ${PV} = *9999* ]]; then
- subversion_wc_info
- fi
if use perl; then
perl-module_src_prepare
sed -i \
@@ -88,9 +78,6 @@ src_prepare() {
# perl-module_src_prepare always calls base_src_prepare
base_src_prepare
fi
- if [[ ${PV} = *9999* ]]; then
- eautoreconf
- fi
}
src_configure() {
@@ -152,11 +139,7 @@ src_install() {
ebegin "Installing Python Bindings (g15daemon.py)"
cd "${WORKDIR}/pyg15daemon"
- installation() {
- insinto $(python_get_sitedir)
- doins g15daemon.py
- }
- python_execute_function installation
+ python_foreach_impl python_domodule g15daemon.py
docinto python
dodoc AUTHORS
@@ -164,11 +147,6 @@ src_install() {
}
pkg_postinst() {
- if use python; then
- python_mod_optimize g15daemon.py
- echo ""
- fi
-
elog "To use g15daemon, you need to add g15daemon to the default
runlevel."
elog "This can be done with:"
elog "# /sbin/rc-update add g15daemon default"
@@ -183,9 +161,3 @@ pkg_postinst() {
elog "Adding keycodes to an existing xmodmap:"
elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
}
-
-pkg_postrm() {
- if use python; then
- python_mod_cleanup g15daemon.py
- fi
-}
diff --git a/app-misc/g15daemon/g15daemon-9999.ebuild
b/app-misc/g15daemon/g15daemon-9999.ebuild
index e881884..48d76e3 100644
--- a/app-misc/g15daemon/g15daemon-9999.ebuild
+++ b/app-misc/g15daemon/g15daemon-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
GENTOO_DEPEND_ON_PERL="no"
-PYTHON_DEPEND="python? *"
-SUPPORT_PYTHON_ABIS="1"
ESVN_PROJECT=${PN}/trunk
ESVN_REPO_URI="https://${PN}.svn.sourceforge.net/svnroot/${ESVN_PROJECT}/${PN}-wip";
-inherit eutils linux-info perl-module python base subversion autotools
+inherit eutils linux-info perl-module python-r1 base subversion autotools
DESCRIPTION="G15daemon takes control of the G15 keyboard, through the linux
kernel uinput device driver"
HOMEPAGE="http://g15daemon.sourceforge.net/";
@@ -27,8 +27,10 @@ DEPEND="virtual/libusb:0
dev-lang/perl
dev-perl/GDGraph
>=dev-perl/Inline-0.4
- )"
+ )
+ python? ( ${PYTHON_DEPS} )"
RDEPEND="${DEPEND}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
PATCHES=(
"${FILESDIR}/${PN}-1.9.5.3-g510-keys.patch"
@@ -56,9 +58,6 @@ uinput_check() {
pkg_setup() {
linux-info_pkg_setup
uinput_check
- if use python; then
- python_pkg_setup
- fi
}
src_unpack() {
@@ -152,11 +151,7 @@ src_install() {
ebegin "Installing Python Bindings (g15daemon.py)"
cd "${WORKDIR}/pyg15daemon"
- installation() {
- insinto $(python_get_sitedir)
- doins g15daemon.py
- }
- python_execute_function installation
+ python_foreach_impl python_domodule g15daemon.py
docinto python
dodoc AUTHORS
@@ -164,11 +159,6 @@ src_install() {
}
pkg_postinst() {
- if use python; then
- python_mod_optimize g15daemon.py
- echo ""
- fi
-
elog "To use g15daemon, you need to add g15daemon to the default
runlevel."
elog "This can be done with:"
elog "# /sbin/rc-update add g15daemon default"
@@ -183,9 +173,3 @@ pkg_postinst() {
elog "Adding keycodes to an existing xmodmap:"
elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
}
-
-pkg_postrm() {
- if use python; then
- python_mod_cleanup g15daemon.py
- fi
-}
