* [gentoo-commits] repo/gentoo:master commit in: x11-terms/guake/files/, x11-terms/guake/
@ 2022-01-13 8:06 Ionen Wolkens
0 siblings, 0 replies; 3+ messages in thread
From: Ionen Wolkens @ 2022-01-13 8:06 UTC (permalink / raw
To: gentoo-commits
commit: 031343498b462b40cca9b65ece8d4020b2495a5e
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 13 04:40:36 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jan 13 08:06:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03134349
x11-terms/guake: drop 3.7.0, 3.8.0
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
x11-terms/guake/Manifest | 2 -
x11-terms/guake/files/guake-3.3.2-paths.patch | 20 -------
x11-terms/guake/guake-3.7.0.ebuild | 79 -------------------------
x11-terms/guake/guake-3.8.0.ebuild | 84 ---------------------------
4 files changed, 185 deletions(-)
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index a7903699d7fb..dfad83dab875 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,3 +1 @@
-DIST guake-3.7.0.tar.gz 1215186 BLAKE2B ff60f83fce5fbdd3712e261bbb72247cdcb311b8208af75007183bced88fcc2d2ebe3c49b76e2264786246444e9d07a41f884de949112c249277717070d64c11 SHA512 578c42ed41049acd253e0c409a9ecb103c7f71679fc5efdd94c60461b952ac77c836e59439361e1cd70e5fe6785ab4c15e7bf73b9f4c7d23b47c77468fa05f62
-DIST guake-3.8.0.tar.gz 1125090 BLAKE2B 72ee6b5e93c3433fcc2863d2b0aa198326cc4889126454040ce870fdeaa0ba110723410355ae49b5e2e4876fcad3f9d849873adaddfcf1ecfa83dc1583db57eb SHA512 6e0bb6b4a0c92c163bd6151c65936a38d93624166af5a4e2b042f9ade7f28683c8e8fad802b23a07edd478e2dd3b99a559069c9935f1154585be936d1b7a96ed
DIST guake-3.8.1.tar.gz 1127132 BLAKE2B e91f74bf119c76ad214b5c29bceb4fe18f19c97f14dbb2973c6118bbb9affc06e919c56e0cd24f96b710d9c2468006289fcf1c13a2050e93cc01972f0c9ebe99 SHA512 5fbf4cc37bc501e4533bd27c1c7e1f783e570457867289702ab2122fcb6a55708df151e4307c4cf84a242ac1d2874ef5e8eb9411318e24eca140102a42b426f4
diff --git a/x11-terms/guake/files/guake-3.3.2-paths.patch b/x11-terms/guake/files/guake-3.3.2-paths.patch
deleted file mode 100644
index d2d94daa4b1a..000000000000
--- a/x11-terms/guake/files/guake-3.3.2-paths.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -81,7 +81,7 @@
-
- @if [ -f guake/paths.py.dev ]; then rm -f guake/paths.py.dev; fi
- @if [ -f guake/paths.py ]; then mv guake/paths.py guake/paths.py.dev; fi
-- @cp -f guake/paths.py.in guake/paths.py
-+ -@cp -f guake/paths.py.in guake/paths.py
- @sed -i -e 's|{{ LOCALE_DIR }}|"$(localedir)"|g' guake/paths.py
- @sed -i -e 's|{{ IMAGE_DIR }}|"$(IMAGE_DIR)"|g' guake/paths.py
- @sed -i -e 's|{{ GLADE_DIR }}|"$(GLADE_DIR)"|g' guake/paths.py
-@@ -368,7 +368,7 @@
-
- generate-paths:
- @echo "Generating path.py..."
-- @cp -f guake/paths.py.in guake/paths.py
-+ -@cp -f guake/paths.py.in guake/paths.py
- @# Generic
- @sed -i -e 's|{{ LOGIN_DESTOP_PATH }}|""|g' guake/paths.py
- @sed -i -e 's|{{ AUTOSTART_FOLDER }}|""|g' guake/paths.py
diff --git a/x11-terms/guake/guake-3.7.0.ebuild b/x11-terms/guake/guake-3.7.0.ebuild
deleted file mode 100644
index 44023bbf3653..000000000000
--- a/x11-terms/guake/guake-3.7.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/Guake/guake.git"
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="amd64 arm x86"
-fi
-
-DESCRIPTION="Drop-down terminal for GNOME"
-HOMEPAGE="
- https://github.com/Guake/guake/
- https://pypi.org/project/guake/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="utempter"
-
-RDEPEND="
- dev-libs/glib
- dev-libs/keybinder:3[introspection]
- $(python_gen_cond_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pbr[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- ')
- x11-libs/libnotify[introspection]
- x11-libs/libwnck:3[introspection]
- x11-libs/vte:2.91[introspection]
- utempter? ( sys-libs/libutempter )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- gnome-base/gsettings-desktop-schemas
- sys-devel/gettext"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.3.2-paths.patch
-)
-
-pkg_setup() {
- GUAKE_SCHEMA_DIR="${EROOT}"/usr/share/glib-2.0/schemas
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- sed -i -e '/^SCHEMA_DIR/s|get_default_schema_dir()|"'"${GUAKE_SCHEMA_DIR}"'"|g' ${PN}/paths.py || die
-}
-
-python_compile_all() {
- emake prepare-install PREFIX=/usr
- emake generate-paths PREFIX=/usr DATA_DIR='$(datadir)/guake' DEV_SCHEMA_DIR='$(gsettingsschemadir)'
- default
-}
-
-python_install_all() {
- emake install-schemas install-locale PREFIX=/usr DESTDIR="${D}"
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- gnome2_schemas_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_schemas_update
- xdg_desktop_database_update
-}
diff --git a/x11-terms/guake/guake-3.8.0.ebuild b/x11-terms/guake/guake-3.8.0.ebuild
deleted file mode 100644
index 45bb69d378a7..000000000000
--- a/x11-terms/guake/guake-3.8.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 gnome2-utils virtualx xdg-utils
-
-DESCRIPTION="Drop-down terminal for GNOME"
-HOMEPAGE="http://guake-project.org/"
-SRC_URI="https://github.com/Guake/guake/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="utempter"
-
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- ')
- dev-libs/keybinder:3[introspection]
- x11-libs/libnotify[introspection]
- x11-libs/libwnck:3[introspection]
- x11-libs/vte:2.91[introspection]
- utempter? ( sys-libs/libutempter )"
-BDEPEND="
- $(python_gen_cond_dep '
- dev-python/pbr[${PYTHON_USEDEP}]
- test? (
- dev-python/pyfakefs[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- )
- ')
- dev-libs/glib:2
- gnome-base/gsettings-desktop-schemas
- sys-devel/gettext"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- emake PREFIX="${EPREFIX}/usr" prepare-install # paths.py.in -> paths.py
-
- export PBR_VERSION=${PV} # needed if using github's tarball
-}
-
-python_test() {
- # - uses /usr/bin/bash if SHELL is not exported
- # - pytest-xvfb fails with Terminated, virtx alone works
- SHELL=${SHELL} virtx epytest -p no:xvfb
-}
-
-python_install() {
- # done here so tests don't use the system's
- sed -e "/^SCHEMA_DIR/s|=.*|= \"${EPREFIX}/usr/share/glib-2.0/schemas\"|" \
- -e "/def get_default_data_dir/{n;s|=.*|= \"${EPREFIX}/usr/share/guake\"|}" \
- -i "${BUILD_DIR}"/lib/guake/paths.py || die
- rm -r "${BUILD_DIR}"/lib/guake/tests || die
-
- distutils-r1_python_install
-}
-
-python_install_all() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-{locale,schemas}
-
- dodoc NEWS.rst README.rst
-
- mv "${D}"/{,"${EPREFIX}"/usr/share/}metainfo || die
-}
-
-pkg_postinst() {
- gnome2_schemas_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_schemas_update
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/guake/files/, x11-terms/guake/
@ 2018-10-06 10:25 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2018-10-06 10:25 UTC (permalink / raw
To: gentoo-commits
commit: a0a6dcbe1a5668bd29d2668fe959a065d566aaf2
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 6 10:22:46 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Oct 6 10:25:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0a6dcbe
x11-terms/guake: Fix dependencies, runtime
Bug: https://bugs.gentoo.org/667878
Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
x11-terms/guake/files/guake-3.4.0-paths.patch | 14 ++++++++++++++
.../guake/{guake-3.4.0.ebuild => guake-3.4.0-r1.ebuild} | 8 +++++---
x11-terms/guake/guake-9999.ebuild | 10 ++++++----
3 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/x11-terms/guake/files/guake-3.4.0-paths.patch b/x11-terms/guake/files/guake-3.4.0-paths.patch
new file mode 100644
index 00000000000..30a47294d5e
--- /dev/null
+++ b/x11-terms/guake/files/guake-3.4.0-paths.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/667878
+https://github.com/Guake/guake/issues/1436
+
+--- a/guake/paths.py
++++ b/guake/paths.py
+@@ -35,7 +35,7 @@
+
+
+ def get_data_files_dir():
+- d = os.path.dirname(os.path.dirname(sys.modules["guake"].__file__))
++ d = os.path.dirname(sys.modules["guake"].__file__)
+ p = os.path.basename(os.path.abspath(os.path.join(d, "..")))
+ if p in ["site-packages", "dist-packages"]:
+ # current "guake" package has been installed in a prefix structure (/usr, /usr/local or
diff --git a/x11-terms/guake/guake-3.4.0.ebuild b/x11-terms/guake/guake-3.4.0-r1.ebuild
similarity index 88%
rename from x11-terms/guake/guake-3.4.0.ebuild
rename to x11-terms/guake/guake-3.4.0-r1.ebuild
index ec3ad80d6f2..a9aeb41ea1c 100644
--- a/x11-terms/guake/guake-3.4.0.ebuild
+++ b/x11-terms/guake/guake-3.4.0-r1.ebuild
@@ -17,13 +17,14 @@ KEYWORDS="~amd64 ~arm ~x86"
IUSE="utempter"
RDEPEND="
- dev-libs/keybinder:3
+ dev-libs/glib[${PYTHON_USEDEP}]
+ dev-libs/keybinder:3[introspection]
dev-python/dbus-python[${PYTHON_USEDEP}]
dev-python/pbr[${PYTHON_USEDEP}]
dev-python/pycairo[${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
- x11-libs/libnotify
- x11-libs/vte:2.91
+ x11-libs/libnotify[introspection]
+ x11-libs/vte:2.91[introspection]
utempter? ( sys-libs/libutempter )
"
DEPEND="
@@ -36,6 +37,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-3.3.2-paths.patch
+ "${FILESDIR}"/${PN}-3.4.0-paths.patch
)
S=${WORKDIR}/${P^}
diff --git a/x11-terms/guake/guake-9999.ebuild b/x11-terms/guake/guake-9999.ebuild
index 46f3706e7f3..593f8375adb 100644
--- a/x11-terms/guake/guake-9999.ebuild
+++ b/x11-terms/guake/guake-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,13 +17,14 @@ KEYWORDS=""
IUSE="utempter"
RDEPEND="
- dev-libs/keybinder:3
+ dev-libs/glib[${PYTHON_USEDEP}]
+ dev-libs/keybinder:3[introspection]
dev-python/dbus-python[${PYTHON_USEDEP}]
dev-python/pbr[${PYTHON_USEDEP}]
dev-python/pycairo[${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
- x11-libs/libnotify
- x11-libs/vte:2.91
+ x11-libs/libnotify[introspection]
+ x11-libs/vte:2.91[introspection]
utempter? ( sys-libs/libutempter )
"
DEPEND="
@@ -36,6 +37,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-3.3.2-paths.patch
+ "${FILESDIR}"/${PN}-3.4.0-paths.patch
)
python_compile_all() {
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/guake/files/, x11-terms/guake/
@ 2018-07-28 10:36 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2018-07-28 10:36 UTC (permalink / raw
To: gentoo-commits
commit: 83dfc011bcea933e0908b15bb0117ba5fff4845e
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 28 10:22:59 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jul 28 10:36:54 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83dfc011
x11-terms/guake: Version 3.3.2.
Package-Manager: Portage-2.3.43, Repoman-2.3.10
x11-terms/guake/Manifest | 1 +
x11-terms/guake/files/guake-3.3.2-paths.patch | 20 +++++++++
x11-terms/guake/guake-3.3.2.ebuild | 61 +++++++++++++++++++++++++++
3 files changed, 82 insertions(+)
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 10ca324039b..247df385840 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,3 +1,4 @@
DIST guake-0.8.13.tar.gz 410816 BLAKE2B 37240d5f86cee596243a23ce47c3d3502cc889dc90d98e8a073325bd8c7fb74929308b5f91756100b2bd641134992e61ec833581380b3733613cf83526e26e92 SHA512 89c21bab2b1e5fc17c16349e4a4a4e8d089b084ddffedcf7a20aa059d4269a2a1c5754ec7b343f4f0e2ffae135b78a6128b8c14642f50645ddd52f700fd82a38
DIST guake-0.8.8.tar.gz 395143 BLAKE2B 34b47948fd03e3187ca5cad4697b0bffd81f5c1add3951a42904837075768bc9f39a278a0e0e3bd555e1d3a9814efd5aefae3c1baa9fac98108eb6dfc81f6035 SHA512 cbff208ea985669c5063793aaa74504a0de92127b52af23499b7c95df7c3841558ae61586e56771ce8e0d444bbe95a95e12e1af41f8a4ac9c74c13b3e9df8dc2
DIST guake-3.3.0.tar.gz 1006849 BLAKE2B 387ca17a881beebb84c81fda29a3f44ab3f297841010128bc4c5c4eded83d3325562bc88858fd1a8824a7c26d3bb9050bbe17399934f6e6cdcf8b4bf3c15d8a6 SHA512 1558e34f29060e449d676077c90df92ea9bc3a57857094be8d98cd283010de1125b7eeb3fbc3b3fcd08cacac9cf8ee461adb28cc29c491e8d2c3ad32fa39754b
+DIST guake-3.3.2.tar.gz 1084094 BLAKE2B b534ed18a6b9ad686fbe41fe1aa6e522429a50725103455cc5ccc5c4c7b67df6ce9eeac3c769ef3cb44bcc2e60305df80b6aa6af83c89a27b290e5ea48d19f8e SHA512 4d5585178d1e70d5b954071c4b68af22c459518df7af5930bd9a44f1f63afaff7b89bcab43422f9ae178c1dccf1268e5555d5776adb01fc8f11666dae2c3e766
diff --git a/x11-terms/guake/files/guake-3.3.2-paths.patch b/x11-terms/guake/files/guake-3.3.2-paths.patch
new file mode 100644
index 00000000000..d2d94daa4b1
--- /dev/null
+++ b/x11-terms/guake/files/guake-3.3.2-paths.patch
@@ -0,0 +1,20 @@
+--- a/Makefile
++++ b/Makefile
+@@ -81,7 +81,7 @@
+
+ @if [ -f guake/paths.py.dev ]; then rm -f guake/paths.py.dev; fi
+ @if [ -f guake/paths.py ]; then mv guake/paths.py guake/paths.py.dev; fi
+- @cp -f guake/paths.py.in guake/paths.py
++ -@cp -f guake/paths.py.in guake/paths.py
+ @sed -i -e 's|{{ LOCALE_DIR }}|"$(localedir)"|g' guake/paths.py
+ @sed -i -e 's|{{ IMAGE_DIR }}|"$(IMAGE_DIR)"|g' guake/paths.py
+ @sed -i -e 's|{{ GLADE_DIR }}|"$(GLADE_DIR)"|g' guake/paths.py
+@@ -368,7 +368,7 @@
+
+ generate-paths:
+ @echo "Generating path.py..."
+- @cp -f guake/paths.py.in guake/paths.py
++ -@cp -f guake/paths.py.in guake/paths.py
+ @# Generic
+ @sed -i -e 's|{{ LOGIN_DESTOP_PATH }}|""|g' guake/paths.py
+ @sed -i -e 's|{{ AUTOSTART_FOLDER }}|""|g' guake/paths.py
diff --git a/x11-terms/guake/guake-3.3.2.ebuild b/x11-terms/guake/guake-3.3.2.ebuild
new file mode 100644
index 00000000000..cb6f65d97f3
--- /dev/null
+++ b/x11-terms/guake/guake-3.3.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 gnome2-utils xdg-utils
+
+DESCRIPTION="Drop-down terminal for GNOME"
+HOMEPAGE="https://github.com/Guake/guake https://pypi.org/project/Guake"
+SRC_URI="mirror://pypi/${PN^:0:1}/${PN^}/${P^}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="utempter"
+
+RDEPEND="
+ dev-libs/keybinder:3
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/pbr[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ x11-libs/libnotify
+ x11-libs/vte:2.91
+ utempter? ( sys-libs/libutempter )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ gnome-base/gsettings-desktop-schemas
+ sys-devel/gettext
+ sys-devel/make
+"
+
+S="${WORKDIR}/${P^}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.3.2-paths.patch
+)
+
+python_compile_all() {
+ emake prepare-install prefix=/usr
+ emake generate-paths prefix=/usr DATA_DIR='$(datadir)/guake' DEV_SCHEMA_DIR='$(gsettingsschemadir)'
+ default
+}
+
+python_install_all() {
+ emake install-schemas install-locale prefix=/usr DESTDIR="${D}"
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ gnome2_schemas_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-01-13 8:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-13 8:06 [gentoo-commits] repo/gentoo:master commit in: x11-terms/guake/files/, x11-terms/guake/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2018-10-06 10:25 Jeroen Roovers
2018-07-28 10:36 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox