gentoo resync : 20.03.2021

3 files changed, 18 insertions, 62 deletions

diff --git a/lxde-base/lxterminal/Manifest b/lxde-base/lxterminal/Manifest
index ff0c4cd0aeb1..35eab8e87455 100644
--- a/lxde-base/lxterminal/Manifest
+++ b/lxde-base/lxterminal/Manifest
@@ -1,6 +1,5 @@
-DIST lxterminal-0.3.1.tar.xz 197628 BLAKE2B 9448855b6d1bfc3fc272ec40f7e5b4fde1dfcb861254db3ed35b73611fd2dc5ca5d760542251f297289a051913e6eb6d669b2c04b194e01862ff7e79305c2e14 SHA512 3063eb7bc7426293d35dc1d9c32d5841e4c3f0b417f3cfa3e5a7bf4d9b71df9c9d375d53d6dd6694b318085ba07167bd8403b2caea9c6e9197aef4b7802877fc
 DIST lxterminal-0.3.2.tar.xz 198348 BLAKE2B 7b24a138dd48bb6dc85a253b21e897e68d1a7e16a0d30aa45a87b4b97540c996b6a196d8f8be6fb37d9e506544878bd3eb65fe098d4d695be51e94b3ff15cd6b SHA512 0711d6eeed1f7e301fd24e0d5f750a48f29cc10c7cd40bcc1de57cceddfe4cb15718e9fb812da975faff24aed99cdd3978cb5f29838f47e276fce47f01577119
-EBUILD lxterminal-0.3.1.ebuild 1161 BLAKE2B f3e6cfe7b16e9179c81ff214158b590f79a973f4ea12ae3df6362b8aee666001abedead640e3ed6850b3ad4794da89bd0eddbae41a75cfc1529f0f43db73953b SHA512 18f8e12479bed318421d45b72448475c4a3881b4218dc4c9ed52aa0ddbc38daef479020ced5031007b374870ccd9f61383815ab7e9768a107a0d5268f6d801ed
-EBUILD lxterminal-0.3.2-r1.ebuild 734 BLAKE2B b9274837b5a0f2b22fe23b6c20f9dbe792e4e5b2659ba31090b45140e093b8a80f96b6ac5d863302f19f76f38a1c3f0bf937197e78785dffd38534de77d90c2f SHA512 2797db75cef1f72cf75da51add8dbfaaefb8e621173f30337c98539414809e08d6960c6b9135fdd69c547317085d3d5eda35d4f8e63b1e3c778622b43c159b4c
+DIST lxterminal-0.4.0.tar.xz 201856 BLAKE2B 2fe72007e36c5324b868b9dfc54b04422f85f93f71265126f65eb0b6e0510e60eefb0a2a53acadee6f2c44adcd3c498117b709c9eaa1eb2241dd9016558b9e5c SHA512 d1462bf9739c5e9022cbabe9f9c8f70bbb882c0aba7a39d1f87d804f4002056151165d7555cace6f439c0acfbdcd3c959a420993379f646d066f5d30af71232e
 EBUILD lxterminal-0.3.2.ebuild 1160 BLAKE2B f0d3f51ec81a087fad85d7f5014442238c970072f1a6972e332058bf73b0452253bbe419ec06d23923164946a94c4aadad19a39c7937f8fd93349c1c000fe01b SHA512 8dc1d952d6b2abd05cd6a137ecfa389066147f3ffb8460cd6f5d6dac3c1ae55fbdbd70d405a861da9f40fe30146c7765c6ad2794f7cad4fb57805f9467da30f9
+EBUILD lxterminal-0.4.0.ebuild 735 BLAKE2B 089490e8a7da688bd2ab339ed7ff8556a092ac4e42fc2a77e735392f8a097b621aca1f8b2273d84858be577d1c55965afbb47eb7eed308537768fb8a3df649f1 SHA512 db3ba508e985adca466eae401d0473931a7a1aa334179a3721bb35f6d003dbaf20b715e354b27a4d9f6f6258b96b49667fa810c45d5442e9fb691cb4c13fc31d
 MISC metadata.xml 319 BLAKE2B 95e1ebe72dc9680bad73dc167bbe202f0d5a943da478ce2beb8c4bd0f15eeae7676598ecca89b0244cdf8292441b6de29a94738b33cc4ebe07783827c6b756e1 SHA512 096769b118aac41cbdfcb9e07eea65860556df150eef61fb2e21c3354c49db5f2eb4bca67c287b217ee42bb8bf643b21b27e02c0b754e7fbbb7d493cc237b805
diff --git a/lxde-base/lxterminal/lxterminal-0.3.1.ebuild b/lxde-base/lxterminal/lxterminal-0.3.1.ebuild
deleted file mode 100644
index a20e5520b167..000000000000
--- a/lxde-base/lxterminal/lxterminal-0.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="af ar be bg bn bn_IN ca cs da de el en_GB eo es et eu fa fi fo fr frp gl
-he hr hu id is it ja kk ko lg lt ml ms nb nl nn pa pl ps pt pt_BR ro ru sk sl sr
-sr@latin sv te th tr tt_RU ug uk ur ur_PK vi zh_CN zh_TW"
-PLOCALE_BACKUP="en_GB"
-
-inherit autotools l10n
-
-DESCRIPTION="Lightweight vte-based tabbed terminal emulator for LXDE"
-HOMEPAGE="https://wiki.lxde.org/en/LXTerminal"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/lxde/${PN}"
-	inherit git-r3
-else
-	SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gtk3"
-
-RDEPEND="dev-libs/glib:2
-	!gtk3? ( x11-libs/gtk+:2 x11-libs/vte:0 )
-	gtk3?  ( x11-libs/gtk+:3 x11-libs/vte:2.91 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0"
-
-src_prepare() {
-	default
-	eautoreconf
-
-	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
-	l10n_get_locales > po/LINGUAS || die
-}
-
-src_configure() {
-	econf --enable-man $(use_enable gtk3)
-}
diff --git a/lxde-base/lxterminal/lxterminal-0.3.2-r1.ebuild b/lxde-base/lxterminal/lxterminal-0.4.0.ebuild
index be9747b86519..50c4a08d1e48 100644
--- a/lxde-base/lxterminal/lxterminal-0.3.2-r1.ebuild
+++ b/lxde-base/lxterminal/lxterminal-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,25 +12,28 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="gtk3"
+IUSE=""
 
-DEPEND="dev-libs/glib:2
-	!gtk3? (
-		x11-libs/gtk+:2
-		x11-libs/vte:0 )
-	gtk3? (
-		x11-libs/gtk+:3
-		x11-libs/vte:2.91 )"
+DEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/pango
+	x11-libs/vte:2.91
+"
 RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig
+BDEPEND="
+	>=dev-util/intltool-0.40.0
 	sys-devel/gettext
-	>=dev-util/intltool-0.40.0"
+	virtual/pkgconfig
+"
 
 src_prepare() {
-	default
+	xdg_src_prepare
 	eautoreconf
 }
 
 src_configure() {
-	econf --enable-man $(use_enable gtk3)
+	econf --enable-man --enable-gtk3
 }