From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- app-text/highlight/Manifest | 4 + .../highlight/files/highlight-3.42-qmake-fix.patch | 32 ++++++++ app-text/highlight/highlight-3.42-r1.ebuild | 91 ++++++++++++++++++++++ app-text/highlight/metadata.xml | 8 ++ 4 files changed, 135 insertions(+) create mode 100644 app-text/highlight/Manifest create mode 100644 app-text/highlight/files/highlight-3.42-qmake-fix.patch create mode 100644 app-text/highlight/highlight-3.42-r1.ebuild create mode 100644 app-text/highlight/metadata.xml (limited to 'app-text/highlight') diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest new file mode 100644 index 000000000000..57eb63d27cbd --- /dev/null +++ b/app-text/highlight/Manifest @@ -0,0 +1,4 @@ +AUX highlight-3.42-qmake-fix.patch 1051 BLAKE2B ad9436c010cb1f9b8db5a21234ec6b80ae73bf49cd165f99638c93b251a53db4918bc1fd70260a5a9310f9d28b86b25190ec5b21cda09b7f4138c3f39dc6088d SHA512 5f74b45995b953c815c9e820fbb73693f3f28927b5785fbc86537f55d2f411f9a6b420e45a4834babda54fddf44c1640bc32cc2cd35d3ec22be07781f05108fc +DIST highlight-3.42.tar.bz2 1294770 BLAKE2B 22c79258be6a665eda8ee17d1de6a97811f97dc4b4491c24b466dc5375d98d865e07ac4e462288d066613bef8bb5a469fa0bdb3065ecf098fc6c4f6090ecb63e SHA512 362150ee396d2b203f11ecc3d011e23b6f8c7d93ff9f8cb0e9e980be6da21e7b3b1ea1e347e3f09129ab0fb1a0aab19ff19f021e643b93a163a99d3882f9bf80 +EBUILD highlight-3.42-r1.ebuild 2229 BLAKE2B 5dfc0539fe776aa6d365d66f620942162dbd971c744b5dd24f453c0262166fe321c4832fb3affe66d4a3dcbead78eb28ddd6906f23b693410f55b48ed64eca5b SHA512 41e82019318923740c0e955bca11ec1e82882f16288da280726030edd2cf7c0236baca0f082e3727fd8d94f073f5a52a2ce7e5e49eed4a5e39a703a48d92a944 +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 new file mode 100644 index 000000000000..31970057d9a6 --- /dev/null +++ b/app-text/highlight/files/highlight-3.42-qmake-fix.patch @@ -0,0 +1,32 @@ +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 new file mode 100644 index 000000000000..0309f3970645 --- /dev/null +++ b/app-text/highlight/highlight-3.42-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~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/metadata.xml b/app-text/highlight/metadata.xml new file mode 100644 index 000000000000..7b4a61aab741 --- /dev/null +++ b/app-text/highlight/metadata.xml @@ -0,0 +1,8 @@ + + + + + tex@gentoo.org + Gentoo TeX Project + + -- cgit v1.2.3