gentoo resync : 24.12.2018

4 files changed, 28 insertions, 116 deletions

diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index 2f857c37dc3c..b7f1e1a7f8f0 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,9 +1,7 @@
 AUX gparted-pkexec 42 BLAKE2B 493ae574b402064745186d9574a9ba9a6dd3a7330248b2ac71a306d060166c08e60cec7dc94ec168167ddef8997c5c5641b66367fe592bc205ffd45b00b4eaf4 SHA512 ecc34719a6fdf3739f87d3d2174a56b02c33c69e77d9811f4a043024d2f0479d077214e36fa6081d9717dc55d51dc3b8e0b51f86d95162422438841af24f7b35
 AUX org.gentoo.pkexec.gparted.policy 815 BLAKE2B d7c3ce48986488ebbb71bcdfe21d18c33598c03c5c5fd67fafe55556bf093784bc9f73cfc703ef3012c92998fcd918ca26595dd016e8df00fb21de5ebe6c8a71 SHA512 56a4c6906c721322a2530de4832f422f1a6dda2a049b8fbbf7536cfd798e0f1557148130af8f489c12687cd301b11563667150e3a703e8e3b01a4e0135ced845
-DIST gparted-0.27.0.tar.gz 3377303 BLAKE2B 3da7f8713609bacba535745fc2655302826404b9f6fe61edac9db161bad8c40b23e107168674b2e3b6b5153329538ab3cd1d04e0ec69d3402017ad771a1af125 SHA512 0a44697e6d34d1ca3d3fc65fb90ec945ff3807cd208bf18fb118b73980e018b6d69fa515f4f1b199974eabb36b977c541f141790fe640e083ff14c2bbd578e5f
-DIST gparted-0.28.1.tar.gz 3444521 BLAKE2B da7c8fe221284be60671b37fcd639b128d0d349239ee5d0c518ec9b64a52e3430bc8c0e23686ef0e54e6c585a6f83a1bd1b17dc010bb858675094c8e33606e60 SHA512 533adc9c2896063532f109ee6ee5fd1e1f510f47aad4ed2b673fc74ba2406f1f8d86db8096965920608028ce255385e04a60926bbf771f7df96100c3e0546a67
 DIST gparted-0.29.0.tar.gz 3751292 BLAKE2B 3feeb5abe01cdef5a14efb1bbe229d1ae167a087a5488eacd00577eb16f4038563e21144e15b38113b1cdca0b53455a036f9f5ac594b2633d579ecdfdf7b1d8e SHA512 ea01a5b98f8a70d229eb81b58e46b5f0037e909cf72043e7364812ca77b32ee4bad0d215699a08f1b6fcacc31cece3a3058b6178e7bf2df6ba63b11ee64e2f8f
-EBUILD gparted-0.27.0.ebuild 2046 BLAKE2B 48ca4dcc8634bbee70165ed9550ff5baa234168572fa8353edb4933994c6a741746ea5760e5cea9754287be5e3b804f6090a7645bc800230d5f7944e009e09a3 SHA512 c9dfa3bf4642f350acb95e24e3a807d4ff5912318977d6c891a922b083298e84815c5fa762ec29eed6425057e899f8b041b5ab3a8c920c6a0706469cd0328d57
-EBUILD gparted-0.28.1.ebuild 2104 BLAKE2B 5d7d16743d5e3ddeb3e7b087fedad920c75add0f5ab92826578dfc6eed503fb2f69829f7225ec884b4b22ac1840e2f47dc4bf4b7c299899b9d5973e9018be1f1 SHA512 4bbd41acdbc645aff307a68fdbfa15e9659a3a6ef0e12d616ae89c3d45d40dd5bdab99ac58684f3a24c0a3cbe82b264ba5c7ffbae91d8251891346fc52e9f65b
+DIST gparted-0.32.0.tar.gz 3880559 BLAKE2B bdd3dd636fd651af06623cdaca828f199a42048d270674c5d5c29a1b99f34fb3a903fa9499bd141ef58a3455d0b861af01b9ed44d9cdba10629e20e5b5114715 SHA512 ea05c387031d0e5ac7f8fa582d9b15881336d72ed2e04a8515217bedccea763491e8d093f9ed3f47fc6c648412a2dca7fff1735e70d897beb065e6b3e698ad43
 EBUILD gparted-0.29.0.ebuild 2139 BLAKE2B 3b5d9d14868f42922ec19d812f089ea26d2f2a71f58d89e89b7010491026a29b330edea700e90f0982029973d62305da2d1aa92a4ede55335b7315123e8f3eb4 SHA512 83dc056344f795f4d22e56369a1e3d53fc20fec201b193bf0881d8e43983387489dedeac708b954229d21d365a49a886e0c0626069c37c3225fe731e825c12f2
