gentoo resync : 27.01.2018

9 files changed, 79 insertions, 8 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index b5a4d00454a6..1eb845937459 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest
index 0ea6f9af03df..b18cbc8520e9 100644
--- a/sys-fs/btrfsmaintenance/Manifest
+++ b/sys-fs/btrfsmaintenance/Manifest
@@ -1,3 +1,5 @@
 DIST btrfsmaintenance-0.3.1.tar.gz 19698 BLAKE2B f792d7e55dd738b4be2f18aa4047c8b2c092244b71c50e32cf881a7862b14a2d897a170515388fcee40a89763c4c91d357ca3ceb559e372ca3c673d0b1d3aec2 SHA512 89be6da3d6bb3f85f645ac899f173d19cb787e938dd2fc91be16b3202a6784ca33dc4a4d9f9ee78ac6a96468dbaa4f4dc7a2f2e6998d550ea44d7af24198dbfb
+DIST btrfsmaintenance-0.4.tar.gz 21622 BLAKE2B 844d467b7712093370c1d6391e26d5046deb84cee6fd60b5774743415c75ad00a1e27c0be21004c260680b72b5615dcfd01b84f1eba3d57f7c9c5d22b6750d8d SHA512 2d19e82c03b291d157dc5f763dcb094330fd1a4aaee6215dbe576a5da44f71f4adee55fd06c60409e4699ac671d2fc73628f202f4f68270910eeba782f0ad153
 EBUILD btrfsmaintenance-0.3.1.ebuild 1381 BLAKE2B c3dcf441fb735792133f6dca9a5bdf5d2cb76d03fc46540a2ac87ea0211b83027249706c6eb55494aaab223ac222c0e3dfd65d09cfa169c37b950436daa46a59 SHA512 f681469cc0db852d21625736f3ecca7cd745c2dae6ef3d2d1b7ca1a4cf51645e904346ab18ce0d19abcd5b372aa40d42822629c9e113dd7fee856e7481b5c2c6
