* [gentoo-commits] repo/gentoo:master commit in: x11-misc/wbarconf/
@ 2017-02-09 21:53 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2017-02-09 21:53 UTC (permalink / raw
To: gentoo-commits
commit: 6a5aa20a393554ccb990acbce215513cceb908ba
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
AuthorDate: Wed Feb 8 17:26:48 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Feb 9 21:52:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a5aa20a
x11-misc/wbarconf: EAPI bump 4 -> 6, migrate to python-single-r1
Fixes: https://bugs.gentoo.org/599774
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3884
x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild | 34 ++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild
new file mode 100644
index 0000000000..ac17c85bb7
--- /dev/null
+++ b/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Configuration GUI for x11-misc/wbar"
+HOMEPAGE="http://koti.kapsi.fi/ighea/wbarconf/"
+SRC_URI="http://koti.kapsi.fi/ighea/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="sys-devel/gettext"
+RDEPEND="
+ ${PYTHON_DEPS}
+ >=x11-misc/wbar-1.3.3
+ dev-python/pygobject:2[${PYTHON_USEDEP}]
+ dev-python/pygtk:2[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${PN}"
+PATCHES=( "${FILESDIR}"/${P}-install.patch )
+
+src_install() {
+ ./install.sh "${ED%/}/usr" || die "./install.sh failed."
+ python_doscript wbarconf
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/wbarconf/
@ 2017-02-19 20:14 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2017-02-19 20:14 UTC (permalink / raw
To: gentoo-commits
commit: 91ac60606cd0d82e3c59c959d60bd02ca5eb1afd
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 19 20:07:25 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 20:14:47 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91ac6060
x11-misc/wbarconf: Use python_fix_shebang instead of wrapping
x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild
index ac17c85bb7..69cb9a7c89 100644
--- a/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild
+++ b/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild
@@ -28,7 +28,10 @@ RDEPEND="
S="${WORKDIR}/${PN}"
PATCHES=( "${FILESDIR}"/${P}-install.patch )
+src_compile() {
+ python_fix_shebang wbarconf
+}
+
src_install() {
./install.sh "${ED%/}/usr" || die "./install.sh failed."
- python_doscript wbarconf
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/wbarconf/
@ 2017-02-19 20:14 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2017-02-19 20:14 UTC (permalink / raw
To: gentoo-commits
commit: 5daea19cec2be8c05517d4f8434afc63a77dc6e3
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 19 20:08:36 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 20:14:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5daea19c
x11-misc/wbarconf: Mark -r2 stable
x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild
index 69cb9a7c89..296121d808 100644
--- a/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild
+++ b/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://koti.kapsi.fi/ighea/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/wbarconf/
@ 2017-02-19 20:14 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2017-02-19 20:14 UTC (permalink / raw
To: gentoo-commits
commit: 95b9857fd7049e9c3d3b536b7489dc75535ad37d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 19 20:12:52 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 20:14:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95b9857f
x11-misc/wbarconf: Clean old version up
x11-misc/wbarconf/wbarconf-0.7.2.2-r1.ebuild | 34 ----------------------------
1 file changed, 34 deletions(-)
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r1.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r1.ebuild
deleted file mode 100644
index 176bc9a5d1..0000000000
--- a/x11-misc/wbarconf/wbarconf-0.7.2.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils python
-
-DESCRIPTION="Configuration GUI for x11-misc/wbar"
-HOMEPAGE="http://koti.kapsi.fi/ighea/wbarconf/"
-SRC_URI="http://koti.kapsi.fi/ighea/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=x11-misc/wbar-1.3.3
- dev-python/pygobject:2
- dev-python/pygtk:2
- sys-devel/gettext"
-DEPEND=""
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-install.patch
-}
-
-src_install() {
- ./install.sh "${D}/usr" || die "./install.sh failed."
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/wbarconf/
@ 2020-02-02 15:56 Jeroen Roovers
0 siblings, 0 replies; 7+ messages in thread
From: Jeroen Roovers @ 2020-02-02 15:56 UTC (permalink / raw
To: gentoo-commits
commit: bcbccb297028d66eafc39a8bb6c0f9e1d6931083
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 2 15:52:36 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Feb 2 15:56:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcbccb29
x11-misc/wbarconf: Fix docdir
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild | 40 ++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild
new file mode 100644
index 00000000000..2c5f19167c2
--- /dev/null
+++ b/x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="Configuration GUI for x11-misc/wbar"
+HOMEPAGE="http://koti.kapsi.fi/ighea/wbarconf/"
+SRC_URI="http://koti.kapsi.fi/ighea/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+ sys-devel/gettext
+"
+RDEPEND="
+ ${PYTHON_DEPS}
+ >=x11-misc/wbar-1.3.3
+ dev-python/pygobject:2[${PYTHON_USEDEP}]
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+"
+PATCHES=(
+ "${FILESDIR}"/${P}-install.patch
+)
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+ python_fix_shebang wbarconf
+}
+
+src_install() {
+ ./install.sh "${ED%/}/usr" || die "./install.sh failed"
+ if [[ "${P}" != "${PF}" ]]; then
+ mv "${ED}"/usr/share/doc/{${P},${PF}} || die
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/wbarconf/
@ 2020-02-08 16:25 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2020-02-08 16:25 UTC (permalink / raw
To: gentoo-commits
commit: 2ac32aa58b23e3ba81c72ca9c17c35fb6c6ea150
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 8 16:23:58 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 8 16:23:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ac32aa5
x11-misc/wbarconf: [QA] Fix UnnecessarySlashStrip
Signed-off-by: David Seifert <soap <AT> gentoo.org>
x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild
index 2c5f19167c2..2de548435db 100644
--- a/x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild
+++ b/x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild
@@ -33,7 +33,7 @@ src_compile() {
}
src_install() {
- ./install.sh "${ED%/}/usr" || die "./install.sh failed"
+ ./install.sh "${ED}/usr" || die "./install.sh failed"
if [[ "${P}" != "${PF}" ]]; then
mv "${ED}"/usr/share/doc/{${P},${PF}} || die
fi
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/wbarconf/
@ 2020-02-09 16:42 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2020-02-09 16:42 UTC (permalink / raw
To: gentoo-commits
commit: d82ad449acf5c8eac33c3d8d8637841c684e963e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 7 20:30:25 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 16:37:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d82ad449
x11-misc/wbarconf: Switch to PYTHON_MULTI_USEDEP API
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../{wbarconf-0.7.2.2-r2.ebuild => wbarconf-0.7.2.2-r4.ebuild} | 8 +++++---
.../{wbarconf-0.7.2.2-r3.ebuild => wbarconf-0.7.2.2-r5.ebuild} | 6 ++++--
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r4.ebuild
similarity index 80%
rename from x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild
rename to x11-misc/wbarconf/wbarconf-0.7.2.2-r4.ebuild
index d5ff90ab324..3caca84352c 100644
--- a/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild
+++ b/x11-misc/wbarconf/wbarconf-0.7.2.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -21,8 +21,10 @@ DEPEND="sys-devel/gettext"
RDEPEND="
${PYTHON_DEPS}
>=x11-misc/wbar-1.3.3
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- dev-python/pygtk:2[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+ ')"
S="${WORKDIR}/${PN}"
PATCHES=( "${FILESDIR}"/${P}-install.patch )
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r5.ebuild
similarity index 86%
rename from x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild
rename to x11-misc/wbarconf/wbarconf-0.7.2.2-r5.ebuild
index 2de548435db..91921185ba3 100644
--- a/x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild
+++ b/x11-misc/wbarconf/wbarconf-0.7.2.2-r5.ebuild
@@ -20,8 +20,10 @@ DEPEND="
RDEPEND="
${PYTHON_DEPS}
>=x11-misc/wbar-1.3.3
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- dev-python/pygtk:2[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+ ')
"
PATCHES=(
"${FILESDIR}"/${P}-install.patch
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-02-09 16:42 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-09 16:42 [gentoo-commits] repo/gentoo:master commit in: x11-misc/wbarconf/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2020-02-08 16:25 David Seifert
2020-02-02 15:56 Jeroen Roovers
2017-02-19 20:14 Michał Górny
2017-02-19 20:14 Michał Górny
2017-02-19 20:14 Michał Górny
2017-02-09 21:53 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox