gentoo resync : 17.10.2017

9 files changed, 95 insertions, 30 deletions

diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 335e304ed233..18e64871baa3 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,8 +1,10 @@
 AUX rofi-0.15.12-Werror.patch 437 SHA256 bfb72d16efefc1e063c2e14b3b9c362b4ab0fb0006a3eff7bb6552d6409d7f02 SHA512 b26d190bdaccca3cf761599a6e3f938a8f9106c9ee395c5f0bf3e58f5c151674621e66ad61891ec4e764424e42f315caa352761923d5c3b45ca326850e369ad9 WHIRLPOOL ebe826a74305a3b74b1a034ea16ba174d64ddaeeb0775acad14794e60a638616b683cc97ad21fce18da3dadab2bbc1dc789570a9d267e32d6c6606b854a7c080
 DIST rofi-1.3.1.tar.xz 211732 SHA256 b52cf1170f5c7c38f6399ee44f23ebbd87ac349d6a34f32f5d169966765c87e8 SHA512 a96c53ad268883277c4ff0ee3267ff7fab4d4a93a982019ce19ea82771b65c32d56216d777494853bffd18481400af72ed777f88cce4b26d7d1b8980a997f6c6 WHIRLPOOL 47ca4050853888fda4ae9dc203c3d4a47284780d8d1506b12f4bb14cb947a8a7e96b3674203b518ada6b9bbd0e5718d49a42f89a2ecbdf26b3fdacce9d9fee6f
 DIST rofi-1.4.1.tar.xz 337988 SHA256 90fbca9b4b4bc4eaf55a8d5115e880611137faaa44b0d929694cb40ef9face76 SHA512 3db3642819761bcfc99e7e8c6f09dde0c85d34be84541ac376ce09032a5c20aa7d64d6e12c9e21bfbee7d2db2611d24a12539548b662df6fb061d91cca1eb808 WHIRLPOOL 09bbb4d2fe1d9b046b7684636f296fcbf4c77c4ffc3bb04c54d949886b29d7c6d9632d6132677a35575671fec7e234df096f15a4d36892e8ffea5924d01335b0
+DIST rofi-1.4.2.tar.xz 339316 SHA256 1a8df8c84316ac0c2b1e9985b346875d8ae4142cbec83f9961a63c73de624984 SHA512 9f6cdde4b169c9f5471eb40cca9ce65ee2e87f541b0a9e48ce5ccc61d65930befbf152af667436a9142b36ba40c2be17c1aacc90deeff70e7f40dcaa1f9a9c8f WHIRLPOOL 00eba890897623ab2392f4c53f4e41e4c0374d755fb98d40a00efcbb35451346c8c0d96f85f36c86049117e0c83555bebe02b9c82789dbe44aaf5a605d74ac14
 EBUILD rofi-1.3.1.ebuild 978 SHA256 192f91f16f04b148314efc5148c6f41391b42ebd2e899ef84e0928ede65b2897 SHA512 60e25a23f36fd83e33c7652cab9ca00c77bbc0f0b5956fdf8658f48e94591d32d34f4c33774bdf7f9565caa8345aaf3cdd6e8139b4e0ed7d8a6e92dee38fe74c WHIRLPOOL f2c3c59f38a37a86751a9602b874477154f8b15a4dff2032d03dc890c4fe06d4aa282e9d03942d7c4ce17a58fad6774f4bc059cfcefed607aa94abdde61f9342
 EBUILD rofi-1.4.1.ebuild 977 SHA256 fcc7103edd52d77e4992cf2273c017999a321099a0b5977ed8685951a9fc8ebf SHA512 62d15b96247d6c29d28d8d5540885d2b62224b875f455541249dea361985a04237c7a9c0fafc7d00334ecc2825c1a16357c97d348973b12607973b2ab6bf701e WHIRLPOOL 188e67cc79503cdf1e70fa4fed174d9191e1868ebfc29d20f394a3c0d422cc7f76449b13f5bdb69b5b44817b9fd20daad8369f6ade86b59dd83b4c983a60bf5f
