From c8a77dfe4d3d307c1d5dd2650b7297447d8b609d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 12 Jan 2019 16:58:08 +0000 Subject: gentoo resync : 12.01.2019 --- x11-terms/kitty/Manifest | 9 +-- x11-terms/kitty/files/kitty-0.13.2-flags.patch | 47 +++++++++++ x11-terms/kitty/kitty-0.12.1.ebuild | 96 ---------------------- x11-terms/kitty/kitty-0.12.3.ebuild | 106 ------------------------- x11-terms/kitty/kitty-0.13.2.ebuild | 106 +++++++++++++++++++++++++ x11-terms/kitty/kitty-9999.ebuild | 6 +- 6 files changed, 160 insertions(+), 210 deletions(-) create mode 100644 x11-terms/kitty/files/kitty-0.13.2-flags.patch delete mode 100644 x11-terms/kitty/kitty-0.12.1.ebuild delete mode 100644 x11-terms/kitty/kitty-0.12.3.ebuild create mode 100644 x11-terms/kitty/kitty-0.13.2.ebuild (limited to 'x11-terms/kitty') diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index 3b597efda9f5..da149b216558 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -1,10 +1,9 @@ AUX kitty-0.11.0-flags.patch 1615 BLAKE2B 862ce366a8a2975b0fd40cf7579b9f5b7eb4de106005509c80d027719a8bef1a90d5c780a439c8c19bb126036e1bf00b46119a5db251c98b1f06b76a16f3f695 SHA512 472b057080800ef6d033f47255b25db0f4029ae0981a997ce057013c7dcce8829472e26810125612f89e0ea292623106eeabe1f4952aad3e9b7de06e97e427e5 AUX kitty-0.11.0-svg-icon.patch 668 BLAKE2B 53fbe58492ebc9e78a9aab1f7ecd977c1daee9a097e34ebd0a98efefc2cf3625dc785e4c6e074f348cf24c9425734d3d521779d0c5fc5dd546f8322d35c3b11a SHA512 9b0aa40447d9ff137d45bdb3c2e4f5a8d9d68cdbc62c486a080107b02c6251d7075eaf212274c53f07977a370c8688cb3ace46828aac3b9467080d0334a05a21 -DIST kitty-0.12.1.tar.gz 3477416 BLAKE2B 4c8c99a16ec903498b17921093542d4389784c1d5bc8c8cbc2fb4c56aab7a0996f94c9442ca0ce403c2cb660c8a27e4f20165bb8dca6e9ce9eb6c9a06b03c1b9 SHA512 3efdc2ee9d41cddda7ff033fa69531ce48a163ef4b6efa7c5f10ca20511046c26313115383aec6bcef1b2a0fbbac19b2de9a43835130624aada48e12fe54b7df -DIST kitty-0.12.3.tar.xz 2832760 BLAKE2B dcf338d6d66bd33c5d1bc164964f344d458fd0bf4869536681ba72c5e2920dc84b18187f0c343b68fe954396a351b887bff0034993966e9feade69593f35272d SHA512 6e4ac5f6a44ae1cdade71f0e3fee7cfbdde15f5770d960904b2d762abef9814f9bcef2b32d4a630de8a0c88d7a7945b7cbb7fef05d62625650c2eea9932c93db +AUX kitty-0.13.2-flags.patch 1622 BLAKE2B 003a236d3817d744012883d9fb4be5029d5b83351c56e6b257ac5acd9bdd791fc7dcc5ad428be5aa227ba3f36aae40b90e04bdd6efbafc7f424b0163aa8f3abb SHA512 d24adbce0c5deee7418998d43d384fa5fb3ecc24fcf9728337c99b01bedb529fec8fd327c5dd2e71fec4957ad802e738a02cdc061f8b0dd78cbcbeffdd9c126c DIST kitty-0.13.1.tar.xz 2836564 BLAKE2B 16fa53f81d291610dd5567ef5f06c083246f9e636fc1d1ef7f340c1017c81b2e92f2a14b9f8d53ad924715ae25fd40190e071b403b2319d7c707f95aaf58e8d1 SHA512 0dbc23c300549b507b526abf2f89bf06d4dbdcd96be240d605cc9da2097b407f9b886de67c19462bb517c2b1931cf78810f0efd982cb848cb4fdab86374701db -EBUILD kitty-0.12.1.ebuild 1897 BLAKE2B ce76a872f9c72f4079f3c5ba4e208defebc65b9a712f41ba43f071a4a2c885cf5adc8f2e9c6b29f526d439f9132ccd23be0d346d46d2dd9cff06561e5fa13692 SHA512 696cd41a9357d17a83d34bace843966e356e917c1162cb2a5f8b61fc0ac08ea4f4de55a2abd4d83932c02d1144636b21214ecb5875b301cee97985622c338fba -EBUILD kitty-0.12.3.ebuild 2064 BLAKE2B ba783ecd219f7ed469b72709c6bde7a12cddd914b423483218c10d24ece856d6a0edc81c6428421398340b631ee7b60cf41a757c2b1378ecb41f551a3cbb22a8 SHA512 42c1f5ef221514ba863759514cd04a56ce469669b2e1cf6b217c810528a54681f2e664feaffaaabbf7d2a048c5460970529d48966e5c4ed2f01e7b4e89747139 +DIST kitty-0.13.2.tar.xz 2849800 BLAKE2B 94f717fd989fda5148cd8a138db7657bacd33f34e2feb6dc37cfaf12081caa0c7170dcd8e8c6641145123a95acd8d745826fcc95dab382e8072a8bfa6578693a SHA512 f66624d200223810e01b7d880ac42fc314e6be3040aa357bfd7ddf94096c58e4dd7924aebc5c1cdd8fe6082556245b586b96a264010baaaf6fd2a2ae264e4faf EBUILD kitty-0.13.1-r1.ebuild 2061 BLAKE2B 188ff7c1931af62a449fa89510537ae90e2971b3f2bf222d6db312172e42f2106d3f8a3e4a9180ec5f02bbc455080ad905c415d8587562c93b5d82e58a4c2758 SHA512 31f3c0486df8041ad77592c97f9f2d700b616452f53e6205e2c6cbfdfe88b77d3b3b02ec6a3368190e0ff19c616b973043fcf73ec536dbcef9e490bd85f5eb5a -EBUILD kitty-9999.ebuild 2061 BLAKE2B 2ada714ff970a264cee21b8e1cb4de042e02924d25bfd4d57071548e507b11c2d12eca6c577af0aaa6ac40a33f5d71aa402203d4179a3c0b272024ffa52b22d8 SHA512 52bad3fa918e945f5d2b478218173401ee131cdd977859ee7b41cd7f00dbda26636272b61b50c925f2d39bebfa5fa76b4233b7ee0b6f2e54613787d09346844a +EBUILD kitty-0.13.2.ebuild 2061 BLAKE2B a60fb0f1798d2abe1dd4cae7eba8cec13ab092312a24120a3938c850265d8b3566e095aa5158bb6ccb841d658728ed980a43b6533f5491982aa03a745d7bdfa9 SHA512 931a21ba970fd1782538b9c83c7ab4e80a9ca262d48fcfe3cf3c412b071a60429a2104441809409da8144dcd080852355de912a296f8fd9e783fa5ce18a12d70 +EBUILD kitty-9999.ebuild 2061 BLAKE2B a60fb0f1798d2abe1dd4cae7eba8cec13ab092312a24120a3938c850265d8b3566e095aa5158bb6ccb841d658728ed980a43b6533f5491982aa03a745d7bdfa9 SHA512 931a21ba970fd1782538b9c83c7ab4e80a9ca262d48fcfe3cf3c412b071a60429a2104441809409da8144dcd080852355de912a296f8fd9e783fa5ce18a12d70 MISC metadata.xml 428 BLAKE2B 961cd7fc3036c8f5a641cb97de57765c423f157430bf1fd68ce7febf24713ab1b15080e03f568d20f6360da467044ea4ed1d3ee7bfb132250951b4239df58980 SHA512 49ffa8dee6be29ab8adacbc0717dc574ad15f690fa1e0726b2a9de439f90867d3770e3628734d9a7457aa45896334d96f15a51e217ad248c766271aa62d85061 diff --git a/x11-terms/kitty/files/kitty-0.13.2-flags.patch b/x11-terms/kitty/files/kitty-0.13.2-flags.patch new file mode 100644 index 000000000000..b79edaf884fa --- /dev/null +++ b/x11-terms/kitty/files/kitty-0.13.2-flags.patch @@ -0,0 +1,47 @@ +--- kitty-0.13.2/setup.py ++++ kitty-0.13.2/setup.py +@@ -178,7 +178,7 @@ + df = '-g3' + if ccver >= (5, 0): + df += ' -Og' +- optimize = df if debug or sanitize else '-O3' ++ optimize = '' + sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set() + cppflags = os.environ.get( + 'OVERRIDE_CPPFLAGS', ( +@@ -191,7 +191,7 @@ + cflags = os.environ.get( + 'OVERRIDE_CFLAGS', ( + '-Wextra -Wno-missing-field-initializers -Wall -std=c11' +- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' ++ ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden' + ).format( + optimize, + ' '.join(sanitize_args), +@@ -205,7 +205,7 @@ + ) + ldflags = os.environ.get( + 'OVERRIDE_LDFLAGS', +- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3') ++ '-Wall ' + ' '.join(sanitize_args) + ) + ldflags = shlex.split(ldflags) + ldflags.append('-shared') +@@ -517,14 +517,14 @@ + + + def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False, for_freeze=False): +- cflags = '-Wall -Werror -fpie'.split() ++ cflags = '-Wall -fpie'.split() + cppflags = [] + libs = [] + if args.profile: + cppflags.append('-DWITH_PROFILER'), cflags.append('-g') + libs.append('-lprofiler') +- else: +- cflags.append('-O3') ++ #else: ++ # cflags.append('-O3') + if for_bundle or for_freeze: + cppflags.append('-DFOR_BUNDLE') + cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version())) diff --git a/x11-terms/kitty/kitty-0.12.1.ebuild b/x11-terms/kitty/kitty-0.12.1.ebuild deleted file mode 100644 index a97e7a7a8c5a..000000000000 --- a/x11-terms/kitty/kitty-0.12.1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{6,7} ) - -inherit python-single-r1 toolchain-funcs gnome2-utils - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" - inherit git-r3 -else - SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator" -HOMEPAGE="https://github.com/kovidgoyal/kitty" - -LICENSE="GPL-3" -SLOT="0" -IUSE="debug imagemagick wayland" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPS=" - ${PYTHON_DEPS} - >=media-libs/harfbuzz-1.5.0:= - sys-libs/zlib - media-libs/libpng:0= - media-libs/freetype:2 - media-libs/fontconfig - x11-libs/libXcursor - x11-libs/libXrandr - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libxkbcommon[X] - wayland? ( - dev-libs/wayland - >=dev-libs/wayland-protocols-1.12 - ) -" -RDEPEND=" - ${COMMON_DEPS} - imagemagick? ( virtual/imagemagick-tools ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=dev-python/sphinx-1.7[${PYTHON_USEDEP}] -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.11.0-flags.patch - "${FILESDIR}"/${PN}-0.11.0-svg-icon.patch -) - -src_prepare() { - default - - # disable wayland as required - if ! use wayland; then - sed -i "/'x11 wayland'/s/ wayland//" setup.py || die - fi - - # respect doc dir - sed -i "/htmldir =/s/appname/'${PF}'/" setup.py - - tc-export CC -} - -doecho() { - echo "$@" - "$@" || die -} - -src_compile() { - doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package -} - -src_test() { - export KITTY_CONFIG_DIRECTORY=${T} - "${EPYTHON}" test.py || die -} - -src_install() { - mkdir -p "${ED}"usr || die - cp -r linux-package/* "${ED}usr" || die - python_fix_shebang "${ED}" -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/x11-terms/kitty/kitty-0.12.3.ebuild b/x11-terms/kitty/kitty-0.12.3.ebuild deleted file mode 100644 index b265ed95339e..000000000000 --- a/x11-terms/kitty/kitty-0.12.3.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{6,7} ) - -inherit python-single-r1 toolchain-funcs gnome2-utils - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" - inherit git-r3 -else - SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator" -HOMEPAGE="https://github.com/kovidgoyal/kitty" - -LICENSE="GPL-3" -SLOT="0" -IUSE="debug doc imagemagick wayland" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPS=" - ${PYTHON_DEPS} - >=media-libs/harfbuzz-1.5.0:= - sys-apps/dbus - sys-libs/zlib - media-libs/libpng:0= - media-libs/freetype:2 - media-libs/fontconfig - x11-libs/libXcursor - x11-libs/libXrandr - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libxkbcommon[X] - x11-libs/libxcb[xkb] - wayland? ( - dev-libs/wayland - >=dev-libs/wayland-protocols-1.12 - ) -" -RDEPEND=" - ${COMMON_DEPS} - imagemagick? ( virtual/imagemagick-tools ) -" -DEPEND="${RDEPEND} - sys-libs/ncurses - virtual/pkgconfig -" -[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]" - -PATCHES=( - "${FILESDIR}"/${PN}-0.11.0-flags.patch - "${FILESDIR}"/${PN}-0.11.0-svg-icon.patch -) - -src_prepare() { - default - - # disable wayland as required - if ! use wayland; then - sed -i "/'x11 wayland'/s/ wayland//" setup.py || die - fi - - # respect doc dir - sed -i "/htmldir =/s/appname/'${PF}'/" setup.py - - tc-export CC -} - -doecho() { - echo "$@" - "$@" || die -} - -src_compile() { - doecho "${EPYTHON}" setup.py \ - --verbose $(usex debug --debug "") \ - --libdir-name $(get_libdir) \ - linux-package -} - -src_test() { - export KITTY_CONFIG_DIRECTORY=${T} - "${EPYTHON}" test.py || die -} - -src_install() { - mkdir -p "${ED}"usr || die - cp -r linux-package/* "${ED}usr" || die - python_fix_shebang "${ED}" - - if ! use doc; then - rm -r "${ED}"/usr/share/doc || die - fi -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/x11-terms/kitty/kitty-0.13.2.ebuild b/x11-terms/kitty/kitty-0.13.2.ebuild new file mode 100644 index 000000000000..74d2102fb6d1 --- /dev/null +++ b/x11-terms/kitty/kitty-0.13.2.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{6,7} ) + +inherit python-single-r1 toolchain-funcs gnome2-utils + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" + inherit git-r3 +else + SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator" +HOMEPAGE="https://github.com/kovidgoyal/kitty" + +LICENSE="GPL-3" +SLOT="0" +IUSE="debug doc imagemagick wayland" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +COMMON_DEPS=" + ${PYTHON_DEPS} + >=media-libs/harfbuzz-1.5.0:= + sys-apps/dbus + sys-libs/zlib + media-libs/libpng:0= + media-libs/freetype:2 + media-libs/fontconfig + x11-libs/libXcursor + x11-libs/libXrandr + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libxkbcommon[X] + x11-libs/libxcb[xkb] + wayland? ( + dev-libs/wayland + >=dev-libs/wayland-protocols-1.17 + ) +" +RDEPEND=" + ${COMMON_DEPS} + imagemagick? ( virtual/imagemagick-tools ) +" +DEPEND="${RDEPEND} + sys-libs/ncurses + virtual/pkgconfig +" +[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]" + +PATCHES=( + "${FILESDIR}"/${PN}-0.13.2-flags.patch + "${FILESDIR}"/${PN}-0.11.0-svg-icon.patch +) + +src_prepare() { + default + + # disable wayland as required + if ! use wayland; then + sed -i "/'x11 wayland'/s/ wayland//" setup.py || die + fi + + # respect doc dir + sed -i "/htmldir =/s/appname/'${PF}'/" setup.py + + tc-export CC +} + +doecho() { + echo "$@" + "$@" || die +} + +src_compile() { + doecho "${EPYTHON}" setup.py \ + --verbose $(usex debug --debug "") \ + --libdir-name $(get_libdir) \ + linux-package +} + +src_test() { + export KITTY_CONFIG_DIRECTORY=${T} + "${EPYTHON}" test.py || die +} + +src_install() { + mkdir -p "${ED}"usr || die + cp -r linux-package/* "${ED}usr" || die + python_fix_shebang "${ED}" + + if ! use doc; then + rm -r "${ED}"/usr/share/doc || die + fi +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild index 37279b2e443f..74d2102fb6d1 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -38,7 +38,7 @@ COMMON_DEPS=" x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland - >=dev-libs/wayland-protocols-1.12 + >=dev-libs/wayland-protocols-1.17 ) " RDEPEND=" @@ -52,7 +52,7 @@ DEPEND="${RDEPEND} [[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]" PATCHES=( - "${FILESDIR}"/${PN}-0.11.0-flags.patch + "${FILESDIR}"/${PN}-0.13.2-flags.patch "${FILESDIR}"/${PN}-0.11.0-svg-icon.patch ) -- cgit v1.2.3