commit: 8d18437a1855845b186993fe88de9b0821be10be Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jun 28 22:10:21 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jun 28 22:15:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d18437a
app-text/highlight: Drop 3.42-r1 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-text/highlight/Manifest | 1 - .../highlight/files/highlight-3.42-qmake-fix.patch | 32 -------- app-text/highlight/highlight-3.42-r1.ebuild | 91 ---------------------- 3 files changed, 124 deletions(-) diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest index 48154bbac99..3dd422a98bc 100644 --- a/app-text/highlight/Manifest +++ b/app-text/highlight/Manifest @@ -1,2 +1 @@ -DIST highlight-3.42.tar.bz2 1294770 BLAKE2B 22c79258be6a665eda8ee17d1de6a97811f97dc4b4491c24b466dc5375d98d865e07ac4e462288d066613bef8bb5a469fa0bdb3065ecf098fc6c4f6090ecb63e SHA512 362150ee396d2b203f11ecc3d011e23b6f8c7d93ff9f8cb0e9e980be6da21e7b3b1ea1e347e3f09129ab0fb1a0aab19ff19f021e643b93a163a99d3882f9bf80 DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99 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 31970057d9a..00000000000 --- 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 <[email protected]> -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 513d088c6f2..00000000000 --- 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-lang/lua-5.2"; then - sed -e "s/-DUSE_LUA52//" -i src/makefile || die - fi - - # We set it via eqmake5, otherwise it forces clang... - sed -e "s/QMAKE_CC/#QMAKE_CC/g" \ - -e "s/QMAKE_CXX /#QMAKE_CXX /g" \ - -i src/gui-qt/highlight.pro || die -} - -src_configure() { - if use qt5 ; then - pushd src/gui-qt > /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 -}
