gentoo resync : 17.10.2017

5 files changed, 10 insertions, 8 deletions

diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest
index 15b0313f106a..5fafb0e8862e 100644
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@@ -1,6 +1,6 @@
-AUX cdemu-3.0.0-bash-completion-dir.patch 387 SHA256 61491ca6dfc4e2f63414174d4d0035c3da0edc25472c943e6296e270b2e0ab3e SHA512 5348f57ee7ad19a2df7d7cc67642ca9144f5c6a0bb8604d4ed565463e539d5e2560cf794da8e3f1f1d67a3165244737e866d8c1f7f7e8adb758ab09dbfbc1b1f WHIRLPOOL b45e71f8c5354c130ae13c26c5754ced33fb423e5101fa72be9315c53073ac76745263ef2b4280860ffa3859ccc6619d17e02654937e34d442934422a427bb89
+AUX cdemu-3.0.0-bash-completion-dir.patch 361 SHA256 8d625841fd3f0b4c6a9e07fd7d6a81aef856ed66c5725f6ddfc246a0034c6058 SHA512 55c2fe9abddf87740126e60d6933431cb433b9420f4e94bb24bb9f80bae170632c5e9f7be4b552efcc748aa0eb97b6d65997cbe5f30f6399c4becb2971d92895 WHIRLPOOL 30a7b998998391a8782fd41e33c3116678d94567038dab067a5db6b5d21a863efeba9d329cd573fda05b0711e3f91bc2a627f51e6f3eae39735fe4112f2e0c56
 DIST cdemu-client-3.1.0.tar.bz2 43066 SHA256 336a078b0b1f70de81d7ee92ee3e3a1e1957843accc4e90a876aeef28648d868 SHA512 62c0650cfd18c1e8edca8c53a343460bf12aae35909251fce24098f16b48a3b30d083d436f494bf23145c06252f943f75413f024c6744696f5ad75cac0a15509 WHIRLPOOL a84940b0c0bd1de343cdd81ea47be6612f4e50b03b00e2c8aba62b90f685d867212babf93a2ade02ef3e9798b80bfd11cff4479e8b4a5866ab58dd936a0d8dc2
-EBUILD cdemu-3.1.0.ebuild 1134 SHA256 c53aab2b9de03f93361c8d84075a29eb18c64665a74ea82e23560eb48a8fda9a SHA512 2a0212b648d12cc71b870d68a6b95dc2351d9eb561a61bab309413fafd7f6c0de075772e886639355fc46df317df510f736acc1900ea5648377ff00ba4867dab WHIRLPOOL 46cb4f6768b67dd8b9c971f3e77739f86d34803ccbe2415733a038a519a778461dc765a2f283cc0b8915cea1c7335bd50a5bfa308ab9a6641d2d1be70c036b61
+EBUILD cdemu-3.1.0.ebuild 1148 SHA256 0f2af448e6b4a03a16e747d3508ea1712352acdd1da2937d74ebd35ce6ed3615 SHA512 91cf3c8c2fc460e0de63dd7d9344142153fdf17f74cf70aee220769a6095a460efcace854ef7f5f5d6ff917011d80755ef55c69b99a9c4351bc24435fac97598 WHIRLPOOL 6516e87f7e5c5aecb225d5885d73945cff6866c60d7209b0dc30cf5088964159236b0ffbbfbdbe8ba6de7cbb533631eb6f8cbd36974437430c0a1f52fd6cbc8b
 MISC ChangeLog 3360 SHA256 3ceead1a68c18956643bec2834b68ffdaaf5cf78074d96b42016a679bd30b6b9 SHA512 001c58fd43e5e4254f275e2bfc90073c23202d4902fd82d487e660726c7d71de76870ea97ddbabc1ebc4d54b8f2cd74c837107ae030aba8e4eb07c1199601427 WHIRLPOOL fd31629aa985bd5fc3f69cfb864fcc05f4c83f765961ee273d13337ec832b87486f4d263c33b3aafaa8dac0ccbd6bf5435d98bb33d8fdf674e5b8fbf32c3acfc
 MISC ChangeLog-2015 8329 SHA256 300ffac627f4f9cc70a5e0d8325455cd4295c83c62c05a585bf5474065686605 SHA512 687811097ddcd9ae470e27402731670a097b0ef851271c74fa44f94f95ad2df4c60e4dfbbf0637b7343ea7ae7b975fad8108af6d6ac3034a2dc4b027bc239f1d WHIRLPOOL c93f93246ba242bec4ff719b4209ace4a9b3cd527cccdee74539ad480900cbe47fe7d6f33d4c8871c4b8d073571191ccc1b0c784336c24678ef321ab308e8a5a
 MISC metadata.xml 652 SHA256 71dc82cfb8a8c342a5cccad94b5de86bf0cf7c987742fc26a9766ce80fb67a6c SHA512 3c37419e3191ab278fdbb03b26ffafb36c6c00edc93566524a08253cb2deddd3ac61184e6bf0e66a0d18aa30b890c13f2c0946d396ee3835131a722e8bb76f93 WHIRLPOOL 958fe5f2b7078436687232a45e54acbbd805fd6c4c9b4b3faf10f468dd5f43c44a99e7df804b49da68d6b6492a319fdd7b00cf60185b6fd02a85344926a684af
diff --git a/app-cdr/cdemu/cdemu-3.1.0.ebuild b/app-cdr/cdemu/cdemu-3.1.0.ebuild
index 725457621cfa..aa0b79fa1f1c 100644
--- a/app-cdr/cdemu/cdemu-3.1.0.ebuild
+++ b/app-cdr/cdemu/cdemu-3.1.0.ebuild
@@ -27,10 +27,12 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/cdemu-client-${PV}
 