+EBUILD rofi-1.4.2.ebuild 1092 SHA256 fe87ed89bbb9b66e7de5d355301d9ad956801fb57a34a0f696f6cddb8d900c76 SHA512 0952d824a7167455941322281dc49eea13e1272e67b23962f2009706ad883fa0be70f9658a2f3cde9622ed8738b8f62fea4bb0e7e48d48c30527b15b02ecf99c WHIRLPOOL 078b496d3a36c9f1368b95ff3e1fc6bb54c9821ef3d04ab0aab33f58cbfe0372f3aca55ad70bf90546ea04e16f105e0ae0bdc14f29cb0fa0921eab01540850e6
 MISC ChangeLog 5408 SHA256 f2d5d4d7dbb53c7dcb55e9df661112610184474a8431d3a2d2b2ac7ccf759c57 SHA512 bd11ccec3cb8339035981e3e229ede1dd3fa2c87b35020bbcc07e783aea6a16433ab22a84b06bc96c78f3c98adffafa2de86216b9b01b84c093c24d7068e728a WHIRLPOOL b5a5a138b6a1c87726dc5e08fb269a82d6c7e333c65eb153b4c46dbecc32345bfc11e096dd3e36ab1d8260b2d5d3f5d3f0879f05d2bb19c1cc88a5e32bf23a77
 MISC ChangeLog-2015 1620 SHA256 3d10ef405d5f3ca489d980fa9490018b52a7fb2b2d5b63c19e95dbdf8c1ecfce SHA512 0d0006e13c4fb27dc3ce6bd0f0f799217931ad9b55b38ad40109cedc30056b9f4755cabd6de182fd8b3c25c5971c515e81ddad9289f4337ee361d939ef92cfb5 WHIRLPOOL ebcea0b5a4ff0483078b18fd8e85437384fc5fff4f2f9c97440f1a158d6b8940119ac02d017e87a24fa00303d83ba9ddd6dd848e7838983976729b3e7f23e806
 MISC metadata.xml 495 SHA256 b334ab8e45b8bc73af14035d9716ee106ee7d7eda9b786a3400526aa26d44fa0 SHA512 afcce018b90e20d190e8da510c57b27b92508a40972fc5e573c185561dd0daa3ce3fd57c689c2ec65902087aaec7d1273ed151abdc5c6be76706f694c1c9510f WHIRLPOOL 02f55aaf5e5b5d491b79abe5b13ff665189950c7f1bc6013aa15544085dad04e91cdac5c5d8f8ab088c017fd3386b3d8c6e6462ea53fff56fb1d9c4ede329208
diff --git a/x11-misc/rofi/rofi-1.4.2.ebuild b/x11-misc/rofi/rofi-1.4.2.ebuild
new file mode 100644
index 000000000000..97565c1283c0
--- /dev/null
+++ b/x11-misc/rofi/rofi-1.4.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A window switcher, run dialog and dmenu replacement"
+HOMEPAGE="https://github.com/DaveDavenport/rofi/"
+SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test windowmode"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/freetype
+	x11-libs/cairo[xcb]
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libxcb
+	x11-libs/libxkbcommon[X]
+	x11-libs/pango[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	test? ( >=dev-libs/check-0.11 )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
+)
+
+src_prepare() {
+	if use test; then
+		sed -i -e 's|"/tmp/rofi-test.pid"|"'"$T"'/rofi-test.pid"|g' test/helper-pidfile.c || die
+	fi
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+
+	econf \
+		$(use_enable test check) \
+		$(use_enable windowmode)
+}
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index 042c70c401ff..1c6a40a09815 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -14,8 +14,8 @@ AUX slim-1.3.6-systemd-session.patch 820 SHA256 1cb2b5f322ae975cd5a5a9ccca45854c
 AUX slim-9999-config.diff 2480 SHA256 e3005e301c54d370cea3911ce1f3dc96f3dae579fc4ec91e7c4581b197084ceb SHA512 6018c5eadd0c63e86b07ad8662ffc046fd1f586c101dc84bc9452295a9a11ed1a82a6a8a228bf8d5e064cc5d17b1bcea8662f957b831c96f8ba21c0f55a0d216 WHIRLPOOL 1479e9e37ba520cd95f63920d68c76910a7390b7f9ab7677e6eea91f60ae21437f1e0f1d481fe39758c923db53cd3ac7cd6f2d17577af2da8dd0cb3539a42467
 AUX slim.logrotate 102 SHA256 d0559cf7764147f601f2bab8077fd956b1171adad4872c0d324279f6a978264a SHA512 b49ce2dc1a1943c5f8eea8e6394cc27b014832e2d9908220f32ffd21fbe69442ec45b18f6e435430c6cbed074e5983e2136ebade10218bb073bb13106716f5b2 WHIRLPOOL 9e940bd1d88613e46ac4a333afa0f02cd16c583a1b34f509c4409321f7d5c5e14ec86e38e9743a6176187a72e403683127fbaf293abbef678e23873c428613c1
 DIST slim-1.3.6.tar.gz 232547 SHA256 21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c WHIRLPOOL 473fa2f3752ec0c1bd2410ff3110649ce792c2e904928694b5fb8a43de619945276282e4a9de86198b9f38cdd74d1f9dc9cbcc754cc97989002b368ef26a8429