-MISC metadata.xml 1906 BLAKE2B 418f37339f5e47903d0af0f73d9676ac9984bff38d4b26f0668ddce0e121b7f5da5a3f0c447be940518b03c35d297f902617873297732d2fd03068ee9a32d977 SHA512 bf2c02576b610ab149f5be05f7117f0cdec91311fb5c8108a46f9676214997dce46338e9b007c666237aecbe8821351122aa3243fc1d21e58a4805635da9be6e
+EBUILD gparted-0.32.0.ebuild 2114 BLAKE2B df808a4b22b7666d1ede78a1b899e5b6d582e4003596f14066b408871408e46db2ee5eac52692cc393423be64b7fab558dde56db42c89ab17928591fdef7791b SHA512 346eef4045ac985eb9112d0700defac7906afd2bcee0712080ba029118c95cd103307f802204a17488266de3f63cf7d70dbdba4e678c3edaa4023d51dac7136c
+MISC metadata.xml 2078 BLAKE2B f510df9b38e36b2110141a6c7939bff842a8b16521db3ae2df10782137686e071e5124a39c3145e95a1cdec3501d2a37e954ed9d722f0999bdbf261e1fc5b594 SHA512 7371d9bed469149fa8d72d56a238ebb4294330f97df87054c44b5f496f836f3ccfdebf9b841c043471d6a537446ebf17395f0359c62c43082488c2831adcdf16
diff --git a/sys-block/gparted/gparted-0.27.0.ebuild b/sys-block/gparted/gparted-0.27.0.ebuild
deleted file mode 100644
index e55999468ed3..000000000000
--- a/sys-block/gparted/gparted-0.27.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Gnome Partition Editor"
-HOMEPAGE="http://gparted.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="btrfs dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 xfs"
-
-COMMON_DEPEND="
-	>=dev-cpp/glibmm-2.14:2
-	>=dev-cpp/gtkmm-2.22:2.4
-	>=dev-libs/glib-2:2
-	>=sys-block/parted-3.2:=
-"
-RDEPEND="${COMMON_DEPEND}
-	!policykit? (
-		kde? ( kde-plasma/kde-cli-tools[kdesu] ) )
-	policykit? ( sys-auth/polkit )
-
-	>=sys-apps/util-linux-2.20
-	>=sys-fs/e2fsprogs-1.41
-	btrfs? ( sys-fs/btrfs-progs )
-	dmraid? (
-		>=sys-fs/lvm2-2.02.45
-		sys-fs/dmraid
-		sys-fs/multipath-tools )
-	f2fs? ( sys-fs/f2fs-tools )
-	fat? (
-		sys-fs/dosfstools
-		sys-fs/mtools )
-	hfs? (
-		sys-fs/diskdev_cmds
-		virtual/udev
-		sys-fs/hfsutils )
-	jfs? ( sys-fs/jfsutils )
-	mdadm? ( sys-fs/mdadm )
-	ntfs? ( >=sys-fs/ntfs3g-2011.4.12[ntfsprogs] )
-	reiserfs? ( sys-fs/reiserfsprogs )
-	reiser4? ( sys-fs/reiser4progs )
-	xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/gnome-doc-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -i -e 's:Exec=@gksuprog@ :Exec=:' gparted.desktop.in.in || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-doc \
-		--enable-online-resize \
-		GKSUPROG=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-
-	local _ddir="${D}"/usr/share/applications
-
-	if use policykit; then
-		sed -i -e 's:/usr/sbin/gparted %f:gparted-pkexec:' "${_ddir}"/gparted.desktop
-		insinto /usr/share/polkit-1/actions/
-		doins "${FILESDIR}"/org.gentoo.pkexec.gparted.policy
-		dobin "${FILESDIR}"/gparted-pkexec
-	else
-		if use kde; then
-			cp "${_ddir}"/gparted{,-kde}.desktop
-			sed -i -e 's:Exec=:Exec=kdesu5 :' "${_ddir}"/gparted-kde.desktop
-			echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop
-		fi
-	fi
-}
diff --git a/sys-block/gparted/gparted-0.28.1.ebuild b/sys-block/gparted/gparted-0.32.0.ebuild
index 77807ab932d0..ae34b4d6f991 100644
--- a/sys-block/gparted/gparted-0.28.1.ebuild
+++ b/sys-block/gparted/gparted-0.32.0.ebuild
@@ -1,29 +1,29 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit gnome2
 
 DESCRIPTION="Gnome Partition Editor"
