gentoo resync : 27.01.2018

10 files changed, 61 insertions, 141 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 60df87c82235..fb9b5689be82 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index 4e9978cd7dae..b6e1dbb5f2b0 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -1,6 +1,9 @@
 DIST albert-0.12.0.tar.gz 404748 BLAKE2B f6f62201a104b51a381036ba44197adc157a472b75636a3e7c391f3cd79ab9cb8f8b5951142df02b9b249e950a2482070e05c81deb779d5442d22dbe363d835c SHA512 56d141a2c6b98744c0b34a7adbbca8b6af93545a7b067263acf59fc63d99ec7d9f19f2f3c73f477e5f35448ae8a563c9f132bed87be135467f8f0c1462f9b031
 DIST albert-0.14.14-plugins.tar.gz 540053 BLAKE2B eeb63b8c884d832907938015c5e444289a04c33fdbec1106fe75259abc031cff579b1137b3d68b786b4af797ce59938a96bd81e7e27e3fb1db0bcef84cb11ec7 SHA512 6e7942911da26672cbf0789ccae06af237794190f10bf91cb261e77c2c6be61201385a202de2798ac2794fb96737ea5055588a4efb1fb5266b0dc09364c4aa1e
 DIST albert-0.14.14.tar.gz 84931 BLAKE2B bf2a6cf7c0a05597fd0c3baf01fafab92e8783d4fde85bb80ebb85692d3166c8d451ffa61f3508cd4f4c99559ad1f0905b96d88ef2c39fc9f6f80e48b69968a0 SHA512 f48357b0611928398c4b55236472bac2db842d971288e863df9d35956864145a1ba22f6e264c6f50357c791064bd5bde1a84f7db5a54bd9c48a91093c830dccf
+DIST albert-0.14.15-plugins.tar.gz 540189 BLAKE2B b8243917cdd30c74f26ad852421cf525047694aaae2ec170a31d6239f7fa704de72f9ef67564282136ca15ec1960a1c882c193a2339541e0bf40986ee10588cb SHA512 1af59c65bd91ac626abd8777b350c92a4532a88119bd9ec6ff55f9f3ad72e5cfd6987c9b34f1c32ca854891e91f79ffbea04ed23fa85a18826e9aa890b400079
+DIST albert-0.14.15.tar.gz 84875 BLAKE2B 80e173100a0d135a18b20482ef0eb103634207b1e1a7284b2c5245750bc22478026b25982b714b3fcd079ed7674075a6853917d789f99628a368c6a9c6fd344d SHA512 9a6efd9203f7b96aa14c063a9de8c59e6b4bb0a5c55a64662ec170b75fc71247b7313a1252f71ab2516b4b62538f4c89778a43b8804915996636f49d4e0a6d31
 EBUILD albert-0.12.0.ebuild 1016 BLAKE2B 54f8d09b961bc677a6df82470c592ff98368e569c89aea2f2b14a0c21dfe9e13a3ee9ae550583a5ce6fc05b41a317a90c866e380b631689935c1da554bba69c9 SHA512 7047299581650cf9f31a3c71259dcab00707b73e9ae22115c512c47b536bf3103cdb120691e80caaef98714d3f70b1467930600f5c911565f4e5658a7cc11796
 EBUILD albert-0.14.14.ebuild 1347 BLAKE2B bf4d3ce890c415b3518dfdf8a548cd8245e838d959e26b0fe5239ecc85aad20d4ed65e96b817c0db1a4deba4603cd848b4cbd27265f283855dfa7edc2724654a SHA512 26c312d14894f43a5e948b09f1f9bde313552c527d13322cb60b8591189c0fd80e32bf47c790ea854a32fbebb0d9c854d8768b408a74f1937a4bcb27202b09bb
+EBUILD albert-0.14.15.ebuild 1347 BLAKE2B 1c33a88c32578369efb8265c4ed1be182750a6f734b3ca766fe5d8e94e398fe8dc10125032981fd0269c66933c4eb1ce078bf6fa0de17371349f5f31d3934733 SHA512 cd990c1e0eb6b32aceac853a1f05b7e96c069602382cc02f810c2a4cc7966165654a339a3aa325ef5865f3bb98094904809ffaae34b75dc274a0475997a4dd10
 MISC metadata.xml 307 BLAKE2B 8113fd9d5c144840eca96ffa19f81d1406343eb5fd60030739bce0a1fe3b469dfbda7066137a3347a4743abbfbbbb08a61712ca2fd681dd6f60e8d7f166336c7 SHA512 2e041e46839e742b36835304388ab2504f46a1a0f9fde76bca26e06e5db570a55e929310a7a06661ee115f5957c089a39125c5c41e42927263551e07d1c5b31a
