[gentoo-commits] repo/gentoo:master commit in: app-text/highlight/, profiles/arch/ia64/, profiles/arch/s390/

[gentoo-commits] repo/gentoo:master commit in: app-text/highlight/, profiles/arch/ia64/, profiles/arch/s390/

[Sam James]

commit:     3275b3b5e0f768334c56bf4ca26992f2d130caaf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 01:29:53 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 01:38:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3275b3b5

app-text/highlight: add 4.6

Closes: https://bugs.gentoo.org/885849
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/highlight/Manifest             |   1 +
 app-text/highlight/highlight-4.6.ebuild | 107 ++++++++++++++++++++++++++++++++
 profiles/arch/ia64/package.use.mask     |   4 ++
 profiles/arch/s390/package.use.mask     |   1 +
 4 files changed, 113 insertions(+)

diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 9afe1785b1df..ff24bf19e0b3 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1 +1,2 @@
 DIST highlight-4.1.tar.bz2 1469115 BLAKE2B 9ee4c61ea5ebdfd04c2bb341838cc66a755d5deb6dfb5d863d22dbb86be9b5d08999f22bb184053126bdaf8858777eb2ac504fed8998dc51bd6e1cd64f911ad8 SHA512 6e3ba72b2109f1b33fcebd1a426a8d4b3e12ee224b8a2069e7aab1391473594ccf9b35303bca5ca1339d2ce42bc6db2d16c1da7b1cdd451f5fabe672ca388731
+DIST highlight-4.6.tar.bz2 1488327 BLAKE2B 952171929aa021c80690b2ddcd5adba3b6c7e54425cfc851368b768a53c749e34495b0832d4ce5546b5bc68c0ea4e3b5bd6df4f379e02702fd3a497adc52d60b SHA512 0214f2141ecf2ab350368ff165dc5f58eb3a23b31142b9d1c443a35f8ea72b9e33770c2de185cd2e3645e298ad41ec1fd45db5ebf546da3144e1dc93da32b811

diff --git a/app-text/highlight/highlight-4.6.ebuild b/app-text/highlight/highlight-4.6.ebuild
new file mode 100644
index 000000000000..d6d49225f645
--- /dev/null
+++ b/app-text/highlight/highlight-4.6.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua-single qmake-utils toolchain-funcs xdg
+
+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 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples gui"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+"
+BDEPEND="
+	virtual/pkgconfig
+	gui? ( 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"
+	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/"
+	examples_dir="${EPREFIX}/usr/share/doc/${PF}/extras"
+)
+
+src_prepare() {
+	default
+
+	# Disable man page compression
+	sed \
+		-e "/GZIP/d" \
+		-e "/COPYING/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,\<lua\>,${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 gui ; 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 gui ; then
+		emake -C src/gui-qt
+	fi
+}
+
+src_install() {
+	emake -f makefile "${myhlopts[@]}" install
+
+	if use gui; 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/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index e5401b0ecb9a..b915ffe657b6 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2023-06-17)
+# Qt 5 not keyworded here
+app-text/highlight gui
+
 # Matt Turner <mattst88@gentoo.org> (2023-05-30)
 # sys-apps/dbus-broker is not keyworded
 app-accessibility/at-spi2-core dbus-broker

diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 38cd501675d0..2e398197e12e 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -4,6 +4,7 @@
 # Sam James <sam@gentoo.org> (2023-06-17)
 # Qt 5 not keyworded here
 app-text/ansifilter gui
+app-text/highlight gui
 
 # Matt Turner <mattst88@gentoo.org> (2023-05-30)
 # sys-apps/dbus-broker is not keyworded