1 |
commit: 8d18437a1855845b186993fe88de9b0821be10be |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 28 22:10:21 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 28 22:15:40 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d18437a |
7 |
|
8 |
app-text/highlight: Drop 3.42-r1 |
9 |
|
10 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
app-text/highlight/Manifest | 1 - |
14 |
.../highlight/files/highlight-3.42-qmake-fix.patch | 32 -------- |
15 |
app-text/highlight/highlight-3.42-r1.ebuild | 91 ---------------------- |
16 |
3 files changed, 124 deletions(-) |
17 |
|
18 |
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest |
19 |
index 48154bbac99..3dd422a98bc 100644 |
20 |
--- a/app-text/highlight/Manifest |
21 |
+++ b/app-text/highlight/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST highlight-3.42.tar.bz2 1294770 BLAKE2B 22c79258be6a665eda8ee17d1de6a97811f97dc4b4491c24b466dc5375d98d865e07ac4e462288d066613bef8bb5a469fa0bdb3065ecf098fc6c4f6090ecb63e SHA512 362150ee396d2b203f11ecc3d011e23b6f8c7d93ff9f8cb0e9e980be6da21e7b3b1ea1e347e3f09129ab0fb1a0aab19ff19f021e643b93a163a99d3882f9bf80 |
24 |
DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99 |
25 |
|
26 |
diff --git a/app-text/highlight/files/highlight-3.42-qmake-fix.patch b/app-text/highlight/files/highlight-3.42-qmake-fix.patch |
27 |
deleted file mode 100644 |
28 |
index 31970057d9a..00000000000 |
29 |
--- a/app-text/highlight/files/highlight-3.42-qmake-fix.patch |
30 |
+++ /dev/null |
31 |
@@ -1,32 +0,0 @@ |
32 |
-From 8464afed560fa1096d37aa82aef99c00819fec87 Mon Sep 17 00:00:00 2001 |
33 |
-From: Chris Mayo <aklhfex@×××××.com> |
34 |
-Date: Fri, 2 Mar 2018 19:15:35 +0000 |
35 |
-Subject: [PATCH] fix directories passed to qmake being ignored |
36 |
- |
37 |
-contains() matches the whole value, add regular expressions for the path |
38 |
-components. |
39 |
---- |
40 |
- src/gui-qt/highlight.pro | 6 +++--- |
41 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
42 |
- |
43 |
-diff --git a/src/gui-qt/highlight.pro b/src/gui-qt/highlight.pro |
44 |
-index bae8d7c..0380a90 100644 |
45 |
---- a/src/gui-qt/highlight.pro |
46 |
-+++ b/src/gui-qt/highlight.pro |
47 |
-@@ -43,13 +43,13 @@ unix { |
48 |
- PKGCONFIG += lua |
49 |
- |
50 |
- # to make it run within Qt Creator |
51 |
-- !contains(DEFINES, DATA_DIR) { |
52 |
-+ !contains(DEFINES, DATA_DIR.*) { |
53 |
- DEFINES+=DATA_DIR=\\\"/usr/share/highlight/\\\" |
54 |
- } |
55 |
-- !contains(DEFINES, CONFIG_DIR) { |
56 |
-+ !contains(DEFINES, CONFIG_DIR.*) { |
57 |
- DEFINES+=CONFIG_DIR=\\\"/etc/highlight/\\\" |
58 |
- } |
59 |
-- !contains(DEFINES, DOC_DIR) { |
60 |
-+ !contains(DEFINES, DOC_DIR.*) { |
61 |
- DEFINES+=DOC_DIR=\\\"/usr/share/doc/highlight/\\\" |
62 |
- } |
63 |
- } |
64 |
|
65 |
diff --git a/app-text/highlight/highlight-3.42-r1.ebuild b/app-text/highlight/highlight-3.42-r1.ebuild |
66 |
deleted file mode 100644 |
67 |
index 513d088c6f2..00000000000 |
68 |
--- a/app-text/highlight/highlight-3.42-r1.ebuild |
69 |
+++ /dev/null |
70 |
@@ -1,91 +0,0 @@ |
71 |
-# Copyright 1999-2020 Gentoo Authors |
72 |
-# Distributed under the terms of the GNU General Public License v2 |
73 |
- |
74 |
-EAPI=6 |
75 |
- |
76 |
-inherit flag-o-matic qmake-utils toolchain-funcs |
77 |
- |
78 |
-DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight" |
79 |
-HOMEPAGE="http://www.andre-simon.de/" |
80 |
-SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2" |
81 |
- |
82 |
-LICENSE="GPL-3" |
83 |
-SLOT="0" |
84 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" |
85 |
-IUSE="examples qt5" |
86 |
- |
87 |
-RDEPEND=" |
88 |
- dev-lang/lua:0= |
89 |
- qt5? ( |
90 |
- dev-libs/double-conversion:= |
91 |
- dev-qt/qtcore:5 |
92 |
- dev-qt/qtgui:5 |
93 |
- dev-qt/qtwidgets:5 |
94 |
- ) |
95 |
-" |
96 |
-DEPEND="${RDEPEND} |
97 |
- dev-libs/boost |
98 |
- virtual/pkgconfig |
99 |
- qt5? ( dev-qt/linguist-tools:5 ) |
100 |
-" |
101 |
- |
102 |
-myhlopts=( |
103 |
- "CXX=$(tc-getCXX)" |
104 |
- "AR=$(tc-getAR)" |
105 |
- "LDFLAGS=${LDFLAGS}" |
106 |
- "CFLAGS=${CXXFLAGS} -DNDEBUG -std=c++11" |
107 |
- "DESTDIR=${D}" |
108 |
- "PREFIX=${EPREFIX}/usr" |
109 |
- "HL_CONFIG_DIR=${EPREFIX}/etc/highlight/" |
110 |
- "HL_DATA_DIR=${EPREFIX}/usr/share/highlight/" |
111 |
- "doc_dir=${EPREFIX}/usr/share/doc/${PF}/" |
112 |
- "conf_dir=${EPREFIX}/etc/highlight/" |
113 |
-) |
114 |
- |
115 |
-PATCHES=( "${FILESDIR}"/${P}-qmake-fix.patch ) # bug 649398 |
116 |
- |
117 |
-src_prepare() { |
118 |
- default |
119 |
- |
120 |
- sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \ |
121 |
- -i src/core/datadir.cpp || die |
122 |
- |
123 |
- if has_version "<dev-lang/lua-5.2"; then |
124 |
- sed -e "s/-DUSE_LUA52//" -i src/makefile || die |
125 |
- fi |
126 |
- |
127 |
- # We set it via eqmake5, otherwise it forces clang... |
128 |
- sed -e "s/QMAKE_CC/#QMAKE_CC/g" \ |
129 |
- -e "s/QMAKE_CXX /#QMAKE_CXX /g" \ |
130 |
- -i src/gui-qt/highlight.pro || die |
131 |
-} |
132 |
- |
133 |
-src_configure() { |
134 |
- if use qt5 ; then |
135 |
- pushd src/gui-qt > /dev/null || die |
136 |
- eqmake5 \ |
137 |
- 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"' |
138 |
- popd > /dev/null || die |
139 |
- fi |
140 |
-} |
141 |
- |
142 |
-src_compile() { |
143 |
- emake -f makefile "${myhlopts[@]}" |
144 |
- if use qt5 ; then |
145 |
- pushd src/gui-qt > /dev/null || die |
146 |
- emake |
147 |
- popd > /dev/null || die |
148 |
- fi |
149 |
-} |
150 |
- |
151 |
-src_install() { |
152 |
- emake -f makefile "${myhlopts[@]}" install |
153 |
- if use qt5; then |
154 |
- emake -f makefile "${myhlopts[@]}" install-gui |
155 |
- docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS} |
156 |
- fi |
157 |
- |
158 |
- if ! use examples ; then |
159 |
- rm -r "${ED}"/usr/share/doc/${PF}/extras || die |
160 |
- fi |
161 |
-} |