From ea31ad0ed5501d0bf92267c35beaf06ac016bad2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 13 May 2018 16:38:56 +0100 Subject: gentoo resync : 13.05.2018 --- x11-libs/Manifest.gz | Bin 22448 -> 22438 bytes x11-libs/libXres/Manifest | 2 +- x11-libs/libXres/libXres-1.2.0.ebuild | 2 +- x11-libs/libdrm/Manifest | 2 +- x11-libs/libdrm/libdrm-2.4.91.ebuild | 2 +- x11-libs/libpciaccess/Manifest | 2 +- x11-libs/libpciaccess/libpciaccess-0.14.ebuild | 2 +- x11-libs/libxcb/Manifest | 2 +- x11-libs/libxcb/libxcb-1.13.ebuild | 2 +- x11-libs/libxkbcommon/Manifest | 2 +- x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild | 2 +- x11-libs/libxkbfile/Manifest | 2 +- x11-libs/libxkbfile/libxkbfile-1.0.9-r1.ebuild | 2 +- x11-libs/libxshmfence/Manifest | 2 +- x11-libs/libxshmfence/libxshmfence-1.3.ebuild | 2 +- x11-libs/qwt/Manifest | 1 + x11-libs/qwt/qwt-6.1.3-r2.ebuild | 154 ++++++++++++++++++++++++ 17 files changed, 169 insertions(+), 14 deletions(-) create mode 100644 x11-libs/qwt/qwt-6.1.3-r2.ebuild (limited to 'x11-libs') diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz index 6a1fd66977cf..d72e17763233 100644 Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ diff --git a/x11-libs/libXres/Manifest b/x11-libs/libXres/Manifest index e0a6828fe462..4b88dc4b4b9c 100644 --- a/x11-libs/libXres/Manifest +++ b/x11-libs/libXres/Manifest @@ -1,5 +1,5 @@ DIST libXres-1.0.7.tar.bz2 282925 BLAKE2B fe453dfdddba0a07ed2bc086782e8e714d148adcc0316c35329cc1538fd1be53c286ed1aae136095e5b6f2fc57a0b74c06eb49a74375d6444bcbba96e16ab7e5 SHA512 796a79ab694317910442cb10a936711df9dde95764eef11efb8dedc85114977e56409de2f640553f1ad492325df178b8cfbeaeec3f03bf084638c555e44292e0 DIST libXres-1.2.0.tar.bz2 286635 BLAKE2B 0c0813118c7ecd5851b075a4001e0e34fa3df92bd8367717eee42ec20352cab3443d232715c1d40c5df313f6508d2dddc779980d11744a1f897cc7511bfdfdf4 SHA512 8eb5a36b1f030eb4e27e676cc4befcc073da66a7bce2b39089314e1facb629d13b087bb53ca2c95fe5291857da7ff9f80c6ab28fb3e245eeb9e0344937900172 EBUILD libXres-1.0.7.ebuild 546 BLAKE2B 87f33f90cfb623d0fe605520684093e946c60c27c1be5ef59759b8b1a4c05a16165a4771dc4b4c409dadebb74d7101d41cb71036dca124ed06613160d93cb487 SHA512 5d2df1ef0e9dd10f057a4481c85edb007e940cbd3a63738ccbe2d9795a1fc3b1092767a814bccf25bfbdc6c08793c72a14ca78f226db5c0e31edc682111db489 -EBUILD libXres-1.2.0.ebuild 548 BLAKE2B 2e598cbdc750adb6a1ff3b795d3e0d42ec45868efe2428af2caae4fbbb7a4bc4df074b4aae326ddcd2cfa0090591dfadf0605908deb2f305f0835a8cf34c99ae SHA512 0bfd09a2b5663db9ed2259ad50c9d3eb841455e045b24624c3aa05438479b9f11a2f7e4e9d2073a4793c33d02ad38aa52138bc06afe5e67455f2335776af74e0 +EBUILD libXres-1.2.0.ebuild 547 BLAKE2B ba64d7fa05e7edb166882bbe32a7133fdaf5e40131c09fdcb3279dcaf56b6dee05a7715fddba9daa2c2d36f2bcf3baeb4bb0741caa3e40dd05555933b3358eec SHA512 2a04ab27823d6416aec900fe2ce26c9a3470bdbc5068304831bccc8d42c4615601d89467d77ae0417b8298a4d91a90b0ace4486bebd2aa19189c42cb3437c24a MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/x11-libs/libXres/libXres-1.2.0.ebuild b/x11-libs/libXres/libXres-1.2.0.ebuild index 129135e7c8a2..effb120a95e8 100644 --- a/x11-libs/libXres/libXres-1.2.0.ebuild +++ b/x11-libs/libXres/libXres-1.2.0.ebuild @@ -7,7 +7,7 @@ inherit xorg-2 EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/lib/libXRes.git" DESCRIPTION="X.Org XRes library" -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 ~x86-solaris" +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 ~x86-solaris" IUSE="" RDEPEND="x11-libs/libX11 diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest index 2fddc162af5f..0f17dc641a8d 100644 --- a/x11-libs/libdrm/Manifest +++ b/x11-libs/libdrm/Manifest @@ -2,7 +2,7 @@ DIST libdrm-2.4.89.tar.bz2 792940 BLAKE2B 86c8227a06060e827f39da9f1debae54784e38 DIST libdrm-2.4.91.tar.bz2 815419 BLAKE2B 7df2a4bdb4b2708cc00b71173e7e261ab7f8645a473984a7cbda2c7073f14b7f87d53eb39cc075b743e72e4cda03b2c4fca6b9df6c7d5db2c739398a13f13f35 SHA512 07578c00c121ba37033db7172590e26d1545f81c242bbce2cfb7fb904bde504822c275d6468e5c5d20360d0046ae73d9b058aa0459ba35eb11927141cc998772 DIST libdrm-2.4.92.tar.bz2 821789 BLAKE2B 6cb2b98e43eae6a04c333693c20710e6693d218cce3ac255d935093a83e318fe5aeae3ea0a56e6ccfb615a4f917f83cdcc11bcb5fa8bc3f41c2b57a046919dcb SHA512 9b75584d8957d298125884d490b74c0a641725d17088ba47f3dc2ec9d06519d8387eb464c024ee11712b31b17fb84e1a9a52bd4ebc7c316beb7d2f8711dc9eb2 EBUILD libdrm-2.4.89.ebuild 1969 BLAKE2B 5b8a863b9dde55ce11e28d3830e50e88623b7789094e46e828ce06e7d056516abba2f5d48365b03cbb816fd12426e0c0e974e97c5d37455ce58dc29bb2cb4105 SHA512 437fbd5cd1c7d550891d36034722a80d27a0af030b050d4dcf614f21fc0043a526b036fec1784d8b11330cca995d688af16d9e2fc03fc5e790eda9c0e2110f67 -EBUILD libdrm-2.4.91.ebuild 2151 BLAKE2B b11486de240babc420ace91a42c6d787d192865dd5b003fe6e91cb3972b6e9c941cd4a14a95999b41e070e96a8910fb674b99e74d667c86bf34b29d3adc47ae1 SHA512 51f1b85a128b15a5ee7b595b60db96bfddfecb7a4af207a134ac39ff35e456e0d3a99b9dd5bedc29ba955c0f232402bd018429425141df3587edd475de900d08 +EBUILD libdrm-2.4.91.ebuild 2150 BLAKE2B e833da26fbcfd7f0d1fd1d572e0ac313c2be1b3a6b37a6b12cbd7e79fd3429c64c71f5fbaddfcf63e344bf67e96494e7eb217793b63db55b4798a0e451ce8bd2 SHA512 ca3f6a076a8476878e95cb2258c965591059b2a1874823a0dad94294aa81b4dff553a502ec54565eafa53615ccaf9c885698e265e4b13b1fda10ecb8dbed4acf EBUILD libdrm-2.4.92.ebuild 2158 BLAKE2B 8a1f197800e9e1dae5e3d35848d831a44f965db88b47503bb3496c6c40220bbf9667eea374186758e0651a9cd13cac3cd2b4cda1b934243600e601892d2f1165 SHA512 c6d8e39f09bed1d15bb40540ecb6c4c93e66a2d086281bce790fd67791044d76528843859c7d85d00df0eda7d53690c190bd753e7620bb8e14069c491f632f6d EBUILD libdrm-9999.ebuild 2158 BLAKE2B 8a1f197800e9e1dae5e3d35848d831a44f965db88b47503bb3496c6c40220bbf9667eea374186758e0651a9cd13cac3cd2b4cda1b934243600e601892d2f1165 SHA512 c6d8e39f09bed1d15bb40540ecb6c4c93e66a2d086281bce790fd67791044d76528843859c7d85d00df0eda7d53690c190bd753e7620bb8e14069c491f632f6d MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da diff --git a/x11-libs/libdrm/libdrm-2.4.91.ebuild b/x11-libs/libdrm/libdrm-2.4.91.ebuild index 327a502c7c7c..b6d7fc95366c 100644 --- a/x11-libs/libdrm/libdrm-2.4.91.ebuild +++ b/x11-libs/libdrm/libdrm-2.4.91.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then SRC_URI="" 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/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest index 73613d58ad5b..d15cf3e1d746 100644 --- a/x11-libs/libpciaccess/Manifest +++ b/x11-libs/libpciaccess/Manifest @@ -3,5 +3,5 @@ DIST libpciaccess-0.13.5.tar.bz2 381729 BLAKE2B f62a8820493782657c8dcaba32900f0f DIST libpciaccess-0.14.tar.bz2 361375 BLAKE2B 05af836e52c7a8e19537a5c246f2dbbfee0a8c078ed0d6c45de6d1cc5f07b70d91b9409846b175da74f31b0e2536e38ffcb65983d79d40a54abc878b679d845d SHA512 bf40214dfd22f2a223f7c948566e6eaa4bfed60116e71b3eb19f6fe7ab2c4546649eb0416c06d5983e476ea5e27de036936646eb5f800ea97763b6d1f1976f4b EBUILD libpciaccess-0.13.4.ebuild 868 BLAKE2B d9f2e456e788f05c26eec95030f2092f47a1afa4ab5b4f945e25edb6459cdaf5831b376b6eb7f6368391555cd9e9ccfb1ecd8c88bfee8ddab77221d397d102fe SHA512 5fe17935dab18929a01fe41991496751f64a0a8ab87bd95b077cf794158b189272c6745c222be9f0c01e5c6dbbe5cc911d9bb7100e84f1608702dcaf27138d22 EBUILD libpciaccess-0.13.5.ebuild 877 BLAKE2B 6f3b6ef03c0eecdf5e62b0e13a328eeb3f4e0e86bbe92fa436de03ef3df8d843fc86d2ce2e458b6ca0fe18818b74dba607cab9ed130118b8bda47947d641d9f5 SHA512 79805b3c23a399936dbf77d49408a2966e27d650168451dc9c5bec940e276f6eafa73617a19406cbc24f1c625eeb72078fea9a95715fb103c58f90634c379009 -EBUILD libpciaccess-0.14.ebuild 870 BLAKE2B 84a187664e079a8e12c4e062ea88766c3da3afd4ed54ffe795875ec6e3edb8aad39064da32a1bc53ef53520361245351d0ee573cb67ff9691d23975834ca285a SHA512 f88a355de1a6fcc3f0e8e46ac87dd4e4681aade73fb6e30d731c1d31f416cb3957c66396bee2a8c8394e84943299547276b06acf84528350d666c5b21a50753b +EBUILD libpciaccess-0.14.ebuild 869 BLAKE2B b23828ad6bcd938423724158bc99f383800c71fb4b6277f121cbcbf8486e6e949dd11de87e46f0d05612a5188aa4d353fc6c18a2f58b7b6841b6abe6fa184e65 SHA512 81522aa7b82e9db17b6225d32f297eb147a2bedae269608284e6c320d0ce5facf362af9fab34f5e5594bdaafb4b5ee10d52f9291e1d4f8eb8c6e90c7244eea72 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/x11-libs/libpciaccess/libpciaccess-0.14.ebuild b/x11-libs/libpciaccess/libpciaccess-0.14.ebuild index 0a79e0227662..9f0ffaf2fe62 100644 --- a/x11-libs/libpciaccess/libpciaccess-0.14.ebuild +++ b/x11-libs/libpciaccess/libpciaccess-0.14.ebuild @@ -7,7 +7,7 @@ XORG_MULTILIB=yes inherit xorg-2 DESCRIPTION="Library providing generic access to the PCI bus and devices" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-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 ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="zlib" DEPEND="! qwtconfig.pri <<-EOF + QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)" + QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6" + QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}" + QWT_CONFIG += QwtPlot QwtWidgets QwtPkgConfig + VERSION = ${PV/_*} + QWT_VERSION = ${PV/_*} + EOF + + use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri + use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri + use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri + use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri + + cat > qwtbuild.pri <<-EOF + QWT_CONFIG += qt warn_on thread release no_keywords + EOF + + multibuild_copy_sources + + preparation() { + if [[ ${MULTIBUILD_VARIANT} == shared ]]; then + echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri + fi + + cat >> qwtconfig.pri <<-EOF + QWT_INSTALL_PLUGINS = "${EPREFIX}$(qt5_get_plugindir)/designer" + QWT_INSTALL_FEATURES = "${EPREFIX}$(qt5_get_mkspecsdir)/features" + EOF + sed \ + -e 's/target doc/target/' \ + -e "/^TARGET/s:(qwt):(qwt6-qt5):g" \ + -e "/^TARGET/s:qwt):qwt6-qt5):g" \ + -i src/src.pro || die + + sed \ + -e '/qwtAddLibrary/s:(qwt):(qwt6-qt5):g' \ + -e '/qwtAddLibrary/s:qwt):qwt6-qt5):g' \ + -i qwt.prf designer/designer.pro examples/examples.pri \ + textengines/mathml/qwtmathml.prf textengines/textengines.pri || die + + default + } + + multibuild_foreach_variant run_in_build_dir preparation +} + +src_configure() { + multibuild_foreach_variant run_in_build_dir eqmake5 +} + +src_compile() { + multibuild_foreach_variant run_in_build_dir default +} + +src_test() { + testing() { + cd examples || die + eqmake5 examples.pro + emake + } + multibuild_foreach_variant run_in_build_dir testing +} + +src_install () { + rm -f doc/man/*/{_,deprecated}* || die + + multibuild_foreach_variant run_in_build_dir emake INSTALL_ROOT="${D}" install + + if use mathml; then + sed \ + -e "s: -L\"${WORKDIR}\".* -lqwt6: -lqwt6:g" \ + -i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die + fi + + if use doc; then + HTML_DOCS=( doc/html/. ) + else + rm -rf "${ED}"/usr/share/doc/${PF}/html || die + fi + + einstalldocs + + mkdir -p "${ED}"/usr/share/man/ || die + mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \ + rmdir "${ED}"/usr/share/doc/${PF}/man || die + + if use examples; then + # don't build examples - fix the qt files to build once installed + cat > examples/examples.pri <<-EOF + include( qwtconfig.pri ) + TEMPLATE = app + MOC_DIR = moc + INCLUDEPATH += "${EPREFIX}/usr/include/qwt6" + DEPENDPATH += "${EPREFIX}/usr/include/qwt6" + LIBS += -lqwt6 + EOF + sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die + cp *.pri examples/ || die + insinto /usr/share/${PN}6 + doins -r examples + fi +} -- cgit v1.2.3