From 90c88731bd036e5698b281fbc0a5f3aa4c9983ac Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 29 Jun 2020 11:38:31 +0100 Subject: gentoo resync : 29.06.2020 --- app-text/highlight/Manifest | 5 +- .../highlight/files/highlight-3.42-qmake-fix.patch | 32 -------- app-text/highlight/highlight-3.42-r1.ebuild | 91 ---------------------- app-text/highlight/highlight-3.57.ebuild | 2 +- 4 files changed, 2 insertions(+), 128 deletions(-) delete mode 100644 app-text/highlight/files/highlight-3.42-qmake-fix.patch delete mode 100644 app-text/highlight/highlight-3.42-r1.ebuild (limited to 'app-text/highlight') diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest index ad9c358bd492..a733ebd11e9f 100644 --- a/app-text/highlight/Manifest +++ b/app-text/highlight/Manifest @@ -1,6 +1,3 @@ -AUX highlight-3.42-qmake-fix.patch 1051 BLAKE2B ad9436c010cb1f9b8db5a21234ec6b80ae73bf49cd165f99638c93b251a53db4918bc1fd70260a5a9310f9d28b86b25190ec5b21cda09b7f4138c3f39dc6088d SHA512 5f74b45995b953c815c9e820fbb73693f3f28927b5785fbc86537f55d2f411f9a6b420e45a4834babda54fddf44c1640bc32cc2cd35d3ec22be07781f05108fc -DIST highlight-3.42.tar.bz2 1294770 BLAKE2B 22c79258be6a665eda8ee17d1de6a97811f97dc4b4491c24b466dc5375d98d865e07ac4e462288d066613bef8bb5a469fa0bdb3065ecf098fc6c4f6090ecb63e SHA512 362150ee396d2b203f11ecc3d011e23b6f8c7d93ff9f8cb0e9e980be6da21e7b3b1ea1e347e3f09129ab0fb1a0aab19ff19f021e643b93a163a99d3882f9bf80 DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99 -EBUILD highlight-3.42-r1.ebuild 2202 BLAKE2B 0b5d44fa0a2a9075e5b55ccb8c09f80dfd6bf0f00b0df7e21ea61d620db70442cb06ae5f0890fd0ee834673975255b9131cb77fff5d316109bd876f81c40e55e SHA512 24666e1693f84bf9f3f285f2fd0130769890ebce3fd67dce262cd9411a3c5d35d5b1cd28115d38269f1811f14322d676bd07f1cc521a529206408681326bc0e4 -EBUILD highlight-3.57.ebuild 2188 BLAKE2B 849955be9504de05df9edaafc02f2af7b598c9934c257b1bf7ee9046e910e2f77e9377b2899942fd20f9fda04919d9d9a53dc5728f5e5383447156450191dfd7 SHA512 92e151a33d1eda74cfcd374af26cea251ba81793507995241ab06bbc3958ba33139d51cabda92a31291867c65d2801a5595b6cfa41f0efc34db5a9a960b5dfda +EBUILD highlight-3.57.ebuild 2179 BLAKE2B 361a74f80a3b8d9ffca9528b15a644911712ea3da02acb6afaf354a2900302aa25d7c5484e75c8e9327d61df2a239e630cdb526ebd1a9f45a8a022852ac4ee7f SHA512 b5c3296235114c356d3abcd187a12ef00cc3ffb0f374a009da088a085b9af9e27b08b4eaa68692e37e8e34156901ba7a953cf693cf5c2a58c13ebdbead80810e MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e diff --git a/app-text/highlight/files/highlight-3.42-qmake-fix.patch b/app-text/highlight/files/highlight-3.42-qmake-fix.patch deleted file mode 100644 index 31970057d9a6..000000000000 --- a/app-text/highlight/files/highlight-3.42-qmake-fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8464afed560fa1096d37aa82aef99c00819fec87 Mon Sep 17 00:00:00 2001 -From: Chris Mayo -Date: Fri, 2 Mar 2018 19:15:35 +0000 -Subject: [PATCH] fix directories passed to qmake being ignored - -contains() matches the whole value, add regular expressions for the path -components. ---- - src/gui-qt/highlight.pro | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/gui-qt/highlight.pro b/src/gui-qt/highlight.pro -index bae8d7c..0380a90 100644 ---- a/src/gui-qt/highlight.pro -+++ b/src/gui-qt/highlight.pro -@@ -43,13 +43,13 @@ unix { - PKGCONFIG += lua - - # to make it run within Qt Creator -- !contains(DEFINES, DATA_DIR) { -+ !contains(DEFINES, DATA_DIR.*) { - DEFINES+=DATA_DIR=\\\"/usr/share/highlight/\\\" - } -- !contains(DEFINES, CONFIG_DIR) { -+ !contains(DEFINES, CONFIG_DIR.*) { - DEFINES+=CONFIG_DIR=\\\"/etc/highlight/\\\" - } -- !contains(DEFINES, DOC_DIR) { -+ !contains(DEFINES, DOC_DIR.*) { - DEFINES+=DOC_DIR=\\\"/usr/share/doc/highlight/\\\" - } - } diff --git a/app-text/highlight/highlight-3.42-r1.ebuild b/app-text/highlight/highlight-3.42-r1.ebuild deleted file mode 100644 index 513d088c6f28..000000000000 --- a/app-text/highlight/highlight-3.42-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic qmake-utils toolchain-funcs - -DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight" -HOMEPAGE="http://www.andre-simon.de/" -SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="examples qt5" - -RDEPEND=" - dev-lang/lua:0= - qt5? ( - dev-libs/double-conversion:= - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" -DEPEND="${RDEPEND} - dev-libs/boost - virtual/pkgconfig - qt5? ( dev-qt/linguist-tools:5 ) -" - -myhlopts=( - "CXX=$(tc-getCXX)" - "AR=$(tc-getAR)" - "LDFLAGS=${LDFLAGS}" - "CFLAGS=${CXXFLAGS} -DNDEBUG -std=c++11" - "DESTDIR=${D}" - "PREFIX=${EPREFIX}/usr" - "HL_CONFIG_DIR=${EPREFIX}/etc/highlight/" - "HL_DATA_DIR=${EPREFIX}/usr/share/highlight/" - "doc_dir=${EPREFIX}/usr/share/doc/${PF}/" - "conf_dir=${EPREFIX}/etc/highlight/" -) - -PATCHES=( "${FILESDIR}"/${P}-qmake-fix.patch ) # bug 649398 - -src_prepare() { - default - - sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \ - -i src/core/datadir.cpp || die - - if has_version " /dev/null || die - eqmake5 \ - 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"' - popd > /dev/null || die - fi -} - -src_compile() { - emake -f makefile "${myhlopts[@]}" - if use qt5 ; then - pushd src/gui-qt > /dev/null || die - emake - popd > /dev/null || die - fi -} - -src_install() { - emake -f makefile "${myhlopts[@]}" install - if use qt5; then - emake -f makefile "${myhlopts[@]}" install-gui - docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS} - fi - - if ! use examples ; then - rm -r "${ED}"/usr/share/doc/${PF}/extras || die - fi -} diff --git a/app-text/highlight/highlight-3.57.ebuild b/app-text/highlight/highlight-3.57.ebuild index 90bd4a859636..f1f062f7d23e 100644 --- a/app-text/highlight/highlight-3.57.ebuild +++ b/app-text/highlight/highlight-3.57.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="examples qt5" RDEPEND=" -- cgit v1.2.3