-MISC metadata.xml 454 BLAKE2B 944720aeb7738b0eba992a1800cd7ed7dfb359cad9e71bdef39161a8d9f6f9ba5306d8574c81216ea0f88a2a92ff8e9b85619bc24d7ad021e5da6d7752b9e98d SHA512 d23ea714ccb28d7f7266fc12c89bafb4b673025e285d1ca6faddaf74b99b39f54aefb043848e2812db5c28ef950ff86ba075d1afac51c0ce23c8c7c9691eb96e
+EBUILD btrfsmaintenance-0.4.ebuild 2054 BLAKE2B 8fdfc67a107f525d827226b556684c3d6ee461b1c412a8c662571991ef9373e1a6c72dd1b86da7e340176b42a54bb1bd25b0b67235a0cd8ab570541c143e755e SHA512 1d84d447b4eb7a47a695b6b8458da137f356779297c65be0ca82b81445c69f1a2a49fe5e3d7df9dce8f82bd75d50fe08086e5de0e07d2fd577e93923162e0ab9
+MISC metadata.xml 564 BLAKE2B a54366a1b7a22e5b6f7ba8814ebcc75e4fb6185a5ce49f021bc2dec51277f31f82cafd4cf2de29918b97aa9276485bdc0dcf42d21e65d71636d3ab6ea4bf78da SHA512 6affb15730bb1ec7d8601c46ac5ea9f48b603d36825b364831459025764080641f51644af6c838d0e6de9edca766236662d068ee5893ba811687c4a1d7585bdc
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.ebuild
new file mode 100644
index 000000000000..8c4208008be5
--- /dev/null
+++ b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Scripts for btrfs maintenance tasks like periodic scrub, balance, trim or defrag"
+HOMEPAGE="https://github.com/kdave/btrfsmaintenance"
+SRC_URI="https://github.com/kdave/btrfsmaintenance/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd"
+
+RDEPEND="systemd? ( sys-apps/systemd )
+	sys-fs/btrfs-progs
+	virtual/cron"
+
+src_prepare() {
+	# Fix config path into watching service
+	sed -i 's%/etc/sysconfig/btrfsmaintenance%/etc/default/btrfsmaintenance%g' btrfsmaintenance-refresh.* || \
+		die "Unable to patch btrfsmaintenance-refresh.*"
+	default
+}
+
+src_install() {
+	dodoc README.md CONTRIBUTING.md btrfsmaintenance.changes
+	insinto /etc/default
+	newins sysconfig.btrfsmaintenance btrfsmaintenance
+	insinto /usr/share/btrfsmaintenance
+	doins btrfsmaintenance-functions
+	exeinto /usr/share/btrfsmaintenance
+	doexe btrfs*.sh
+	systemd_dounit *.service
+	systemd_dounit *.timer
+	systemd_dounit *.path
+}
+
+pkg_postinst() {
+	elog "Installing default btrfsmaintenance scripts"
+	if use systemd; then
+		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer || die
+	else
+		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die
+	fi
+	elog "Now edit cron periods and mount points in /etc/default/btrfsmaintenance "
+	elog "then run /usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh to"
+	elog "update cron symlinks or run"
+	elog "/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer"
+	elog "to update systemd timers."
+	elog "You can also enable btrfsmaintenance-refresh.path service in order to"
+	elog "monitor the config files changes and update systemd timers accordly."
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		elog "Removing symlinks from btrfsmaintenance cron tasks"
+		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh uninstall || die
+	fi
+}
diff --git a/sys-fs/btrfsmaintenance/metadata.xml b/sys-fs/btrfsmaintenance/metadata.xml
index 1aba136c2736..46342cb51b38 100644
--- a/sys-fs/btrfsmaintenance/metadata.xml
+++ b/sys-fs/btrfsmaintenance/metadata.xml
@@ -12,4 +12,9 @@
 	<upstream>
 		<remote-id type="github">kdave/btrfsmaintenance</remote-id>
 	</upstream>
+	<use>
+		<flag name="systemd">
+			Enable systemd services and timers instead of cron timers
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 4cf1b56f781e..f1f546f6ab35 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -6,7 +6,7 @@ DIST eudev-3.2.4.tar.gz 1856432 BLAKE2B 2382a8052033a93f54750dfcdba0624bbf506112
 DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d18103a6568bcf82d0664a20f8e38b58b67a74798f9f0c10a5adc99a7524318055b79dc2e360aee684c2a2a5983a4 SHA512 f73efde0d2dafcf79be4ebe9f6e6abb44329ea4ae45ccc4d9662c1d5ca6f4d45c27ca0b3135d7fa85f305bf7c5825dc1000079eb93fe7179c36a229fe63e372c
 EBUILD eudev-3.1.5.ebuild 7324 BLAKE2B ae82567bb7d926edf0bbdcbd50493e3de3ee602058ca78624ef6c98209265d990fea4f6a7533b2a506f603e999edb99ec7ca4fdbd37b021271d6936294fd29c1 SHA512 caba559c00546389c4a8ae0cd62cd1926877939d89b97060e175e8bfc7ba3bc2d081e8400a34bf830a269d8a1102a2a56e00b19e2b23b75b98347fdcbec4908f
 EBUILD eudev-3.2.4.ebuild 7374 BLAKE2B 62476242231ed8d6a037f232417ef7d6cdac5917ce6b22ee15b9acc14b4b6dbaf7c274359cbd5d41e575cc5ab7e8ad74b94415e31104f292881a1f94b490d45d SHA512 1953a761499144642ef49552116d66aff1fdb2aeb56d86c8dcf9118040f0f2ecd160666ffe3281288a812228433b0f4c58c19be70cf9b2eca871d6fd627b95bd
