app-editors/lite: VariableOrderWrong

Signed-off-by: Alfred Wingate <parona@protonmail.com>

app-editors/lite/lite-1.11-r1.ebuild

@@ -16,10 +16,11 @@ else
 	KEYWORDS="~amd64"
 fi
 
-RESTRICT="mirror"
 LICENSE="MIT"
 SLOT="0"
 
+RESTRICT="mirror"
+
 BDEPEND="
 	media-gfx/imagemagick
 "

app-editors/lite/lite-1.11-r2.ebuild

@@ -0,0 +1,81 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs xdg
+
+DESCRIPTION="A lightweight text editor written in Lua"
+HOMEPAGE="https://github.com/rxi/lite"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rxi/lite.git"
+else
+	SRC_URI="https://github.com/rxi/lite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="
+	media-gfx/imagemagick
+"
+DEPEND="
+	media-libs/libsdl2
+"
+RDEPEND="
+	${DEPEND}
+"
+
+src_prepare() {
+	default
+
+	# 1. no automagic ccache please
+	# 2. respect user compiler
+	# 3. respect user CFLAGS
+	# 4. respect user LDFLAGS
+	sed -i \
+		-e '/if command -v ccache/,/fi/d' \
+		-e 's/compiler="gcc"/compiler="${CC}"/' \
+		-e '/^cflags=/acflags+=" ${CFLAGS}"' \
+		-e '/^lflags=/alflags+=" ${LDFLAGS}"' \
+		build.sh || die
+}
+
+src_compile() {
+	tc-export_build_env CC
+	bash -x build.sh release || die
+
+	cp icon.ico lite.ico || die
+	# This converts to 4 png files
+	convert icon.ico "${PN}.png" || die
+	mv lite-0.png lite-64.png || die
+	mv lite-1.png lite-48.png || die
+	mv lite-2.png lite-32.png || die
+	mv lite-3.png lite-16.png || die
+}
+
+src_install() {
+	insinto "/opt/${PN}"
+	doins -r data
+	exeinto "/opt/${PN}"
+	doexe lite
+	dosym "../../opt/${PN}/${PN}" "/usr/bin/${PN}"
+
+	local res
+	for res in 16 32 48 64
+	do
+		# We do this 'mv' to install to
+		# /usr/share/icons/hicolor/16x16/apps/lite.png
+		# instead of
+		# /usr/share/icons/hicolor/16x16/apps/lite-16.png
+		mv "${PN}-${res}.png" "${PN}.png" || die
+		doicon -s "${res}" "${PN}.png"
+	done
+	doicon "${PN}.ico"
+	make_desktop_entry "${PN}" "${PN^}" "${PN}" "Development;IDE"
+
+	einstalldocs
+}

app-editors/lite/lite-9999.ebuild

@@ -1,22 +1,21 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit desktop xdg
+inherit desktop toolchain-funcs xdg
 
 DESCRIPTION="A lightweight text editor written in Lua"
 HOMEPAGE="https://github.com/rxi/lite"
 
 if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/rxi/${PN}.git"
+	EGIT_REPO_URI="https://github.com/rxi/lite.git"
 else
-	SRC_URI="https://github.com/rxi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/rxi/lite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
-RESTRICT="mirror"
 LICENSE="MIT"
 SLOT="0"
 
@@ -25,29 +24,29 @@ BDEPEND="
 "
 DEPEND="
 	media-libs/libsdl2
-	net-libs/libasyncns
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libXxf86vm
-	x11-libs/libxcb
 "
 RDEPEND="
 	${DEPEND}
 "
 
+src_prepare() {
+	default
+
+	# 1. no automagic ccache please
+	# 2. respect user compiler
+	# 3. respect user CFLAGS
+	# 4. respect user LDFLAGS
+	sed -i \
+		-e '/if command -v ccache/,/fi/d' \
+		-e 's/compiler="gcc"/compiler="${CC}"/' \
+		-e '/^cflags=/acflags+=" ${CFLAGS}"' \
+		-e '/^lflags=/alflags+=" ${LDFLAGS}"' \
+		build.sh || die
+}
+
 src_compile() {
-	bash build.sh release || die
+	tc-export_build_env CC
+	bash -x build.sh release || die
 
 	cp icon.ico lite.ico || die
 	# This converts to 4 png files
@@ -59,8 +58,6 @@ src_compile() {
 }
 
 src_install() {
-	default
-
 	insinto "/opt/${PN}"
 	doins -r data
 	exeinto "/opt/${PN}"
@@ -79,14 +76,6 @@ src_install() {
 	done
 	doicon "${PN}.ico"
 	make_desktop_entry "${PN}" "${PN^}" "${PN}" "Development;IDE"
-}
 
-pkg_postinst() {
+	einstalldocs
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
 }

dev-python/icoextract/Manifest

@@ -1,2 +1 @@
-DIST icoextract-0.1.4.gh.tar.gz 46660 BLAKE2B 5e08a6ae63ed8de204a7afcbee17253e853653c2896b3900565d1eb51e2b8765ef82f38fa1432becc37e0770f173aa343da0f3f30ef221bb50676ca1097a4f03 SHA512 61a902eeb6dbe7d212a7b077d75b061c7bff64066e16cd6d5f7e993c77b4d2877458349d82c5bc51b1470615e9e8dbd400df8c8f02faa649a9b0c235fed85ce8
 DIST icoextract-0.1.5.gh.tar.gz 47625 BLAKE2B 5db642a0494c67c68c4848a63ced27dc30e52e6c0fdfd067f25ec5badec861a29109c2327b1e424f248eb91d3e7cb90aefa1f30c499e704579874c4d026e88d9 SHA512 ae65347800e83380fd688d43105e17f304c9d3e8e0058c757740ff7ede8551a980eeee8c4119374457e9399e642aac3bd3e2d484b77ce6cdb16abdda47dc874e

dev-python/icoextract/icoextract-0.1.4.ebuild

@@ -1,38 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-inherit distutils-r1
-
-DESCRIPTION="Extract icons from Windows PE files (.exe/.dll)"
-HOMEPAGE="
-	https://pypi.org/project/icoextract/
-	https://github.com/jlu5/icoextract
-"
-SRC_URI="https://github.com/jlu5/icoextract/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/pefile[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-util/mingw64-toolchain
-		${RDEPEND}
-	)
-"
-
-distutils_enable_tests unittest
-
-src_test() {
-	export PATH="${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}"
-	emake -C tests
-	distutils-r1_src_test
-}

dev-python/icoextract/icoextract-0.1.5.ebuild

@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit distutils-r1
 
 DESCRIPTION="Extract icons from Windows PE files (.exe/.dll)"

profiles/package.mask

@@ -1,3 +1,7 @@
+# Alfred Wingate <parona@protonmail.com> (2024-08-23)
+# Dead url for bundled luajit
+app-editors/howl
+
 # Alfred Wingate <parona@protonmail.com> (2024-02-15)
 # Masked for NonsolvableDepsInStable
 acct-group/sensu