+PATCHES=( "${FILESDIR}/${PN}-3.0.0-bash-completion-dir.patch" )
+
 src_prepare() {
+	cmake-utils_src_prepare
+
 	python_fix_shebang src/cdemu
-	eapply -p2 "${FILESDIR}/${PN}-3.0.0-bash-completion-dir.patch"
-	eapply_user
 }
 
 src_configure() {
diff --git a/app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch b/app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch
index 54d11dab4d1b..270ce7bb2ba8 100644
--- a/app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch
+++ b/app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch
@@ -1,7 +1,7 @@
 diff --git a/cdemu-client/CMakeLists.txt b/cdemu-client/CMakeLists.txt
 index 99b595e..e4f9b6e 100644
---- a/cdemu-client/CMakeLists.txt
-+++ b/cdemu-client/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -39,7 +39,8 @@ install (
  
  install (
diff --git a/app-cdr/gcdemu/Manifest b/app-cdr/gcdemu/Manifest
index c44b29c8ffcb..af2602dc5698 100644
--- a/app-cdr/gcdemu/Manifest
+++ b/app-cdr/gcdemu/Manifest
@@ -1,5 +1,5 @@
 DIST gcdemu-3.1.0.tar.bz2 48036 SHA256 025c801300aa6ef13b9da484d8bd1ec2774c53e898942d44a43b4d27c0e0b666 SHA512 e3e0369cc443bc47befa52989cc2bc5d62e4c9462bb8de1c3dd8563e1240ba7f59fc8cc54aed2e96bdb23a5f6e2fa11ca36073dfa066409f097a1dca619866fc WHIRLPOOL 17da254190e933e7677d021f7f5a06bbeb19e82b05249e8189d4fcb441b95b33e8b86a996a5ef9603a771e53a40ced5f12ef81d29e48f58684b7a02e4a7cac3a
-EBUILD gcdemu-3.1.0.ebuild 1201 SHA256 951f53ba16900b24ed869e26cc098057ec71690354863829e36697f89c760b6f SHA512 5a9569974813680583930a53c3302cd466352d2e34355e807ba75d13fba78eebe2bcdc027eab8483830ddb20de4da30db7d762f0ed74edb0a47b564e69cd6041 WHIRLPOOL ab88d9d7b4cb4c7d87daa1851fa15543e92c6478f6be9a9cfea841a17a19bc3cb4840e59ed2c38e8e3663f0a65ce21a1b2f065dff4bf142f0fc44d97c6ae98dc
+EBUILD gcdemu-3.1.0.ebuild 1213 SHA256 d11221e80f72350045a398a114fce7c25d949788891ab8bab9b9b43c1a005d96 SHA512 95f84316bf0a91f2ba54fd5ed53b75d2d967507d1c14c5fb3c1c1950c83660b0efc40874bd1a6c34a1324c0f1a34ea64decd0379965a0609279405fbd40a206e WHIRLPOOL 4e9492375830ae4c8bfbdcf47fafde570a28e3546e49d9f9939613930ffd3392ee424e2e7909414e6eedd019785e06fefcc0277dc2b62585d7a89ce2599161a2
 MISC ChangeLog 3026 SHA256 4c4326c015307fc21a5fba80c9fb29835747d9dbd155f1425248af6bfd723ff2 SHA512 6fb48ba46f978b38e07cf7b6c0830d5826a46269b77ac267c583b1c9d2f5562fa0a5b51141f5d6ea7d218a01022e720690c2c87c41219e5c89648a87ecc6036d WHIRLPOOL 696db705a51503d6031fb2e94dfee388759197fcf3580b7164dee2c214860122e178cb7c907af377151e9cb346dde0fa36077b3ae24b151c547b3145151bc8d4
 MISC ChangeLog-2015 6305 SHA256 62ab89157ebcdad03bf052e6c54fc687b9380c7ece613d5ff8ccac2e99f341be SHA512 768af44e03dc866630a58edd5e9b637d3d43544cdbe01070d1c399f4bb22a8a3bc85a6e2fe29408f8e52e0eed6de3b781e4956293347bb8878d8da6616b7c1a8 WHIRLPOOL 7e533974a6b85bc4c49b7e37bb99ddbbb0800c0bba187a828eb4f266c59c363d73e977c0ddaef6a0cbc53b79ebf1f9a65a4f373ec759b0f82b7f9d7f35e70b7c
 MISC metadata.xml 455 SHA256 07a8d13abb61a51f6dab1c9f0a8892b806da028e300d36cbfb639e2a4e92ed9d SHA512 51c8d87f3c49c81798e4d2e038f911a2e05bfde742f229939f759c6768c6459cf4aa6829981791c57ef766fd447923194d7c14d4ad16951ae505d3b5a73c3479 WHIRLPOOL 789f78c7079cea5fe08400d0d66b83a0eb65fa88569250b82117797c15383c141d655e0ab2191cd7b8ea20052b697254993f9c4870f28a50b4ae4faa973310c9
diff --git a/app-cdr/gcdemu/gcdemu-3.1.0.ebuild b/app-cdr/gcdemu/gcdemu-3.1.0.ebuild
index 0417d526a75b..ec901b26bc91 100644
--- a/app-cdr/gcdemu/gcdemu-3.1.0.ebuild
+++ b/app-cdr/gcdemu/gcdemu-3.1.0.ebuild
@@ -34,8 +34,8 @@ DEPEND="${COMMON_DEPEND}
 DOCS=( AUTHORS README )
 
 src_prepare() {
+	cmake-utils_src_prepare
 	python_fix_shebang src/gcdemu
-	eapply_user
 }
 
 src_configure() {