summaryrefslogtreecommitdiff
path: root/x11-libs
diff options
context:
space:
mode:
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/Manifest.gzbin22642 -> 22782 bytes
-rw-r--r--x11-libs/fox-wrapper/Manifest4
-rw-r--r--x11-libs/fox-wrapper/fox-wrapper-2.ebuild6
-rw-r--r--x11-libs/fox-wrapper/fox-wrapper-3.ebuild6
-rw-r--r--x11-libs/gdk-pixbuf/Manifest2
-rw-r--r--x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild2
-rw-r--r--x11-libs/goffice/Manifest2
-rw-r--r--x11-libs/goffice/goffice-0.10.38.ebuild2
-rw-r--r--x11-libs/gtk+/Manifest4
-rw-r--r--x11-libs/gtk+/gtk+-3.22.29.ebuild2
-rw-r--r--x11-libs/gtk+/gtk+-3.22.30.ebuild231
-rw-r--r--x11-libs/gtksourceview/Manifest2
-rw-r--r--x11-libs/gtksourceview/gtksourceview-3.24.7.ebuild2
-rw-r--r--x11-libs/libFS/Manifest2
-rw-r--r--x11-libs/libFS/libFS-1.0.6.ebuild22
-rw-r--r--x11-libs/libXaw/Manifest2
-rw-r--r--x11-libs/libXaw/libXaw-1.0.12.ebuild37
-rw-r--r--x11-libs/libXext/Manifest2
-rw-r--r--x11-libs/libXext/libXext-1.3.2.ebuild26
-rw-r--r--x11-libs/libXft/Manifest2
-rw-r--r--x11-libs/libXft/libXft-2.3.1-r1.ebuild23
-rw-r--r--x11-libs/libXmu/Manifest3
-rw-r--r--x11-libs/libXmu/libXmu-1.1.1-r1.ebuild30
-rw-r--r--x11-libs/libXmu/libXmu-1.1.1.ebuild29
-rw-r--r--x11-libs/libXt/Manifest2
-rw-r--r--x11-libs/libXt/libXt-1.1.4.ebuild25
-rw-r--r--x11-libs/libXxf86vm/Manifest2
-rw-r--r--x11-libs/libXxf86vm/libXxf86vm-1.1.3.ebuild19
-rw-r--r--x11-libs/libdlo/Manifest4
-rw-r--r--x11-libs/libdlo/files/disable-testprogram.patch33
-rw-r--r--x11-libs/libdlo/libdlo-0.1.2.ebuild51
-rw-r--r--x11-libs/libdlo/metadata.xml21
-rw-r--r--x11-libs/libdrm/Manifest2
-rw-r--r--x11-libs/libdrm/libdrm-2.4.89.ebuild2
-rw-r--r--x11-libs/libfontenc/Manifest2
-rw-r--r--x11-libs/libfontenc/libfontenc-1.1.2.ebuild18
-rw-r--r--x11-libs/libgksu/Manifest2
-rw-r--r--x11-libs/libgksu/libgksu-2.0.12-r4.ebuild2
-rw-r--r--x11-libs/libxcb/Manifest4
-rw-r--r--x11-libs/libxcb/libxcb-1.12-r2.ebuild4
-rw-r--r--x11-libs/libxcb/libxcb-1.13.ebuild4
-rw-r--r--x11-libs/libxkbfile/Manifest2
-rw-r--r--x11-libs/libxkbfile/libxkbfile-1.0.8.ebuild14
-rw-r--r--x11-libs/motif/Manifest2
-rw-r--r--x11-libs/motif/motif-2.3.8-r1.ebuild1
-rw-r--r--x11-libs/qscintilla/Manifest4
-rw-r--r--x11-libs/qscintilla/qscintilla-2.10.1.ebuild100
-rw-r--r--x11-libs/qscintilla/qscintilla-2.10.2.ebuild100
-rw-r--r--x11-libs/xcb-util-cursor/Manifest6
-rw-r--r--x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild36
-rw-r--r--x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.2.ebuild36
-rw-r--r--x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild (renamed from x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r1.ebuild)8
-rw-r--r--x11-libs/xpyb/Manifest3
-rw-r--r--x11-libs/xpyb/xpyb-1.3.1-r3.ebuild49
-rw-r--r--x11-libs/xpyb/xpyb-1.3.1-r5.ebuild (renamed from x11-libs/xpyb/xpyb-1.3.1-r4.ebuild)4
55 files changed, 380 insertions, 625 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index e16dfef598aa..17f2256e2f90 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
Binary files differ
diff --git a/x11-libs/fox-wrapper/Manifest b/x11-libs/fox-wrapper/Manifest
index 082b969aa62c..1a35e5f70f00 100644
--- a/x11-libs/fox-wrapper/Manifest
+++ b/x11-libs/fox-wrapper/Manifest
@@ -1,5 +1,5 @@
AUX fox-wrapper-2.sh 1905 BLAKE2B 1b437efc5d8fa8b4d12ccd84469b1c6b8c19cad06fafcdca19304f352edb97e645815411a49ff1aeea1347b3ad024b40bacb761727d32c1d2692e2d5a040f893 SHA512 9cf96c083ea0d787992f40c5acce69dec162535122d65788aa05fe4bf33473103c889a1de98dfd80526c4a53e684cf536105f88bd610e9e50a55eb68bc2ecf35
AUX fox-wrapper-3.sh 1901 BLAKE2B 20b6ca94deee62464642e5a7e127c78135dc83a5c8c4d369fe35d7e6c2686b825b7fe966998f58dbd7bd5d77ae30a9f6e98d1bac46bb06050cf52a1d8c9f30fb SHA512 19d7115feb5566ae8e3c7af9a88aca7d0643dab92fb8bfbdd0bfa826f7357b2caff436741218eb9d51164fcdf863c3150526108e3282fa244102bd85f8abaee5
-EBUILD fox-wrapper-2.ebuild 520 BLAKE2B 1ff6ed255c9d674a8a675952880bbab3ae32a458358fa3c8eee19ee0f3627808e310fe8e5c9887a9b2e2a930a5c8e22dee650d362a135d08f6a9a6016af18e1c SHA512 a8606b8f0a715d5610b4b7079cece44828f2ba9407f3289456ba08dfe54f3e6be87021aba407ab0917f27c10db5c5a5d0bc53b0be009d3e64c54e455a7ca9d89
-EBUILD fox-wrapper-3.ebuild 541 BLAKE2B 9516aa0c628fcdc35a768ab8f44a9da7c43be52f1396f1ec4aa94a8c24f29a194bd924414c368ddc422166370f1ced17524513dbfa3d155917be479768b86bbd SHA512 616722fe511af3799534a30e9b36770c98e48e54d1295fd45b15e948bd6fa0b7510f511dadfbfcc989b5a217d95a725ddbf5656f613d5669814e853b1e47e858
+EBUILD fox-wrapper-2.ebuild 521 BLAKE2B 3180b08d0c55585f0cbaedc43fab068ed68d02a47d51631f2bcbac6b88ffa76924c41c610f113c4ff8e60f505c9059db21de99ad5336e1dd32039b6fb19526f6 SHA512 8cbb277dbd1f60a13e7319aa5f8e9788ef96ca8bb6aec46ff765d8cd3e186b7dbbf0bc55671dc7bb90e5a6bc7f44fbaf101544dd3fbf0255e2c9a79326823839
+EBUILD fox-wrapper-3.ebuild 542 BLAKE2B 635930b9ec415321ecdc2d291c269a854c48d3919f6d4981b1673882c2d0e69bbf55c83ce57ef0fa7218a4a0122d3287120b7c12391de60e73955f9baf31df1a SHA512 0f19dc92535474212e5e26b544717bd6755d2a4fc2ae40a4cde4b1bb5d961dddea76246ecd83efd31d8f65d00bfa7df4ff52cf0bdb8ed5e3de549e4ae9b9fe17
MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/x11-libs/fox-wrapper/fox-wrapper-2.ebuild b/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
index f5662434b399..4f9bb151e2c8 100644
--- a/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
+++ b/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+EAPI=6
+
DESCRIPTION="wrapper for fox-config to manage multiple versions"
HOMEPAGE="https://www.gentoo.org/"
SRC_URI=""
@@ -17,7 +19,7 @@ S=${WORKDIR}
src_install() {
exeinto /usr/lib/misc
- newexe "${FILESDIR}"/fox-wrapper-${PV}.sh fox-wrapper.sh || die
+ newexe "${FILESDIR}"/fox-wrapper-${PV}.sh fox-wrapper.sh
dodir /usr/bin
dosym ../lib/misc/fox-wrapper.sh /usr/bin/fox-config
diff --git a/x11-libs/fox-wrapper/fox-wrapper-3.ebuild b/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
index 82cc948f070c..62ecfd896f60 100644
--- a/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
+++ b/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+EAPI=6
+
DESCRIPTION="wrapper for fox-config to manage multiple versions"
HOMEPAGE="https://www.gentoo.org/"
SRC_URI=""
@@ -17,7 +19,7 @@ S=${WORKDIR}
src_install() {
exeinto /usr/lib/misc
- newexe "${FILESDIR}"/fox-wrapper-${PV}.sh fox-wrapper.sh || die
+ newexe "${FILESDIR}"/fox-wrapper-${PV}.sh fox-wrapper.sh
dodir /usr/bin
dosym ../lib/misc/fox-wrapper.sh /usr/bin/fox-config
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 1adba1fd6605..6bfe32cab7a5 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -4,5 +4,5 @@ DIST gdk-pixbuf-2.36.11.tar.xz 5675908 BLAKE2B 1b111c2866b06ff5da5d5e043481956d6
DIST gdk-pixbuf-2.36.12-bug753605-atsize.jpg 80850 BLAKE2B 17e414ca097b7aaf513241eacae97c5bc582f7ebd8870e8b67ce4af4e57134b8b4ae0ed579eb4cf0f57db2891e95a673d2129a1bafefe5ab8e2a8dd5f66da271 SHA512 d27197d2395446cd3c970841381958f7eb1b8df78913f7da70bec5f09af6edfc5dd74cd809c37ec8cf69f0eba504e0cc6354f1ec6ce3ec2192ad316cb64b69c9
DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B da9e18b5dc55ad13a1bdab76d9c63a6233da1b45235ae5eb620e6e3f83888a0cc846f1ba17f72cb3b5af1ccd59a69631b3403bf09e262c53e0149e6f26896a33 SHA512 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b
EBUILD gdk-pixbuf-2.36.11.ebuild 3884 BLAKE2B 8b406fc21b510a6f5fe4303f13a3c4cebc1948f491e6c3ac2648b0beed032b23437e76b96e4d18b4d1fab61c9763b85e95fb43307cb7e6b4e6ec77a3e5389bd7 SHA512 c0f6d46fec0dcb975a86dcac09e583d43126c845c59fe937a7c628f247a0b98ecee4c0e90ebafeeedb696758324824da4f42c3418531bb3c39b33732746c5469
-EBUILD gdk-pixbuf-2.36.12.ebuild 4079 BLAKE2B 1555d52f4199eb8179f7c80908de72864cc7838834291aa5f91eb7277d4169b09dc2713fa4151a726fd153e060797e092329f1c81e81d5f1fd9a4bb2ffdad172 SHA512 da8d6d0f71832c055f8944f1145fcfa282e2720566ce92f4b49cbf40c049b0e9b854f92e7132fcb9bcfef58948f68ebe4f2e459c820b286bc681052a1ff3b97c
+EBUILD gdk-pixbuf-2.36.12.ebuild 4075 BLAKE2B 331e359333388205a9b511b8ae67ec428b7a31a14e1ddd5192605d17170cf7036b4d4edac86b37a846819b6f8a210de685763c5b5b32969e243e621dcaf188e9 SHA512 186e46b68f62bb95779db5a2c50dd4dbc3334d4b304eb8655bcbdc65bd09cae82abe3b955f6d5d78c967760b6656a56ec4d466be77a119722991e1a5b3257ee6
MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
index 710db4c581aa..d557da498cb6 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
LICENSE="LGPL-2+"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="X debug +introspection jpeg jpeg2k tiff test"
# Remove SRC_URI when gnome bug #795069 is fixed
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 28d3ab42e69d..bcb3162e308e 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -3,6 +3,6 @@ DIST goffice-0.10.35.tar.xz 2370332 BLAKE2B 44799f90f45b36241aa1a3e9371719dcf76d
DIST goffice-0.10.38.tar.xz 2373308 BLAKE2B f270233adbbf300ad41516b1ed988db0772b95940196a6ac92c3090f6e52bc47933bb6bb4c023d7137cbca42adfab17fc41b82042c2e9c0340a6cd84942874e5 SHA512 1d72e30ee0b9f322cd4114d0a024a99e6d9ff7efcaeb9ca40b5fffe94180c232f03935743c15b1c6170f8bfc04fea5bdcc4d12760643c66cffafefbaa562fd62
DIST goffice-0.8.17.tar.xz 1814488 BLAKE2B 8e17ade84f7417e493bbd56bd42805ad9fb87749b4705eb09c208384e3537610f478cf0ecb957b2a2007a097efc5e1c2019060b1aaffddf52bd1db559d7af957 SHA512 61a3063d37e2ded4d4065d261f728c862daea04090ac38abe2524089ed1ee253e0d77e501f5b3451b1e011491a8225f90fd4914f28ce2a347ecf561098e6400c
EBUILD goffice-0.10.35.ebuild 1237 BLAKE2B 54b543357075c968a7064c0308cc89677d2d770e9df472c34defbdf52f14ba2f00da32f311e757e51bf13ac8398ce7b1aa25fd715122980c6dde1ccf6a559057 SHA512 4753e0655aad603abd555524552728277c40d930e8ecc5030866b2ed3941dde17ffd04bc2637e895d29a46c80c506ecbe4fdc45fb17ca442bdd4b1c9fa2548e5
-EBUILD goffice-0.10.38.ebuild 1238 BLAKE2B 3434874fabc86dcaa1b79cbad84b36bc05a75e8d94712c6371ebc19ade6cabfa5523d43eba61e8111d44ec74969d5304aeb1796cdcd7be86f95b941db3bbe856 SHA512 8b212594e4f47b06fb46d086f702acdb89d2968688ebb0865e8e59d5a9d1d2dead48e6e5d6cc037bde5f073f69f858709abc218363a65f4f0068deacd2731def
+EBUILD goffice-0.10.38.ebuild 1236 BLAKE2B c76bcf2963ca520fe37ad8b6ba768f3783cde1f764dc8ed6992dae2ba179607a45da2f67ec856980924a62cb7e52c03c5d99da530b3aaf393e6ab55310522ff0 SHA512 7746c69bd8dbb68e207592897711e445f45cc6995452d6b128db24532ec21004fcdd95863561899d78278dc951338d0c6774760eb065249112342ae3ffa95b81
EBUILD goffice-0.8.17-r2.ebuild 1426 BLAKE2B 10b9f19c0d19037a8291ab580781fa1b42477115c18136dff346cac59ab2449de8a0b03ecb2e6c86e74a04d660d95227204137ee495d9cfaeeee0e0991763758 SHA512 f674210aa851730d911b7893b30c069b9fca3b79baa5f1dd018c024f366a756ef3487cd0d262edcae7ea0085afe9c40b86b73110e40556c3c62d6da43b3413e6
MISC metadata.xml 441 BLAKE2B d1239d813165b887ed43610e0b9a09afd739164ecf52a0b6a94e957550b5dec5e18dbf5777e4b7bf8e1d665edf89bc5777ad90ebd93caeab5af6fc2882eb3469 SHA512 69e822f6c8ecb89ae952b30074c2527e8283eeabe32ac6555d043576b21d0f5a40b968b0211574ce8b1836dac85370070ee86905551bdd8cf2418cdc2ac6c3ce
diff --git a/x11-libs/goffice/goffice-0.10.38.ebuild b/x11-libs/goffice/goffice-0.10.38.ebuild
index 9bf3bf394d80..ac042ad12192 100644
--- a/x11-libs/goffice/goffice-0.10.38.ebuild
+++ b/x11-libs/goffice/goffice-0.10.38.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/goffice/"
LICENSE="GPL-2"
SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
IUSE="+introspection"
# FIXME: add lasem to tree
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index a1769bb38ea3..98ee683022bd 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -9,8 +9,10 @@ DIST gtk+-2.24.31.tar.xz 12805344 BLAKE2B f516f9970a95afa21ae5dbe9f0cafd3c57c5cd
DIST gtk+-3.22.19.tar.xz 18841024 BLAKE2B dc4c27d022c6766036b16e52b53b4aa3946c41457abaabca390bdba2b720db71b9c584101990928af1bef73dc49f7b71a951ba0000bd52e11aa5306a1d877f18 SHA512 c83198794433ee6eb29f8740d59bd7056cd36808b4bff1a99563ab1a1742e6635dab4f2a8be33317f74d3b336f0d1adc28dd91410da056b50a08c215f184dce2
DIST gtk+-3.22.26.tar.xz 18922136 BLAKE2B a1e43be24abe2bda8eb63f3794b191b152abb5717334f8f46fe3158eb7ec92d5413ed3ca0df2a1ad676deacee3e7ce5e737661ec5f5c911609d40d3b9379c4c4 SHA512 2fd3a4175168d37f243359bac5df84722a2830fe5b62f86b914ce39ff500f0361e412843922343dffef8bee8f1205799ff86dd3ae8ac419928f4fe977e0e946f
DIST gtk+-3.22.29.tar.xz 18964852 BLAKE2B a7551d604a1e27cba1d0580f2645bf4afff900908ce40d3d4d05cfb7348afc0620922e9b7939cf4ce2314ff489ffe38386aaf2634f3eff6591dfd0a225f19bc7 SHA512 046fa4458626e81ea7b1ddb753d53ecd91d0f2101af428cfdf77fe866bbe430cb3622203cc5e895b220a9364e35009245cdaf76e0cfa30d32d31095b5fcb42bc
+DIST gtk+-3.22.30.tar.xz 18946084 BLAKE2B 020512f61ae9d265849bb684c55c6ad3f1e1726d73ce169cd482e781e614f22f37ac23bc721b1dc11df03f0d4e07333266cc8549633cb255ca99a85a499108d3 SHA512 31440a615cb2f406d0f904e59febb8f876106f27818ddd6951c76ab9bcb421ca480dae2bebfb1c4b1e03b833fc7c42e9feede053d9d71f19a02fe778e3197b38
EBUILD gtk+-2.24.31-r1.ebuild 10104 BLAKE2B 2d9f63b1aaea867dc1bf0267e0e4000590ae10bfc3b4e1f3539cc1d83b55e874383f621db1cb5564283c069f606ed90dcb5c8cc3c45716507bbff31924da0ba3 SHA512 7efbaaa3ffccb8268f50fdf05cc96f0c87a6801a64e89977153368ae334176325ee77822fa663455e808d18008e54faf86c0d5a4cf9b6d5dc995ca8c3d33f61e
EBUILD gtk+-3.22.19.ebuild 6779 BLAKE2B d3116d1930a2f383ada49111144c8371cce1a07c990757d7e8a936e13f65beb90c33385dc87d13deea0022f89755d3c01d632c922e7fd6ad30619a968d70b418 SHA512 8d04280a143b9ace7b9ee2149e6554149e0306a70c90806cad6063f05afd8cacba30d4ba88091f8bc9ec2344f5bead4c4ee8e61d21cbbfccb9656fe8fbd03345
EBUILD gtk+-3.22.26.ebuild 6961 BLAKE2B f7efd4cd7ea7a91ed82a1eab888a3eb317a72e8c5d71adac4e5d231d69ca51298eb7c997c9da8db631f4c7ba46738e0b14b00d5cc56a3f2d773af95367a31f69 SHA512 8ef4e04588eff83a258b03241a0794c8f962077bd36bf2372f78dc70588ebd0a4d0ba3877338495d3bc977f9ba04d26fa7d24053a6b4368ff22a31704622eed1
-EBUILD gtk+-3.22.29.ebuild 6961 BLAKE2B f7efd4cd7ea7a91ed82a1eab888a3eb317a72e8c5d71adac4e5d231d69ca51298eb7c997c9da8db631f4c7ba46738e0b14b00d5cc56a3f2d773af95367a31f69 SHA512 8ef4e04588eff83a258b03241a0794c8f962077bd36bf2372f78dc70588ebd0a4d0ba3877338495d3bc977f9ba04d26fa7d24053a6b4368ff22a31704622eed1
+EBUILD gtk+-3.22.29.ebuild 6957 BLAKE2B 599b9134d8e35f6d97a635b22be684c19ec07915c6348b868c4582eea63bc51581a07adeffc3c49d4a6aa0dca5104f1ff29a1a35efc23200b28e8fab9befb8c3 SHA512 c7b398ec74acf9d478664bb3b6926ebcc94be6214b88da92940eca260b72d2a4bed6183f26f31f04eaa18914841e227f7e8e61c9fd5b18dda327d7b1833a0412
+EBUILD gtk+-3.22.30.ebuild 6962 BLAKE2B 36157dbaed4d979a57fb0d1525ce2a8a9898b1c7b717d4827a08ade0745efa621a936c408a5498cf658df560b87028a02757023d23dfcc7d876a5d6c856e35b5 SHA512 0cde76a4fcbd9857008a72b48e1f195b45809d8adfecda42c5273fa48316b9a4582a16ed1701ccb3351448bcc7f72ec1af2a1fdc27673e6bcb4008604177c411
MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-3.22.29.ebuild b/x11-libs/gtk+/gtk+-3.22.29.ebuild
index 0f2ed64289cf..d331980e954b 100644
--- a/x11-libs/gtk+/gtk+-3.22.29.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.29.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
xinerama? ( X )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Upstream wants us to do their job:
# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtk+/gtk+-3.22.30.ebuild b/x11-libs/gtk+/gtk+-3.22.30.ebuild
new file mode 100644
index 000000000000..4f99d0d75ca0
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.22.30.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
+REQUIRED_USE="
+ || ( aqua wayland X )
+ xinerama? ( X )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Upstream wants us to do their job:
+# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
+RESTRICT="test"
+
+# FIXME: introspection data is built against system installation of gtk+:3,
+# bug #????
+COMMON_DEPEND="
+ >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}]
+ media-libs/fontconfig[${MULTILIB_USEDEP}]
+ >=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+ >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}]
+ x11-misc/shared-mime-info
+
+ cloudprint? (
+ >=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+ >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
+ colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+ cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+ wayland? (
+ >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.12
+ media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+ >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+ )
+ X? (
+ >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+ x11-libs/libXdamage[${MULTILIB_USEDEP}]
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd:4.1.2
+ dev-libs/libxslt
+ dev-libs/gobject-introspection-common
+ >=dev-util/gdbus-codegen-2.48
+ >=dev-util/gtk-doc-am-1.20
+ >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
+ virtual/pkgconfig[${MULTILIB_USEDEP}]
+ X? (
+ x11-proto/xextproto[${MULTILIB_USEDEP}]
+ x11-proto/xproto[${MULTILIB_USEDEP}]
+ x11-proto/inputproto[${MULTILIB_USEDEP}]
+ x11-proto/damageproto[${MULTILIB_USEDEP}]
+ xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
+ )
+ test? (
+ media-fonts/font-misc-misc
+ media-fonts/font-cursor-misc )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+RDEPEND="${COMMON_DEPEND}
+ >=dev-util/gtk-update-icon-cache-3
+ !<gnome-base/gail-1000
+ !<x11-libs/vte-0.31.0:2.90
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+ gnome-base/librsvg[${MULTILIB_USEDEP}]
+ >=x11-themes/adwaita-icon-theme-3.14
+ vim-syntax? ( app-vim/gtk-syntax )
+"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/gtk-query-immodules-3.0$(get_exeext)
+)
+
+strip_builddir() {
+ local rule=$1
+ shift
+ local directory=$1
+ shift
+ sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+ || die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+ if ! use test ; then
+ # don't waste time building tests
+ strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+
+ # the tests dir needs to be build now because since commit
+ # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
+ # strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+ fi
+
+ if ! use examples; then
+ # don't waste time building demos
+ strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+ strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
+ fi
+
+ # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+ eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
+
+ # Fix broken autotools logic
+ eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ # need libdir here to avoid a double slash in a path that libtool doesn't
+ # grok so well during install (// between $EPREFIX and usr ...)
+ # cloudprovider is not packaged in Gentoo
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ $(use_enable aqua quartz-backend) \
+ $(use_enable broadway broadway-backend) \
+ $(use_enable cloudprint) \
+ $(use_enable colord) \
+ $(use_enable cups cups auto) \
+ $(multilib_native_use_enable introspection) \
+ $(use_enable wayland wayland-backend) \
+ $(use_enable X x11-backend) \
+ $(use_enable X xcomposite) \
+ $(use_enable X xdamage) \
+ $(use_enable X xfixes) \
+ $(use_enable X xkb) \
+ $(use_enable X xrandr) \
+ $(use_enable xinerama) \
+ --disable-cloudproviders \
+ --disable-mir-backend \
+ --disable-papi \
+ --enable-man \
+ --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+ # work-around gtk-doc out-of-source brokedness
+ if multilib_is_native_abi; then
+ local d
+ for d in gdk gtk libgail-util; do
+ ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+ done
+ fi
+}
+
+multilib_src_test() {
+ "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+ GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+multilib_src_install_all() {
+ insinto /etc/gtk-3.0
+ doins "${FILESDIR}"/settings.ini
+ # Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
+ DOCS=( AUTHORS NEWS README )
+ einstalldocs
+}
+
+pkg_preinst() {
+ gnome2_pkg_preinst
+
+ multilib_pkg_preinst() {
+ # Make immodules.cache belongs to gtk+ alone
+ local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+ if [[ -e ${EROOT}${cache} ]]; then
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die
+ else
+ touch "${ED}"/${cache} || die
+ fi
+ }
+ multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ multilib_pkg_postinst() {
+ gnome2_query_immodules_gtk3 \
+ || die "Update immodules cache failed (for ${ABI})"
+ }
+ multilib_parallel_foreach_abi multilib_pkg_postinst
+
+ if ! has_version "app-text/evince"; then
+ elog "Please install app-text/evince for print preview functionality."
+ elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+ elog "add it to your settings.ini file."
+ fi
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+
+ if [[ -z ${REPLACED_BY_VERSION} ]]; then
+ multilib_pkg_postrm() {
+ rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+ }
+ multilib_foreach_abi multilib_pkg_postrm
+ fi
+}
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index b61a54cc0ab5..0122403b1351 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -5,5 +5,5 @@ DIST gtksourceview-3.24.6.tar.xz 1623288 BLAKE2B 2332b31534f4fb7e4115e3827c3d57f
DIST gtksourceview-3.24.7.tar.xz 1390500 BLAKE2B fc8c6695ec94f8c0ff44fbf96fa3c1f8e11d11c9959a8b873d25e420894208444f1f88624d49f7366486039f0e1590692e2b5b0164c08c1358a8ea8b0b4aeaa3 SHA512 d86ef2bea6ae24c128f65e314c82f58265a53309abff22630360b0f5a5f9b640e3fc31fdd58b06221efc28f41c95c0f92613edb8c0a2c8f5c6147d287310a9a2
EBUILD gtksourceview-2.10.5-r3.ebuild 1353 BLAKE2B e019389cd3e530c9f1d696d3574d7641125a0e10ad542d61949eb89d4a4f46bbfba1f37e2565f938228c43bba9cf34e611eadec8c222530c113ec17766e55c6b SHA512 1d8dfed14a7bca7114fd4641949144781775cf02344e4b4fc886c82374f92a73b61a81666cd1c7ab5ff75daaff71ed368d4f80a18480237a32129b17ce086fb6
EBUILD gtksourceview-3.24.6.ebuild 1323 BLAKE2B dfb4cb0a4f2321b36570fd33eb4e50f2d1357d6915636591f3833fce85324c88e3d80411629dd290f5eec9c38fcd46022ee29b55f0870108d784f2ade72d7267 SHA512 7b8d8b0edcbff5dec0aaf99ad31553ecd1e0d6b35a6fe8e2889f2325cc6988ba177485d6ae4168135358f2ad9c64663610fcf0c7d58dd4f0628eec8ecb586ebc
-EBUILD gtksourceview-3.24.7.ebuild 1331 BLAKE2B 12e4d6f54651c159eb77b492aa771a39c837bf1fcab5412d9557f36dbf896ba519f785dc9a6a228ec314a50cbf888f022132abd58c13fcd041427016759d5afd SHA512 2a323abde1e2c2ca9eb3a6f008410db0222b36f05f8bc367f7d2ae9d088e5bb8c4f65e232ee659548d4dcc78cfd6e3f12fceeeed8369338bc40204978be12b0b
+EBUILD gtksourceview-3.24.7.ebuild 1327 BLAKE2B 9529674cf02d832782a27f24dc5d8f7e446f569cb591d4cad96eddb7f3fb2510953c19aadcf0bdabbb20c8d7b19768a44499d60335abff9749b492fd684a307f SHA512 25026157b2e70fdb7787d40320af80187598cdd425ebaeaa8ea398deece79c66e0a1cd190530c06eb7f7711234afed248aff430f6944ca6ca89a63897f1681ba
MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.7.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.7.ebuild
index db3725e99188..264ff9c5d555 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.7.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.7.ebuild
@@ -16,7 +16,7 @@ SLOT="3.0/3"
IUSE="glade +introspection vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.48:2
diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest
index ea5c3b2bc669..524512630e9e 100644
--- a/x11-libs/libFS/Manifest
+++ b/x11-libs/libFS/Manifest
@@ -1,5 +1,3 @@
-DIST libFS-1.0.6.tar.bz2 323246 BLAKE2B 4c77d0e0ce7a06092b0cbf820a4daf74bde5e43c91ecc02c9ef962764e1bf7b5c132acaa7463b0d8febdb3c0b9fc5f7f2f3af915485b24a70115e317161c529e SHA512 6eb20abb963e4f1c897dcc69321351c7672f2d15463d5d1e3391ff534848eb1a95a80833f698c98d9d5b6c8d7462eb3207eb5c0f74d86ef84a461ae6b11c8447
DIST libFS-1.0.7.tar.bz2 315569 BLAKE2B ea629c9d935e4e2f159edd6e3513a571d4a145fcd3030605babd2b931aff3377509e8476859e4278bfbbe48cfe94444d9daa85628e9fcdfa384c4ac0a46dc01b SHA512 3596e87710c14706ab345377799e9b2dbab79500fd75b4213f9615bf7db7df3265b4dbc65fdeca9d32343b848013780cfa1a43e76229665ce80246332bb8b96f
-EBUILD libFS-1.0.6.ebuild 438 BLAKE2B bfcdd840ac358970e0b098f85d61d018e3de476f18eb7ab03b138768427ae09c86fac780faf094f7c0857cf8ef2bacaf2766c7848c5e6ab98eb971763bb6445d SHA512 dd621d2dbc9b85e050916625248d907a414f46f1201f59d61bfb44d51c419d516c50e68914ba327cc2429f3fd6e94073682b22a67094d9440e87dc0c940dc1cd
EBUILD libFS-1.0.7.ebuild 438 BLAKE2B 526f44d199e54589168ca0906713375c9086a7a10da0ef9aaa59d70bd38e7ae5593ef49d54e828e8b03135e250f01d29ef5a1fc1a3e09317cc9b2e72d6e41f5f SHA512 43f1c60c813ce2b2d5a7646506016238bbdb3eede6740517b5bb151a48949c5e9f3d07cfb28b3761eaae65d6a7bc974e5db1d17bc625aa03342b7da71157d4df
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libFS/libFS-1.0.6.ebuild b/x11-libs/libFS/libFS-1.0.6.ebuild
deleted file mode 100644
index 93b0cd3502bc..000000000000
--- a/x11-libs/libFS/libFS-1.0.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org FS library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="ipv6"
-
-RDEPEND="x11-libs/xtrans
- x11-proto/xproto
- x11-proto/fontsproto"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable ipv6)
- )
- xorg-2_src_configure
-}
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
index e105902b768b..c86d9f1a9417 100644
--- a/x11-libs/libXaw/Manifest
+++ b/x11-libs/libXaw/Manifest
@@ -1,6 +1,4 @@
AUX libXaw-1.0.12-format-security.patch 818 BLAKE2B 14df89fff04aa784c4d0ef37832bdee98699ed33084b4df189bc1482aaac1e8847abed088b2a50dd131cb241bc82d382565b81ab13ba0ff1d1899589aaec598a SHA512 d08763618a02eeb2ec2abe339566d7a2d2465615306831e4ee02ee2b1699446e598d5aa8dd36356936a87c643900b36845e8419bfa1a1570431c4b5a608f955a
-DIST libXaw-1.0.12.tar.bz2 677147 BLAKE2B b234c60d6e491b5f2c828b1cdf6e6bfe063ed4f76ecaf92382651da7ac3c6f5ac79264751861b38a8b54330dbc88a46a348680d6093b7c80f10edde6f9397ed5 SHA512 baf11625a20b89f08747e25dff6755ab796c8a5a91341d3cb21f85780733c4a3c25bbf134ac6259982207067d0a617f83f516c48aef6f57cbab14c8a9862944d
DIST libXaw-1.0.13.tar.bz2 674140 BLAKE2B e141a135d1a45edfb71687951542a31d838bf560997a631b3590db0581f94768a8cc77ebd86c7cff60668e9843b1258a9eb60383a4d25b704ce9dc91fc6d0bdf SHA512 d768a39f7111802493fa1df1b80d858e4139ceeb883d45ff13ce3b7a0e775a7d2834b7ad157c8330117f04c32f38979795332dd7a119adb2344fcb1aa9cf1e2f
-EBUILD libXaw-1.0.12.ebuild 1099 BLAKE2B e38cae3c0f11a182d98ed0416f90def84cee9cfb3b23b88fa8693b13266fb9dfa91d618a29df3de97b4fe2d568ad6a3134616e99bcf26e2b7eb236af3a358953 SHA512 1b7ea909325c6cebf3c70e22ffe13f3806c8db62a62d111677ad98ec1df166be40e4bd360f865d5c838dc9e356ce1a5f9bc3d8f8f61c75becb1033c7bfcbaf22
EBUILD libXaw-1.0.13.ebuild 981 BLAKE2B 210f0b1fb8c12b2937bc74f86112ed9337c31b04ccfa4c2c71fe69e1ee55e1791627683f3e2f9fb2097a49ae3ba4215a77a277489cedc91ca9bdb6d92ddce0bc SHA512 8bcb3fd9eb65d62bd851952c32422c2250c0bda73005977a85e5bed5222202a9c0a390bd98f0c8c0fab8e6bc0a62061dac013cf0278bf5c444fa015c4cebd670
MISC metadata.xml 308 BLAKE2B c8b1bdf11408b82ade3364323648bf367d76ddec0711a46f3662f4fe34aec46918c7acc617a782312725ab0169e82c25d480194a2ff22bc3429f5f3c1d4e434d SHA512 331203494a47823877466669591ec0de413400dc18f51e96c18a06b7bece2fe56a73055cd7f1e4ffcf6cc9cc9bdd488a7a5ce2830def9ce5a6ae187c52dad364
diff --git a/x11-libs/libXaw/libXaw-1.0.12.ebuild b/x11-libs/libXaw/libXaw-1.0.12.ebuild
deleted file mode 100644
index 93554d3c6304..000000000000
--- a/x11-libs/libXaw/libXaw-1.0.12.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xaw library"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="deprecated"
-
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
- >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- # Fix build with gcc -Werror=format-security (from 'master')
- "${FILESDIR}"/${P}-format-security.patch
-)
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable deprecated xaw6)
- $(use_enable doc specs)
- $(use_with doc xmlto)
- --without-fop
- )
- xorg-2_src_configure
-}
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index dac98a4ff822..63e406a79f51 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1,5 +1,3 @@
-DIST libXext-1.3.2.tar.bz2 378901 BLAKE2B f2b1b12b0437f560153e41962b12282a56c9bd3f1b4db2c6eb72eed3c0a0268c63023fc797c5938bd1cb5af518e9a2a1c30e6904c664bb051fb66b1c3dc296f3 SHA512 5ed612f2c5e902648eb0438bfb8d9d6440a5baa19d95eb1253b51fe9ad8dcf903a7ee68a9455044d17ce0d486e421df0f98a069ab5ad1a49364f157bdf64efe7
DIST libXext-1.3.3.tar.bz2 389523 BLAKE2B 5f187b85bcc4736c57011964821ca7fafc4ef44caefcafe60fd4c14fd8f60df8e9bd67136d067b62aa1b16e43ee1ab158f0931f9c1120fb4e391dc40ad9a0468 SHA512 669d61545d10b999872addbf5628127840a221cbeaafb5ffa4328e0e0e1823583ece973bcafd5f13852ed58d4b0fe313a35f304ac80c6ed2b382cbbca977761a
-EBUILD libXext-1.3.2.ebuild 717 BLAKE2B 47a74c0149a98a141d480a324447a7aab2545781e5c5b45eed7bf37459e858e40115b708ec5af36519505e323a971ba4d166ce660b8e77940f4049b0a897408e SHA512 20277830306c87a0f0b11b515be9ed78ab8c71bb7dc49433b6e192fcbe07e4e84bc2cef7b436ac9af8b9bfd5992756032c7dfab5a83d612ccfbc9be1a4356b1f
EBUILD libXext-1.3.3.ebuild 721 BLAKE2B ed4b34b12f1693e13e22176c00c9d4f1e40bbf143516c0fa9b9f05554feb290a00f693d278618342fe7e477db723f9665e20d0d60e7f9e4904feec9baab17509 SHA512 feca85f2ceae5794ca5a22d322f8c0c59a2eeefd6a0f7c8bcc9dbc488d52e5514ec7d864d17145a9525d5413bd349d4b8d15457b8e6d9b7067c30774796088e6
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXext/libXext-1.3.2.ebuild b/x11-libs/libXext/libXext-1.3.2.ebuild
deleted file mode 100644
index 36036be1a331..000000000000
--- a/x11-libs/libXext/libXext-1.3.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xext library"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable doc specs)
- $(use_with doc xmlto)
- --without-fop
- )
- xorg-2_src_configure
-}
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index 6236275c6866..dbd6ebee65a3 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1,6 +1,4 @@
AUX libXft-2.3.1-compile_fix.patch 404 BLAKE2B e564a5bfadd0179f24532e9b8869809cf7c40d795c8cd465687fb83091dd6c168cc10ac846ef24bd4ce31cfa492cb74704e65e3f0c3f11a455179a49c25ee132 SHA512 b8bf5c564741c805ebb7b07c9a605de07fe5e66330743e92d47f6f0d8ba9e58d78d038aabcd08514a4d14d365d1f08faab87d9ef5788762eb0ab53ea80cc2dcc
-DIST libXft-2.3.1.tar.bz2 311556 BLAKE2B 4f2bfb4b85f8a459c6723483a9eb955826ca4be09fb1a712ab00e72c66ba96ecea90ff8f259374796fa39706275790fe160564f7283f647c9e2ec2f619b151c3 SHA512 737d6ab892daf829da8b2fed954b31b2657d29033f35e806599cd67c6e044ab94b0f035804a1c4c9e3e0cbdc74a117cd274128a57f4b2cf81383561d62eb9f1f
DIST libXft-2.3.2.tar.bz2 335495 BLAKE2B 9592e82449d3253fc71cb93866275bfbea37988ad7bf05c1d17de14038e48099cbc2569e329daba9354bab1d522dac03077d94e82f561e0747f08bbc08f6a737 SHA512 eb2e0c46b4434198690a3ca2b613df14ad599c860b47d10a1e8efe3b4e812a78460f9f414eaf89db21d605613a4e18324dcb8a22928609c6bc15178330a05398
-EBUILD libXft-2.3.1-r1.ebuild 833 BLAKE2B 12c9fedd105ec46b1074a2e628cc30925ff36ba295909b2cef5acd9e867420550619abf7347de35750dcb1db6ed25d41187bf4977473b257330c1c677f8a3070 SHA512 8710b4c400f3cc8c11d26315426f5d28281347e0f3c92d82cb062684bcb39a01d260a24f4c96f56add3483102de4b5ca5565f3eb2512da02b1574492bfb004ca
EBUILD libXft-2.3.2.ebuild 782 BLAKE2B 8307b65184e5e4d17d1e06b484727b6c5b52956aaa2c695ada5e04149acb7ca6e7366239d30e663e7bc2738c6a1ab97bb6f1a7d917d3bb5cf5579b65b8a59cf0 SHA512 626b5ee582cb0836464a18b677ad828a9bb76627f6fb30286fe3c42d3239d36f1b3fb0de9b9f68fdff435cf7172d5ddd9a4ede07589084508be1e1ef3f7773b4
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXft/libXft-2.3.1-r1.ebuild b/x11-libs/libXft/libXft-2.3.1-r1.ebuild
deleted file mode 100644
index eccb6f06fadc..000000000000
--- a/x11-libs/libXft/libXft-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2 flag-o-matic
-
-DESCRIPTION="X.Org Xft library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
- >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- virtual/ttf-fonts"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.3.1-compile_fix.patch" )
diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
index 66216c3e479a..798442624b0a 100644
--- a/x11-libs/libXmu/Manifest
+++ b/x11-libs/libXmu/Manifest
@@ -1,6 +1,3 @@
-DIST libXmu-1.1.1.tar.bz2 383473 BLAKE2B 8460f54083e702e15a0bf002707d90bb0ff762564fabf75410d6af5a114e729671baa1443bf3f34cb3744df80362940e5283de25c32945506d7928c32a40e370 SHA512 fb3baf697bb93fd5c2a26af318b9f7632b83bb2efe9cb4570b799ecca54e7de93248930fb8fd14d973c67612ad31502733417b1a6eb6d0c91ebafa204371c953
DIST libXmu-1.1.2.tar.bz2 396230 BLAKE2B adcea6ff4c9874b8f7022b236f9c0f76f6291b61ad2bc3ef16f9021d49c2cdee01b07e0bfa46afe3636bdbf2802f2c63f7e01854c1e0ca7acdaa274d348b2eb1 SHA512 eba4e3d10f7d75ba8464881fb69f295a89774a4b37793197d75f3312e3a342b2df8b7e13e3f5c887962704329b5347ff2f3395e229af9dadf46a93b1e8613cfc
-EBUILD libXmu-1.1.1-r1.ebuild 815 BLAKE2B b7420266c726645fc60a78b0bae4b11e3f3a4824180ca22716df3a795a99c127b68b3701f80f9292e62efad6551f2521e07570cc9e71e1be93b5dfe63fe3d523 SHA512 29b1c888a8606eaca48ec3169344777bd39f61c6095326c1f6c458d599f8c24ef0c37b047ec82e0485fb55f1959f477f78980dbf0253684ddf07e41fcbbd0500
-EBUILD libXmu-1.1.1.ebuild 671 BLAKE2B 411d2df39e16db1c6c47e53166b4a864b3972641effebdee8c605234b5c109801f132ab8b1ebc3daa294c26a6132506aade03458f578ab5d166b0ca3fec1e75f SHA512 96c726dd77fe930ac355d30ffba9328532342eee5bcbf2afbce193a0359df09b26bffd6937e7bb3e7148c4b843bbb8ced5f95d23cb1af92e3f1849ef1f39ec33
EBUILD libXmu-1.1.2.ebuild 819 BLAKE2B f7783bb7c9dcdfa1d6f4ab00b765a2e1890373ba3f0250eba764e73ddb6c13931b416c2d9bb48ed0465c10ca0d87bbb32cf1df4632d6c9f37b37a7f101e086f1 SHA512 50c78e134179aba4b2f7bf6d92c8151d59eff1ede1b07f6f6277df1b3d972f5c1d1c19cb2245474c8f13250601f3c625195b4ff4eb569f019195287f30aabe3a
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXmu/libXmu-1.1.1-r1.ebuild b/x11-libs/libXmu/libXmu-1.1.1-r1.ebuild
deleted file mode 100644
index 3720b13e4b3d..000000000000
--- a/x11-libs/libXmu/libXmu-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xmu library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ipv6"
-
-RDEPEND=">=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- xorg-2_pkg_setup
-
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable ipv6)
- $(use_enable doc docs)
- $(use_with doc xmlto)
- --without-fop
- )
-}
diff --git a/x11-libs/libXmu/libXmu-1.1.1.ebuild b/x11-libs/libXmu/libXmu-1.1.1.ebuild
deleted file mode 100644
index 559805399594..000000000000
--- a/x11-libs/libXmu/libXmu-1.1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-XORG_DOC=doc
-inherit xorg-2
-
-DESCRIPTION="X.Org Xmu library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ipv6"
-
-RDEPEND="x11-libs/libXt
- x11-libs/libXext
- x11-libs/libX11
- x11-proto/xextproto"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- xorg-2_pkg_setup
-
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable ipv6)
- $(use_enable doc docs)
- $(use_with doc xmlto)
- --without-fop
- )
-}
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index 3537f6131384..4ffb0ed4ea03 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1,5 +1,3 @@
-DIST libXt-1.1.4.tar.bz2 762331 BLAKE2B 2537a55205d03e8182e42344b04b77918de961bde6bbc3888a09443fd4729736e456d7d31d532a83f9a60c5b5d8c2757854b81fb67a32fbc367097eb5da2d253 SHA512 57721def16bf29e05deb746566400d71cf0cd5bf9b8b7ebed19abb7c6804e14073060b6cf94409903aa464d27acca2e91f55654b2d4770677b2b4b4dc78fd423
DIST libXt-1.1.5.tar.bz2 771567 BLAKE2B c3624f1ab81fdace1b2eef8749807e9a2157ec6f60e2f5f8b463aae088057d4eb82f9c6de547e286798b98f68be8f8097ff291b490baf49a4204e62566c1a9c4 SHA512 29828cfc021b60e0a0b5ff0321801db20f12bd635866cd000b35a23736b5477a3d1e5f936a1124ed3e3f4c0e7a27cb8744dbb5ab4fbcd45c817a13877081e05b
-EBUILD libXt-1.1.4.ebuild 831 BLAKE2B a5e97d08714679da669dd49641b51dafbb493f5a404a0d4e0ceb29b2efcbdbb66d190e758f9d65717dccc7a1b3877366baf6efd2bc7521105e673a65dc61ee62 SHA512 6b2b3c9a9f65f73a31c2ed5bfaca205e0400bc862bbd4f59306f6be7878f1cbf762eb6b40e93c809e82ac558e2264053f83aa3e8b79656a22bf04f735f50b77c
EBUILD libXt-1.1.5.ebuild 831 BLAKE2B 86712a9de5325aeb7656f29a782757f4b5ce6bb724fbaa31041c80f3816fceaf02b805d2d709a11ed1752efd2108249672ca528e1e923405a59f6a1ead812551 SHA512 8a8e4da8b4ef5eb431d3ed6cb8e2ef88d53e94e091d4ffd54da0ec6f7b498e46730cd4bfb924dbfd816f4ee412d4daa08800545360a17a56d0a009b5213d57bc
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXt/libXt-1.1.4.ebuild b/x11-libs/libXt/libXt-1.1.4.ebuild
deleted file mode 100644
index 956395f82716..000000000000
--- a/x11-libs/libXt/libXt-1.1.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2 toolchain-funcs
-
-DESCRIPTION="X.Org X Toolkit Intrinsics library"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="test"
-
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- >=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-libs/glib )"
-
-src_configure() {
- tc-export_build_env
- xorg-2_src_configure
-}
diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
index 0aec4c3ad88b..6a9776ffb865 100644
--- a/x11-libs/libXxf86vm/Manifest
+++ b/x11-libs/libXxf86vm/Manifest
@@ -1,5 +1,3 @@
-DIST libXxf86vm-1.1.3.tar.bz2 284279 BLAKE2B 4e56f09a299aa91b3eb42d31a25727ecbc48606ff240eaa0695e57463ee24ff161795c0a64639137a36b555bca5c33f02bff6d58fed515c01c3ae9d78ec3d893 SHA512 7cd5491b79920f9c1d134f2815f14d45b0a29cf5f99d866c35418b6f84ce6b48e702db3472bd7c6158804e573f2384ad4ebee78e5ea8f07afec2e34489d99ed4
DIST libXxf86vm-1.1.4.tar.bz2 295346 BLAKE2B 22698db5beb0ac06663e9163e13f8afd99597afc6dbc9f9d4fb232682df6b41a155d63fc1beb58da3d83bd0e420872c457671696246dbf39a6451454a6e24b9e SHA512 c5f92d86e143db02ebb36bcd25618acaa2cb2831f5a23800a06dd431cd73b6702d95de8fe7407ce626336bf614c288d5256f4d87ea7781fad2ab6c517cbf09e0
-EBUILD libXxf86vm-1.1.3.ebuild 694 BLAKE2B f749f992a0b67878ea9b9408cb24c9bbfa63bee4d7ed00d10332129470787b10273730e2a11b771b0899a7d611af3b8e08d586abe67b558f56f5c9210eb7d978 SHA512 cedf72c264774d5861a34c48dbb056e83aa80aaf9190f948cb3595a82cfaa2f05f25b66cf632b3a238e8df37bb0988e3dd313ae7bda51ef875a3a93c0c4b93a9
EBUILD libXxf86vm-1.1.4.ebuild 694 BLAKE2B f749f992a0b67878ea9b9408cb24c9bbfa63bee4d7ed00d10332129470787b10273730e2a11b771b0899a7d611af3b8e08d586abe67b558f56f5c9210eb7d978 SHA512 cedf72c264774d5861a34c48dbb056e83aa80aaf9190f948cb3595a82cfaa2f05f25b66cf632b3a238e8df37bb0988e3dd313ae7bda51ef875a3a93c0c4b93a9
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.3.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.3.ebuild
deleted file mode 100644
index d6d8ab59fe08..000000000000
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xxf86vm library"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-proto/xf86vidmodeproto-2.3.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libdlo/Manifest b/x11-libs/libdlo/Manifest
new file mode 100644
index 000000000000..8f8eb58b9953
--- /dev/null
+++ b/x11-libs/libdlo/Manifest
@@ -0,0 +1,4 @@
+AUX disable-testprogram.patch 832 BLAKE2B d0658618b0042f51e0f85efbff77933e62efc2acf571bbc539f908a771d290834d5b60f3840cac317d56f378f0c3b1c457fb966782df417d8d3af33c6dee88c5 SHA512 b07a0ddd5eca10f13e82039690c3d310981cdafebc38a9e632a55be38c5c8ff22b7dddffcf0ab0f9795e650e61f9079ff1d9c12b3ddaad8d018f060c377aecd3
+DIST libdlo-0.1.2.tar.gz 476865 BLAKE2B b2391b58046e1f403b7e0d1eb915a46aa17c47e8ad804246f12f3b94f9ffb4dbc811e5d08aac29c2f4196b5d384e7244bddad3193adff5d5e890a7463a503fbb SHA512 6df69bebcf3142e0a87f66bb9d690fd78b96e08c2ae5d46fe0f3d91bc135364d5f5dd0c3a481705c3cd90c78a0a076757220fbcc3b0ad4343cdddb54501e3f2f
+EBUILD libdlo-0.1.2.ebuild 1158 BLAKE2B 917cba041ff98d82555969fd8c0c422567f2e73887e22f81dff9c6261c5c53ce18bc7739d3ef389a7406f1958f742b468c8184526fd1b884524e9fd55d5debc5 SHA512 44ebe111f6ceb6cdfd7ff908e8b8f0ca6ec0baa870cd5ea7db08092faaf26962e5e9af778da78f5d78b04dd603184056969f482cd53e99cc555216e085165e8a
+MISC metadata.xml 806 BLAKE2B e32dfb3777d2da84f0134345630fda1b4447f9e8bc9764ee7e097a27e6d1bfba447494e9ab8959de502afbb0dce376d406862490aa113525c085e74c8b3ff43c SHA512 7cfdbbdc93fef8d555ac23b0718329243d778fef89ca5d95bcdd827de66e034af2bded73f3956d44ff369214368851bc91e5a0a9634ea7ab40118e507f77b2ee
diff --git a/x11-libs/libdlo/files/disable-testprogram.patch b/x11-libs/libdlo/files/disable-testprogram.patch
new file mode 100644
index 000000000000..a8f2bba40bf4
--- /dev/null
+++ b/x11-libs/libdlo/files/disable-testprogram.patch
@@ -0,0 +1,33 @@
+--- a/configure.ac 2009-10-19 04:41:33.000000000 +0200
++++ b/configure.ac 2018-04-23 23:18:48.867807771 +0200
+@@ -48,7 +48,6 @@
+
+ AC_CONFIG_FILES([Makefile
+ src/Makefile
+- test/Makefile
+ ])
+ AC_OUTPUT
+ AC_MSG_RESULT([
+--- a/Makefile.am 2009-10-09 02:20:55.000000000 +0200
++++ b/Makefile.am 2018-04-23 23:19:27.036807625 +0200
+@@ -1,19 +1,13 @@
+-SUBDIRS=src \
+- test
++SUBDIRS=src
+ dist_doc_DATA = README
+ ACLOCAL_AMFLAGS = -I m4
+ AUTOMAKE_OPTIONS = foreign
+ EXTRA_DIST = \
+ autogen.sh \
+- test/images/test08.bmp \
+- test/images/test16.bmp \
+- test/images/test24.bmp \
+- test/images/test32.bmp \
+ Guide-v104.pdf \
+ mkdox.sh
+
+ TESTS_ENVIRONMENT = sudo
+-TESTS = test/test1
+
+ MAINTAINERCLEANFILES = depcomp INSTALL install-sh missing aclocal.m4 config.guess config.sub configure
+
diff --git a/x11-libs/libdlo/libdlo-0.1.2.ebuild b/x11-libs/libdlo/libdlo-0.1.2.ebuild
new file mode 100644
index 000000000000..d461b4dee5b7
--- /dev/null
+++ b/x11-libs/libdlo/libdlo-0.1.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A fully open source driver which supports all DisplayLink devices"
+HOMEPAGE="https://libdlo.freedesktop.org/wiki/"
+SRC_URI="https://people.freedesktop.org/~berniet/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test-program"
+
+RDEPEND="virtual/libusb:0="
+
+DEPEND="${RDEPEND}"
+
+DOCS=( "AUTHORS" "ChangeLog" "Guide-v104.pdf" "README" )
+
+src_prepare() {
+ default
+
+ # AM_PROG_AR must be defined or automake will fail with:
+ # archiver requires 'AM_PROG_AR' in 'configure.ac'.
+ sed -i -e '/AC_PROG_CC/a AM_PROG_AR' configure.ac || die
+
+ # Only build the Displaylink test program, if a user wants it.
+ if ! use test-program; then
+ eapply "${FILESDIR}"/disable-testprogram.patch
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+
+ # Rename the Displaylink test program to an useful name
+ if use test-program; then
+ mv "${D}"/usr/bin/test1 "${D}"/usr/bin/displaylink-test || die
+ fi
+
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/libdlo/metadata.xml b/x11-libs/libdlo/metadata.xml
new file mode 100644
index 000000000000..c0175f30bba8
--- /dev/null
+++ b/x11-libs/libdlo/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ck+gentoo@bl4ckb0x.de</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ A fully open source GPL driver which supports all DisplayLink devices
+ in the mainline Linux kernel, called udlfb. It's possible to write
+ custom applications for it or to the libdlo user mode library itself.
+ And it's also possible to configure X and standard X applications to run on udlfb.
+ </longdescription>
+ <use>
+ <flag name="test-program">Build the program for testing Displaylink devices</flag>
+ </use>
+</pkgmetadata>
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index c62a9fc46bbf..e60faf034aa8 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -5,7 +5,7 @@ DIST libdrm-2.4.90.tar.bz2 822164 BLAKE2B 043428cea0f74b69577f79b3b9422546821945
DIST libdrm-2.4.91.tar.bz2 815419 BLAKE2B 7df2a4bdb4b2708cc00b71173e7e261ab7f8645a473984a7cbda2c7073f14b7f87d53eb39cc075b743e72e4cda03b2c4fca6b9df6c7d5db2c739398a13f13f35 SHA512 07578c00c121ba37033db7172590e26d1545f81c242bbce2cfb7fb904bde504822c275d6468e5c5d20360d0046ae73d9b058aa0459ba35eb11927141cc998772
EBUILD libdrm-2.4.82.ebuild 1968 BLAKE2B 13f465860e3637b6df37a633e2076336f59ae33caa00a4b1200967ea9874b750706c2341abb5262d7a999d2fb49741c947db4032e200129217be034f110ba63e SHA512 bccc1090ea3c01865b4f39d9a8b83ca00436f7501468c12ed3204fdade362f18cc6a23e0e439b80799d7c189e2f1e367c2cfe22f8a52cdb523c64f18f5dc7164
EBUILD libdrm-2.4.88.ebuild 1969 BLAKE2B a1c0294d7787b2fcd84a163324fe74a1ffb71f6cd950963c03a5af5dd268a0d761c43d1f4436f7df2b5e6f082d42f80611a1fcbeaecf62b83aff496c1f5eaaaf SHA512 5f6d166c1340c0404d921171ceffb7118fbe12fd726d389a00a790cd4b9d5ff2b9768eb9345a787df0e6445db661b47cf9cac87193466858bcbf04573c3ba1cc
-EBUILD libdrm-2.4.89.ebuild 1971 BLAKE2B 41bde55cd10e572c286cb413e7e2ebb23ba662d6a65681e9ca1f50e17720c7d53303ffdd6aa65d0110ca59379a459e06a2060af20e686b738875b44d24978c17 SHA512 ec71147dcc0455dc58833547cc1be082ddfcfa58c0ef495fb83c14a06d1052038a7bce37f5939082bb8a2d7972915aa8b4cd6480e0988516dc94c992aa6858bc
+EBUILD libdrm-2.4.89.ebuild 1970 BLAKE2B bdf5cb215f947e4e435383fb7bceae1432060f2d04b36d5b7d9354bdf38a7cc503d4061b87953cf05f82695b8f91744db603101eb41e05e0917acf609ce1cd1f SHA512 422fd7bea7e288186185e7c4c9758b56a59e44dd13a724da1728da7febdb064466115d7833d560f864bbc4b6a403027d90b38f27f6d6dbf70e9890f5f067a541
EBUILD libdrm-2.4.90.ebuild 1978 BLAKE2B a554b2c5762f512145d792d87c172e05a9aa51cce878d5568a33bd6ebed014fc30f173cdb860bfd55d5090cd0339082b1b67000bc1d0c7851859fbdcfec1816c SHA512 502fe8a211d3cb64d7eab03c28454bf79109b1f11ece181d65fc81b84f9a7c29c38ac3a8a394d887530d1d2aca7a434e052400942734b66c4458566bca650283
EBUILD libdrm-2.4.91.ebuild 2158 BLAKE2B 8a1f197800e9e1dae5e3d35848d831a44f965db88b47503bb3496c6c40220bbf9667eea374186758e0651a9cd13cac3cd2b4cda1b934243600e601892d2f1165 SHA512 c6d8e39f09bed1d15bb40540ecb6c4c93e66a2d086281bce790fd67791044d76528843859c7d85d00df0eda7d53690c190bd753e7620bb8e14069c491f632f6d
EBUILD libdrm-9999.ebuild 2158 BLAKE2B 8a1f197800e9e1dae5e3d35848d831a44f965db88b47503bb3496c6c40220bbf9667eea374186758e0651a9cd13cac3cd2b4cda1b934243600e601892d2f1165 SHA512 c6d8e39f09bed1d15bb40540ecb6c4c93e66a2d086281bce790fd67791044d76528843859c7d85d00df0eda7d53690c190bd753e7620bb8e14069c491f632f6d
diff --git a/x11-libs/libdrm/libdrm-2.4.89.ebuild b/x11-libs/libdrm/libdrm-2.4.89.ebuild
index cc8b1e46112a..b798ebe33c45 100644
--- a/x11-libs/libdrm/libdrm-2.4.89.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.89.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
else
SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
- KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+ KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
fi
VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index 2108e81f1156..4c9bf14152dc 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1,5 +1,3 @@
-DIST libfontenc-1.1.2.tar.bz2 294884 BLAKE2B dee29ab3c7f6ce4369d511cf9716f137a036932b4743842dcc4ea36ac093af43a6f274cded2ff9970626cf328e45cbddb8fdc996e706fd154f5bf83647cfcb20 SHA512 e0905592b7ef65acb8298b9807f90e68d18eddf3112c6232c1c774603c95ca7ec7f6db161e133dadc00d8791c5f76d4c3d65aa95544a1500c0767b88fdb52f45
DIST libfontenc-1.1.3.tar.bz2 301494 BLAKE2B 1d9d5387cd11820b1d458cab8de26fbaebeb2d0b5c6197a455b0261e53004e6d8eb9cea7dab27ad163c8897237a864075f981ec3a740cf8056c3f15be23ecd3d SHA512 7346079a6980464f57f5da0e96025bbf4b13fbb7ed976b58d9c54b78525d9d0b4174b4783326a12048971cf5d05221bafe2f41c6b02931743913719cde21740c
-EBUILD libfontenc-1.1.2.ebuild 546 BLAKE2B 8830f909d9005263b6410dd6412839cf2ae3c6e2780b28cb01de3724a04417ed16a11474e75dbba67c4a5b9cec7921b77b9e16c46f06c08b91a9999379400ce5 SHA512 cfc31442eb9d8f0579ec3757f9adc5bf128724ef6108c7b7e3c70312d25fab4b5daad5aa29b506e35078e38d7d887ca136620afc4c71c3b19d1835b922f7407c
EBUILD libfontenc-1.1.3.ebuild 548 BLAKE2B 2511ed11bb919e55ed0fbfdbb6a0f18703758091cc4b79739b86aaf550f44e2e81a12430b3b8d33d47fcb00c6b26fc4defed8a88d8b0218f839cd1ad65b9f56c SHA512 6e2060dfd8de400fff99f3149c5a236548e6dc07b12991253a59757766fd29c5ed67bf61fd4fe93ae116413a16ad3dbdb8416f8829eab0bdafc42dd379897aa2
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libfontenc/libfontenc-1.1.2.ebuild b/x11-libs/libfontenc/libfontenc-1.1.2.ebuild
deleted file mode 100644
index 7a8e143c3581..000000000000
--- a/x11-libs/libfontenc/libfontenc-1.1.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org fontenc library"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="sys-libs/zlib
- x11-proto/xproto"
-DEPEND="${RDEPEND}"
-
-XORG_CONFIGURE_OPTIONS=(
- --with-encodingsdir="${EPREFIX}/usr/share/fonts/encodings"
-)
diff --git a/x11-libs/libgksu/Manifest b/x11-libs/libgksu/Manifest
index d41f82d41d72..3e243331e2b3 100644
--- a/x11-libs/libgksu/Manifest
+++ b/x11-libs/libgksu/Manifest
@@ -14,5 +14,5 @@ AUX libgksu-2.0.7-libs.patch 3129 BLAKE2B 1ccd6e9fa0dc83c0853375e17c9df1e243b91f
AUX libgksu-2.0.7-polinguas.patch 749 BLAKE2B 8b8b675686d23cdfc1b30e0cafcb653c4ae3485413f499172f77396f06b1a4dc7da0ec1b8657d0d7926fc6f674b8bd2b033cb809b2451bc7130e215e4a668fb9 SHA512 9a9488703e28ce048ec1a5844ec386ba969d702e499e70342af44cbdc881ead450d182c0c270a54be42cc4ec7f35f66904a94f221a7446280b8bfe7b3b138103
DIST libgksu-2.0.12.tar.gz 477903 BLAKE2B c4a130b43d1e9acffd740b9160f98ed318f9861db90acaa047fd9c2a162707fdffa86a4b0854b81486f982099f9440ee7d5b8c5ca65122e0cb2872e3a8aa508f SHA512 06935583787c2d63db5ee345efeabd46ce1b2f36ec5c94ba0219d7c27d0935ddbf9987c0368158e57486d541b4a8e75140da53a806061d465985452fd1128573
EBUILD libgksu-2.0.12-r3.ebuild 2029 BLAKE2B fc8def81a770dae2baf3b2def02f5e94aa741798adf2e4b0d4b202598729959e7af0f83df1a76a79038dc616e0c51ba403826fcb25e52aa2f88ce145ea9d94e3 SHA512 db47d0e8a0184976671ff1b616962ccaa5ca37b61b73d7a83bad2badd5f0799d2d3758edab8276e607018edab1708194516e0c4946f17866031afa6d43fdd089
-EBUILD libgksu-2.0.12-r4.ebuild 2081 BLAKE2B 601ad593462289fab04e47259b22a1524896d8d2d25559694d3f29306ed5e852403879a7fcae47446960840cfcedad1236a9dadb0bdffb407afabf3eab5246a4 SHA512 0559ac5132c72bb84427548f922bc70ef2bad19a440b67d4087f031936c0b540161e91d50c0af1d5517e537904d7c5fe0783ca5d99dd06b4392b5f994f793d69
+EBUILD libgksu-2.0.12-r4.ebuild 2077 BLAKE2B 30101ad9124a5cbe3a711f135112863cf4292d994bea9726dc5ae19424cb70f0fe274e4bb0f6bc15c5a614f70655d5cbfc51140955fbb42375062e191f89c567 SHA512 6ede8918f9a5ed99960dff09615b6e6898aa3b469bf1f7e10ec167c872182c5cc48d2219be0d12d92727dc937c929a615c050ef4450d1262e4ab3234304a404f
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild
index d143ddc533c2..f2febc02dd76 100644
--- a/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild
+++ b/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://people.debian.org/~kov/gksu/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd"
IUSE="nls static-libs"
COMMON_DEPEND="
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 16ed411c47ac..88d20e55132b 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -2,6 +2,6 @@ AUX libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch 8094
AUX libxcb-1.12-fix-inconsistent-use-tabs-space.patch 2515 BLAKE2B 74b2969e976ce7736232a5caa35d7ab525cefdcc7915db2ea5a3333aa356e7995935a40ed0b1362abbe2d72e3ef5a847aa22d780a9267cf785a8540257967a4a SHA512 ad3b9d9b16b42756a72e583b7d42bd670ef581b614cf185de667badb6121524b84f2738933d2ea1e5da3d135b3a5f2296eb62206463bedc9e4d3f8343f476f85
DIST libxcb-1.12.tar.bz2 613822 BLAKE2B 61f164ba6fb9493fe0692badc74a2866ee08ce3c3499773be0bddf742d0ffc69bb876233aae46a7e76cb9263485eb007d105b16091a73750d490da0528482ff2 SHA512 4ce3e3f62b7e1c3a9e61c149c720ef2a4a760539ea615d7d52ae39e7f5a08456dc87d7a1ac5d85ca15dcc468a9a02d56fb8f8f6361c959af9b8780f011995896
DIST libxcb-1.13.tar.bz2 510453 BLAKE2B 2bdae7610cb8b3fdefeded6cf457e1c397666d235114439caba114b9e7a6b2af50f2cd8363ebaa3ddfa5c5040b8cdf2960150e1f4db141c572e12b1a2fb0ca9a SHA512 d99bbe386a65f60fcc0cc2935e4a365bc0577b5e90433e18778a665a5aee8ebc8e9e8cb0aedac0ac4a276147c0507e759a716874ea4f80792b2fc18eefbc128c
-EBUILD libxcb-1.12-r2.ebuild 1790 BLAKE2B d32b3ea8c35666835d9ff37e4d25a97038f74e1c67f069d8b2f2ee8d612b1402d435e71f40559f3140b31f0e5f4b3505e170859b620213f29421479c74d1bfe2 SHA512 c843fb6fcfe534bc84d2f8b9999d499df4f524ffeccc18d0056272d3f2cec9b8b0be8dc90e9e4d5e236dec8933d08a05a34d2b312d96c3279af04caf4f846079
-EBUILD libxcb-1.13.ebuild 1492 BLAKE2B 28cf78fc62ff5004af2d40415c078cae7ac980a0d9ef68a7626a842c107108ca7c5e1c600c387055ad594d425ab490e32b939be167dfbfc7031bd07a88747a6b SHA512 c0548c152c6a399f6efdacc0f73b99aa0493b82b801153dc83eb20168be63db7a7ef528df7305c0b533582599675b4f49deb3687f73a5bc243d95dc932dec5ec
+EBUILD libxcb-1.12-r2.ebuild 1788 BLAKE2B 005e197d4ab0a47f500f7391b19edaa6992af4f3c42151d40b32a90e55bf520e58f77238fc84abc18bf746797f546519931b46af4263e4727e54b6fd96f72f08 SHA512 d95d60568dccb221be4786eb55c0b35cfce848d6091e8102f382f986af8d1c51a20c57ddc15da29c26fd4f53d661f01dea00475d56a4f697961132908acbbec7
+EBUILD libxcb-1.13.ebuild 1490 BLAKE2B 49d6d9b9bfdbb246ec1d3ca0b8e043be17fc319d3801215e99dbb8cf58a633edd3e28aa9f4ac6a8c7778057b9bcb423e9d0a1766c9aba519964446004f1066e5 SHA512 6db782a7d71a1d317278c44900fd3cbaf158c9112a4fd11149954db11d2bae16f3f2508c8eb57c5c7e8f6039c83a22daba55180a660a08abf7da820c32bdbe9a
MISC metadata.xml 319 BLAKE2B 8dc76aaf5b8760a5b4a1b6785de5c77cac259c44ec88e41a02834e240cabb2037cf90117462c9aeadbd73502f63e8fdd1223e7dd07fdbfa11fee2c6eb6659cc2 SHA512 099359a62cca3897168fb9cbdb25f48feb8ca3524bde0c7f36b271059c84e567bba9fa6e47d999ba8effb2969e0a918bb52ede5e1a8737d9ff5a13a69f709a5e
diff --git a/x11-libs/libxcb/libxcb-1.12-r2.ebuild b/x11-libs/libxcb/libxcb-1.12-r2.ebuild
index 5ec2a2ba345b..922c0eb9855b 100644
--- a/x11-libs/libxcb/libxcb-1.12-r2.ebuild
+++ b/x11-libs/libxcb/libxcb-1.12-r2.ebuild
@@ -31,10 +31,10 @@ DEPEND="${RDEPEND}
dev-libs/libxslt
${PYTHON_DEPS}
$(python_gen_any_dep \
- "~x11-proto/xcb-proto-1.12[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
+ "~x11-base/xcb-proto-1.12[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
python_check_deps() {
- has_version --host-root ">=x11-proto/xcb-proto-1.11[${PYTHON_USEDEP}]"
+ has_version --host-root ">=x11-base/xcb-proto-1.11[${PYTHON_USEDEP}]"
}
pkg_setup() {
diff --git a/x11-libs/libxcb/libxcb-1.13.ebuild b/x11-libs/libxcb/libxcb-1.13.ebuild
index a8f6ab111833..f3ce17fcb187 100644
--- a/x11-libs/libxcb/libxcb-1.13.ebuild
+++ b/x11-libs/libxcb/libxcb-1.13.ebuild
@@ -30,10 +30,10 @@ DEPEND="${RDEPEND}
dev-libs/libxslt
${PYTHON_DEPS}
$(python_gen_any_dep \
- ">=x11-proto/xcb-proto-1.13[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
+ ">=x11-base/xcb-proto-1.13[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
python_check_deps() {
- has_version --host-root ">=x11-proto/xcb-proto-1.13[${PYTHON_USEDEP}]"
+ has_version --host-root ">=x11-base/xcb-proto-1.13[${PYTHON_USEDEP}]"
}
pkg_setup() {
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index 8934edbb6239..ca1fd7e656ee 100644
--- a/x11-libs/libxkbfile/Manifest
+++ b/x11-libs/libxkbfile/Manifest
@@ -1,6 +1,4 @@
-DIST libxkbfile-1.0.8.tar.bz2 335788 BLAKE2B 602d1bb8f49fa1a46cf9887a43124f2ce1b49d514acd324133b82950401d9e31f64eb1f0ea2a12231aa1e401186160f1ddd98db4ca71ad265ffc64ad3eead98f SHA512 1d8766db2a15fe0a1f3775d38422eabd572ec8ba8417cde9f1ec95b0065e1acb6036fcf9a8e54f2e0517b358f9f3fe6f8b419554ec7688c24ec4072939c5e099
DIST libxkbfile-1.0.9.tar.bz2 348009 BLAKE2B 2b4f398c7ef35ae6fcae8491733669408db98a27c2351514ea1cd0332a34cd995a34d18013c0ed2a70977935ee1dec527f744bd3a01530e6eefcf715752be9e1 SHA512 5fa268f10d7c4bd7b1e0c9f12adaa53d86b149f193d228fc620b3b81d360b37e4ede0192f5a0dc715bf830a57bd1388af01399fb33609413fc64623ee91cb8d1
-EBUILD libxkbfile-1.0.8.ebuild 479 BLAKE2B d1b1d76668ce3f3b1c14f35afc25a72bd01800462f42a7d33b44f204155b6dfb7a0bea1ae4bf8d90c2abb0a39277c103fe2385f9127a5fd0acf5b0be97c53dbf SHA512 df18550be78415f78ca07a3f8d2f2f33cc6509ff4f0c6539c3d65da0409e878a5e838ac65cfa8a7656aa9257c69528cb17479865242c3617f731f204d791a1c2
EBUILD libxkbfile-1.0.9-r1.ebuild 548 BLAKE2B 49677eece156da29dadf10db7ea62ccb9ed42721ccac0c614a5c6a68c914f0b354f859c754ad337136aa50b1e70373e8782870b262a9f651bb16cfadc1eb1289 SHA512 8b97a8e7c59601c22ae37031a308b98228b071a2c8734135ae74407912bab625e88c1bf0bb858830090098f20eda25e5e13eb1ecdfbf3f979df57bb9f260e922
EBUILD libxkbfile-1.0.9.ebuild 481 BLAKE2B 6d1d85f609322d52bd2c2d8e863d312565f7a44ac43b52b980804e5f1f01dafed3852e97170299444dc675996aea787376aeb81e9c1374e0a22b5937029412fb SHA512 699f1c1b354f820c126118385a8f5322b8d3609f36b3ee4f51d3bb74de85e2e0e64c1bd9f8e71e60bef08685b7011f0f4fd1199797f014f00b9c78883319a323
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxkbfile/libxkbfile-1.0.8.ebuild b/x11-libs/libxkbfile/libxkbfile-1.0.8.ebuild
deleted file mode 100644
index b27dd96546e6..000000000000
--- a/x11-libs/libxkbfile/libxkbfile-1.0.8.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="X.Org xkbfile library"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
- x11-proto/kbproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index 1a209bcd0023..69b0be2954f0 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,5 +1,5 @@
AUX Mwm.defaults 536 BLAKE2B 675abf74eaa86c9b8f1f9730c3216d06239a6e67cd3657245b4c4095a5e1fc552a0c9c59cd72d3537de71e7f26d10bca87c7d34723e5514890c7a044aa2674b2 SHA512 ef121001e0a124fdea20a2b573ad79a68f23bf4f73c33097e8acc62fa00fd28311d999893b37514be33bceee1d2a22a5b03a02b75b2c02049131c8fedb3e02ab
DIST motif-2.3.6-patches-2.tar.xz 1600 BLAKE2B 03ef74773c581d09ad89f35f26e9d01ed01ec8b40344cd4d6aba106de80bfe0ce69d65551aafb4c53daf61cc31d1e703c9762c2b4a60729c73783b649a00e6c3 SHA512 09c857f7f2ec0d48660e6fff8afddec99416084e2b80a8793401e7641a3669fbe4eb10811e60f3d9dc106c828a87324dfdd27cc91a62bf3dedbd9154542c7619
DIST motif-2.3.8.tar.gz 5704328 BLAKE2B 3755b7f46e50240e1e9e7046aa439fa89872e54ae5d03860383f509b6d0f09edf85bd7d92ea4d37925efd2e44401028aa2752d940c42d9cccb652b2bd1d85459 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
-EBUILD motif-2.3.8-r1.ebuild 3366 BLAKE2B 469019271c2d4572fb1ea7149d02ce02aa6f1cd3a1bba4ca02ce6050f961fb73bb255e83ec2794158ce823e81e387d4f940353cae026ac5d8473a6ad93732373 SHA512 b9d7e0ecebfa53883da90aae67f49cf8d54c8172f7e915443974b0b262bca7181d60f372d3ff2612403d8936f68b58befe9e61a270e6bc95e2e79fbd143a1880
+EBUILD motif-2.3.8-r1.ebuild 3387 BLAKE2B 917a36f3836bf125dc865974c8f17961a2a522668ae81f37a8a5345fc3b99e44f21b87afb59af34536e2570e0df2da4ec6466f171adedee50e67109fb9098830 SHA512 41cf507d9e1ee3182aceae05d020446486e28d494395a626234be982af099b9c3fa2931130853ad86efb321c517a2183ca77da911d5335c603a96626ed8f4b74
MISC metadata.xml 394 BLAKE2B 8302e867353fbe09f017b4d54ec2ad043f8872643914ef29002611b41f4f1c0639959da9c7e06b4317c8fec4d0a5fba72cc3927991054a65a1d42a1f4fb9da17 SHA512 5a2fd548df5d694acb6c1bf1d51c8e80adb49915d4328879478a6b7c5a76cfbf02f31e58103967bab2c4afd4873752ffafd9f8f0839f68d09868d7f501542d3c
diff --git a/x11-libs/motif/motif-2.3.8-r1.ebuild b/x11-libs/motif/motif-2.3.8-r1.ebuild
index 1677a1ad6ac8..2258ff7c47cc 100644
--- a/x11-libs/motif/motif-2.3.8-r1.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r1.ebuild
@@ -31,6 +31,7 @@ RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
DEPEND="${RDEPEND}
sys-devel/flex
|| ( dev-util/byacc sys-freebsd/freebsd-ubin )
+ x11-base/xorg-proto
x11-misc/xbitmaps"
src_prepare() {
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index a89fd59a0ba2..bdf5f254d815 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,9 +1,5 @@
-DIST QScintilla_gpl-2.10.1.tar.gz 2663446 BLAKE2B 720ce990b4e3dd65d47cd26b473bffc07240d76b2c10d393cba41331c6f160472d87b9b22985fd45b5b8064d5358b3b25f0decfe8759542a9c987381249bca42 SHA512 ea9b95ca371a8af9262493ab59ecaef77e1697ba21d1d594aab39e836917884fd829aa4f6c4e72cce60b0d3f40eac654157cc507d027945f0034881855123ccc
-DIST QScintilla_gpl-2.10.2.tar.gz 2665138 BLAKE2B 1c6349ea717997681e678cdfa6cc590a6a1cfbe652f2dd52d57fefff71229251c46cd4554b546d2e272deb7c3f970c44f657966ad08e45279813215a775c637d SHA512 755f486d62275acb5908262c4a50ad31dd9d8fca0501eb1eeec1aa2181872f8d16179b42f4213b207fd6b46fd8a72d25af7ce6c5cc10eabb363a92c0600ca972
DIST QScintilla_gpl-2.10.3.tar.gz 2721287 BLAKE2B cc85eea17e563ae5f4a130d26ca88bec3e1a6cbff7bc0af096c63789384d03149105641d6324f53b37a2bd8ab4681a285ccb76e6063a06e5db30d070d3fd8219 SHA512 a1b9d6869797ec074e4e0727164804779792fb77b2230aae80e6d6b5fb3a3ff9d84e17d775d18ab74c97b78bac454511fd2cb49be1fa36f71d9097abf88045b6
DIST QScintilla_gpl-2.10.4.tar.gz 2721322 BLAKE2B df50dd0a34db96dd57147ddc399d4a30751b1bb4922dc1b8b3c3c1989e810937dc8345f92128e8a606b1edc04fde4b930a424ab8344818c9899c8fe496793a77 SHA512 dee6684f68173784d098931554c839a30e129b89f980cd9704f818c44eb7023199bd3682e4b342091fa3e0ce577ec576d34046477bdd1d7fc58ca5dd2ba947a3
-EBUILD qscintilla-2.10.1.ebuild 2392 BLAKE2B 8949f6e08aa13e41ec7ba1d8a0a2d029b3601c8cdb3c71e44a34a728cc05a923b5162c2f657df06bc564bd4042760f1229409f2e9e8420441731e769251e1522 SHA512 c53488e751beb5a52dfc6e9903442f436e976f26afaa4a765e9bada3d0621fec6acecf4df5c98e7434f206f04336b21f0a07dccb09372cd8a693ac6c0930ebec
-EBUILD qscintilla-2.10.2.ebuild 2396 BLAKE2B 28f458ac59aa6a8fe3dea42ad42e4fb0e85d0f385c72c6afc8e67c64e95ae18c65b0b92b9498a8d7fd6808b430fbf74c82eb7e2e2dfaf962fc4d2f48f996b540 SHA512 ec04a36a7db01686439adb97aad938eb966928c4ba1b3f7df23365f59e2401efe35fff12de86016937cf1cb4fc03c9e5f2e3226d5410b13bda0c1d8d1f85c4e8
EBUILD qscintilla-2.10.3.ebuild 1792 BLAKE2B c5bc390ece8a01fc8ed9c709df1f941b3df050b61187d2db6868619435e13757fd2212182999cdf5f927123b4e100ad4ca16d291c5a25124eb74034d06b453bb SHA512 c44765c9c30c4e7ff0f9aca8595605f2620eb8b7a25ef7dad535f51976190a158dc1bb9c0a084e4ba9f3b6ca1c0b466fa18c08b9d74995b0d45e9abc0abc3ee3
EBUILD qscintilla-2.10.4.ebuild 1795 BLAKE2B 36847c597a849c37bfdb2d4cd9d230dfdef8acd08b75a7acfb1f0508edc3742e705c0db20e9a867102ecd4858f3dccafd253e5ccef9c8e5b6028c1ccba571cae SHA512 934d5063e87b917059e3d49b01230f57b00b7272310bf1ee55c12a9962a76f274e877ab5e6362e47466729d3f832fa4435ab35f0c5a20cdba7760acef270ba64
MISC metadata.xml 741 BLAKE2B 0ad895f5e6b73a5a89f527ceea61f323c13ec9329352b84a78982594a2bcdca2bd13bd67f4a4f60f21786cebef6da2bb233718fe0a90376c703de510b25e416f SHA512 393c6b16b403a5f14180ca4b010bd74b62dea7043dabaf463e6995690226105f872556d3df54e0cee1a6dfe2140b033aad25998fc65414e7380f41894201f43a
diff --git a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
deleted file mode 100644
index 34580af5018c..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multibuild qmake-utils
-
-MY_P=QScintilla_gpl-${PV/_pre/.dev}
-
-DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/13"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="designer doc +qt4 qt5"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-DEPEND="
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- designer? ( dev-qt/designer:4 )
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- designer? ( dev-qt/designer:5 )
- )
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- default
-
- # Sub-slot sanity check
- local subslot=${SLOT#*/}
- local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro)
- local major=${version%%.*}
- if [[ ${subslot} != ${major} ]]; then
- eerror
- eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
- eerror "Please update SLOT variable as follows:"
- eerror " SLOT=\"${SLOT%%/*}/${major}\""
- eerror
- die "sub-slot sanity check failed"
- fi
-
- MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
- multibuild_copy_sources
-}
-
-qsci_run_in() {
- pushd "$1" >/dev/null || die
- shift || die
- "$@" || die
- popd >/dev/null || die
-}
-
-src_configure() {
- use qt4 && append-cxxflags -std=gnu++0x
-
- if use designer; then
- # prevent building against system version (bug 466120)
- append-cxxflags -I../Qt4Qt5
- append-ldflags -L../Qt4Qt5
- fi
-
- qsci_configure() {
- qsci_run_in Qt4Qt5 eqmake${MULTIBUILD_VARIANT#qt}
- use designer && qsci_run_in designer-Qt4Qt5 eqmake${MULTIBUILD_VARIANT#qt}
- }
- multibuild_foreach_variant run_in_build_dir qsci_configure
-}
-
-src_compile() {
- qsci_compile() {
- qsci_run_in Qt4Qt5 emake
- use designer && qsci_run_in designer-Qt4Qt5 emake
- }
- multibuild_foreach_variant run_in_build_dir qsci_compile
-}
-
-src_install() {
- qsci_install() {
- qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
- use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
- }
- multibuild_foreach_variant run_in_build_dir qsci_install
-
- DOCS=( ChangeLog NEWS )
- use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
- einstalldocs
-}
diff --git a/x11-libs/qscintilla/qscintilla-2.10.2.ebuild b/x11-libs/qscintilla/qscintilla-2.10.2.ebuild
deleted file mode 100644
index eb99746332b8..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.10.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multibuild qmake-utils
-
-MY_P=QScintilla_gpl-${PV/_pre/.dev}
-
-DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="designer doc +qt4 qt5"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-DEPEND="
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- designer? ( dev-qt/designer:4 )
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- designer? ( dev-qt/designer:5 )
- )
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- default
-
- # Sub-slot sanity check
- local subslot=${SLOT#*/}
- local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro)
- local major=${version%%.*}
- if [[ ${subslot} != ${major} ]]; then
- eerror
- eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
- eerror "Please update SLOT variable as follows:"
- eerror " SLOT=\"${SLOT%%/*}/${major}\""
- eerror
- die "sub-slot sanity check failed"
- fi
-
- MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
- multibuild_copy_sources
-}
-
-qsci_run_in() {
- pushd "$1" >/dev/null || die
- shift || die
- "$@" || die
- popd >/dev/null || die
-}
-
-src_configure() {
- use qt4 && append-cxxflags -std=gnu++0x
-
- if use designer; then
- # prevent building against system version (bug 466120)
- append-cxxflags -I../Qt4Qt5
- append-ldflags -L../Qt4Qt5
- fi
-
- qsci_configure() {
- qsci_run_in Qt4Qt5 eqmake${MULTIBUILD_VARIANT#qt}
- use designer && qsci_run_in designer-Qt4Qt5 eqmake${MULTIBUILD_VARIANT#qt}
- }
- multibuild_foreach_variant run_in_build_dir qsci_configure
-}
-
-src_compile() {
- qsci_compile() {
- qsci_run_in Qt4Qt5 emake
- use designer && qsci_run_in designer-Qt4Qt5 emake
- }
- multibuild_foreach_variant run_in_build_dir qsci_compile
-}
-
-src_install() {
- qsci_install() {
- qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
- use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
- }
- multibuild_foreach_variant run_in_build_dir qsci_install
-
- DOCS=( ChangeLog NEWS )
- use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
- einstalldocs
-}
diff --git a/x11-libs/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest
index f87e99ce0167..664920a9a189 100644
--- a/x11-libs/xcb-util-cursor/Manifest
+++ b/x11-libs/xcb-util-cursor/Manifest
@@ -1,7 +1,3 @@
-DIST xcb-util-cursor-0.1.1.tar.bz2 280852 BLAKE2B ab5229e22ccec6e1fbc25e21fd8f3a65a518bc156b0d0c53482a61344f0b8ec7988ce3de46f54b6d8ddb934dcf5efb8031bcb51865b4671e3b36f0b870c286e9 SHA512 599f9074a9801615a29374a96649c2d9d8de8abd053b7ddb245b7cc50a1c9c94610a8df996a7a79a831ade3d903335fdf7ac299e6b33e735ab087c3fe5923d71
-DIST xcb-util-cursor-0.1.2.tar.bz2 289714 BLAKE2B 5439eeac2a80c1d6551eff7662d9262c3341cecd043f6710aee8fb17199067f067e614ffd50e06fed0a626f20ed320cd9c2ec6440bb78dd6eff2211b954cbed1 SHA512 13b9dc0e9f8a61fc72ef6ec722d574ba46c5eacdaf0785d301a3cca00de00b772b6b7fa0b6484f54b4ee19d384a46b3bbf29935bf15ffdde23b004567fc4a85e
DIST xcb-util-cursor-0.1.3.tar.bz2 295224 BLAKE2B 7a1a89c0f326f4ac0768110c4aa5a7818ddace1f231f6a0dcfacaf8b157a2d6aae53f5278a02cb945822d83eccb8a01ebb14ab98e8828d8f1d506e42f51431ba SHA512 be5eee7b268b18f356d6aae04820a7e1c51397dac9020d876df379e833200255b5194269541c245a9b4ac286edad4cfe44dae8e4fcfd16a4726dd7553c104c21
-EBUILD xcb-util-cursor-0.1.1-r1.ebuild 1088 BLAKE2B 0d203a0c222fa9cac1f3b4cf8b97fe823e12e918fbb243c41bbc20004673cc4fce13058c6d7edfac4b3ca857077afbaa09d3ee5a36edcec6cd6126142b3a95a9 SHA512 beac2bb4689f27ca869a685748585ebc6ca798d8d2d4d417e99589ddd6a622390ad63ac1811135613d894ceaf26e2283e3212c187516bb690cd02e9f9576e11c
-EBUILD xcb-util-cursor-0.1.2.ebuild 1088 BLAKE2B 0d203a0c222fa9cac1f3b4cf8b97fe823e12e918fbb243c41bbc20004673cc4fce13058c6d7edfac4b3ca857077afbaa09d3ee5a36edcec6cd6126142b3a95a9 SHA512 beac2bb4689f27ca869a685748585ebc6ca798d8d2d4d417e99589ddd6a622390ad63ac1811135613d894ceaf26e2283e3212c187516bb690cd02e9f9576e11c
-EBUILD xcb-util-cursor-0.1.3-r1.ebuild 1348 BLAKE2B 09dcfcec7850d8fe99f27b0c3f20aa34103e73ea47e4b39ae1c8cde24d01309fa2250467423e7d2b328423308e92097e84caecd39743980ed3fadad125fb9014 SHA512 16a786751e5a67c6ecd9541c4c8766cb4f96eb495ded24e3f5fea58c62b202c94d1108c58dd9cb1a85fb9aef92e2e164d3533ef6c8d1e28d6cf1829e9157b7f9
+EBUILD xcb-util-cursor-0.1.3-r2.ebuild 1319 BLAKE2B d2bf6f579a5e058ac15ea6ce2947e9fdb46c135e4d80879c0d8d2ad9921ebdb1ee01c3952eae1afa4eee35ab2e48a85d008b2802a64fb261153abde05de4ab3d SHA512 bf4865a70b8a5da98bfa60ebbc99e7da4ffe156462bf6b2f11b526388289c2c4245bae0010e350e0501e54706499b296ef2f258db35ddefdf245ec63dde9fc29
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild
deleted file mode 100644
index 0b93b5f3d406..000000000000
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MODULE=/
-XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util-cursor.git"
-EGIT_HAS_SUBMODULES=yes
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
- >=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
- >=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]
- >=x11-proto/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- >=dev-util/gperf-3.0.1
- test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- $(use_with doc doxygen)
- )
-
- xorg-2_src_configure
-}
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.2.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.2.ebuild
deleted file mode 100644
index 0b93b5f3d406..000000000000
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MODULE=/
-XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util-cursor.git"
-EGIT_HAS_SUBMODULES=yes
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
- >=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
- >=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]
- >=x11-proto/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- >=dev-util/gperf-3.0.1
- test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- $(use_with doc doxygen)
- )
-
- xorg-2_src_configure
-}
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r1.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
index 1729b1717639..1b44dc87488b 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r1.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-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
@@ -20,10 +20,10 @@ IUSE="test"
RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
- >=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]
- >=x11-proto/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+ >=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
+ >=x11-base/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
+ x11-base/xorg-proto
>=dev-util/gperf-3.0.1
test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
diff --git a/x11-libs/xpyb/Manifest b/x11-libs/xpyb/Manifest
index 29a25a71afb4..073e3494b067 100644
--- a/x11-libs/xpyb/Manifest
+++ b/x11-libs/xpyb/Manifest
@@ -2,6 +2,5 @@ AUX xpyb-1.3.1-xcbproto-1.13.patch 482 BLAKE2B 94643f0eb2ee39219ace29c0c436984b9
AUX xpyb-1.3.1-xcbproto-1.9.patch 533 BLAKE2B 1166382041c9813eae21b4d0b8f264dc558348102ff5a55627c5cba11f2dbf3c091d2be3e743fa1c41f65d3687b5024ad43f5de019e1311997a2fde0f59cb424 SHA512 62fcb656d0990b22e1d375e18b3fca7f8d7a09dec5a1a7d116c4c225ff3fab65e16cd00caba6e179b2b3dbc2d53574af36466d4ac87f7f3516f8660615a00bc4
AUX xpyb-python.patch 551 BLAKE2B 6c413d578f4a9e2b63bcd5ecb46473478adee1e6d0a007da96770c1f06876177b42481ed4842f023d2a38eaca21ef109d12e878ba2645e23f23f49d2530be28a SHA512 1aa769145dac51fe70fcdd043f06e5dfebc9108c71bf6a34f3e3161e88d82883b7a53406e153dd6253d9de516745bb2297fbb8dbf1f8f0a1b3a7d6e1aa873cb7
DIST xpyb-1.3.1.tar.bz2 273962 BLAKE2B 931502b14a6fcd41a5a72124895c5e1c2215c74a4baa20778e39611f51ad38e78d7c37859a45c5e7a7e4754aa612bcd01d7362d96bf3c77751c6025f41f4ec6d SHA512 f3020f9b9d27ae522408d22cbdb14c9eb3d4acbc911e6f8fac425323c3f99233f773c3c4e027aa3812dec11b832cf0df8a38f71d21b0c3a1918eea6efe36c090
-EBUILD xpyb-1.3.1-r3.ebuild 1124 BLAKE2B 1e4404db61b091420dabc07ca591c8683617e221fb4d0f8cb1b86fecd35d9048c93c12ae137c844f298a8ff55994ae63c534708da999c8374eaba34ec9885086 SHA512 d8034aa2de2092ce561c7f16c1ce72370c54ee0a3962777768046a8a773eade0c2349e03efb8972edaa8559b18ab3cf905c393440fa2bde4798cb30782f17297
-EBUILD xpyb-1.3.1-r4.ebuild 1180 BLAKE2B 69f58ce6cd5df91360332fa17d20e812e3a40bb9e9ab49d9a8163d4744f5a486468bba5c89f3b9df3bef89df6b847d735d1b95af829e0fff1d9a03b1a2edb6cf SHA512 844203bc639e0346476cf6a7f338f95967b7bfdaf451e5e2e7bd0a189e55e32f28885bccaa4b988efc090a4ce16016db0142a6e84165e017394a5d86b484177c
+EBUILD xpyb-1.3.1-r5.ebuild 1179 BLAKE2B 7d871698888f26f978b67ef8e35bb2fe6a6bfa27eeafaa698b9336ab26cc98b893f6806336b5ecbcf11823321626c2ef64e57f2cafa34f726ba0628634150266 SHA512 9d971506e8cc909dae8668f08f988b89fe8a7c03cb93b2c76e286504c3c2ad42a4f1529e79eac96a9a79e1ddf2351e83411806b95b052dff5adfd2535fa7482c
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xpyb/xpyb-1.3.1-r3.ebuild b/x11-libs/xpyb/xpyb-1.3.1-r3.ebuild
deleted file mode 100644
index 64d7a33b7dab..000000000000
--- a/x11-libs/xpyb/xpyb-1.3.1-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=1
-
-inherit flag-o-matic xorg-2 python-r1
-
-#EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/xpyb.git"
-SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-DESCRIPTION="XCB-based Python bindings for the X Window System"
-HOMEPAGE="https://xcb.freedesktop.org/"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="selinux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=x11-libs/libxcb-1.7
- >=x11-proto/xcb-proto-1.7.1[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-python.patch
- "${FILESDIR}"/${PN}-1.3.1-xcbproto-1.9.patch
-)
-DOCS=( NEWS README )
-
-pkg_setup() {
- xorg-2_pkg_setup
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable selinux)
- )
-}
-
-src_configure() {
- append-cflags -fno-strict-aliasing
- python_foreach_impl xorg-2_src_configure
-}
-
-src_compile() {
- python_foreach_impl xorg-2_src_compile
-}
-
-src_install() {
- python_foreach_impl xorg-2_src_install
-}
diff --git a/x11-libs/xpyb/xpyb-1.3.1-r4.ebuild b/x11-libs/xpyb/xpyb-1.3.1-r5.ebuild
index 1e7d210bc6ae..5e162838c60d 100644
--- a/x11-libs/xpyb/xpyb-1.3.1-r4.ebuild
+++ b/x11-libs/xpyb/xpyb-1.3.1-r5.ebuild
@@ -18,9 +18,9 @@ IUSE="selinux"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND=">=x11-libs/libxcb-1.7
- >=x11-proto/xcb-proto-1.7.1[${PYTHON_USEDEP}]
${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ >=x11-base/xcb-proto-1.7.1[${PYTHON_USEDEP}]"
PATCHES=(
"${FILESDIR}"/${PN}-python.patch