gentoo resync : 18.11.2018

3 files changed, 34 insertions, 48 deletions

diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 8e5c264b2766..f06d33d58bb5 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,6 +1,6 @@
 DIST girara-0.2.8.tar.gz 73646 BLAKE2B 08a3fea194922cfb84793d14905f15aac6e73daf3c4304842b88e7f517046daa287deaef770176bc06358b37c52418f1e42204df302c2c7d4f82c2f4a10a44a9 SHA512 d853f8337a63ae2ed319547a2daa2ccd3ce6f31b3dbb52522705c78dbbb94da1dc1efc4ac62d3c2af94531d4dea309323b878619ea0c9778c37960791ca0cb4e
 DIST girara-0.3.1.tar.xz 58148 BLAKE2B 7945ca0b417bf09a37f4ce7cc6603adc93cd224d7e449c7f4dae00a4abf254b251230fb40e2f985c293bad95c0bd05ff646418bb5f8e0a1c6d5d2df832900256 SHA512 5c4b2972bfb0296cd1b984c9426b67b50e29e2928fb0e9a3aa3f9bc21aebc28dcc93570e888060e0bb02561022b379cdfcfa3317b52e78cac04e7fc1ba476107
 EBUILD girara-0.2.8.ebuild 1411 BLAKE2B 572289bb28e3150c8b4b67b2d7da7b47a413a408e968cdf04b3821e32f15f6e51266cb24a030f626d86355ee66cfae5ce696351c07056a6d1cfdb5a977ffadb8 SHA512 e55455523f3f92870d93ef1dd54796b61d14c4b8bf875da6b67c88611f20a55d623e6263852e9f88001c6725d7488f000eca2ae8332be60dd0a737807dee7125
-EBUILD girara-0.3.1.ebuild 1088 BLAKE2B d8a7b3d6df62bd55c8986aa7ad8211a9b724bce56564fea857119707ffbac4f0ddf4c22bf2f789d140ff743807db14a69d7b6e597513f3cb2ceebbddd1a9c685 SHA512 73978f226c851a22414e3d5a5be70a0315acf4acaa995e30ea03a393beef3cf8533937225e6262297ab39f7095129421c97904c8439b15b4510fe04f85388a3a
-EBUILD girara-9999.ebuild 1371 BLAKE2B d65ba5390bdced2ff54c92882f6735aa216716f7aa1933b193ed3c9929f19b494bce5298a6f963ad84ad129c44465e31368d22dfc84f39adc10ab39b4ac1b04f SHA512 078b7fdb2cd1dde3a8132bbb1085359e70ae89fc4dd59eb7d5e96decfa4869535007cdc39d5406b9d2b9bf5fcdcf7a159cdc033f09d3e6ae7ce7a54877d044c9
+EBUILD girara-0.3.1.ebuild 1087 BLAKE2B efa80fdf6c283fa3b3c30dfca4e12ba71cd5890a216ee8f7aeb6e991874404085fbe30aedc601b5ab28f42600e1a762b4d474a8739ff622e6ef8669028e3694b SHA512 393eb4191dc13efa6c690fa9321b16a3245c9c4de91832eac40731ad186f830f6832f185429c79230c30b2c28439748dbe1b3b2a4f8b6d98ca4b522128b2c05d
+EBUILD girara-9999.ebuild 1088 BLAKE2B d8a7b3d6df62bd55c8986aa7ad8211a9b724bce56564fea857119707ffbac4f0ddf4c22bf2f789d140ff743807db14a69d7b6e597513f3cb2ceebbddd1a9c685 SHA512 73978f226c851a22414e3d5a5be70a0315acf4acaa995e30ea03a393beef3cf8533937225e6262297ab39f7095129421c97904c8439b15b4510fe04f85388a3a
 MISC metadata.xml 700 BLAKE2B a40c7ce11c9e6ccee885e8da21856f4b74b9845b358f560e7cbd597a87cdc70942fbdc2a4a30c0ad156a964c4c07754ccd03be8be9a98021813dabc12c5483e1 SHA512 96d4e1a4d9d59be1e2613ae45def5357af5a20d2f9511f1f56418bf2eb3e41198a062ff3af741cfca9b644201703a2e7979cb533c4e00fc9b85336844b10e5c2
diff --git a/dev-libs/girara/girara-0.3.1.ebuild b/dev-libs/girara/girara-0.3.1.ebuild
index 6a933684b7c9..3ecb3fb1fda6 100644
--- a/dev-libs/girara/girara-0.3.1.ebuild
+++ b/dev-libs/girara/girara-0.3.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~x86"
 fi
 
 LICENSE="ZLIB"
diff --git a/dev-libs/girara/girara-9999.ebuild b/dev-libs/girara/girara-9999.ebuild
index d4db899b1913..6a933684b7c9 100644
--- a/dev-libs/girara/girara-9999.ebuild
+++ b/dev-libs/girara/girara-9999.ebuild
@@ -1,67 +1,53 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit multilib toolchain-funcs virtualx
-[[ ${PV} == 9999* ]] && inherit git-2
+inherit meson virtualx
 
 DESCRIPTION="UI library that focuses on simplicity and minimalism"
 HOMEPAGE="https://pwmt.org/projects/girara/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="https://pwmt.org/projects/${PN}/download/${P}.tar.gz"
+
+if [[ ${PV} == *999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
-EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-else
-KEYWORDS=""
-fi
-IUSE="libnotify static-libs test"
+IUSE="doc libnotify test"
+
+RDEPEND="dev-libs/glib:2
+	 dev-libs/json-c
+	 >=x11-libs/gtk+-3.20:3
+	 >=x11-libs/pango-1.14
+	 libnotify? ( x11-libs/libnotify )"
 
-RDEPEND=">=dev-libs/glib-2.28
-	>=x11-libs/gtk+-3.4:3
-	!<${CATEGORY}/${PN}-0.1.6
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
+	 doc? ( app-doc/doxygen )
+	 test? ( dev-libs/check )"
 
-pkg_setup() {
-	mygiraraconf=(
-		WITH_LIBNOTIFY=$(usex libnotify 1 0)
-		PREFIX="${EPREFIX}"/usr
-		LIBDIR='${PREFIX}'/$(get_libdir)
-		CC="$(tc-getCC)"
-		SFLAGS=''
-		VERBOSE=1
-		DESTDIR="${D}"
-		)
-}
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	# Remove 'static' and 'install-static' targets
-	if ! use static-libs; then
-		sed -i \
-			-e '/^${PROJECT}:/s:static::' \
-			-e '/^install:/s:install-static::' \
-			Makefile || die
-	fi
+	default
+	sed -i -e '/'-Werror.*'/d' meson.build || die "sed failed"
 }
 
-src_compile() {
-	emake "${mygiraraconf[@]}"
+src_configure() {
+	local emesonargs=(
+		--libdir=/usr/$(get_libdir)
+		-Denable-json=true
+		-Denable-docs=$(usex doc true false)
+		-Denable-notify=$(usex libnotify true false)
+		)
+		meson_src_configure
 }
 
 src_test() {
-	virtx default
-}
-
-src_install() {
-	emake "${mygiraraconf[@]}" install
-	dodoc AUTHORS
+	virtx meson_src_test
 }