gentoo resync : 22.05.2018

5 files changed, 7 insertions, 9 deletions

diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 3718eb92b40d..1ed0dbb2295f 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/rasmol/Manifest b/sci-chemistry/rasmol/Manifest
index 9bc60d986ddb..0bfc8a3f1d3c 100644
--- a/sci-chemistry/rasmol/Manifest
+++ b/sci-chemistry/rasmol/Manifest
@@ -3,5 +3,5 @@ AUX rasmol-2.7.5.2-format-security.patch 1617 BLAKE2B d9a083ae6c72724359274da5b6
 AUX rasmol-2.7.5.2-glib.h.patch 770 BLAKE2B 1c83587711540a9e2b91b53ffd0836cde27f040c593b7d771eb185edf8e72b50f09d1c38ef0b2510effee95649bbaf3adf7d0340f49a38381bd15200fd94e749 SHA512 d743b89817d0ed2aa551f3a6529e5bcc50c811d79c0deddd50d07a59614cb0c2d71500452ff9aec4b4b84e4985d9851f61aafa30196356aa1724212b5159375e
 AUX rasmol-2.7.5.2-longlong.patch 396 BLAKE2B 68ce4bff3584bbc6331ad5e27171d23e443be2d24b60bbd45dd02d4f04b5531cfd7fdb18904471c85ef107875fb23574f6b3212b78706746cc73c39d09cda801 SHA512 4c3ce01ade36fe8a9512bdac62bcd47268bcc5a0448f4af69b26d8add9cc8495d376bac33a8ae5aeae42fa114a1cba980ce86559bf2d52334257f2e001c011d3
 DIST rasmol-2.7.5.2-13May11.tar.gz 9768769 BLAKE2B dcc9bfe9381ebab6bbf5a12e233490f076ead2388a22e3186421e3489bedde987813b1f65ce7b17ef168389c33d03bd7d4a8162635c0a79b3dc704eade23715d SHA512 c4fd149c002a34d8ce7620a7eed37aa6020acd83fc352a4c16697eb94e6a0377c55455cb6da5fb3f492f879248a6707f677f4b35572f2295b23fc924ddf3128f
-EBUILD rasmol-2.7.5.2-r2.ebuild 2299 BLAKE2B 4f415af644ffaa73304aa017eaf81d773644f898ddb79b90780eb5efcfd71974c583d70a5262792c1792fbc3d74b0c7708f31ae61f625d28d12137f622ae6b00 SHA512 c725dde02ff311e385373f6125f254ff9ba3ab7e59164315edcfb852f587495fc1ca30e48a65eaad4c9756ba95c682100034808e8fbbc2a97de4f5c954f82e02
+EBUILD rasmol-2.7.5.2-r2.ebuild 2277 BLAKE2B 4808f417fe98f8c3da9ee801100eaea574c3ae85dbe6e563f3a11a9be7117d5ca9945d6f64638296afc5c5baa4c2081a2bdfc4ee98f3d1ca6c6676248334fe5c SHA512 505a14c99ab9706b759fa703d63990365ea7c864c062dee4ad11d2f821bb004b576aa69bca1704c29191fa7949ff5c682497fe45a97b606edd5ba39d229b3068
 MISC metadata.xml 355 BLAKE2B 71f9b1537eea00556419ae1c9920458d86992e3c0b01083d55ca02f162c420f82e8f52ee8af224573912e2b988497901702962ed3b54342991f22e1eec37ce2e SHA512 98822367149551ef6af6d75e4bd0b9104f1a625a5a17e1a2dad32e7ed83345870dc45392525cfe7e49514eae29f986e8ac2ed253ec22fec94d6152f96620b916
diff --git a/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild b/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild
index 3335b5ae5a47..8f91aad3f659 100644
--- a/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild
+++ b/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.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=5
@@ -32,9 +32,8 @@ RDEPEND="
 	x11-libs/vte:0"
 DEPEND="${RDEPEND}
 	app-text/rman
