[gentoo-commits] repo/gentoo:master commit in: mate-extra/mate-tweak/, mate-base/mate-menus/, app-text/atril/, ...

[gentoo-commits] repo/gentoo:master commit in: mate-extra/mate-tweak/, mate-base/mate-menus/, app-text/atril/, ...

[Arthur Zamarin]

commit:     d4bf91b23fa91da8e800fb939b3afb6af7b97cca
Author:     Ian Jordan <immoloism <AT> gmail <DOT> com>
AuthorDate: Sat Apr  6 14:55:08 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Apr  9 17:28:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4bf91b2

mate-extra/mate-tweak: New package

Signed-off-by: Ian Jordan <immoloism <AT> gmail.com>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-text/atril/metadata.xml                        |  4 +
 mate-base/mate-menus/Manifest                      |  1 +
 mate-base/mate-menus/mate-menus-1.28.0.ebuild      | 47 ++++++++++++
 mate-extra/mate-calc/metadata.xml                  |  5 +-
 mate-extra/mate-tweak/Manifest                     |  1 +
 .../mate-tweak-22.10.0-avoid-distutilsextra.patch  | 86 ++++++++++++++++++++++
 mate-extra/mate-tweak/mate-tweak-22.10.0.ebuild    | 67 +++++++++++++++++
 mate-extra/mate-tweak/metadata.xml                 | 22 ++++++
 8 files changed, 229 insertions(+), 4 deletions(-)

diff --git a/app-text/atril/metadata.xml b/app-text/atril/metadata.xml
index d690fcffc210..8ddaf88c17a3 100644
--- a/app-text/atril/metadata.xml
+++ b/app-text/atril/metadata.xml
@@ -5,6 +5,10 @@
 		<email>oz.tiram@gmail.com</email>
 		<name>Oz Tiram</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>immoloism@gmail.com</email>
+		<name>Ian Jordan/name>
+	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>

diff --git a/mate-base/mate-menus/Manifest b/mate-base/mate-menus/Manifest
index a8db75b05123..e6f15213128b 100644
--- a/mate-base/mate-menus/Manifest
+++ b/mate-base/mate-menus/Manifest
@@ -1 +1,2 @@
 DIST mate-menus-1.26.1.tar.xz 421032 BLAKE2B c767a1a60fba60ad7c86e64a5a17e71bfa0bb8bb5170c22594c1ef896dead8fed6e901e66b88495c5a89f7a6e35a6e45102a1bed4a1e511db0950bfa7c553031 SHA512 df57f653bc7a456719c24fa077b70a175d9bbaec7d55fb807e35ed66a9e0f2aaf7251bea0e7778ec98bf2b07b9f7bc25f4931a9c83ec0ae3621a1b8f257b1329
+DIST mate-menus-1.28.0.tar.xz 420212 BLAKE2B 3ed5b8b2f7973c4272714ee528766a4a8afbc5444804c6c750484e7ba0271c0916a37e71ac6ae6ff2d6e89dd5a7bd751bc5826c7e760ead32634d95ae1f6813e SHA512 23baff3fc76d19df82fc36a94f1178a96cfec2aa57171b0d4839ff1d431e56169f09a277254cf3991fd5bb3d7f8c2d67cb41f30e94cedd50c934b561793d15af

