Skip to content

Commit

Permalink
Merge pull request #23 from kir68k/pkgcheck-final
Browse files Browse the repository at this point in the history
Signed-off-by: Kirin Etheridge <revelation@krxt.dev>
  • Loading branch information
kir68k committed Sep 14, 2024
2 parents dd47f93 + 867ca10 commit 3ae0100
Show file tree
Hide file tree
Showing 14 changed files with 64 additions and 127 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pkgcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ jobs:
- name: Run pkgcheck
uses: pkgcore/pkgcheck-action@v1
with:
args: --keywords=-NonsolvableDepsInStable,-UnknownRestrict
args: --keywords=-NonsolvableDepsInStable,-UnknownRestrict --profiles=default/linux/amd64/23.0/llvm,default/linux/amd64/23.0/desktop
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ Ebuilds I have copied from e.g. the main repository preserve their original GPLv
### Requirements
- GURU Overlay
- Some ebuilds might have dependencies that exist only in the GURU overlay. [//]: # (TODO: Explain which ebuilds require this, please.)
- The following ebuilds contain depends already existing in GURU:
- gui-apps/gradience (dep: dev-python/material-color-utilities)

#### Recommendations
- LLVM profile
- Best is to install using the LLVM stage3.
Expand Down
2 changes: 1 addition & 1 deletion TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<p align="center"<i><sub>2024-09-02</sub></i></p>

### Documentation
- [ ] README.md: Explain which ebuilds require the GURU overlay, check if at all.
- [x] README.md: Explain which ebuilds require the GURU overlay, check if at all.

### Sets
- [ ] Remove openwrt-prequisites; I am not a fan of installing software I'll use once.\
Expand Down
3 changes: 1 addition & 2 deletions games-util/r2mod_cli/r2mod_cli-1.3.3-r4.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ HOMEPAGE="https://github.com/Foldex/r2mod_cli"
SRC_URI="https://github.com/Foldex/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${P}"

KEYWORDS="~amd64"

LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"

RESTRICT="mirror"

Expand Down
3 changes: 2 additions & 1 deletion games-util/spcomp-bin/spcomp-bin-1.11.6968-r2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ SRC_URI="
https://sm.alliedmods.net/smdrop/${MAJ_VER}/sourcemod-${MAJ_VER}.${MIN_VER}-git${GITREV}-linux.tar.gz -> ${P}.tar.gz
"
S="${WORKDIR}"
KEYWORDS="amd64 x86"

LICENSE="GPL-2+ GPL-3"
SLOT="0"
KEYWORDS="amd64 x86"

RESTRICT="mirror"

src_unpack() {
Expand Down
3 changes: 2 additions & 1 deletion games-util/spcomp-bin/spcomp-bin-1.12.7158-r2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ SRC_URI="
https://sm.alliedmods.net/smdrop/${MAJ_VER}/sourcemod-${MAJ_VER}.${MIN_VER}-git${GITREV}-linux.tar.gz -> ${P}.tar.gz
"
S="${WORKDIR}"
KEYWORDS="~amd64 ~x86"

LICENSE="GPL-2+ GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"

RESTRICT="mirror"

src_unpack() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ MY_P="${PN}-${GIT_COMMIT}"
SRC_URI="${REPO_URI}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${MY_P}"


LICENSE="GPL-3"
SLOT="0"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ SRC_URI="https://github.com/GreycLab/gmic/archive/v.${PV}.tar.gz -> ${P}.tar.gz
gimp? ( ${GMIC_QT_URI} )
gui? ( ${GMIC_QT_URI} )
"
KEYWORDS="~amd64 ~x86"
GMIC_QT_DIR="gmic-qt-v.${PV}"
S="${WORKDIR}/${PN}-v.${PV}"

LICENSE="CeCILL-2 GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="bash-completion +cli ffmpeg fftw gimp gimp3 graphicsmagick gui jpeg opencv openexr openmp png static-libs tiff X"
REQUIRED_USE="
|| ( cli gimp gui )
Expand All @@ -41,7 +44,7 @@ COMMON_DEPEND="
${QT_DEPS}
)
gimp3? (
=media-gfx/gimp-2.99.18
~media-gfx/gimp-2.99.18
${QT_DEPS}
)
graphicsmagick? ( media-gfx/graphicsmagick:0= )
Expand Down Expand Up @@ -71,9 +74,6 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
"

GMIC_QT_DIR="gmic-qt-v.${PV}"
S="${WORKDIR}/${PN}-v.${PV}"

pkg_pretend() {
if use openmp ; then
tc-check-openmp
Expand Down Expand Up @@ -101,7 +101,7 @@ src_prepare() {
patch -p1 -i "${FILESDIR}/gmic-3.2.0-system-gmic.patch" || die
if use gimp3 ; then
patch -p1 -i "${FILESDIR}/gimp-3-functions.patch"
pushd ${WORKDIR}
pushd "${WORKDIR}"
patch -p1 -i "${FILESDIR}/gimp-3-setup.patch"
popd
fi
Expand Down
6 changes: 3 additions & 3 deletions media-gfx/gmic/metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<name>Kirin Etheridge</name>
</maintainer>
<use>
<flag name="cli">Enable G'Mic CLI</flag>
<flag name="gimp3">Enable GIMP 3 support (Only for X11)</flag>
<flag name="opencv">Enable OpenCV support</flag>
<flag name="cli">Enable G'Mic CLI</flag>
<flag name="gimp3">Enable GIMP 3 support (Only for X11)</flag>
<flag name="opencv">Enable OpenCV support</flag>
</use>
<upstream>
<remote-id type="github">GreycLab/gmic</remote-id>
Expand Down
80 changes: 40 additions & 40 deletions media-video/natron-bin/natron-bin-2.5.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -19,64 +19,64 @@ SLOT="0"
KEYWORDS="amd64"

DEPEND="
virtual/glu
sys-libs/libxcrypt
x11-themes/hicolor-icon-theme
virtual/glu
sys-libs/libxcrypt
x11-themes/hicolor-icon-theme
"
RDEPEND="${DEPEND}"

BDEPEND="
sys-apps/gendesk
media-gfx/imagemagick
sys-apps/gendesk
media-gfx/imagemagick
"

RESTRICT="mirror strip"

src_prepare() {
# Generate desktop file
gendesk -f -n \
--pkgname="${MY_PN}" \
--pkgdesc="${DESCRIPTION}" \
--name="${PROG_NAME}" \
--comment="${DESCRIPTION}" \
--exec="${PROG_NAME}" \
--icon="${MY_PN}" \
--categories='Graphics' \
--mimetypes="application/x-${MY_PN}"
default
# Generate desktop file
gendesk -f -n \
--pkgname="${MY_PN}" \
--pkgdesc="${DESCRIPTION}" \
--name="${PROG_NAME}" \
--comment="${DESCRIPTION}" \
--exec="${PROG_NAME}" \
--icon="${MY_PN}" \
--categories='Graphics' \
--mimetypes="application/x-${MY_PN}"
default
}

src_install() {
mkdir -p "${ED}/usr/share/applications" || die
mkdir -p "${ED}/usr/share/mime/application" || die
mkdir -p "${ED}/opt/${PN}" || die
mkdir -p "${ED}/usr/bin" || die
mkdir -p "${ED}/usr/share/applications" || die
mkdir -p "${ED}/usr/share/mime/application" || die
mkdir -p "${ED}/opt/${PN}" || die
mkdir -p "${ED}/usr/bin" || die

cp -r * "${ED}/opt/${PN}/" || die
cp "${S}/${MY_PN}.desktop" "${ED}/usr/share/applications" || die
cp "${FILESDIR}/x-${MY_PN}.xml" "${ED}/usr/share/mime/application" || die
ln -sf "/opt/${PN}/${PROG_NAME}" "${ED}/usr/bin/${PROG_NAME}" || die
cp -r * "${ED}/opt/${PN}/" || die
cp "${S}/${MY_PN}.desktop" "${ED}/usr/share/applications" || die
cp "${FILESDIR}/x-${MY_PN}.xml" "${ED}/usr/share/mime/application" || die
ln -sf "/opt/${PN}/${PROG_NAME}" "${ED}/usr/bin/${PROG_NAME}" || die

for i in 16 22 24 32 48 64 96 128 256; do
magick "${ED}/opt/${PN}/Resources/pixmaps/${MY_PN}Icon256_linux.png" \
-resize "${i}x${i}" "${S}/icon_app${i}.png" || die
mkdir -p "${ED}/usr/share/icons/hicolor/${i}x${i}/apps/" || die
cp "${S}/icon_app${i}.png" "${ED}/usr/share/icons/hicolor/${i}x${i}/apps/${MY_PN}.png" || die
done
for i in 16 22 24 32 48 64 96 128 256; do
magick "${ED}/opt/${PN}/Resources/pixmaps/${MY_PN}ProjectIcon_linux.png" \
-resize "${i}x${i}" "${S}/icon_mime${i}.png" || die
mkdir -p "${ED}/usr/share/icons/hicolor/${i}x${i}/mimetypes" || die
cp "${S}/icon_mime${i}.png" "${ED}/usr/share/icons/hicolor/${i}x${i}/mimetypes/${MY_PN}.png" || die
done
for i in 16 22 24 32 48 64 96 128 256; do
magick "${ED}/opt/${PN}/Resources/pixmaps/${MY_PN}Icon256_linux.png" \
-resize "${i}x${i}" "${S}/icon_app${i}.png" || die
mkdir -p "${ED}/usr/share/icons/hicolor/${i}x${i}/apps/" || die
cp "${S}/icon_app${i}.png" "${ED}/usr/share/icons/hicolor/${i}x${i}/apps/${MY_PN}.png" || die
done
for i in 16 22 24 32 48 64 96 128 256; do
magick "${ED}/opt/${PN}/Resources/pixmaps/${MY_PN}ProjectIcon_linux.png" \
-resize "${i}x${i}" "${S}/icon_mime${i}.png" || die
mkdir -p "${ED}/usr/share/icons/hicolor/${i}x${i}/mimetypes" || die
cp "${S}/icon_mime${i}.png" "${ED}/usr/share/icons/hicolor/${i}x${i}/mimetypes/${MY_PN}.png" || die
done
}

pkg_postinst() {
xdg_icon_cache_update
xdg_desktop_database_update
xdg_icon_cache_update
xdg_desktop_database_update
}

pkg_postrm() {
xdg_icon_cache_update
xdg_desktop_database_update
xdg_icon_cache_update
xdg_desktop_database_update
}
2 changes: 1 addition & 1 deletion sys-apps/gendesk/Manifest
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DIST gendesk-1.0.9.tar.gz 957713 BLAKE2B 5677330273532ad03de5a35230a34b506138b9174a5e6183f505e9f29927352d709a6f97859ff5981fbcb8c1aac12dfd3a7fda402f0d14a8d661e716274ca092 SHA512 f0b07628df6efe24ebb48b8982293f393a00edb5c72cc04bd6b9d035bef1cc6cfacd505216e75d19091e4df31ab94ee76df8ec37f8851985ef4945c57eca43f9
DIST gendesk-1.0.10.tar.gz 1152320 BLAKE2B 0603cb2bc8da7c4c3667bf156ca74c2327e2e462690d448daa78d906fcc78eca4a2dd91879ab25372343905d54603c9983335ff2c0891753578511a76871df4b SHA512 2b43381d341a19aa50e3f4ffaec3d00f29f1c3dfa61ca20bdb219a1919f0b0f983f87164a4fd98c34d87fada8a0a9783fc2d5a30d5b1042581d0cae8611e1969
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,16 @@ HOMEPAGE="
https://gendesk.roboticoverlords.org
"

if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/xyproto/${PN}"
else
SRC_URI="https://github.com/xyproto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${P}"
KEYWORDS="~amd64"
fi
SRC_URI="https://github.com/xyproto/gendesk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${P}"

LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
IUSE="man"

RESTRICT="mirror"

src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack || die
go-module_src_unpack || die
else
go-module_src_unpack || die
fi
}

src_compile() {
ego build -mod=vendor -v -trimpath
}
Expand Down
51 changes: 0 additions & 51 deletions sys-apps/gendesk/gendesk-9999.ebuild

This file was deleted.

2 changes: 1 addition & 1 deletion sys-block/hddrand/metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<name>Kirin Etheridge</name>
</maintainer>
<upstream>
<remote-id type="github">xyproto/gendesk</remote-id>
<remote-id type="github">mqudsi/hddrand</remote-id>
</upstream>
</pkgmetadata>

0 comments on commit 3ae0100

Please sign in to comment.