diff --git a/x11-misc/albert/albert-0.14.15.ebuild b/x11-misc/albert/albert-0.14.15.ebuild
new file mode 100644
index 000000000000..f2b0faa7ea21
--- /dev/null
+++ b/x11-misc/albert/albert-0.14.15.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLUGINS_HASH="caa38cfa1ba6289ee2fc4913ea70d49fd761244e"
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Desktop agnostic launcher"
+HOMEPAGE="https://albertlauncher.github.io/"
+# plugins is a git submodule. the hash is taken from the submodule reference in the ${PV} tag.
+SRC_URI="https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${P}-plugins.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+RDEPEND="
+	dev-cpp/muParser
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins/ || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DEBUG=$(usex debug)
+		-DBUILD_PYTHON=OFF #plugin directory is empty causing build failure
+		-DBUILD_VIRTUALBOX=OFF #plugin needs virtualbox installed to build, untested
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/ccsm/Manifest b/x11-misc/ccsm/Manifest
deleted file mode 100644
index e0be0558c3ac..000000000000
--- a/x11-misc/ccsm/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ccsm-0.8.4-pygobject-glib-fix.patch 637 BLAKE2B 52ba467e0ec723dc38cc1fcc962e7b867b2a1a4702f0e4898490abcff89c1581b203d8e989e570c7d924a1591a808d439908cde99c7eaff6550791001eb2d9ea SHA512 fac2a97bcb0883ab3c0a24040f88b354653a3e507c306fb89e58f1a1d1aba46d65ed92a0094b3ebe312095ffc53af717fd43e284f13a1785dd3c45b907e38672
-DIST ccsm-0.8.4.tar.bz2 475864 BLAKE2B 6ccfaa4329dd33b78efd43f98e08d10c5909e1ef36a9fe096c4a1f123f92bf7623f7a73b724ec8146e544dd523022170ba83f4d35d0cd486bdbeabdcddea90ee SHA512 1991f25ca4f04363006bacd5267cb54c7e24817b263996c7172f58180ca0acf94050220938d4fa87081c93fde23ca0b44a333f9b675950e4c5187903a03692c5
-EBUILD ccsm-0.8.4-r5.ebuild 1256 BLAKE2B 74bd5c71086fdf8332b2a0191539fc6de4f6abe3314c8e3e505ffd7b7d2e0deb96e24a5bedd8c135b98f7d386eede7ea2e88cd9807b876232a0eaa9b863aa056 SHA512 087587ccf3c85cdba8e82874a06f5f8d477f54cef6dae0fa358bc98b074317490e6743699ed09cbcb4f693268928fa8bb9687320fe5d8ac2331c093e189034a7
-MISC metadata.xml 244 BLAKE2B 5f0afd0057d3801f32054c2da72fd9ab5c94e20e8a83ae9233c07ca50cfc8cd4044e21fda629435ed749a7738fb4f95b9c5d809b576c3259c768c763a2ab601e SHA512 cd993582cf1cfbf6bcff4c936bd1a8ad4633a2df771378d45eb18d835c39d2efa7d3fab77ac48ad00078c2c072ed1b13c39537193eb147f543f6c88aebeaf56d
diff --git a/x11-misc/ccsm/ccsm-0.8.4-r5.ebuild b/x11-misc/ccsm/ccsm-0.8.4-r5.ebuild
deleted file mode 100644
index 235de9f1687f..000000000000
--- a/x11-misc/ccsm/ccsm-0.8.4-r5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-DESCRIPTION="Compizconfig Settings Manager"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	>=dev-python/compizconfig-python-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
-	gnome-base/librsvg
-"
-
-# missing icons and text fix, bug #487106
-PATCHES=( "${FILESDIR}/${P}-pygobject-glib-fix.patch" )
-
-DOCS=( AUTHORS )
-
-python_prepare_all() {
-	# return error if wrong arguments passed to setup.py
-	sed -i -e 's/raise SystemExit/\0(1)/' setup.py || die 'sed on setup.py failed'
-	# fix desktop file
-	sed -i \
-		-e '/Categories/s/Compiz/X-\0/' \
-		-e '/Encoding/d' \
-		ccsm.desktop.in || die 'sed on ccsm.desktop.in failed'
-
-	# correct gettext behavior
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(cd po ; echo *po | sed 's/\.po//g') ; do
-		if ! has ${i} ${LINGUAS} ; then
-			rm po/${i}.po || die
-		fi
-		done
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	#set prefix
-	mydistutilsargs=( build --prefix=/usr )
-}
diff --git a/x11-misc/ccsm/files/ccsm-0.8.4-pygobject-glib-fix.patch b/x11-misc/ccsm/files/ccsm-0.8.4-pygobject-glib-fix.patch
deleted file mode 100644
index 9b325af7f341..000000000000
--- a/x11-misc/ccsm/files/ccsm-0.8.4-pygobject-glib-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix missing icon and text with new PyGObject
-Gentoo bugreport - https://bugs.gentoo.org/show_bug.cgi?id=487106
-Patch by  Small_Penguin <dark.shadow AT gmx.at>
-
-diff -Naur ccsm-0.8.4~/ccm/Utils.py ccsm-0.8.4/ccm/Utils.py
---- ccsm-0.8.4~/ccm/Utils.py	2009-10-14 03:05:30.000000000 +0200
-+++ ccsm-0.8.4/ccm/Utils.py	2013-10-05 10:16:10.050030522 +0200
-@@ -184,7 +184,7 @@
-         if has_focus:
-             self.unset_flags (gtk.HAS_FOCUS)
- 
--        ret = super (PrettyButton, self).do_expose_event (self, event)
-+        ret = gtk.Button.do_expose_event (self, event)
- 
-         if has_focus:
-             self.set_flags (gtk.HAS_FOCUS)
diff --git a/x11-misc/ccsm/metadata.xml b/x11-misc/ccsm/metadata.xml
deleted file mode 100644
index 3f57497447fb..000000000000
--- a/x11-misc/ccsm/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">Compizconfig Settings Manager.</longdescription>
-</pkgmetadata>
diff --git a/x11-misc/simple-ccsm/Manifest b/x11-misc/simple-ccsm/Manifest
deleted file mode 100644
index d64e634805c0..000000000000
--- a/x11-misc/simple-ccsm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST simple-ccsm-0.8.4.tar.bz2 62423 BLAKE2B ffffb5df6716fe7a5f39f2972090c217e81424ebf6f3e67d3107e76e6ba19946b276c3d2587dd46c23f184453f5030a1b501f1ee7e1abceda88d46acdb641003 SHA512 f60a689e18fcea494eacc4eaa8718d77b846af6790cb5de056ecd432fd8b5190ebd4ce6669744b3da408e492f68012503f420e28e66be83b747b2e532b152158
-EBUILD simple-ccsm-0.8.4-r2.ebuild 1162 BLAKE2B 573efbf7fb7e189f6a1983ea2142bd1ead79a9e7030e7ba2a4fe44ca864b593471fc0e617fcbd3abbd5abf73111b449f87a15dc93cb8b2ae57fa8e395c38227c SHA512 af4243ea4764b5d1ef52a7eecd062badf2518d816f224be184e1331f0bf53b2a684964a153ff2450a8faa7f2e72877c60c0fcffe091d71cb8d9a9d3de322a3d3
-MISC metadata.xml 255 BLAKE2B 87ea394bfc01a932e9347251c9337944d9649cbac7abed973219bce3524335e5fa68a1ffda4037e4f3e05216a684578d82fa2ab38e231148a295effdf8818011 SHA512 aebbe0fa1825be6065600fc5289c5751d3d8a16b07d83201b772bb6561114e5d2b1d1d5e53488a55e3458272723a28374cdd1221a87d585161e09ed5d71a6e9d
diff --git a/x11-misc/simple-ccsm/metadata.xml b/x11-misc/simple-ccsm/metadata.xml
deleted file mode 100644
index 173985d43602..000000000000
--- a/x11-misc/simple-ccsm/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">Simplified Compizconfig Settings Manager.</longdescription>
-</pkgmetadata>
diff --git a/x11-misc/simple-ccsm/simple-ccsm-0.8.4-r2.ebuild b/x11-misc/simple-ccsm/simple-ccsm-0.8.4-r2.ebuild
deleted file mode 100644
index a56e4fee0107..000000000000
--- a/x11-misc/simple-ccsm/simple-ccsm-0.8.4-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="Simplified Compizconfig Settings Manager"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DEPEND="
-	dev-util/intltool
-	virtual/pkgconfig"
-RDEPEND="
-	>=dev-python/compizconfig-python-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-	>=x11-misc/ccsm-${PV}[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# return error if wrong arguments passed to setup.py
-	sed -i -e 's/raise SystemExit/\0(1)/' setup.py || die 'sed on setup.py failed'
-	# fix desktop file
-	sed -i \
-		-e '/Categories/s/Compiz/X-\0/' \
-		-e '/Encoding/d' \
-		"${PN}".desktop.in || die "sed on ${PN}.desktop.in failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=( build --prefix=/usr )
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}