diff --git a/mate-base/mate-menus/mate-menus-1.28.0.ebuild b/mate-base/mate-menus/mate-menus-1.28.0.ebuild
new file mode 100644
index 000000000000..3aa5f5deff60
--- /dev/null
+++ b/mate-base/mate-menus/mate-menus-1.28.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GNOME2_LA_PUNT="yes"
+
+inherit mate
+
+MINOR=$(($(ver_cut 2) % 2))
+if [[ ${MINOR} -eq 0 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+fi
+
+DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
+LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="debug +introspection nls"
+
+COMMON_DEPEND=">=dev-libs/glib-2.50:2
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+DEPEND="${COMMON_DEPEND}"
+
+src_configure() {
+	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
+	# usage checks.
+	mate_src_configure \
+		--enable-debug=$(usex debug yes) \
+		$(use_enable introspection) \
+		$(use_enable nls)
+}
+
+src_install() {
+	mate_src_install
+
+	exeinto /etc/X11/xinit/xinitrc.d/
+	newexe "${FILESDIR}/10-xdg-menu-mate-r1" "10-xdg-menu-mate"
+}

diff --git a/mate-extra/mate-calc/metadata.xml b/mate-extra/mate-calc/metadata.xml
index 144734d5fb8a..6d18d4d8c299 100644
--- a/mate-extra/mate-calc/metadata.xml
+++ b/mate-extra/mate-calc/metadata.xml
@@ -9,10 +9,7 @@
 			<email>proxy-maint@gentoo.org</email>
 			<name>Proxy Maintainers</name>
 		</maintainer>
-	<longdescription>
-		MATE Calculator is a fork of gnome-calc, the calculator application that was previously in the OpenWindows Deskset of the Solaris 8 operating system.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">mate-desktop/mate-calc</remote-id>
+		<remote-id type="github">mate-desktop/mate-session-manager</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/mate-extra/mate-tweak/Manifest b/mate-extra/mate-tweak/Manifest
new file mode 100644
index 000000000000..c9dc760b7162
--- /dev/null
+++ b/mate-extra/mate-tweak/Manifest
@@ -0,0 +1 @@
+DIST mate-tweak-22.10.0.tar.gz 183534 BLAKE2B b5fffb3e0114df627e9634bef0da68354bd52f96e64ddbe7a2183e89c15957deae9398885b8ec7cd2074a9417a5e2801bd26743db6b8e222ec986445dc6100ca SHA512 9d1cd553827e79023635d6027e4028ee527d6950a2321d87c44ac7874ef019d46ea41f59b8020e1dbab2bdfd97bfc8647bff89983de549150087659ef25a1f89

diff --git a/mate-extra/mate-tweak/files/mate-tweak-22.10.0-avoid-distutilsextra.patch b/mate-extra/mate-tweak/files/mate-tweak-22.10.0-avoid-distutilsextra.patch
new file mode 100644
index 000000000000..bf8b552d7424
--- /dev/null
+++ b/mate-extra/mate-tweak/files/mate-tweak-22.10.0-avoid-distutilsextra.patch
@@ -0,0 +1,86 @@
+alternative to distutilsextra that can be inserted into setup.py
+based on https://davesteele.github.io/development/2015/12/11/add-i18n-to-setup-py/
+
+diff --git a/setup.py b/setup.py
+index 412527b..2e79447 100755
+--- a/setup.py
++++ b/setup.py
+@@ -20,13 +20,11 @@
+ 
+ import os
+ import sys
++import shutil
+ 
+ from glob import glob
+ from setuptools import setup
+-
+-import DistUtilsExtra.command.build_extra
+-import DistUtilsExtra.command.build_i18n
+-import DistUtilsExtra.command.clean_i18n
++from setuptools.command.build import build
+ 
+ # to update i18n .mo files (and merge .pot file into .po files) run on Linux:
+ #   tx pull -a --minimum-perc=5
+@@ -43,6 +41,48 @@ with open('mate-tweak') as f:
+ 
+ PROGRAM_VERSION = __VERSION__
+ 
++podir = "po"
++pos = [x for x in os.listdir(podir) if x[-3:] == ".po"]
++langs = sorted([os.path.split(x)[-1][:-3] for x in pos])
++
++def mkmo(lang):
++    outpath = os.path.join("build/mo", lang, "LC_MESSAGES")
++    if os.path.exists(outpath):
++        shutil.rmtree(outpath)
++    os.makedirs(outpath)
++
++    inpath = os.path.join(podir, lang + ".po")
++
++    cmd = "msgfmt %s -o %s/%s.mo" % (inpath, outpath, "mate-tweak")
++    os.system(cmd)
++
++def merge_i18n():
++    cmd = "LC_ALL=C intltool-merge -u -c ./po/.intltool-merge-cache ./po "
++    for infile in (x[:-3] for x in os.listdir('.') if x[-3:] == '.in'):
++        print("Processing %s.in to %s" % (infile, infile))
++
++        if 'desktop' in infile:
++            flag = '-d'
++        elif 'schema' in infile:
++            flag = '-s'
++        elif 'xml' in infile:
++            flag = '-x'
++        else:
++            flag = ''
++
++        if flag:
++            os.system("%s %s %s.in %s" % (cmd, flag, infile, infile))
++
++class custom_build(build):
++    def run(self, *args):
++        build.run(self, *args)
++
++        for lang in langs:
++            mkmo(lang)
++
++        merge_i18n()
++        data_files.extend(datafilelist('{prefix}/share/locale'.format(prefix=sys.prefix), 'build/mo'))
++
+ def datafilelist(installbase, sourcebase):
+     datafileList = []
+     for root, subFolders, files in os.walk(sourcebase):
+@@ -62,12 +102,9 @@ data_files = [
+     ('{prefix}/share/polkit-1/actions'.format(prefix=sys.prefix), ['data/org.mate.mate-tweak.policy',]),
+     ('{prefix}/lib/mate-tweak'.format(prefix=sys.prefix), ['data/mate-tweak.ui', 'util/mate-tweak-helper']),
+ ]
+-data_files.extend(datafilelist('{prefix}/share/locale'.format(prefix=sys.prefix), 'build/mo'))
+ 
+ cmdclass ={
+-    "build" : DistUtilsExtra.command.build_extra.build_extra,
+-    "build_i18n" :  DistUtilsExtra.command.build_i18n.build_i18n,
+-    "clean": DistUtilsExtra.command.clean_i18n.clean_i18n,
++    "build" : custom_build,
+ }
+ 
+ setup(

diff --git a/mate-extra/mate-tweak/mate-tweak-22.10.0.ebuild b/mate-extra/mate-tweak/mate-tweak-22.10.0.ebuild
new file mode 100644
index 000000000000..1bc88c4fed7b
--- /dev/null
+++ b/mate-extra/mate-tweak/mate-tweak-22.10.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+inherit distutils-r1
+
+DESCRIPTION="Tweak tool for the MATE Desktop"
+HOMEPAGE="https://github.com/ubuntu-mate/mate-tweak"
+SRC_URI="https://github.com/ubuntu-mate/mate-tweak/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dropdown"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+	')
+	gnome-base/dconf
+	x11-libs/libnotify
+	mate-base/libmatekbd
+	mate-base/mate-panel
+	dropdown? ( x11-terms/tilda )
+"
+
+BDEPEND="
+	dev-util/intltool
+	net-misc/rsync
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}/mate-tweak-22.10.0-avoid-distutilsextra.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Correct paths in mate-tweak script - makes "Window Behavior" options work
+	# from https://github.com/shiznix/unity-gentoo/blob/master/mate-extra/mate-tweak/mate-tweak-22.10.0_p_p0_p01.ebuild
+	sed -e "s:brisk-menu/brisk-menu:brisk-menu:g" \
+		-e "s:/usr/lib/mate-netbook/mate-window-picker-applet:/usr/libexec/mate-window-picker-applet:g" \
+		-e "s:/usr/lib/MULTIARCH:MULTIARCH:g" \
+		-e "s:'/usr/lib/' + self.multiarch + :self.multiarch + :g" \
+		-e "/self.multiarch = sysconfig.get_config_var/c\        self.multiarch = os.path.join('/','usr','libexec')" \
+		-e "s:self.multiarch + '/mate-panel/libappmenu-mate.so':'/usr/$(get_libdir)/mate-panel/libappmenu-mate.so':g" \
+			-i mate-tweak || die
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	rsync -av "${ED}"/usr/lib/python*/site-packages/usr/ "${ED}"/usr || die
+	rm -r "${ED}"/usr/lib/python*/site-packages/{usr,__pycache__,setup.py} || die
+	python_fix_shebang "${ED}"
+}

diff --git a/mate-extra/mate-tweak/metadata.xml b/mate-extra/mate-tweak/metadata.xml
new file mode 100644
index 000000000000..8df5c97744ba
--- /dev/null
+++ b/mate-extra/mate-tweak/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>immoloism@gmail.com</email>
+		<name>Ian Jordan</name>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>tacokoneko@gmail.com</email>
+		<name>Robet Kirkman</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="dropdown">Support the <pkg>x11-terms/tilda</pkg> dropdown terminal emulator</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">ubuntu-mate/mate-tweak</remote-id>
+	</upstream>
+</pkgmetadata>