-EBUILD eudev-3.2.5.ebuild 7314 BLAKE2B b0c0630ae1029c611536d4a7eeb928171f4175308f275ac16c42bba6241421a2101bca64ac80bf45050f4b7a7fee6078fc93a117ae73e03818e3935f7b927a54 SHA512 bba81dcce7562500933c7836a951ce1f7a71a7755b106c604189938b782697a837fd7d712cc5a0bedacb0eab6d260728a6a109c6a8876e48d4d4541341d34fef
+EBUILD eudev-3.2.5.ebuild 7312 BLAKE2B 03134141340e1fe93969d4e9ec7088fa8257fbcf15e284013e869bcd30ef655df02f9a1b6d15a2d7c750ccc5bb3a031cdfa97ddf35e2e7ae88c68dcd6e669a2e SHA512 71b63d44bf993ad8b1df9f1c18a877293c6307fe1d4b811aeaba3ab1524b17c8a81d1722f5bdf0d68c765c041e1d546b21d668e1af8bf6e22fc2eb16c4e54c42
 EBUILD eudev-4.9999.ebuild 6604 BLAKE2B a3156ec55b873be29ca371162f89d92e5be23fd72eb7bcf1fd968c5ce4cb622155fe7da3e0dde47b085b840dcbc536a6afe65f66f37b04c904e4b955ab69415f SHA512 c5b231b5dc6406255b38e67e99b054e429f5c482614eb905f9a9c0c03af9c7107c30c29850f0a2566e6731f4d206e957b4d714ef59739c60835e80a0b6a3e4fd
 EBUILD eudev-9999.ebuild 7314 BLAKE2B b0c0630ae1029c611536d4a7eeb928171f4175308f275ac16c42bba6241421a2101bca64ac80bf45050f4b7a7fee6078fc93a117ae73e03818e3935f7b927a54 SHA512 bba81dcce7562500933c7836a951ce1f7a71a7755b106c604189938b782697a837fd7d712cc5a0bedacb0eab6d260728a6a109c6a8876e48d4d4541341d34fef
 MISC metadata.xml 858 BLAKE2B dda0b6f29e9bce44b437db2236a94db9924c1e0999bcd68833ffae35fb6b390cfe0b6373d2e66d45eaa78059a89e9824f14c8ec775d085f51aa2b9ee7eb80a42 SHA512 bfffbea2229a0beabe8e979857b9f9761ade64faa0fc421a5f4d8ec1030aed60cce1505ff7d964f0128220773865d7f564db746fee1d68e611851c73406d1a79
diff --git a/sys-fs/eudev/eudev-3.2.5.ebuild b/sys-fs/eudev/eudev-3.2.5.ebuild
index a864deb766cc..f252b3f01e7f 100644
--- a/sys-fs/eudev/eudev-3.2.5.ebuild
+++ b/sys-fs/eudev/eudev-3.2.5.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"
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 9e7537122730..63f4b14b0939 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -14,6 +14,6 @@ EBUILD udev-225-r1.ebuild 13566 BLAKE2B 9aba88a7a7edcd0b2f63f590f84af713df2b2bbb
 EBUILD udev-233.ebuild 13034 BLAKE2B ab219baa2baa309e5b0598bbc1fc9a11d8dfb110e100dc8bf9e63c894df62c217a4ebaf9c2a28d67ce0f61d90c64fe476c3c5c4ba25b52decef9d47d4d72001a SHA512 6382221804b758022770ef3643720bd6780722790d408506fc4357132dc052e2061180ccef904da59302c464d9383de305b01f47835fef33dea5869f75a54d8a
 EBUILD udev-234-r1.ebuild 9990 BLAKE2B 8759bf272f1f7d2e03692049c11d9cbf106e0169c36b5125f8bf342af00133c70c5ecf88bf10bd1edfecddbc3c5075c7149903d5211c956277d7920191275688 SHA512 347f2941145237bc9732ad94074e5a6be432b15466ef2af4f82110a9314dbd9c6d69d391d8181ca66e9b13998466d9a609d03886e5afb5e250ad0323aaa65ec9
 EBUILD udev-235.ebuild 9988 BLAKE2B 275ed1ba897951832d3bcd566aed8c3762002736444fcd808b71c11cdadb194ab59da7df31af42092f474eeba2ae47f87cf8d68ed1c09117990c0bdfeda7fbaf SHA512 8a6fc0f42ccba3f0cbf808d1bf4c2d725347781f156fb36fe39057573f35e8d2a5c01fc091e2a5fc2a9a49ba78b4c86f6fec164ffd4d9d153092c3dfdc46c76f