-	x11-misc/imake
-	x11-proto/inputproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto
+	x11-misc/imake"
 
 #S="${WORKDIR}/${PN}-2.7.5-${VERS}"
 S="${WORKDIR}/RasMol-${PV}"
diff --git a/sci-chemistry/viewmol/Manifest b/sci-chemistry/viewmol/Manifest
index feff26552515..7de430c5ed44 100644
--- a/sci-chemistry/viewmol/Manifest
+++ b/sci-chemistry/viewmol/Manifest
@@ -1,5 +1,5 @@
 AUX 2.4.1-change-default-paths.patch 2745 BLAKE2B c604ab1ffbe992b49671f0f1c713ce95fa2cec18b39d625856bdf8cbc226f8965f3fc13b22003a8ec812954daf2533cac4a001255e07a5cd3bf0eeaeed6524dd SHA512 9dda6e39f43706f9868eb02402137573d58e90b14940ad5d10ede6088e49d2ebd8a114ffda3cf4a69bee5874cc0a16b83bb4ea86281203765c5d861cb8dac6dd
 AUX 2.4.1-remove-icc-check.patch 1020 BLAKE2B 63c0b2c68be4bc745f8dbc184f1ca90bc0b5e2964508e686c811cb1a3f46d5ed8f401f789fce8e8f15b89e1ccaf7a657a2de830c2e829d6782f285031a89ee3c SHA512 ea2a1a58730561fcf2bc05a0f23dc2108cf2fd97d228a7a6305d3323abda5ce3510793dbebf2253cef9e6d60326889079bc6a9639228b1b2bfd9d9a3b8c03ebb
 DIST viewmol-2.4.1.src.tgz 2229379 BLAKE2B c7d3d9f0a0a728f13be718e2b85a645d1824d2c9efd920a05a0693dfb5904e18da20fcef8080e99f497280effdb71cb21c58d9aeadf49d2477e1c931caa49389 SHA512 42701d570d97e77b84597950a9068dfdf48faf4e551957383c8eea38f082c1ad136c17b7cbd3903673478506116d6fc08d1288842e74d6a9776526c685083584
-EBUILD viewmol-2.4.1-r3.ebuild 2244 BLAKE2B b4c3eb0556b554b5c5432d5235349e8fdb22db8b7355b2c1e1f1037276dd8be718940b96267e703212898c1abb82471d7b088ad4a52bddcdf594165fa237501a SHA512 883277f1919a18c6ef5c0086a7d6e71f2555e8fce2b51c38133ad654e693fa73c0507a81dbb5487f7c921196638da7f9a677fd401ed74c2495aa85f2475c603f
+EBUILD viewmol-2.4.1-r3.ebuild 2225 BLAKE2B 74563226fe1bcbe418bde909f202eead15aedf7610a592f8d6d7ae1b2e0d47cf2bdec2a91e21772f978512ddbe0cc0739028694f85a2fa13adcaa9fe9e79a6c6 SHA512 b290d08a50662422876d093b973ba7b4e44fe759258325d1f796beb8f929575861a0b8367d52b1ab8a5976dea8e5b805894454867f32751fbd768bd6c9a3476c
 MISC metadata.xml 342 BLAKE2B 3d43fda7cef989246f20968757c7c9710832915b5aa7623026185e69f79901fdeed5503c04a87d7395bcc0f9fd47313a017673903df74cc7a55999fb5c24467a SHA512 f77c63597bc5df26ba6dd136ee943f78562c5d99fefc1b435633c602a6eb3433600976884085ea8aa8f87f2f79fd495e9b51f918290bc1751e66d7515fe4e039
diff --git a/sci-chemistry/viewmol/viewmol-2.4.1-r3.ebuild b/sci-chemistry/viewmol/viewmol-2.4.1-r3.ebuild
index 7881b3a708c3..a82367bac3b7 100644
--- a/sci-chemistry/viewmol/viewmol-2.4.1-r3.ebuild
+++ b/sci-chemistry/viewmol/viewmol-2.4.1-r3.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
@@ -30,8 +30,7 @@ RDEPEND="
 	x11-libs/motif:0
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 S="${WORKDIR}/${P}/source"