commit: cddd047f9bac69f947c78c40eccd371194eec957
Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 21:44:21 2020 +0000
Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 22:49:25 2020 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=cddd047f
x11-misc/mozo: Drop old, sync with Gentoo
Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>
x11-misc/mozo/Manifest | 9 ++-
x11-misc/mozo/metadata.xml | 3 -
x11-misc/mozo/mozo-1.12.0-r1.ebuild | 75 ----------------------
.../{mozo-1.16.0-r1.ebuild => mozo-1.22.0.ebuild} | 18 +++---
.../{mozo-1.18.0.ebuild => mozo-1.22.1.ebuild} | 16 ++---
.../{mozo-1.14.1.ebuild => mozo-1.22.2.ebuild} | 18 +++---
.../{mozo-1.18.0.ebuild => mozo-1.24.0.ebuild} | 27 ++++----
x11-misc/mozo/mozo-9999.ebuild | 29 +++++----
8 files changed, 61 insertions(+), 134 deletions(-)
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index a472807..932df41 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,5 +1,4 @@
-DIST mozo-1.12.0-gtk3.patch.bz2 6562 BLAKE2B
1b594ad4f3fbab0534ee90be8b10aa219b836d349031175237863db8f32394f4e387f5114c5fa29c26c1c13d77dd8bc2b8ffa425e6f4e55b49c184cd5a3689d4
SHA512
9f86a77f29fb359fb59092d819634d2223b74c5eb149917b1442589306d989cfb87df2cc8c4f1e36fd086ba57a75274feccb4978cc0156e20cfd73712ea2a48b
-DIST mozo-1.12.0.tar.xz 163820 BLAKE2B
337bf187e9d14fb61750a306314eb5d4a57f4dd187cb7d0fed953fb91907e71a3afa57625cf68d96605dcaf63689305b07de94327e39b38012d9d64835217ec4
SHA512
93e760b791a74b6a6ca0377d5aaa060c8bf339dcfde91fcb146ef1e37cc25912b3c93fa2b4d612c0abf2bbd00597c80b58769bc88b57925ec4c465967f32c05b
-DIST mozo-1.14.1.tar.xz 171576 BLAKE2B
b4ca3588e57cadd1ee814045b59b464487265a0eb391288d936d8c2290be2e28ed24e541eabe6a912fe54a238569e0832a62a911d52dc0758db3b7aee3ac3822
SHA512
62269ed358807d7ebcf04e6bcbfd3689f019396ebd43a8634bca752f13d6609e94b97688b5fdfa83b1168f0e1cdf284275dc08054e27ab507ce40c2de881bc76
-DIST mozo-1.16.0.tar.xz 172312 BLAKE2B
d1fd10aa32b7619238584ab33637b7bbc6404f5741445f1c09fed2132c69eeb4f2727a43c0cd3d7673bf689e15750739d04dd84c39d5c611016a0401fd48415e
SHA512
507a35bbdad944ec55ce81e5193af9e5697747c2fc55817b3e3913aca68f1d99caa75df1d79f3b7abc1ba354a5c4f34c868e054e20cb86e5d0a7d65b463af57a
-DIST mozo-1.18.0.tar.xz 173432 BLAKE2B
46c791b056c3fb8bb768599f4b474cd9434d6918d9deb740e2d65bef5853199822818e02a7cf9b653d3ef49453aff413b09ad92cda218f70db950b19b5f74363
SHA512
e333c572e5bc1d0905daed17eacd3dda10df5f80ed5b5b01ca3478d345a8c724e0161ccf51914f4982f16df71f252a3b08b194bec18e6aee05eb7af021369a12
+DIST mozo-1.22.0.tar.xz 178924 BLAKE2B
6cc74cbdb7342d926483948391798cc9b0be66b63bba758b7ec8cea3f5555ae01f1ecf279053612ed060a283076bdac1a9ef8bd15e3cfe61d96685aeee168ae0
SHA512
f3d60e94d9bf5fdd435320856563622f0687cc2844a3d51473bcef5c442f4938a4030533271ead2fd88fb0ce805c16b40d629e5a69fc642e7e670a1afd5745db
+DIST mozo-1.22.1.tar.xz 171976 BLAKE2B
c4a1166b605d3fed68b71987dbf70b7f908aabc2c7266415b0d7ce4c8ccb93ad690c72ce83a708f9d3518cfba66128d2cd4bc5413432133299595cf4d2c5a43c
SHA512
6cd4ed04d43ae064077fc78ed59644bf6efe4c65c26995742166c57333d470fbe95ca4f4037e786f16dc076e75d938868948e8c2e5c662f35d971b36992f1a9b
+DIST mozo-1.22.2.tar.xz 172644 BLAKE2B
15e643cfdceb1d62f7fd1499a42bb92a4dd8485adc764d304a2b3f31ffac962fa48f2af402564a6c1598fc97ae19288f4281bc19e9ba6855aeb329ec09bbe4ab
SHA512
c5122b37036291ea7a2ecdb2a2ca37bf63d88404f8fb608c45917a28f4e5996d862764ea5e33544027f8f1f144387de40e204aa69b07d5a590b76aca29e1ad71
+DIST mozo-1.24.0.tar.xz 228180 BLAKE2B
6eb880b82dcb608f84efd8df74e77812f9da68dfa877ec896c6f04fa18088e8e4a82641c715e3620201dbb8a1bea8bb4ded09dd72f50770edae09c1326cbf453
SHA512
e0d217d2e7bb7d2c8df777e51bfb20e8bf4fa1bee0f9f3a9348ec1c8501b386a4afbd8848735ecfa61a0f9576382d784d3ef5b884a2a34af6ba33d3a126fe193
diff --git a/x11-misc/mozo/metadata.xml b/x11-misc/mozo/metadata.xml
index 6931d55..dae7419 100644
--- a/x11-misc/mozo/metadata.xml
+++ b/x11-misc/mozo/metadata.xml
@@ -5,9 +5,6 @@
<email>m...@gentoo.org</email>
<name>Gentoo MATE Desktop</name>
</maintainer>
- <use>
- <flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
- </use>
<upstream>
<remote-id type="github">mate-desktop/mozo</remote-id>
</upstream>
diff --git a/x11-misc/mozo/mozo-1.12.0-r1.ebuild
b/x11-misc/mozo/mozo-1.12.0-r1.ebuild
deleted file mode 100644
index ec999ea..0000000
--- a/x11-misc/mozo/mozo-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 mate
-
-SRC_URI="${SRC_URI} gtk3? (
https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${P}-gtk3.patch.bz2 )"
-KEYWORDS="amd64 ~arm x86"
-
-DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3"
-
-RDEPEND="${PYTHON_DEPS}
- >=mate-base/mate-menus-1.6[introspection]
- x11-libs/gdk-pixbuf:2[introspection]
- virtual/libintl:0
- !!x11-misc/mate-menu-editor
- !gtk3? (
- >=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
- >=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}]
- >=mate-base/mate-menus-1.6[python]
- x11-libs/gtk+:2[introspection]
- )
- gtk3? (
- >=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
- x11-libs/gtk+:3[introspection]
- )"
-
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.40:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-src_prepare() {
- if use gtk3; then
- eapply "${WORKDIR}/${P}-gtk3.patch"
- MATE_FORCE_AUTORECONF=true
- fi
- mate_src_prepare
- python_copy_sources
-}
-
-src_configure() {
- python_foreach_impl run_in_build_dir mate_src_configure \
- --disable-icon-update
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
- python_foreach_impl run_in_build_dir emake check
-}
-
-src_install() {
- installing() {
- mate_src_install
-
- # Massage shebang to make python_doscript happy
- sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
- -i mozo || die
-
- python_doscript mozo
- }
-
- python_foreach_impl run_in_build_dir installing
-}
diff --git a/x11-misc/mozo/mozo-1.16.0-r1.ebuild
b/x11-misc/mozo/mozo-1.22.0.ebuild
similarity index 76%
rename from x11-misc/mozo/mozo-1.16.0-r1.ebuild
rename to x11-misc/mozo/mozo-1.22.0.ebuild
index 5d07223..5acaed0 100644
--- a/x11-misc/mozo/mozo-1.16.0-r1.ebuild
+++ b/x11-misc/mozo/mozo-1.22.0.ebuild
@@ -1,35 +1,35 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
PYTHON_REQ_USE="xml"
inherit python-r1 mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2"
+LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
SLOT="0"
-
IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
COMMON_DEPEND="${PYTHON_DEPS}
>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
- >=mate-base/mate-menus-1.6[introspection,python]
+ >=mate-base/mate-menus-1.21.0[introspection]
x11-libs/gdk-pixbuf:2[introspection]
- x11-libs/gtk+:3[introspection]
- virtual/libintl:0
+ >=x11-libs/gtk+-3.22:3[introspection]
+ virtual/libintl
!!x11-misc/mate-menu-editor"
RDEPEND="${COMMON_DEPEND}"
DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.40:*
+ >=dev-util/intltool-0.40
sys-devel/gettext:*
virtual/pkgconfig:*"
diff --git a/x11-misc/mozo/mozo-1.18.0.ebuild b/x11-misc/mozo/mozo-1.22.1.ebuild
similarity index 79%
copy from x11-misc/mozo/mozo-1.18.0.ebuild
copy to x11-misc/mozo/mozo-1.22.1.ebuild
index 468d076..3c7cb64 100644
--- a/x11-misc/mozo/mozo-1.18.0.ebuild
+++ b/x11-misc/mozo/mozo-1.22.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
PYTHON_REQ_USE="xml"
inherit python-r1 mate
@@ -13,23 +13,23 @@ if [[ ${PV} != 9999 ]]; then
fi
DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2"
+LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
SLOT="0"
-
IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
COMMON_DEPEND="${PYTHON_DEPS}
>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
- >=mate-base/mate-menus-1.6[introspection,python]
+ >=mate-base/mate-menus-1.21.0[introspection]
x11-libs/gdk-pixbuf:2[introspection]
- x11-libs/gtk+:3[introspection]
- virtual/libintl:0
+ >=x11-libs/gtk+-3.22:3[introspection]
+ virtual/libintl
!!x11-misc/mate-menu-editor"
RDEPEND="${COMMON_DEPEND}"
DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.40:*
+ >=dev-util/intltool-0.40
sys-devel/gettext:*
virtual/pkgconfig:*"
diff --git a/x11-misc/mozo/mozo-1.14.1.ebuild b/x11-misc/mozo/mozo-1.22.2.ebuild
similarity index 76%
rename from x11-misc/mozo/mozo-1.14.1.ebuild
rename to x11-misc/mozo/mozo-1.22.2.ebuild
index a02a515..950b638 100644
--- a/x11-misc/mozo/mozo-1.14.1.ebuild
+++ b/x11-misc/mozo/mozo-1.22.2.ebuild
@@ -1,35 +1,35 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{3_6,3_7} )
PYTHON_REQ_USE="xml"
inherit python-r1 mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2"
+LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
SLOT="0"
-
IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
COMMON_DEPEND="${PYTHON_DEPS}
>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
- >=mate-base/mate-menus-1.6[introspection]
+ >=mate-base/mate-menus-1.21.0[introspection]
x11-libs/gdk-pixbuf:2[introspection]
- x11-libs/gtk+:3[introspection]
- virtual/libintl:0
+ >=x11-libs/gtk+-3.22:3[introspection]
+ virtual/libintl
!!x11-misc/mate-menu-editor"
RDEPEND="${COMMON_DEPEND}"
DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.40:*
+ >=dev-util/intltool-0.40
sys-devel/gettext:*
virtual/pkgconfig:*"
diff --git a/x11-misc/mozo/mozo-1.18.0.ebuild b/x11-misc/mozo/mozo-1.24.0.ebuild
similarity index 70%
rename from x11-misc/mozo/mozo-1.18.0.ebuild
rename to x11-misc/mozo/mozo-1.24.0.ebuild
index 468d076..ac2cdef 100644
--- a/x11-misc/mozo/mozo-1.18.0.ebuild
+++ b/x11-misc/mozo/mozo-1.24.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{3_6,3_7} )
PYTHON_REQ_USE="xml"
inherit python-r1 mate
@@ -13,25 +13,27 @@ if [[ ${PV} != 9999 ]]; then
fi
DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2"
+LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
SLOT="0"
-
IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
COMMON_DEPEND="${PYTHON_DEPS}
>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
- >=mate-base/mate-menus-1.6[introspection,python]
+ >=mate-base/mate-menus-1.21.0[introspection]
x11-libs/gdk-pixbuf:2[introspection]
- x11-libs/gtk+:3[introspection]
- virtual/libintl:0
- !!x11-misc/mate-menu-editor"
+ >=x11-libs/gtk+-3.22:3[introspection]
+ !!x11-misc/mate-menu-editor
+"
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+ virtual/libintl
+"
DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.40:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
+ >=sys-devel/gettext-0.19.8:*
+ virtual/pkgconfig:*
+"
src_prepare() {
mate_src_prepare
@@ -60,6 +62,7 @@ src_install() {
-i mozo || die
python_doscript mozo
+ python_optimize
}
python_foreach_impl run_in_build_dir installing
diff --git a/x11-misc/mozo/mozo-9999.ebuild b/x11-misc/mozo/mozo-9999.ebuild
index 5d07223..ac2cdef 100644
--- a/x11-misc/mozo/mozo-9999.ebuild
+++ b/x11-misc/mozo/mozo-9999.ebuild
@@ -1,37 +1,39 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{3_6,3_7} )
PYTHON_REQ_USE="xml"
inherit python-r1 mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2"
+LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
SLOT="0"
-
IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
COMMON_DEPEND="${PYTHON_DEPS}
>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
- >=mate-base/mate-menus-1.6[introspection,python]
+ >=mate-base/mate-menus-1.21.0[introspection]
x11-libs/gdk-pixbuf:2[introspection]
- x11-libs/gtk+:3[introspection]
- virtual/libintl:0
- !!x11-misc/mate-menu-editor"
+ >=x11-libs/gtk+-3.22:3[introspection]
+ !!x11-misc/mate-menu-editor
+"
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+ virtual/libintl
+"
DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.40:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
+ >=sys-devel/gettext-0.19.8:*
+ virtual/pkgconfig:*
+"
src_prepare() {
mate_src_prepare
@@ -60,6 +62,7 @@ src_install() {
-i mozo || die
python_doscript mozo
+ python_optimize
}
python_foreach_impl run_in_build_dir installing