-EBUILD udev-236.ebuild 9986 BLAKE2B 70f0639d812d5b80e11ac39e39b0f3df525111d043107bbfeb9dd31a97d0fe0253c23e8a109b2794a41bd61093b3d21dcb0a94e7c340a461777e3ec51c3f561f SHA512 e3e5f17d0dbc479b52b64a4abad8dca63a4670399759ae2da50bda52edf84b3abee2d265a890d5869d0a67201f1db0da8083f57cb3b33135444d53a600440641
-EBUILD udev-9999.ebuild 9988 BLAKE2B 1e5bd0e56d880773cf8737a7fb10601daaa49b32d22d4471d135e3048231d976dffb6e8eeb2e6a50ce26c7f5888b3f22e20b388168845e115226a766f57a7852 SHA512 0e2378f4f690be31c6091ec74b015269b32a42191d06a28d4b664bc08686e057089dc786a6bee5bd0779374cb0caf326527bcd5f95bfd951df72c3c3296ebb32
+EBUILD udev-236.ebuild 10021 BLAKE2B 433f4bf443b6e8add993f98c47c3b2b1b8afaca366d66e268a5be743b8a7842ac342688cc43007959d40cef1b35d6fcabf67b8466b40ddd98f3403ab74e8fcb2 SHA512 67506a5dbd607b781bbe6c3ae18b43695ab375fb37e9b529b5c039837104bb3abe71c7dc1115d3869a0456f344f563216fee9b40c5a9d1be6b3024bb0054e945
+EBUILD udev-9999.ebuild 10024 BLAKE2B 73f00f31b7feb9c33095c3617bbf6281dcebb97ad208b5636510069e17e91395d544fbe76ebb193f16c7ac38d29d54bd430fb3624b081bcb52beca62521b88d9 SHA512 7bee9649aca3f8d32b85c245f4dee1d14b566a6d58b3c05427c819083a381ceea64374c0a97e536a48acfd388e7b93f6ba62b5d7cdfb7b60a1c1d53aef396865
 MISC metadata.xml 680 BLAKE2B 3f6b21eff391977d69921da6eeb7f48ae6c706dd856e12c4b0126f0db4ced358925374bed23d950d957a58b5447e087ad98301aa1f75dd140a1cd816ef1d2426 SHA512 2e90cdfb013904211fba8404c6b96ad940dfaea05eebe7592e3fa185dec9b16b738cc7661fd466990788accf8c261a596bcb08477e879e0e18fcc91cdce65c5e
diff --git a/sys-fs/udev/udev-236.ebuild b/sys-fs/udev/udev-236.ebuild
index 0bc6698ce506..614a5e9f08ae 100644
--- a/sys-fs/udev/udev-236.ebuild
+++ b/sys-fs/udev/udev-236.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -195,6 +195,7 @@ multilib_src_install_all() {
 
 	insinto /etc/udev
 	doins src/udev/udev.conf
+	keepdir /etc/udev/{hwdb.d,rules.d}
 
 	insinto /lib/systemd/network
 	doins network/99-default.link
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index ec6201a5a68d..fcbf552175c1 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.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
@@ -195,6 +195,7 @@ multilib_src_install_all() {
 
 	insinto /etc/udev
 	doins src/udev/udev.conf
+	keepdir /etc/udev/{hwdb.d,rules.d}
 
 	insinto /lib/systemd/network
 	doins network/99-default.link