gentoo resync : 23.03.2018

6 files changed, 6 insertions, 43 deletions

diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index 9e707412cf83..c7af46e3e081 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
diff --git a/lxde-base/lxde-meta/Manifest b/lxde-base/lxde-meta/Manifest
index 4b965ef74f77..bdab63df43f4 100644
--- a/lxde-base/lxde-meta/Manifest
+++ b/lxde-base/lxde-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD lxde-meta-0.5.5-r4.ebuild 1020 BLAKE2B c93833608026934e75c46177f21eec930a4cd3f021a7ccedde452885e956f8e3eab16da3613d4152fa9b08ccfe3f6369a850945712ffe708c00512545b757fbb SHA512 db96516b946ac25ff9959e1704333be2439c96309a88218aef463dc70079fb817a9766d1692eb52e5082b621853606567cfa146813f0fce19e53e900a1ddd2d6
-EBUILD lxde-meta-0.5.5-r5.ebuild 954 BLAKE2B 9a6bb7bd30be030bdc4036a05b9f8b5695dc1f64fe4153d18ec00339cd66348d9a48036e371a8300286dc46d66333384fa297f56dfb1ae441fcfe5a3fc0a5877 SHA512 ecc07119b7d766458747d0f3c43efbde2f89c0f8b8371021038d40d1729c750c0eea2053af05262177b9e686feaf463f96f57339fd8b51a006559c0f4e5c42f7
+EBUILD lxde-meta-0.5.5-r5.ebuild 952 BLAKE2B 8d2a5ea0d183e82a984db816e85b429a1d9001413adc4746f3c9509aca210e2c6db8ad3cc8ce1775c4602839ffa434eabb6d8391a8f1bd219014d53eaa0be6b5 SHA512 9f32aaea934af7e2b9985b56a80e7672c15aa6c6c978c62d3b1001199711955c6c4e6fd857432622023962d949be0895ecf56462ce2193b6baa88b2703155f67
 MISC metadata.xml 257 BLAKE2B efad62f245bde8ac51046146d034662f80c0d53ba081e1b308572facf6104e001af8d874e5429c2ad7f2c587545091f286e607fb53e353ee6eddacf01846d9ce SHA512 f25b418b4204c0b1b8c3a08ae8cad894c8352b5f49ca653ec9fb028eb5e0cd1f3a8ce26ca5acce609085b8fd73e49586d8c34ff5f0808ff9cb9688c8aafd8c69
diff --git a/lxde-base/lxde-meta/lxde-meta-0.5.5-r4.ebuild b/lxde-base/lxde-meta/lxde-meta-0.5.5-r4.ebuild
deleted file mode 100644
index d7bf2f8ceada..000000000000
--- a/lxde-base/lxde-meta/lxde-meta-0.5.5-r4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-DESCRIPTION="Meta ebuild for LXDE, the Lightweight X11 Desktop Environment"
-HOMEPAGE="http://lxde.sf.net/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86"
-IUSE=""
-
-RDEPEND=">=lxde-base/menu-cache-0.3.3
-	=lxde-base/lxappearance-0.5*
-	=lxde-base/lxde-icon-theme-0.5*
-	=lxde-base/lxde-common-0.5.5*
-	=lxde-base/lxmenu-data-0.1*
-	=lxde-base/lxinput-0.3*
-	>=lxde-base/lxpanel-0.5.10
-	=lxde-base/lxrandr-0.1*
-	|| ( ( <=lxde-base/lxsession-0.4.6.1
-		=lxde-base/lxsession-edit-0.2* )
-		>lxde-base/lxsession-0.4.6.1 )
-	|| ( >=x11-libs/libfm-1.2.0 =lxde-base/lxshortcut-0.1* )
-	=lxde-base/lxtask-0.1*
-	>=lxde-base/lxterminal-0.1.11
-	media-gfx/gpicview
-	x11-misc/pcmanfm
-	x11-wm/openbox
-	>=x11-misc/obconf-2.0.3_p20111019"
-
-pkg_postinst() {
-	elog "For your convenience you can review the LXDE Configuration HOWTO at"
-	elog "https://www.gentoo.org/proj/en/desktop/lxde/lxde-howto.xml"
-}
diff --git a/lxde-base/lxde-meta/lxde-meta-0.5.5-r5.ebuild b/lxde-base/lxde-meta/lxde-meta-0.5.5-r5.ebuild
index 07bd4faf6887..2c49ab44225f 100644
--- a/lxde-base/lxde-meta/lxde-meta-0.5.5-r5.ebuild
+++ b/lxde-base/lxde-meta/lxde-meta-0.5.5-r5.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://lxde.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc x86"
 IUSE=""
 
 RDEPEND=">=lxde-base/menu-cache-0.3.3