-EBUILD slim-1.3.6-r5.ebuild 4192 SHA256 1482c46164fcd85f5545d441943cf99c2ae03a3590e9810569a9799efcae90b6 SHA512 30666fddd7b6d85ea19a5cee3a6cca3eddaa08a488ba149fa38a9efd54d018d0e6d6d707d2a43c3247ed0d0c55212eda97dd7823e964f94b887e1d645e6aefed WHIRLPOOL 1fb5583b5dfeacf0c41a63fd1d08f6a990f9bff5858048e49669eadbd04c4ffdf02c2104aebc3373668376035796df960905d21f717176e28b1472f7769f651f
-EBUILD slim-9999.ebuild 4018 SHA256 468982fc85e8e793d661081f53abd5c384cc7b1d06c1bb6e8709bb81efe551ab SHA512 0c19543e3e0a17dcd57077e3a434d78844059d9c019ad0fec3c4807eeb7b84065e445aaf4f31949012f0d375eac6bc7b3a2cc4b3f009e0e1fa9d8c0da065f7a4 WHIRLPOOL 6bc8bd5a0ae21316c68da51deda870dbbcdb6e5abd94cf63ef0838de81e56b0e18453b3cce22202c52566cd035def1dadae4360d979a98bb44232799b2144580
+EBUILD slim-1.3.6-r5.ebuild 4182 SHA256 444e718911a24c8ee304f569560d3242a6ec08e934ed0768d88e45d9b90c4041 SHA512 c81b6e112a3b657763b376a5da461a9fcb48d14d3d8b2af7ecd1b17add81c8f06bc6322ae1a48f54267a33b7bbddf5fcb5f4541e97374d8651e00b129464485b WHIRLPOOL 9fd181c9315cb0e20573328b1e01eb00cd0090e1e98260071cadf5638c80b5fb7dff115b252e0fc4deaf14a5b02dbe024cf5b364818e7bf6630dff3713d17bf3
+EBUILD slim-9999.ebuild 4055 SHA256 3ebf79afaba19ea6732083429ac767af1349e7e0ccc9180b85ae5f0768d0176d SHA512 9027bc73ccb70c95b1000545bfbd8b1314f1a08d9833389b25887b929323e8379f7442182a0a802ea4ece764447f1a2dbbabd2fae31bc64e99b39afea4d04803 WHIRLPOOL 2339f479f1dba7360dde6a01838c7327202b26ef2b4b4f82da227604cc2f8d187b9a939c3730c20143056ebbbfe73b6b80bb20eeafc8ee653f38f8946468959e
 MISC ChangeLog 5333 SHA256 f9c57c79c9c3ba95f341184696aadc7687a54aacfdddc52dcf68706d51cc7d99 SHA512 534536b3c01ddd5f7eecfbb6f6dfcd73b351a4f7aea514a4af3fde846deb83c68320b4aac07ef519d619090a9ba0bdb2c368da73e445161f294032669ba1aa10 WHIRLPOOL 052878a509d34f34576d1b7be013efffc77c33d27eb8796e4b5dda6c5a5bbee497d2a771381b80f4a9983b663b1a156b8d3f02bd83bb1d603e3e722d0e6c6a5d
 MISC ChangeLog-2015 22739 SHA256 1e67ee4595a1e8158ecd11793aee571869c36ac957cbfcee33568fe3322567c2 SHA512 b4b057c02f75ce35393919f66b30bdab9e022ec3b4c84a3f2b1df8326cff73544242a7f8e89573158f4c3900de3445bca7cadc04e7711238ab5671d93ddbaf9b WHIRLPOOL f14e454abea01516a1fd930fa599077b09e0f53984fa377070e2ee706cc44392622793a7fb351d492cc7a6d89dec11b78293dbd0fba3f21e174aa55d43515097
 MISC metadata.xml 514 SHA256 8096ec96a71df42b3dad271816d305140ad3dc67321778a300a8d3876a4fcb0e SHA512 28f99f92bda5c50f97a164aa53915ecc458dfd84e6c3dbfb9dbfd6e64d0a98b7de9bfc202949506b2af91cb716a8b681f1db07b974d3d3776f15e2cdf5129950 WHIRLPOOL 695802103c841ee6ae60fe8225e6eefbbeae6ed65d7dcf51b249a77c3ef1339e485f29c60ddd4f392aa9e524fe97e5e9a7ed519c262b62fd67b52d0836265e60
diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild
index 6663621cf77b..3a0c714df65d 100644
--- a/x11-misc/slim/slim-1.3.6-r5.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -32,20 +32,24 @@ DEPEND="${RDEPEND}
 	x11-proto/xproto"
 PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
 
-src_prepare() {
+PATCHES=(
 	# Our Gentoo-specific config changes
-	epatch "${FILESDIR}"/${P}-config.diff \
-		"${FILESDIR}"/${PN}-1.3.5-arm.patch \
-		"${FILESDIR}"/${P}-honour-cflags.patch \
-		"${FILESDIR}"/${P}-libslim-cmake-fixes.patch \
-		"${FILESDIR}"/${PN}-1.3.5-disable-ck-for-systemd.patch \
-		"${FILESDIR}"/${P}-strip-systemd-unit-install.patch \
-		"${FILESDIR}"/${P}-systemd-session.patch \
-		"${FILESDIR}"/${P}-session-chooser.patch \
-		"${FILESDIR}"/${P}-fix-slimlock-nopam-v2.patch \
-		"${FILESDIR}"/${P}-drop-zlib.patch \
-		"${FILESDIR}"/${P}-freetype.patch \
-		"${FILESDIR}"/${P}-envcpy-bad-pointer-arithmetic.patch
+	"${FILESDIR}"/${P}-config.diff
+	"${FILESDIR}"/${PN}-1.3.5-arm.patch
+	"${FILESDIR}"/${P}-honour-cflags.patch
+	"${FILESDIR}"/${P}-libslim-cmake-fixes.patch
+	"${FILESDIR}"/${PN}-1.3.5-disable-ck-for-systemd.patch
+	"${FILESDIR}"/${P}-strip-systemd-unit-install.patch
+	"${FILESDIR}"/${P}-systemd-session.patch
+	"${FILESDIR}"/${P}-session-chooser.patch
+	"${FILESDIR}"/${P}-fix-slimlock-nopam-v2.patch
+	"${FILESDIR}"/${P}-drop-zlib.patch
+	"${FILESDIR}"/${P}-freetype.patch
+	"${FILESDIR}"/${P}-envcpy-bad-pointer-arithmetic.patch
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
 
 	if use elibc_FreeBSD; then
 		sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
@@ -55,12 +59,10 @@ src_prepare() {
 	if use branding; then
 		sed -i -e 's/  default/  slim-gentoo-simple/' slim.conf || die
 	fi
-
-	epatch_user
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		$(cmake-utils_use pam USE_PAM)
 		$(cmake-utils_use consolekit USE_CONSOLEKIT)
 	)
diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild
index 1b8b9a68b1c8..7b08d5e831de 100644
--- a/x11-misc/slim/slim-9999.ebuild
+++ b/x11-misc/slim/slim-9999.ebuild
@@ -38,9 +38,13 @@ DEPEND="${RDEPEND}
 	x11-proto/xproto"
 PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
 
-src_prepare() {
+PATCHES=(
 	# Our Gentoo-specific config changes
-	epatch "${FILESDIR}"/${P}-config.diff
+	"${FILESDIR}"/${P}-config.diff
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
 
 	if use elibc_FreeBSD; then
 		sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
@@ -54,7 +58,7 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		$(cmake-utils_use pam USE_PAM)
 		$(cmake-utils_use consolekit USE_CONSOLEKIT)
 	)
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 6920bb585ec2..2af036677cb9 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -5,9 +5,9 @@ AUX vgl.service 254 SHA256 86fbefb4f77967f7fe7b0ce10915f5d5cf7bac504a9a65dd7f72f
 DIST VirtualGL-2.4.1.tar.gz 1116018 SHA256 2889c6eb35b50340517856f497c07450a9d5ccab46e9b1700a76029a2159cf2e SHA512 b8901eccb29ea21ca1cb0743b6b3a7316ee02422a94be04133daa1c8a24b109e27504a63c901359c7dec22a8af2f0e26d909f9b74c834b97dc19f7491232db0a WHIRLPOOL 2fec19e22eab70cde4a9e4a8a2c9a9628e3e20809e6322b14de53bca50a967f8a142dee147255cb3e9d4d6c802d984b5adbd5293b6bdd205405b92fe18386b95
 DIST VirtualGL-2.5.1.tar.gz 1165255 SHA256 da342e0157257cd7b7c9c6705c7f2b9853f28f6bb6c51c90c710cc14257f3659 SHA512 a60a55bae58c80bcea418702f4d3b41356a9e599f007fd539043228c4fe75c28582bab376caf121a5eeee4a21cddb80f1edc2f89abfe88a584321c46383d3654 WHIRLPOOL 90555331f109b2cf3a0737860b57abebd8a21bd114effbae56ae900f03b65029e950c8d51cfed482eaa2376da219c7034823afca7d4e516721dbb8a56d3bf065
 DIST VirtualGL-2.5.2.tar.gz 1172965 SHA256 4f43387678b289a24139c5b7c3699740ca555a9f10011c979e51aa4df2b93238 SHA512 a3156f663c03e611a98a083bb12bea47820cdadc9f064e20431fddec55aae560f09b133f5254a24d7da01b64be2672d27713d7f6605eaca2d9d83090a070fafd WHIRLPOOL 33efef4b83def93908dfdd89aecb1a075b68258dc5f7909af2bcf6f1047c7dc83f5aa125366517a03abb21c97d64428a0d4f21064a686facc49f34ae486e59d7
-EBUILD virtualgl-2.4.1-r3.ebuild 2336 SHA256 557b09d0c9cdaec14e652a90a7c74b496ee807d1d31c127e8915580557e68a81 SHA512 81bfc6b3e54204b6f6c65687ab646203c280d01cf931886e6cd9a910b4ee91d5b4791e675aed9c4e1abbffe9fd5cc54940be843346e2ba3c3868229af01ed70f WHIRLPOOL 90fd646a22c9d27be6097261394ad47d00c7c04759ef347ed8d695d6dff876878b7ef857f9c4405d29a5ff9bfe9ceb78ea594b2f811851e577a51f83ad8ca2ee
-EBUILD virtualgl-2.5.1.ebuild 2295 SHA256 6ee8a9cab218703812e0964411d5debc2528114dadaa08533e4659730622f1b7 SHA512 adf3d3509d1af3f974d92b40f2e52db0a5dfea056d1ada788358a0bb3dc57660a7c9990a4e9bda2d3864e8571b79fe9ac8261f2b4a6799812269e64e6e1b619e WHIRLPOOL 7d9c9f49516f1f372aaabd1ca0eab2dac5d57717d1ee02df3820fc09c73e0dc8d3d1580f48b065a7ac3b38681fc26ebd8a7d384a1b0e71361da63db4baa787c8
-EBUILD virtualgl-2.5.2.ebuild 2486 SHA256 08899272149f53ae1e8c1543ed9847ddf362c86096e0e220b899e177040f0375 SHA512 22df595418e5b903af6bec5ef79af3e73f4938dd4eff8c1795c87bd205c994026dfa5ca21341e96b81d30bebda52e8f5cede284368ef246e7842e180cc4b619e WHIRLPOOL fb4bb3da38ed0c28652d51f1604cf21840b222bd16fa7663ab014eb44d6f28a6a95fcc96353e4dee272474a66fa5ba57298c27a4d667ab2453015bf38b0ebc8a
+EBUILD virtualgl-2.4.1-r3.ebuild 2352 SHA256 ff4c11af7d71a032f036a30c432ae46a9d317b9baa05aa84a4ae74f8e1b9c0ee SHA512 93d2e74d07c2298946d75098b04b9688cf996fd82e9d6d38ef1291515bcdf7a79257b39a9bae293ac0b215cc016451408e812750e41ac9296c7776af405faf7c WHIRLPOOL 7c3bf527445d8445d842eae417740f25e47b380553e9b2342b2352bc9c4fb8f1f9dd14f9c3c97855dc76238990a530deff42242ab9665e1eecf196e746ea6b30
+EBUILD virtualgl-2.5.1.ebuild 2311 SHA256 8df8d5a6a62c165a4a6eeddf096d11e3c9293c7652e95a57b8873f322e3d8d4e SHA512 71aa964664ef87e51d8b6cb0904aeab5401d7615625a247dc4ed2a86e101de2f4c8e7cb564b12098a0170b14a2928ff86a4f8a0845b042c0c07362ef7c6e7ea3 WHIRLPOOL 6bb857c2535e6f25624fd754a1812e4ad7adefce2bb29ea5f5c96772ec397655c5cce3a8f8133393e5dcdf46b3524ac3eeb09df29c071fcedb97ba05c69b9a51
+EBUILD virtualgl-2.5.2.ebuild 2502 SHA256 62856c26d6b27163efd04d7d774638b0e049ebeb41d5619c42eccb43606026d3 SHA512 e65f5a9a4ff8e962fc879b573a57198f37f0e90526d248c59da9941cef905b64e6934ea7dc535799c807b8b9cd1e1a7d64420b5b77b9e00d7211383874fad765 WHIRLPOOL fcdd3d3b3f1c7b506bdd8d72be6eda096f3b208092044dd2bf09282395d3c6d27e67215f384f22e4ccaaa4c8e6599be19a551493daaca9602591680bd0811274
 MISC ChangeLog 4913 SHA256 3c2453f010faf5032e9f0ec8bd5c8f0c9f6e037cfb7b4c7e1911651af4d21fa8 SHA512 f7aee4d547fc7e55d4d6232ef99607a1f6502ccc13ab322b81b9b3128ed8d734bf15a6fdfd53a80133e3b1dd3a50845530ae0c88fd062a2519c44f5fbd44c7c3 WHIRLPOOL 87f2f6cd0e3c1c2fd508aab67b625be343ddb694c99ad2da4fc82516d6885b0ac914ec96d43349ebf8e04e684049ccda9748dc358ed1002070335fa49f3f467b
 MISC ChangeLog-2015 4575 SHA256 392fad0cbc6180c4bb57dec0a4c39937a4dc493c553c95c8a167e622fa443928 SHA512 f0b70469daa1d09f4afc769e48cf92bcdff603af354e7685c0ed54ff31915f95ae6f888937b222b8ed6846d84e077e19d15b0ba9034f42cf197eb408f0a68d80 WHIRLPOOL 804795c0e1cca265b5b620fcfb0de9456386dbfb72236d47bec005440457d47bfce387298e2d59c878c05ce76fb3fa9347139c50a18240df00142cfc7e0e0e61
 MISC metadata.xml 736 SHA256 31265fb384705bed457e2c673f898dfeab747ecaf64652eb037bd17c351158a0 SHA512 b1d37b1974a1db8cb9080279863708a6c1e50a86114ccfb17540980c178093ae6617b1bdfa470e73899277b44af231e41ec2b28504da5e335c0e34d509457600 WHIRLPOOL d07ecf0e3ae44a32cced673cc2dfeca55389ccd9fc1926002844aaf18da5067944f93080416439bb4bcf075c29578be57f0c4a7988aa8360b7b216d76f4c5615
diff --git a/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild b/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
index 6df4d7616cbc..8cc8c1f711e6 100644
--- a/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -44,7 +44,7 @@ src_prepare() {
 	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
 		server/vglrun.in server/vglgenkey server/vglserver_config || die
 
-	default
+	cmake-utils_src_prepare
 }
 
 src_configure() {
diff --git a/x11-misc/virtualgl/virtualgl-2.5.1.ebuild b/x11-misc/virtualgl/virtualgl-2.5.1.ebuild
index a90df85ec7ad..39757c09b612 100644
--- a/x11-misc/virtualgl/virtualgl-2.5.1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -44,7 +44,7 @@ src_prepare() {
 	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
 		server/vglrun.in server/vglgenkey server/vglserver_config || die
 
-	default
+	cmake-utils_src_prepare
 }
 
 src_configure() {
diff --git a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild b/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
index 981a222f951c..0c640fbb96e4 100644
--- a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
@@ -44,7 +44,7 @@ src_prepare() {
 	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
 		server/vglrun.in server/vglgenkey server/vglserver_config || die
 
-	default
+	cmake-utils_src_prepare
 }
 
 src_configure() {