summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2022-07-05 10:01:41 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2022-07-05 10:01:41 +0000
commit06a631b8b9e3e707752657b43e1c072a3be31f5b (patch)
treee598b213d771a757014970f639d65119365a1cf0
parent2022-07-05 09:31:37 UTC (diff)
parentmedia-plugins/vdr-streamdev: fix Makefiles calling ar directly (diff)
downloadgentoo-06a631b8b9e3e707752657b43e1c072a3be31f5b.tar.gz
gentoo-06a631b8b9e3e707752657b43e1c072a3be31f5b.tar.bz2
gentoo-06a631b8b9e3e707752657b43e1c072a3be31f5b.zip
Merge updates from master
-rw-r--r--dev-db/sqlcl-bin/Manifest2
-rw-r--r--dev-db/sqlcl-bin/sqlcl-bin-22.2.0.172.1718.ebuild (renamed from dev-db/sqlcl-bin/sqlcl-bin-22.1.1.131.0820.ebuild)0
-rw-r--r--media-plugins/vdr-streamdev/files/vdr-streamdev-0.6.3-Makefile.patch36
-rw-r--r--media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild7
-rw-r--r--net-im/mattermost-desktop-bin/Manifest4
-rw-r--r--net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.1.1.ebuild (renamed from net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.1.0.ebuild)13
6 files changed, 53 insertions, 9 deletions
diff --git a/dev-db/sqlcl-bin/Manifest b/dev-db/sqlcl-bin/Manifest
index 5705c6590a20..c5d4405608a7 100644
--- a/dev-db/sqlcl-bin/Manifest
+++ b/dev-db/sqlcl-bin/Manifest
@@ -1 +1 @@
-DIST sqlcl-22.1.1.131.0820.zip 40620046 BLAKE2B f09898832eba3ae3f371c7535c589a9cbf83f5caa6a91c4af0df0ad8348819686a633459ff680b58c215bfaf163eb6fc5e9faa00ad128a4cc4309f41986134e8 SHA512 a2af4737dc892676f302869301d1ebbb0fbcf2633e574f75e697abe37d84ba8b70879f85ebe71960c4376f6f17db0752b71358aa563c054fb3a80fd33468136d
+DIST sqlcl-22.2.0.172.1718.zip 41321573 BLAKE2B 43e5413a07de69f5cddad8825b71957c44f0e9f6126f05206b9c3528fb66fa91fe1097eab57c76b9e733c55651444b4f1b9c7bc1c30c0e33fc3df20026272878 SHA512 107c40074b3bc1e73cc174fd5758140cedb652447c2adaecc3f4820f0a777ce1c43c16fe9551a1516245008f3a5ee74404a5da2d424e6e9d63db127e71492514
diff --git a/dev-db/sqlcl-bin/sqlcl-bin-22.1.1.131.0820.ebuild b/dev-db/sqlcl-bin/sqlcl-bin-22.2.0.172.1718.ebuild
index 9788f57e0b28..9788f57e0b28 100644
--- a/dev-db/sqlcl-bin/sqlcl-bin-22.1.1.131.0820.ebuild
+++ b/dev-db/sqlcl-bin/sqlcl-bin-22.2.0.172.1718.ebuild
diff --git a/media-plugins/vdr-streamdev/files/vdr-streamdev-0.6.3-Makefile.patch b/media-plugins/vdr-streamdev/files/vdr-streamdev-0.6.3-Makefile.patch
new file mode 100644
index 000000000000..282108476c7b
--- /dev/null
+++ b/media-plugins/vdr-streamdev/files/vdr-streamdev-0.6.3-Makefile.patch
@@ -0,0 +1,36 @@
+diff -Naur vdr-plugin-streamdev-0.6.3.orig/libdvbmpeg/Makefile vdr-plugin-streamdev-0.6.3/libdvbmpeg/Makefile
+--- vdr-plugin-streamdev-0.6.3.orig/libdvbmpeg/Makefile 2022-01-22 17:07:53.000000000 +0100
++++ vdr-plugin-streamdev-0.6.3/libdvbmpeg/Makefile 2022-06-30 23:15:50.274114529 +0200
+@@ -15,7 +15,7 @@
+
+ .PHONY: clean
+ libdvbmpegtools.a: $(OBJS)
+- ar -rcs libdvbmpegtools.a $(OBJS)
++ $(AR) -rcs libdvbmpegtools.a $(OBJS)
+
+ ### Implicit rules:
+
+diff -Naur vdr-plugin-streamdev-0.6.3.orig/remux/Makefile vdr-plugin-streamdev-0.6.3/remux/Makefile
+--- vdr-plugin-streamdev-0.6.3.orig/remux/Makefile 2022-01-22 17:07:53.000000000 +0100
++++ vdr-plugin-streamdev-0.6.3/remux/Makefile 2022-06-30 23:15:18.845454583 +0200
+@@ -11,7 +11,7 @@
+
+ .PHONY: clean
+ remux.a: $(OBJS)
+- ar -rcs remux.a $^
++ $(AR) -rcs remux.a $^
+
+ ### Implicit rules:
+
+diff -Naur vdr-plugin-streamdev-0.6.3.orig/tools/Makefile vdr-plugin-streamdev-0.6.3/tools/Makefile
+--- vdr-plugin-streamdev-0.6.3.orig/tools/Makefile 2022-01-22 17:07:53.000000000 +0100
++++ vdr-plugin-streamdev-0.6.3/tools/Makefile 2022-06-30 23:16:14.494623068 +0200
+@@ -11,7 +11,7 @@
+
+ .PHONY: clean
+ sockettools.a: $(OBJS)
+- ar -rcs sockettools.a $(OBJS)
++ $(AR) -rcs sockettools.a $(OBJS)
+
+ ### Implicit rules:
+
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild
index 3565a40465d6..02b5e7e2ae29 100644
--- a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit vdr-plugin-2
+inherit toolchain-funcs vdr-plugin-2
DESCRIPTION="VDR Plugin: Client/Server and http streaming plugin"
HOMEPAGE="https://github.com/vdr-projects/vdr-plugin-streamdev"
@@ -24,6 +24,7 @@ RDEPEND="${DEPEND}"
QA_FLAGS_IGNORED="
usr/lib/vdr/plugins/libvdr-streamdev-.*
usr/lib64/vdr/plugins/libvdr-streamdev-.*"
+PATCHES=( "${FILESDIR}/${P}-Makefile.patch" )
# vdr-plugin-2.eclass changes
PO_SUBDIR="client server"
@@ -51,6 +52,10 @@ src_prepare() {
fix_vdr_libsi_include server/livestreamer.c
}
+src_compile() {
+ emake AR="$(tc-getAR)"
+}
+
src_install() {
vdr-plugin-2_src_install
diff --git a/net-im/mattermost-desktop-bin/Manifest b/net-im/mattermost-desktop-bin/Manifest
index efa21d49d2b1..9c096b333e70 100644
--- a/net-im/mattermost-desktop-bin/Manifest
+++ b/net-im/mattermost-desktop-bin/Manifest
@@ -1,2 +1,2 @@
-DIST mattermost-desktop-5.1.0-linux-ia32.tar.gz 102235544 BLAKE2B f7427aa195ec3be706243ce1f1aeb2cbad594905f86b6493796de2ebb7fa161e06b910af9a285583018bad9709e6ce16ee5bc168f2d98f26534af3de3b753b41 SHA512 a94be8235c5c1927c89615297c7e82ff2d1bc61e3600133a5af262bc25b6b6a7c50b516d58c7a387f672510736572aacc0bd9a657e5d25351eea4df2dc8958fc
-DIST mattermost-desktop-5.1.0-linux-x64.tar.gz 102764810 BLAKE2B 7e555d70aa15b308cea637b7ad12a11a16a93cb80693157afbfcf782efff03458e880eabbbd52292e476159669a6ebd809197ba4b2f6154093515cb7f51b7e6e SHA512 5fb3abaf93cdb4e76ba29e56f1da800d665171ade8aa475ccc927f667d513db34db37ee2e1326e59584a38260d32e6c0420ac36822e6b22564d76391a44c7e18
+DIST mattermost-desktop-5.1.1-linux-ia32.tar.gz 102392038 BLAKE2B ad18b2c654e9d1b7d575a0e877ae8ac702d0e5b37c2654ff5b000404f25cf1a67995cc9a63ce833c7779285ed4a038aadc00d2e5dab9de1737142bc98d77f632 SHA512 57e1901d0d9c106e16a3ff7df332cfb0716c0e6b1bdf0dd447cd81059df628c445164079baa464751980583f4de12d704f46f3601df1823eab05cd83b850d73f
+DIST mattermost-desktop-5.1.1-linux-x64.tar.gz 102908239 BLAKE2B 34bb28894aa8a4dc5e2c9ea2ad601665db4a1a1eaf888f3eaeeabf01aedab07a51da0a3cb25e11bbf08b16e12a24af7e8d8dec308be3951d8d52953a0c9abd43 SHA512 576f41d0a5f7a6217c13594a7b5328442203d143b7ee54843167a38d0cdcb38d93732bcf3f42d6e329107917989f261483a303a2780f7639b0d91666d5a82c73
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.1.0.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.1.1.ebuild
index ca1c0b052808..d3d4259d992a 100644
--- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.1.0.ebuild
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.1.1.ebuild
@@ -4,15 +4,16 @@
EAPI=8
MY_PN="${PN%-*}"
+MY_PV="${PV/_rc/-rc}"
-inherit desktop
+inherit desktop xdg
DESCRIPTION="Mattermost Desktop application"
HOMEPAGE="https://mattermost.com/"
SRC_URI="
- amd64? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-x64.tar.gz )
- x86? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-ia32.tar.gz )
+ amd64? ( https://releases.mattermost.com/desktop/${MY_PV}/mattermost-desktop-${MY_PV}-linux-x64.tar.gz )
+ x86? ( https://releases.mattermost.com/desktop/${MY_PV}/mattermost-desktop-${MY_PV}-linux-ia32.tar.gz )
"
LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT"
@@ -65,11 +66,13 @@ S="${WORKDIR}"
src_install() {
if use amd64; then
- cd "${WORKDIR}/mattermost-desktop-${PV}-linux-x64" || die
+ cd "${WORKDIR}/mattermost-desktop-${MY_PV}-linux-x64" || die
elif use x86; then
- cd "${WORKDIR}/mattermost-desktop-${PV}-linux-ia32" || die
+ cd "${WORKDIR}/mattermost-desktop-${MY_PV}-linux-ia32" || die
fi
+ newicon app_icon.png ${MY_PN}.png
+
insinto "/opt/${MY_PN}/locales"
doins locales/*.pak