-HOMEPAGE="http://gparted.sourceforge.net/"
+HOMEPAGE="https://gparted.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="btrfs cryptsetup dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 xfs"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="btrfs cryptsetup dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 udf wayland xfs"
 
 COMMON_DEPEND="
-	>=dev-cpp/glibmm-2.14:2
+	!policykit? (
+		kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) )
+	policykit? ( >=sys-auth/polkit-0.102 )
+	>=dev-cpp/glibmm-2.45.40:2
 	>=dev-cpp/gtkmm-2.22:2.4
 	>=dev-libs/glib-2:2
 	>=sys-block/parted-3.2:=
+	>=dev-libs/libsigc++-2.5.1:2
 "
 RDEPEND="${COMMON_DEPEND}
-	!policykit? (
-		kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) )
-	policykit? ( sys-auth/polkit )
-
 	>=sys-apps/util-linux-2.20
 	>=sys-fs/e2fsprogs-1.41
 	btrfs? ( sys-fs/btrfs-progs )
@@ -45,43 +45,41 @@ RDEPEND="${COMMON_DEPEND}
 	ntfs? ( >=sys-fs/ntfs3g-2011.4.12[ntfsprogs] )
 	reiserfs? ( sys-fs/reiserfsprogs )
 	reiser4? ( sys-fs/reiser4progs )
+	udf? ( sys-fs/udftools )
+	wayland? ( x11-apps/xhost )
 	xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )
 "
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/gnome-doc-utils
-	dev-util/intltool
+	>=dev-util/intltool-0.36.0
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	sed -i -e 's:Exec=@gksuprog@ :Exec=:' gparted.desktop.in.in || die
-	gnome2_src_prepare
-}
-
 src_configure() {
 	gnome2_src_configure \
 		--enable-doc \
 		--enable-online-resize \
-		GKSUPROG=$(type -P true)
+		$(use_enable wayland xhost-root) \
+		GKSUPROG=kdesu \
+		ac_cv_prog_have_scrollkeeper_update=no
 }
 
 src_install() {
 	gnome2_src_install
 
 	local _ddir="${D}"/usr/share/applications
+	local _bdir="${D}"/usr/bin
 
-	if use policykit; then
-		sed -i -e 's:/usr/sbin/gparted %f:gparted-pkexec:' "${_ddir}"/gparted.desktop
-		insinto /usr/share/polkit-1/actions/
-		doins "${FILESDIR}"/org.gentoo.pkexec.gparted.policy
-		dobin "${FILESDIR}"/gparted-pkexec
-	else
+	if ! use policykit; then
 		if use kde; then
-			cp "${_ddir}"/gparted{,-kde}.desktop
-			sed -i -e 's:Exec=:Exec=kdesu :' "${_ddir}"/gparted-kde.desktop
-			echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop
+			cp "${_ddir}"/gparted{,-kde}.desktop || die
+			cp "${_bdir}"/gparted{,-kde} || die
+			sed -i -e '/Exec/ s:gparted:gparted-kde:' "${_ddir}"/gparted-kde.desktop || die
+			echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop || die
 		fi
+	else
+		sed -i -e 's:kdesu::' "${_bdir}"/gparted || die
 	fi
 }
diff --git a/sys-block/gparted/metadata.xml b/sys-block/gparted/metadata.xml
index 2fb14814df55..ade662b4afee 100644
--- a/sys-block/gparted/metadata.xml
+++ b/sys-block/gparted/metadata.xml
@@ -34,6 +34,8 @@
 		<flag name="reiserfs">Include ReiserFS support
 		(<pkg>sys-fs/reiserfsprogs</pkg>)</flag>
 		<flag name="udf">Include UDF support (<pkg>sys-fs/udftools</pkg>)</flag>
+		<flag name="wayland">Enable interim workaround to allow running GParted under
+		Wayland by granting permission to the X11 display using <pkg>x11-apps/xhost</pkg>.</flag>
 		<flag name="xfs">Include XFS support
 		(<pkg>sys-fs/xfsprogs</pkg>, <pkg>sys-fs/xfsdump</pkg>)</flag>
 	</use>