Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app-emulation/fs-uae/files/fs-uae-3.1.35-ar.patch25
-rw-r--r--dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.ebuild4
-rw-r--r--dev-vcs/gitolite/gitolite-3.6.11-r1.ebuild4
-rw-r--r--media-libs/sdl2-ttf/sdl2-ttf-2.0.18-r1.ebuild2
-rw-r--r--media-sound/gnump3d/gnump3d-3.0-r4.ebuild6
-rw-r--r--net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild8
-rw-r--r--net-misc/cfengine/cfengine-3.6.2-r1.ebuild30
-rw-r--r--sci-electronics/spice/spice-3.5.5-r3.ebuild6
-rw-r--r--sys-apps/dbus-broker/dbus-broker-29.ebuild4
-rw-r--r--sys-apps/dbus-broker/dbus-broker-9999.ebuild4
10 files changed, 35 insertions, 58 deletions
diff --git a/app-emulation/fs-uae/files/fs-uae-3.1.35-ar.patch b/app-emulation/fs-uae/files/fs-uae-3.1.35-ar.patch
deleted file mode 100644
index 9075723da74c..000000000000
--- a/app-emulation/fs-uae/files/fs-uae-3.1.35-ar.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4e6295094978817ba02e16ac5404ac9c9e287c82 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 17 Oct 2021 09:54:24 +0100
-Subject: [PATCH] Have configure respect the AR variable instead of setting it
- to "ar"
-
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index bb2c69de..6e41d68e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -66,6 +66,7 @@ AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
- AC_PROG_RANLIB
-+AM_PROG_AR
- AM_PROG_CC_C_O
- # AC_PATH_TOOL(OBJCOPY, objcopy)
- AC_PATH_PROG([MSGFMT], [msgfmt], [not found])
---
-2.32.0
-
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.ebuild
index bdac564d2a2c..0f02b78dc441 100644
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -69,7 +69,7 @@ src_install() {
dodir /usr/bin
for bin in gitolite{,-shell}; do
- dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+ dosym ../libexec/${PN}/${bin} /usr/bin/${bin}
done
if use tools; then
diff --git a/dev-vcs/gitolite/gitolite-3.6.11-r1.ebuild b/dev-vcs/gitolite/gitolite-3.6.11-r1.ebuild
index c83049e8e95e..dab1116f65a7 100644
--- a/dev-vcs/gitolite/gitolite-3.6.11-r1.ebuild
+++ b/dev-vcs/gitolite/gitolite-3.6.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -71,7 +71,7 @@ src_install() {
dodir /usr/bin
for bin in gitolite{,-shell}; do
- dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+ dosym ../libexec/${PN}/${bin} /usr/bin/${bin}
done
if use tools; then
diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.0.18-r1.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.0.18-r1.ebuild
index 03b5545aa54b..6094378764b6 100644
--- a/media-libs/sdl2-ttf/sdl2-ttf-2.0.18-r1.ebuild
+++ b/media-libs/sdl2-ttf/sdl2-ttf-2.0.18-r1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-minimal
MY_P="SDL2_ttf-${PV}"
DESCRIPTION="Library that allows you to use TrueType fonts in SDL applications"
-HOMEPAGE="https//www.libsdl.org/projects/SDL_ttf/"
+HOMEPAGE="https://www.libsdl.org/projects/SDL_ttf/"
SRC_URI="https://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
S="${WORKDIR}/${MY_P}"
diff --git a/media-sound/gnump3d/gnump3d-3.0-r4.ebuild b/media-sound/gnump3d/gnump3d-3.0-r4.ebuild
index fc1a65587ece..1e5fb6e69414 100644
--- a/media-sound/gnump3d/gnump3d-3.0-r4.ebuild
+++ b/media-sound/gnump3d/gnump3d-3.0-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit multilib perl-module
+inherit perl-module
DESCRIPTION="A streaming server for MP3, OGG vorbis and other streamable files"
HOMEPAGE="https://www.gnu.org/software/gnump3d/"
@@ -43,7 +43,7 @@ src_install() {
doins lib/gnump3d/lang/*.pm
dobin bin/gnump3d2 bin/gnump3d-top bin/gnump3d-index
- dosym /usr/bin/gnump3d2 /usr/bin/gnump3d
+ dosym gnump3d2 /usr/bin/gnump3d
doman man/*.1
insinto /usr/share/gnump3d
diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild b/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
index eaa17997c338..001c32520db9 100644
--- a/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
+++ b/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -84,8 +84,8 @@ src_install() {
doins "${FILESDIR}"/psybnc.conf
keepdir "${PSYBNC_HOME}"/{log,motd,scripts}
- dosym /usr/share/psybnc/lang "${PSYBNC_HOME}"/lang
- dosym /usr/share/psybnc/help "${PSYBNC_HOME}"/help
+ dosym ../../../usr/share/psybnc/lang "${PSYBNC_HOME}"/lang
+ dosym ../../../usr/share/psybnc/help "${PSYBNC_HOME}"/help
fowners psybnc:psybnc "${PSYBNC_HOME}"/{,log,motd,scripts} /etc/psybnc/psybnc.conf
fperms 0750 "${PSYBNC_HOME}"/{,log,motd,scripts}
@@ -93,7 +93,7 @@ src_install() {
if use ssl; then
keepdir /etc/psybnc/ssl
- dosym /etc/psybnc/ssl "${PSYBNC_HOME}"/key
+ dosym ../../../etc/psybnc/ssl "${PSYBNC_HOME}"/key
else
# Drop SSL listener from psybnc.conf
sed -i -e "/^# Default SSL listener$/,+4 d" "${D}"/etc/psybnc/psybnc.conf || die
diff --git a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
index 7ade88aede8b..53c7b95c86ad 100644
--- a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="7"
-inherit autotools epatch
+inherit autotools
MY_PV="${PV//_beta/b}"
MY_PV="${MY_PV/_p/p}"
MY_P="${PN}-${MY_PV}"
-DESCRIPTION="An automated suite of programs for configuring and maintaining Unix-like computers"
+DESCRIPTION="An suite of programs for configuring and maintaining Unix-like computers"
HOMEPAGE="http://www.cfengine.org/"
SRC_URI="http://cfengine.package-repos.s3.amazonaws.com/tarballs/${MY_P}.tar.gz
masterfiles? ( http://cfengine.package-repos.s3.amazonaws.com/tarballs/masterfiles-${MY_PV}.tar.gz -> ${PN}-masterfiles-${MY_PV}.tar.gz )"
@@ -22,7 +22,7 @@ IUSE="acl examples libvirt mysql masterfiles postgres +qdbm selinux tokyocabinet
DEPEND="acl? ( virtual/acl )
mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql )
+ postgres? ( dev-db/postgresql:= )
selinux? ( sys-libs/libselinux )
tokyocabinet? ( dev-db/tokyocabinet )
qdbm? ( dev-db/qdbm )
@@ -39,9 +39,11 @@ REQUIRED_USE="^^ ( qdbm tokyocabinet )"
S="${WORKDIR}/${MY_P}"
src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/${P}-ifconfig.patch"
+ "${FILESDIR}/${P}-sysmacros.patch"
+ )
default
- epatch "${FILESDIR}/${P}-ifconfig.patch"
- epatch "${FILESDIR}/${P}-sysmacros.patch"
eautoreconf
}
@@ -86,12 +88,12 @@ src_install() {
find "${D}"/usr/share -name "*.cf" | xargs sed -i "s,/sbin/ifconfig,$(which ifconfig),g"
# Evil workaround for now..
- mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF}
+ mv "${ED}"/usr/share/doc/${PN}/ "${ED}"/usr/share/doc/${PF}
dodoc AUTHORS
if ! use examples; then
- rm -rf "${D}"/usr/share/doc/${PF}/example*
+ rm -rf "${ED}"/usr/share/doc/${PF}/example*
fi
# Create cfengine working directory
@@ -103,7 +105,7 @@ src_install() {
# binaries here. This is the default search location for the
# binaries.
for bin in promises agent monitord serverd execd runagent key; do
- dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin
+ dosym ../../../usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin
done
if use masterfiles; then
@@ -130,10 +132,10 @@ pkg_postinst() {
# Fix old cf-servd, remove it after some releases.
local found=0
- for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
+ for fname in $(find "${EROOT}"/etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
found=1
- rm $fname
- ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
+ rm "$fname"
+ ln -s "${EROOT}"/etc/init.d/cf-serverd $(echo "$fname" | sed 's:cf-servd:cf-serverd:')
done
if [ "${found}" -eq 1 ]; then
@@ -143,7 +145,7 @@ pkg_postinst() {
}
pkg_config() {
- if [ "${ROOT}" == "/" ]; then
+ if [[ -z ${ROOT} ]]; then
if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
einfo "Generating keys for localhost."
/usr/sbin/cf-key
diff --git a/sci-electronics/spice/spice-3.5.5-r3.ebuild b/sci-electronics/spice/spice-3.5.5-r3.ebuild
index e20171071a19..ed2fa12832f5 100644
--- a/sci-electronics/spice/spice-3.5.5-r3.ebuild
+++ b/sci-electronics/spice/spice-3.5.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -41,7 +41,7 @@ src_prepare() {
-e "s:/X11R6::" \
conf/linux || die
sed -i -e "s:head -1:head -n 1:" util/build || die
- epatch "${FILESDIR}"/${P}-gcc-4.1.patch
+ eapply "${FILESDIR}"/${P}-gcc-4.1.patch
# fix possible buffer overflow (bug #339539)
sed -i -e "s:fgets(buf, BSIZE_SP:fgets(buf, sizeof(buf):g" \
@@ -62,7 +62,7 @@ src_install() {
# install binaries
dobin obj/bin/{spice3,nutmeg,sconvert,multidec,proc2mod}
newbin obj/bin/help spice.help
- dosym /usr/bin/spice3 /usr/bin/spice
+ dosym spice3 /usr/bin/spice
# install runtime stuff
rm -f lib/make*
dodir /usr/$(get_libdir)/spice
diff --git a/sys-apps/dbus-broker/dbus-broker-29.ebuild b/sys-apps/dbus-broker/dbus-broker-29.ebuild
index b26194a37d38..c9cca56ea57a 100644
--- a/sys-apps/dbus-broker/dbus-broker-29.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2021 Gentoo Authors
+# Copyright 2017-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
else
- KEYWORDS="amd64 arm64 ppc64"
+ KEYWORDS="amd64 arm64 ppc64 ~riscv"
SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
declare -Ag SUBPROJECTS=(
[c-dvar]=c8ea9712a94186512c22c32f32c421d6a2db6feb
diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
index 36eca730b925..83f7734dc680 100644
--- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2021 Gentoo Authors
+# Copyright 2017-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
else
- KEYWORDS="~amd64 ~arm64 ~ppc64"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
declare -Ag SUBPROJECTS=(
[c-dvar]=9e1a5b4363aaece7169df2b2852944a1434b2df5