From 441d1370330332b7d78f238d2f5e13f7aed5e4e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 25 Dec 2020 23:06:25 +0000 Subject: gentoo christmass resync : 25.12.2020 --- app-text/highlight/Manifest | 5 +- .../files/highlight-3.57-qt_libs_lua.patch | 13 +++ app-text/highlight/highlight-3.57-r1.ebuild | 2 +- app-text/highlight/highlight-3.57-r100.ebuild | 103 +++++++++++++++++++++ app-text/highlight/highlight-3.57.ebuild | 93 ------------------- 5 files changed, 120 insertions(+), 96 deletions(-) create mode 100644 app-text/highlight/files/highlight-3.57-qt_libs_lua.patch create mode 100644 app-text/highlight/highlight-3.57-r100.ebuild delete mode 100644 app-text/highlight/highlight-3.57.ebuild (limited to 'app-text/highlight') diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest index d55f1f0f70da..bf7393831171 100644 --- a/app-text/highlight/Manifest +++ b/app-text/highlight/Manifest @@ -1,4 +1,5 @@ +AUX highlight-3.57-qt_libs_lua.patch 334 BLAKE2B 6cd387009986ef29f309dc52668f08c404ca7f744c8d1c6d1bb8ed47a392834f4ce9c8474397c4294fc40633501d52754caa0938ea84d9b050800a33db46e5cc SHA512 db298ed4a12e90c8745d7307fd916dd73f3fc62bd306fec279d9c38973e3556425ca7b90759b03e645983c35de298b3d28e80bdcde5ece94b480ee32d7742a18 DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99 -EBUILD highlight-3.57-r1.ebuild 2800 BLAKE2B 0a31b7d18381d608fe24f9e7ee999aabe95398f7e75a6760ed4cf3f9fe1ae5b40b67ac32346223dbe45ec09e3f22ed24a54df518d04402f90f302c4f7147c2f1 SHA512 67c74eda4c2868cafe4e21a974ec75d8eb88f464f3f6b3d3e87ecb534bcfdbcb3df665e54ac9ff74d6ad1e6ff333445f43d1c064617ab23f4d5c1d099caa3ff6 -EBUILD highlight-3.57.ebuild 2179 BLAKE2B 361a74f80a3b8d9ffca9528b15a644911712ea3da02acb6afaf354a2900302aa25d7c5484e75c8e9327d61df2a239e630cdb526ebd1a9f45a8a022852ac4ee7f SHA512 b5c3296235114c356d3abcd187a12ef00cc3ffb0f374a009da088a085b9af9e27b08b4eaa68692e37e8e34156901ba7a953cf693cf5c2a58c13ebdbead80810e +EBUILD highlight-3.57-r1.ebuild 2796 BLAKE2B 5f381d9e9fe5b6268e61c54e9abb5b67bf83d58caab1261f2c904d65ddda3455a5e0b453bb2c3a7a46461e28b2dc656c71c293064af1a15368d4205edc44faa4 SHA512 69646dd692daa9c7b458c489d77b8d372e7603b5a2809e3cdf49a55e5eb512e3f274054512da668f0dfdcb1c908dbc9a9da376f827259854dfb0d27f5b9ac7ee +EBUILD highlight-3.57-r100.ebuild 2411 BLAKE2B 1c2e1bf90ec8614e7f15dc05ea0fbd8ce469ecb15f57d480ccf3c082a5b3213784a35adf95147de16b5993ad30f66cc2e4b7cb256626943f7a257974b3f887b4 SHA512 1516ac86f493d0fffd0e7d8de90d3ab044b7439bf68ec0cb7c1ccba19d255e1eb440b42a8505cf385973155badafa2fb1fc0bdebc76b018a544f52c145a80fac MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e diff --git a/app-text/highlight/files/highlight-3.57-qt_libs_lua.patch b/app-text/highlight/files/highlight-3.57-qt_libs_lua.patch new file mode 100644 index 000000000000..02009164f4e9 --- /dev/null +++ b/app-text/highlight/files/highlight-3.57-qt_libs_lua.patch @@ -0,0 +1,13 @@ +Unnecessary (the linker gets the right library from pkgconfig anyway) +and breaks slotted Lua. See Bug #761511 for details. + +--- a/src/gui-qt/highlight.pro ++++ b/src/gui-qt/highlight.pro +@@ -39,7 +39,6 @@ + unix { + DESTDIR = ../ + LIBS += -L.. -lhighlight +- LIBS += -llua + CONFIG += link_pkgconfig + PKGCONFIG += lua + diff --git a/app-text/highlight/highlight-3.57-r1.ebuild b/app-text/highlight/highlight-3.57-r1.ebuild index 515f2314f4fc..971c9675c1b5 100644 --- a/app-text/highlight/highlight-3.57-r1.ebuild +++ b/app-text/highlight/highlight-3.57-r1.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=" diff --git a/app-text/highlight/highlight-3.57-r100.ebuild b/app-text/highlight/highlight-3.57-r100.ebuild new file mode 100644 index 000000000000..4755abe9c040 --- /dev/null +++ b/app-text/highlight/highlight-3.57-r100.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} ) + +inherit lua-single 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" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + ${LUA_DEPS} + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) +" +DEPEND="${RDEPEND} + dev-libs/boost +" +BDEPEND=" + virtual/pkgconfig + qt5? ( dev-qt/linguist-tools:5 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.57-qt_libs_lua.patch +) + +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/" +) + +src_prepare() { + default + + # disable man page compression + sed -e "/GZIP/d" -i makefile || die + + sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \ + -i src/core/datadir.cpp || die + + sed -r -i \ + -e "/^LUA_.*pkg-config/s,\,${ELUA},g" \ + "${S}"/extras/tcl/makefile \ + "${S}"/extras/swig/makefile \ + || die "Failed to set Lua implementation" + + # 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 LUA_PKG_NAME="${ELUA}" "${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 deleted file mode 100644 index f1f062f7d23e..000000000000 --- a/app-text/highlight/highlight-3.57.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit 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-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" -DEPEND="${RDEPEND} - dev-libs/boost -" -BDEPEND=" - 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/" -) - -src_prepare() { - default - - # disable man page compression - sed -e "/GZIP/d" -i makefile || die - - 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 -} -- cgit v1.2.3