commit: e2ce2e16d38488fa19e36fb8b2cb30c9c9996d4d
Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 17:43:06 2020 +0000
Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 22:49:23 2020 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=e2ce2e16
app-editors/pluma: Drop old, sync from Gentoo
Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>
app-editors/pluma/Manifest | 9 +--
app-editors/pluma/metadata.xml | 3 -
app-editors/pluma/pluma-1.12.2-r1.ebuild | 91 ---------------------
app-editors/pluma/pluma-1.14.1.ebuild | 93 ----------------------
app-editors/pluma/pluma-1.16.0-r1.ebuild | 93 ----------------------
app-editors/pluma/pluma-1.16.2.ebuild | 93 ----------------------
.../{pluma-9999.ebuild => pluma-1.22.0.ebuild} | 39 ++++-----
.../{pluma-1.18.3.ebuild => pluma-1.22.1.ebuild} | 37 ++++-----
.../{pluma-1.18.3.ebuild => pluma-1.22.2.ebuild} | 37 ++++-----
.../{pluma-1.18.3.ebuild => pluma-1.24.0.ebuild} | 50 ++++++------
app-editors/pluma/pluma-9999.ebuild | 52 ++++++------
11 files changed, 117 insertions(+), 480 deletions(-)
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index 6536da6..7076b88 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,5 +1,4 @@
-DIST pluma-1.12.2.tar.xz 3397280 BLAKE2B
23af095549ff944b0936889deda6576717a6376aa2f2be8ed9b7d8ad70f8bb0524aff7314f9c335a42d80951c047c8008278144f45c2c5edb09a259b298c0024
SHA512
db2878161903868703514531ba214fc34dad1789885f18756e9192d6ba17950c8be03141ada72f8c386b515d8b0f9d58a0ee94a33fe3ffe00f360ea667c2b275
-DIST pluma-1.14.1.tar.xz 3415364 BLAKE2B
9449fc6b5e98d8ecb25f70df6c114c13cc32a8c0348ed2047eb874e85c7d448d3d7f0b4d7dd6e2fada3de847ded425651dc6d0ca92ce3c784fd32948735f3b25
SHA512
5d04e053ab2eb0f90e34d9af541004867c7317fd9386229c4e702e95a80420df16b20e4ae4c30bbee79fe904282f6134f7c361971be07cd6952612d975c88d11
-DIST pluma-1.16.0.tar.xz 3412640 BLAKE2B
dff2b93ff24a75b0c3f4418ea117297092ec52cc550ee1da5fbbde157dd354d8ca754de88b511eea255b6b4aea62d9e17002d6cf9ea865c267c09b79054e65f1
SHA512
2472a1631cb89f4df0d09558bd274b6c6d042ae4cbb6ae0134a089cfefb5d0673ec28d78d3665dd1933f76a9c20517afe626f921e06703af9e3c71b9f3b96260
-DIST pluma-1.16.2.tar.xz 3428472 BLAKE2B
c3b543fb11678269fbbc2d049686b2a553aa1fede4ef1bab8abbc7fed316f27ba67cbb366908966b6c844f8ad0c4899499e52b4720378364555ef9156c80ae95
SHA512
bf91a7e4e1cfb92f9fd9a1d5b4ac9f0fd2704785b2da5d7a3aa360b4c217a57653d6f7bf509c156b8711bc5164e022c685331c93a139f55ea41431bc72e848fe
-DIST pluma-1.18.3.tar.xz 3355188 BLAKE2B
d53f381aa9c74cad0df82ccc73aaab9f87347cb8e3886471a2531bdd4d49a84ee97a50f2333b2e375f9bc2a634c25dc69b36659dcb589ace716e523a9d0b4544
SHA512
62ad57a8d7626e34c15610e121869ee9b06a2498acb40ec0a60839ca0273d146bd59682d352c3e98d892460c444c5442d32673c2f63897bb8c3e9e595e771dc1
+DIST pluma-1.22.0.tar.xz 3235612 BLAKE2B
a0cda23a6ee73e562cb32c3f1430590042248b6a6e7cbf021103db507450b2a594506f3d8283eeed08e2ba5006ff51376eb6db5e94ea5ac9d5707b29e0efc2c4
SHA512
7c74c2ce0a89ec3813c936449d3114957e7b319433875ef567ecc508a28a1d3ddc3d0da418b2eb1278b6dc9dbaa3c75a279524f5a061b5aecb52955edcf28f51
+DIST pluma-1.22.1.tar.xz 3236724 BLAKE2B
f571ccb79ffac11122dad1888a9804fdb1671f2c73b28c216e0ec593ffc4dac3fec3053b83fd1503e0c951e032f6e4c22fb4f3d6a1d23477a54e06de2659222e
SHA512
0d3f07b2e8c736c9e1ad64ed5cb749db6088868e9bc27aa786cbb0c3fe72715f0fd4dd53999502a4333ec82110148b772c0dde81433d0936d2d3c2d04804026a
+DIST pluma-1.22.2.tar.xz 3262288 BLAKE2B
0a7af4318ec11aa6a01dd14ed071975b6a961747c1abda9120912244f3fd530c5c06e2fc9dad6ad23175c119e35c1380e88be4b9bc1e331485b646dee87af8e1
SHA512
a68b79713f649def15ea29e58e041d70bb6d756a356743f6e06d8dd680f7b39e8bcdd90c68cbe5c517bead7f9263d7596954bc595c3a2501edf0d0ea421c9992
+DIST pluma-1.24.0.tar.xz 3717544 BLAKE2B
fd9375fd05566c11c24d5bdf55ab0d4619143127a5e48c4e91d18421f50340775d58c3e2264382aa3bbd8aad0569c559e87381a9ece07ce1592d1bc1a5315db1
SHA512
390bf2949549baa0e3dc706526217fbc1513e2f9778917710da806e58cdfb0b7a36e95ed2186442490996cf76783acd4e0f4b8f1fedacee9ba356c0d466510be
diff --git a/app-editors/pluma/metadata.xml b/app-editors/pluma/metadata.xml
index e740906..3daddb1 100644
--- a/app-editors/pluma/metadata.xml
+++ b/app-editors/pluma/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/pluma</remote-id>
</upstream>
diff --git a/app-editors/pluma/pluma-1.12.2-r1.ebuild
b/app-editors/pluma/pluma-1.12.2-r1.ebuild
deleted file mode 100644
index a9646a9..0000000
--- a/app-editors/pluma/pluma-1.12.2-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate multilib python-single-r1 virtualx
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 python spell"
-
-REQUIRED_USE="
- gtk3? ( !python )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
-# https://github.com/mate-desktop/mate-text-editor/issues/33
-RESTRICT="test"
-
-RDEPEND="app-text/rarian:0
- dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libxml2-2.5:2
- >=mate-base/mate-desktop-1.9[gtk3(-)=]
- x11-libs/cairo:0
- x11-libs/gdk-pixbuf:2
- x11-libs/libICE:0
- x11-libs/libX11:0
- >=x11-libs/libSM-1.0
- x11-libs/pango:0
- virtual/libintl:0
- !gtk3? (
- >=x11-libs/gtk+-2.24:2
- >=x11-libs/gtksourceview-2.9.7:2.0
- )
- gtk3? (
- >=x11-libs/gtk+-3.0:3
- >=x11-libs/gtksourceview-2.9.7:3.0
- )
- spell? (
- >=app-text/enchant-1.2:0
- >=app-text/iso-codes-0.35:0
- )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygobject-2.15.4:2[${PYTHON_USEDEP}]
- >=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
- >=dev-python/pygtksourceview-2.9.2:2
- )
- !!app-editors/mate-text-editor"
-
-DEPEND="${RDEPEND}
- ~app-text/docbook-xml-dtd-4.1.2
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- >=sys-devel/libtool-2.2.6:2
- >=sys-devel/gettext-0.17:*
- virtual/pkgconfig:*"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- mate_src_configure \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(use_enable python) \
- $(use_enable spell)
-}
-
-src_test() {
- # FIXME: This should be handled at eclass level.
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
- unset DBUS_SESSION_BUS_ADDRESS
-
- GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
diff --git a/app-editors/pluma/pluma-1.14.1.ebuild
b/app-editors/pluma/pluma-1.14.1.ebuild
deleted file mode 100644
index a1c96ea..0000000
--- a/app-editors/pluma/pluma-1.14.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate multilib python-single-r1 virtualx
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 python spell"
-
-REQUIRED_USE="
- gtk3? ( !python )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
-# https://github.com/mate-desktop/mate-text-editor/issues/33
-RESTRICT="test"
-
-COMMON_DEPEND="dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libxml2-2.5:2
- >=mate-base/mate-desktop-1.9[gtk3(-)=]
- x11-libs/cairo:0
- x11-libs/gdk-pixbuf:2
- x11-libs/libICE:0
- x11-libs/libX11:0
- >=x11-libs/libSM-1.0
- x11-libs/pango:0
- virtual/libintl:0
- !gtk3? (
- >=x11-libs/gtk+-2.24:2
- >=x11-libs/gtksourceview-2.9.7:2.0
- )
- gtk3? (
- >=x11-libs/gtk+-3.0:3
- >=x11-libs/gtksourceview-2.9.7:3.0
- )
- spell? (
- >=app-text/enchant-1.2:0
- >=app-text/iso-codes-0.35:0
- )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygobject-2.15.4:2[${PYTHON_USEDEP}]
- >=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
- >=dev-python/pygtksourceview-2.9.2:2
- )
- !!app-editors/mate-text-editor"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- ~app-text/docbook-xml-dtd-4.1.2
- app-text/rarian:0
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- >=sys-devel/libtool-2.2.6:2
- >=sys-devel/gettext-0.17:*
- virtual/pkgconfig:*"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- mate_src_configure \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(use_enable python) \
- $(use_enable spell)
-}
-
-src_test() {
- # FIXME: This should be handled at eclass level.
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
- unset DBUS_SESSION_BUS_ADDRESS
-
- GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
diff --git a/app-editors/pluma/pluma-1.16.0-r1.ebuild
b/app-editors/pluma/pluma-1.16.0-r1.ebuild
deleted file mode 100644
index bba6256..0000000
--- a/app-editors/pluma/pluma-1.16.0-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate multilib python-single-r1 virtualx
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 python spell"
-
-REQUIRED_USE="
- gtk3? ( !python )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
-# https://github.com/mate-desktop/mate-text-editor/issues/33
-RESTRICT="test"
-
-COMMON_DEPEND="dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libxml2-2.5:2
- x11-libs/cairo:0
- x11-libs/gdk-pixbuf:2
- x11-libs/libICE:0
- x11-libs/libX11:0
- >=x11-libs/libSM-1.0
- x11-libs/pango:0
- virtual/libintl:0
- !gtk3? (
- >=x11-libs/gtk+-2.24:2
- >=x11-libs/gtksourceview-2.9.7:2.0
- )
- gtk3? (
- >=x11-libs/gtk+-3.0:3
- >=x11-libs/gtksourceview-2.9.7:3.0
- )
- spell? (
- >=app-text/enchant-1.2:0
- >=app-text/iso-codes-0.35:0
- )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygobject-2.15.4:2[${PYTHON_USEDEP}]
- >=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
- >=dev-python/pygtksourceview-2.9.2:2
- )
- !!app-editors/mate-text-editor"
-
-RDEPEND="${COMMON_DEPEND}
- >=mate-base/mate-desktop-1.9[gtk3(-)=]"
-
-DEPEND="${COMMON_DEPEND}
- ~app-text/docbook-xml-dtd-4.1.2
- app-text/rarian:0
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- >=sys-devel/libtool-2.2.6:2
- >=sys-devel/gettext-0.17:*
- virtual/pkgconfig:*"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- mate_src_configure \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(use_enable python) \
- $(use_enable spell)
-}
-
-src_test() {
- # FIXME: This should be handled at eclass level.
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
- unset DBUS_SESSION_BUS_ADDRESS
-
- GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
diff --git a/app-editors/pluma/pluma-1.16.2.ebuild
b/app-editors/pluma/pluma-1.16.2.ebuild
deleted file mode 100644
index 801ac0a..0000000
--- a/app-editors/pluma/pluma-1.16.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate multilib python-single-r1 virtualx
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 python spell"
-
-REQUIRED_USE="
- gtk3? ( !python )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
-# https://github.com/mate-desktop/mate-text-editor/issues/33
-RESTRICT="test"
-
-COMMON_DEPEND="dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libxml2-2.5:2
- x11-libs/cairo:0
- x11-libs/gdk-pixbuf:2
- x11-libs/libICE:0
- x11-libs/libX11:0
- >=x11-libs/libSM-1.0
- x11-libs/pango:0
- virtual/libintl:0
- !gtk3? (
- >=x11-libs/gtk+-2.24:2
- >=x11-libs/gtksourceview-2.9.7:2.0
- )
- gtk3? (
- >=x11-libs/gtk+-3.0:3
- >=x11-libs/gtksourceview-2.9.7:3.0
- )
- spell? (
- >=app-text/enchant-1.2:0
- >=app-text/iso-codes-0.35:0
- )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygobject-2.15.4:2[${PYTHON_USEDEP}]
- >=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
- >=dev-python/pygtksourceview-2.9.2:2
- )
- !!app-editors/mate-text-editor"
-
-RDEPEND="${COMMON_DEPEND}
- >=mate-base/mate-desktop-1.9[gtk3(-)=]"
-
-DEPEND="${COMMON_DEPEND}
- ~app-text/docbook-xml-dtd-4.1.2
- app-text/rarian:0
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- >=sys-devel/libtool-2.2.6:2
- >=sys-devel/gettext-0.17:*
- virtual/pkgconfig:*"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- mate_src_configure \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(use_enable python) \
- $(use_enable spell)
-}
-
-src_test() {
- # FIXME: This should be handled at eclass level.
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
- unset DBUS_SESSION_BUS_ADDRESS
-
- GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
diff --git a/app-editors/pluma/pluma-9999.ebuild
b/app-editors/pluma/pluma-1.22.0.ebuild
similarity index 71%
copy from app-editors/pluma/pluma-9999.ebuild
copy to app-editors/pluma/pluma-1.22.0.ebuild
index 65d4d2f..8760273 100644
--- a/app-editors/pluma/pluma-9999.ebuild
+++ b/app-editors/pluma/pluma-1.22.0.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
@@ -7,14 +7,14 @@ MATE_LA_PUNT="yes"
PYTHON_COMPAT=( python2_7 )
-inherit mate multilib python-single-r1 virtualx
+inherit mate python-single-r1 virtualx
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
SLOT="0"
IUSE="+introspection spell"
@@ -25,23 +25,23 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# https://github.com/mate-desktop/mate-text-editor/issues/33
RESTRICT="test"
-COMMON_DEPEND="dev-libs/atk:0
- >=dev-libs/glib-2.36:2
+COMMON_DEPEND="dev-libs/atk
+ >=dev-libs/glib-2.50:2
>=dev-libs/libpeas-1.2.0[gtk]
>=dev-libs/libxml2-2.5:2
- x11-libs/cairo:0
+ x11-libs/cairo
x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.14.0:3[introspection?]
+ >=x11-libs/gtk+-3.22:3[introspection?]
>=x11-libs/gtksourceview-3.0.0:3.0
- x11-libs/libICE:0
- x11-libs/libX11:0
+ x11-libs/libICE
+ x11-libs/libX11
>=x11-libs/libSM-1.0
- x11-libs/pango:0
- virtual/libintl:0
+ x11-libs/pango
+ virtual/libintl
introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
spell? (
- >=app-text/enchant-1.2:0
- >=app-text/iso-codes-0.35:0
+ >=app-text/enchant-1.2:=
+ >=app-text/iso-codes-0.35
)
!!app-editors/mate-text-editor"
@@ -51,15 +51,16 @@ RDEPEND="${PYTHON_DEPS}
DEPEND="${COMMON_DEPEND}
~app-text/docbook-xml-dtd-4.1.2
- app-text/rarian:0
+ app-text/rarian
>=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
+ app-text/yelp-tools
+ dev-util/glib-utils
dev-util/gtk-doc
dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
+ >=dev-util/intltool-0.50.1
>=sys-devel/libtool-2.2.6:2
- >=sys-devel/gettext-0.17:*
- virtual/pkgconfig:*"
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig"
src_configure() {
mate_src_configure \
diff --git a/app-editors/pluma/pluma-1.18.3.ebuild
b/app-editors/pluma/pluma-1.22.1.ebuild
similarity index 73%
copy from app-editors/pluma/pluma-1.18.3.ebuild
copy to app-editors/pluma/pluma-1.22.1.ebuild
index 2dc7663..f1278f5 100644
--- a/app-editors/pluma/pluma-1.18.3.ebuild
+++ b/app-editors/pluma/pluma-1.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,14 +7,14 @@ MATE_LA_PUNT="yes"
PYTHON_COMPAT=( python2_7 )
-inherit mate multilib python-single-r1 virtualx
+inherit mate python-single-r1 virtualx
if [[ ${PV} != 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
SLOT="0"
IUSE="+introspection spell"
@@ -25,23 +25,23 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# https://github.com/mate-desktop/mate-text-editor/issues/33
RESTRICT="test"
-COMMON_DEPEND="dev-libs/atk:0
- >=dev-libs/glib-2.36:2
+COMMON_DEPEND="dev-libs/atk
+ >=dev-libs/glib-2.50:2
>=dev-libs/libpeas-1.2.0[gtk]
>=dev-libs/libxml2-2.5:2
- x11-libs/cairo:0
+ x11-libs/cairo
x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.14.0:3[introspection?]
+ >=x11-libs/gtk+-3.22:3[introspection?]
>=x11-libs/gtksourceview-3.0.0:3.0
- x11-libs/libICE:0
- x11-libs/libX11:0
+ x11-libs/libICE
+ x11-libs/libX11
>=x11-libs/libSM-1.0
- x11-libs/pango:0
- virtual/libintl:0
+ x11-libs/pango
+ virtual/libintl
introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
spell? (
- >=app-text/enchant-1.2:0
- >=app-text/iso-codes-0.35:0
+ >=app-text/enchant-1.6:=
+ >=app-text/iso-codes-0.35
)
!!app-editors/mate-text-editor"
@@ -51,15 +51,16 @@ RDEPEND="${PYTHON_DEPS}
DEPEND="${COMMON_DEPEND}
~app-text/docbook-xml-dtd-4.1.2
- app-text/rarian:0
+ app-text/rarian
>=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
+ app-text/yelp-tools
+ dev-util/glib-utils
dev-util/gtk-doc
dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
+ >=dev-util/intltool-0.50.1
>=sys-devel/libtool-2.2.6:2
- >=sys-devel/gettext-0.17:*
- virtual/pkgconfig:*"
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig"
src_configure() {
mate_src_configure \
diff --git a/app-editors/pluma/pluma-1.18.3.ebuild
b/app-editors/pluma/pluma-1.22.2.ebuild
similarity index 73%
copy from app-editors/pluma/pluma-1.18.3.ebuild
copy to app-editors/pluma/pluma-1.22.2.ebuild
index 2dc7663..f1278f5 100644
--- a/app-editors/pluma/pluma-1.18.3.ebuild
+++ b/app-editors/pluma/pluma-1.22.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,14 +7,14 @@ MATE_LA_PUNT="yes"
PYTHON_COMPAT=( python2_7 )
-inherit mate multilib python-single-r1 virtualx
+inherit mate python-single-r1 virtualx
if [[ ${PV} != 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
SLOT="0"
IUSE="+introspection spell"
@@ -25,23 +25,23 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# https://github.com/mate-desktop/mate-text-editor/issues/33
RESTRICT="test"
-COMMON_DEPEND="dev-libs/atk:0
- >=dev-libs/glib-2.36:2
+COMMON_DEPEND="dev-libs/atk
+ >=dev-libs/glib-2.50:2
>=dev-libs/libpeas-1.2.0[gtk]
>=dev-libs/libxml2-2.5:2
- x11-libs/cairo:0
+ x11-libs/cairo
x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.14.0:3[introspection?]
+ >=x11-libs/gtk+-3.22:3[introspection?]
>=x11-libs/gtksourceview-3.0.0:3.0
- x11-libs/libICE:0
- x11-libs/libX11:0
+ x11-libs/libICE
+ x11-libs/libX11
>=x11-libs/libSM-1.0
- x11-libs/pango:0
- virtual/libintl:0
+ x11-libs/pango
+ virtual/libintl
introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
spell? (
- >=app-text/enchant-1.2:0
- >=app-text/iso-codes-0.35:0
+ >=app-text/enchant-1.6:=
+ >=app-text/iso-codes-0.35
)
!!app-editors/mate-text-editor"
@@ -51,15 +51,16 @@ RDEPEND="${PYTHON_DEPS}
DEPEND="${COMMON_DEPEND}
~app-text/docbook-xml-dtd-4.1.2
- app-text/rarian:0
+ app-text/rarian
>=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
+ app-text/yelp-tools
+ dev-util/glib-utils
dev-util/gtk-doc
dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
+ >=dev-util/intltool-0.50.1
>=sys-devel/libtool-2.2.6:2
- >=sys-devel/gettext-0.17:*
- virtual/pkgconfig:*"
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig"
src_configure() {
mate_src_configure \
diff --git a/app-editors/pluma/pluma-1.18.3.ebuild
b/app-editors/pluma/pluma-1.24.0.ebuild
similarity index 63%
rename from app-editors/pluma/pluma-1.18.3.ebuild
rename to app-editors/pluma/pluma-1.24.0.ebuild
index 2dc7663..b4b4168 100644
--- a/app-editors/pluma/pluma-1.18.3.ebuild
+++ b/app-editors/pluma/pluma-1.24.0.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-inherit mate multilib python-single-r1 virtualx
+inherit mate python-single-r1 virtualx
if [[ ${PV} != 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
SLOT="0"
-IUSE="+introspection spell"
+IUSE="+introspection spell test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -25,46 +25,50 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# https://github.com/mate-desktop/mate-text-editor/issues/33
RESTRICT="test"
-COMMON_DEPEND="dev-libs/atk:0
- >=dev-libs/glib-2.36:2
+COMMON_DEPEND="dev-libs/atk
+ >=dev-libs/glib-2.50:2
>=dev-libs/libpeas-1.2.0[gtk]
>=dev-libs/libxml2-2.5:2
- x11-libs/cairo:0
+ x11-libs/cairo
x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.14.0:3[introspection?]
+ >=x11-libs/gtk+-3.22:3[introspection?]
>=x11-libs/gtksourceview-3.0.0:3.0
- x11-libs/libICE:0
- x11-libs/libX11:0
+ x11-libs/libICE
+ x11-libs/libX11
>=x11-libs/libSM-1.0
- x11-libs/pango:0
- virtual/libintl:0
+ x11-libs/pango
introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
spell? (
- >=app-text/enchant-1.2:0
- >=app-text/iso-codes-0.35:0
+ >=app-text/enchant-1.6:=
+ >=app-text/iso-codes-0.35
)
- !!app-editors/mate-text-editor"
+ !!app-editors/mate-text-editor
+"
RDEPEND="${PYTHON_DEPS}
${COMMON_DEPEND}
- >=mate-base/mate-desktop-1.9[introspection?]"
+ >=mate-base/mate-desktop-1.9[introspection?]
+ virtual/libintl
+"
DEPEND="${COMMON_DEPEND}
~app-text/docbook-xml-dtd-4.1.2
- app-text/rarian:0
+ app-text/rarian
>=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
+ app-text/yelp-tools
+ dev-util/glib-utils
dev-util/gtk-doc
dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
>=sys-devel/libtool-2.2.6:2
- >=sys-devel/gettext-0.17:*
- virtual/pkgconfig:*"
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
src_configure() {
mate_src_configure \
$(use_enable introspection) \
- $(use_enable spell)
+ $(use_enable spell) \
+ $(use_enable test tests)
}
src_test() {
diff --git a/app-editors/pluma/pluma-9999.ebuild
b/app-editors/pluma/pluma-9999.ebuild
index 65d4d2f..b4b4168 100644
--- a/app-editors/pluma/pluma-9999.ebuild
+++ b/app-editors/pluma/pluma-9999.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-inherit mate multilib python-single-r1 virtualx
+inherit mate python-single-r1 virtualx
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
SLOT="0"
-IUSE="+introspection spell"
+IUSE="+introspection spell test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -25,46 +25,50 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# https://github.com/mate-desktop/mate-text-editor/issues/33
RESTRICT="test"
-COMMON_DEPEND="dev-libs/atk:0
- >=dev-libs/glib-2.36:2
+COMMON_DEPEND="dev-libs/atk
+ >=dev-libs/glib-2.50:2
>=dev-libs/libpeas-1.2.0[gtk]
>=dev-libs/libxml2-2.5:2
- x11-libs/cairo:0
+ x11-libs/cairo
x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.14.0:3[introspection?]
+ >=x11-libs/gtk+-3.22:3[introspection?]
>=x11-libs/gtksourceview-3.0.0:3.0
- x11-libs/libICE:0
- x11-libs/libX11:0
+ x11-libs/libICE
+ x11-libs/libX11
>=x11-libs/libSM-1.0
- x11-libs/pango:0
- virtual/libintl:0
+ x11-libs/pango
introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
spell? (
- >=app-text/enchant-1.2:0
- >=app-text/iso-codes-0.35:0
+ >=app-text/enchant-1.6:=
+ >=app-text/iso-codes-0.35
)
- !!app-editors/mate-text-editor"
+ !!app-editors/mate-text-editor
+"
RDEPEND="${PYTHON_DEPS}
${COMMON_DEPEND}
- >=mate-base/mate-desktop-1.9[introspection?]"
+ >=mate-base/mate-desktop-1.9[introspection?]
+ virtual/libintl
+"
DEPEND="${COMMON_DEPEND}
~app-text/docbook-xml-dtd-4.1.2
- app-text/rarian:0
+ app-text/rarian
>=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
+ app-text/yelp-tools
+ dev-util/glib-utils
dev-util/gtk-doc
dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
>=sys-devel/libtool-2.2.6:2
- >=sys-devel/gettext-0.17:*
- virtual/pkgconfig:*"
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
src_configure() {
mate_src_configure \
$(use_enable introspection) \
- $(use_enable spell)
+ $(use_enable spell) \
+ $(use_enable test tests)
}
src_test() {