diff --git a/lxde-base/lxterminal/Manifest b/lxde-base/lxterminal/Manifest
index c8cf28f72301..818d6732c1ef 100644
--- a/lxde-base/lxterminal/Manifest
+++ b/lxde-base/lxterminal/Manifest
@@ -3,5 +3,5 @@ DIST lxterminal-0.2.0.tar.gz 248698 BLAKE2B ca65e08baf22410a4e93d18ecc05e27329b9
 DIST lxterminal-0.3.1.tar.xz 197628 BLAKE2B 9448855b6d1bfc3fc272ec40f7e5b4fde1dfcb861254db3ed35b73611fd2dc5ca5d760542251f297289a051913e6eb6d669b2c04b194e01862ff7e79305c2e14 SHA512 3063eb7bc7426293d35dc1d9c32d5841e4c3f0b417f3cfa3e5a7bf4d9b71df9c9d375d53d6dd6694b318085ba07167bd8403b2caea9c6e9197aef4b7802877fc
 EBUILD lxterminal-0.1.11.ebuild 603 BLAKE2B edb2eff40e44f3ca6603cbc6003c6dd61d6aadb346e8645923fc43a002510cb1f5e2cd5d01af25378447a6da270289346b84436281d52d1e2b7d5cfa7190893c SHA512 3987739c16c86f08e1ae7df3177934f2e290e215bf0044271af26a559944fb6c59ea935efb84b710d5e2af7d2cfd4c9fe71e84e2a552dcab993f1b6c411f83a5
 EBUILD lxterminal-0.2.0-r1.ebuild 658 BLAKE2B 17d722e0344c2bfbeb134ffbbefeaa18b7fa6b75f923229f962bfe53c0bd00da0d3bcc55f9eaca9d551a92f49b376ddbee3b10640c11a96a7427d05eb6b37f7f SHA512 d84e773bec3f05d8f07b3799cd76623d30cc4202bcaf3a61e840044a687acc5fff1bef795407ad8821c381e66bec6da17de1b93bb5cbe94d67c0cf6c635af8a8
-EBUILD lxterminal-0.3.1.ebuild 1192 BLAKE2B 927945918dbd0db4900ce74d512317ac80560476ca0150bc881253648af47440fcbf62fad5f8d2bb3bfdf031c2e6f73ab07ffca4bf216b74932bd658e6270546 SHA512 19e41554a48eef86f943a98553faf800f1397b5624f056f7e3c7f56ff0f8a515e528b9d07e0e885ed5709fa508a6746e59edfa12bbf3a08512bee0c05f32d134
+EBUILD lxterminal-0.3.1.ebuild 1199 BLAKE2B 54c9b337dde71179110674f0ec77123dbd3d1fd5ab0ca662f7a2bd237962b89236e1a257ebf0f7d36650a2e7b919e7dc57b6bf920c9857d5c4e56ee455e35a28 SHA512 d50c20156a49c7bd07e7b376bc56bc2fdcec15c423fa55e7d07363b8445a71f5ff290059fdd7c783f99262563daebf0fe93b4dc8ecd0b4173d5c17f45584b1d0
 MISC metadata.xml 408 BLAKE2B 46853cfafd4a24907018aa2f99cf01f261d2ba37bdadd119e70493a6632e14b8dfec1dd0359c2192940c0c272d38e7c482a83590c7e775a06587b0bf4059e57b SHA512 2542f3365bcca18cfbb25bbe5a58b569bc7480ab42df1d86238e7dc1b52968387440f588394421b7b9ddcebb3c26709630a92ad3670684fa6b510d1cabc58907
diff --git a/lxde-base/lxterminal/lxterminal-0.3.1.ebuild b/lxde-base/lxterminal/lxterminal-0.3.1.ebuild
index c6b5993d83cd..4d4cc4a53d62 100644
--- a/lxde-base/lxterminal/lxterminal-0.3.1.ebuild
+++ b/lxde-base/lxterminal/lxterminal-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,10 +16,10 @@ 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
-	KEYWORDS=""
+	KEYWORDS="amd64 ppc"
 else
 	SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~mips ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"