From fab849d1daed0ba7f2ac497d07985c3dbb692543 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jun 2019 21:23:20 +0100 Subject: gentoo resync : 16.06.2019 --- x11-terms/kitty/Manifest | 10 +-- x11-terms/kitty/files/kitty-0.11.0-flags.patch | 47 ----------- x11-terms/kitty/files/kitty-0.14.2-flags.patch | 49 +++++++++++ x11-terms/kitty/kitty-0.13.1-r1.ebuild | 106 ------------------------ x11-terms/kitty/kitty-0.13.2.ebuild | 106 ------------------------ x11-terms/kitty/kitty-0.14.2.ebuild | 107 +++++++++++++++++++++++++ x11-terms/kitty/kitty-9999.ebuild | 3 +- 7 files changed, 162 insertions(+), 266 deletions(-) delete mode 100644 x11-terms/kitty/files/kitty-0.11.0-flags.patch create mode 100644 x11-terms/kitty/files/kitty-0.14.2-flags.patch delete mode 100644 x11-terms/kitty/kitty-0.13.1-r1.ebuild delete mode 100644 x11-terms/kitty/kitty-0.13.2.ebuild create mode 100644 x11-terms/kitty/kitty-0.14.2.ebuild (limited to 'x11-terms/kitty') diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index cf7a6889375c..f0b675612677 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -1,12 +1,10 @@ -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 AUX kitty-0.13.2-flags.patch 1622 BLAKE2B 003a236d3817d744012883d9fb4be5029d5b83351c56e6b257ac5acd9bdd791fc7dcc5ad428be5aa227ba3f36aae40b90e04bdd6efbafc7f424b0163aa8f3abb SHA512 d24adbce0c5deee7418998d43d384fa5fb3ecc24fcf9728337c99b01bedb529fec8fd327c5dd2e71fec4957ad802e738a02cdc061f8b0dd78cbcbeffdd9c126c +AUX kitty-0.14.2-flags.patch 1658 BLAKE2B debb36362a1130c2ec55d51814d6ca1fb93190e9a7f29a2450440a8c808a5604ed2000c43f317d56098f6af74e1076ae71f34523b8a762c93434d7ddb611599a SHA512 f8e46c2b699ed4a9495f1afcce6a932d89710b01f8ac35aef9cbf035ead3b7e2186ad67af5b09f156b08052bbe9e42fc5ffb87b5af5e9b36ca403bfa6b0d8e78 AUX kitty-9999-flags.patch 1636 BLAKE2B 02b608c0fe448344f9c682ca4da621fe10af0ffca378b9877192a94d909b560cfc5c34593ef5b162e9511c88edaee297074e529a7201161f625d714223c26d06 SHA512 6ad2014f214cccd0aa26b1cf47df24067f016be803b8b1b2be380328edc044c0a89f6ea0f2c2f8fa829ca6611a17030c2b753a235992fc192c39cb5f61d925a6 -DIST kitty-0.13.1.tar.xz 2836564 BLAKE2B 16fa53f81d291610dd5567ef5f06c083246f9e636fc1d1ef7f340c1017c81b2e92f2a14b9f8d53ad924715ae25fd40190e071b403b2319d7c707f95aaf58e8d1 SHA512 0dbc23c300549b507b526abf2f89bf06d4dbdcd96be240d605cc9da2097b407f9b886de67c19462bb517c2b1931cf78810f0efd982cb848cb4fdab86374701db -DIST kitty-0.13.2.tar.xz 2849800 BLAKE2B 94f717fd989fda5148cd8a138db7657bacd33f34e2feb6dc37cfaf12081caa0c7170dcd8e8c6641145123a95acd8d745826fcc95dab382e8072a8bfa6578693a SHA512 f66624d200223810e01b7d880ac42fc314e6be3040aa357bfd7ddf94096c58e4dd7924aebc5c1cdd8fe6082556245b586b96a264010baaaf6fd2a2ae264e4faf DIST kitty-0.13.3.tar.xz 2846220 BLAKE2B cb2da9e64696298471001f28bc5cc568a6ec21331153929fa86b8bc7262b5928430fc053f86b7ef669eafde676439f6ee644f14cd942e2f11fba7b7dadfcb294 SHA512 9ce803469057245f9e1c50b53e03d48d3f2483b01f9441be6eadbfea8edcba01652177cbff11d1dd2b35e9415db6822fd72a0494f00ee3be30f58c1f1991c37b -EBUILD kitty-0.13.1-r1.ebuild 2061 BLAKE2B 188ff7c1931af62a449fa89510537ae90e2971b3f2bf222d6db312172e42f2106d3f8a3e4a9180ec5f02bbc455080ad905c415d8587562c93b5d82e58a4c2758 SHA512 31f3c0486df8041ad77592c97f9f2d700b616452f53e6205e2c6cbfdfe88b77d3b3b02ec6a3368190e0ff19c616b973043fcf73ec536dbcef9e490bd85f5eb5a -EBUILD kitty-0.13.2.ebuild 2061 BLAKE2B a60fb0f1798d2abe1dd4cae7eba8cec13ab092312a24120a3938c850265d8b3566e095aa5158bb6ccb841d658728ed980a43b6533f5491982aa03a745d7bdfa9 SHA512 931a21ba970fd1782538b9c83c7ab4e80a9ca262d48fcfe3cf3c412b071a60429a2104441809409da8144dcd080852355de912a296f8fd9e783fa5ce18a12d70 +DIST kitty-0.14.2.tar.xz 2867116 BLAKE2B 20f3d66caa5242502f2699d4a5e8364eda357b00c72d50650ab0d03fbbb552152a2d4447e37ce20660d6d8f9ffc285aee057f6adf7a03ac57fa8ab6d1da61013 SHA512 191a37424c51776d271008c6b4b0cb43b60cd2abea3ea7b2a08cca9a8d44c4932ca11470f3efb8debc0e2ef3641bb68c05374401073b23cf81042af467b1dbf4 EBUILD kitty-0.13.3.ebuild 2061 BLAKE2B a60fb0f1798d2abe1dd4cae7eba8cec13ab092312a24120a3938c850265d8b3566e095aa5158bb6ccb841d658728ed980a43b6533f5491982aa03a745d7bdfa9 SHA512 931a21ba970fd1782538b9c83c7ab4e80a9ca262d48fcfe3cf3c412b071a60429a2104441809409da8144dcd080852355de912a296f8fd9e783fa5ce18a12d70 -EBUILD kitty-9999.ebuild 2053 BLAKE2B a25e09111e19c8764edeb6a484c97357a38ee632fe9b14fc92402ba090a8e72945b680ecd3b4ee4378267e4c9d3d10c21df3f16b6ca54ab54877aaf594e68f2e SHA512 e3f58830d27ff0fff04105f5abebb049c88045ba536cd77f61241cd21566c39d9093be34c7e05f4bc8bf54e2088ab03ec90ccbd6a8e8a79b22d8658697e9ea5f +EBUILD kitty-0.14.2.ebuild 2078 BLAKE2B 22b6521d25754c5ab6aa0cfdc5c28ec2f923e52779ac2a1ed4209ee9c702927de2c7ea6444b97efbcf961dfbde9d6d861b33d823ea7e24ec7e769c0e9c24ead7 SHA512 5f367b960b0457b1e9601083f36abf539f97142cf8530415697e719898cecbbc9b25a544c742acd1a24c3f4fb4653565e220f51716c812ef52a498b2e56d825f +EBUILD kitty-9999.ebuild 2070 BLAKE2B 5f7e2a261edaa1c0988470cbdab32d13979c99ae88e8b6929f8f5880d4a3afc2e4a3d5357770331e83cba5aa2f973131d84a5987f2c275b79d0670355fc98289 SHA512 3777e8b57011f22aca8b7f7e150acdd96b25ddeaa6a641026aed21673ddd53ec434399eeeeec94cd21d276635727c1327dffc200cb4e4e483fdbe8f1af8af65b MISC metadata.xml 428 BLAKE2B 961cd7fc3036c8f5a641cb97de57765c423f157430bf1fd68ce7febf24713ab1b15080e03f568d20f6360da467044ea4ed1d3ee7bfb132250951b4239df58980 SHA512 49ffa8dee6be29ab8adacbc0717dc574ad15f690fa1e0726b2a9de439f90867d3770e3628734d9a7457aa45896334d96f15a51e217ad248c766271aa62d85061 diff --git a/x11-terms/kitty/files/kitty-0.11.0-flags.patch b/x11-terms/kitty/files/kitty-0.11.0-flags.patch deleted file mode 100644 index 44abfb669a0c..000000000000 --- a/x11-terms/kitty/files/kitty-0.11.0-flags.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- kitty-0.11.0/setup.py -+++ kitty-0.11.0/setup.py -@@ -177,7 +177,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', ( -@@ -190,7 +190,7 @@ - cflags = os.environ.get( - 'OVERRIDE_CFLAGS', ( - '-Wextra -Wno-missing-field-initializers -Wall -std=c99' -- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' -+ ' -pedantic {} {} -fwrapv {} {} {} -fvisibility=hidden' - ).format( - optimize, - ' '.join(sanitize_args), -@@ -204,7 +204,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') -@@ -505,14 +505,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/files/kitty-0.14.2-flags.patch b/x11-terms/kitty/files/kitty-0.14.2-flags.patch new file mode 100644 index 000000000000..d362c4216511 --- /dev/null +++ b/x11-terms/kitty/files/kitty-0.14.2-flags.patch @@ -0,0 +1,49 @@ +Respect user CFLAGS. + +--- kitty-0.14.2/setup.py ++++ kitty-0.14.2/setup.py +@@ -198,7 +198,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', ( +@@ -213,7 +213,7 @@ + cflags = os.environ.get( + 'OVERRIDE_CFLAGS', ( + '-Wextra -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11' +- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' ++ ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden' + ).format( + optimize, + ' '.join(sanitize_args), +@@ -227,7 +227,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') +@@ -550,14 +550,14 @@ + + + def build_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.13.1-r1.ebuild b/x11-terms/kitty/kitty-0.13.1-r1.ebuild deleted file mode 100644 index 01fd1141ccc3..000000000000 --- a/x11-terms/kitty/kitty-0.13.1-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2018 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.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 deleted file mode 100644 index 74d2102fb6d1..000000000000 --- a/x11-terms/kitty/kitty-0.13.2.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# 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-0.14.2.ebuild b/x11-terms/kitty/kitty-0.14.2.ebuild new file mode 100644 index 000000000000..9a7deb4fa06d --- /dev/null +++ b/x11-terms/kitty/kitty-0.14.2.ebuild @@ -0,0 +1,107 @@ +# 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} + media-libs/mesa + sys-libs/ncurses + virtual/pkgconfig +" +[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]" + +PATCHES=( + "${FILESDIR}"/${PN}-0.14.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 4e18d020cf5a..b56c1d4487fe 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -46,14 +46,15 @@ RDEPEND=" imagemagick? ( virtual/imagemagick-tools ) " DEPEND="${RDEPEND} + media-libs/mesa sys-libs/ncurses virtual/pkgconfig " [[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]" PATCHES=( - "${FILESDIR}"/${PN}-0.11.0-svg-icon.patch "${FILESDIR}"/${P}-flags.patch + "${FILESDIR}"/${PN}-0.11.0-svg-icon.patch ) src_prepare() { -- cgit v1.2.3