From e748ba9741f6540f4675c23e3e37b73e822c13a4 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 31 May 2021 20:59:14 +0100
Subject: gentoo resync : 31.05.2021

---
 media-libs/libogg/Manifest                         |  3 +-
 .../libogg/files/libogg-1.3.4-libdir-m4.patch      | 13 +++++++++
 media-libs/libogg/libogg-1.3.4-r1.ebuild           | 32 ++++++++++++++++++++++
 media-libs/libogg/libogg-1.3.4.ebuild              | 29 --------------------
 4 files changed, 47 insertions(+), 30 deletions(-)
 create mode 100644 media-libs/libogg/files/libogg-1.3.4-libdir-m4.patch
 create mode 100644 media-libs/libogg/libogg-1.3.4-r1.ebuild
 delete mode 100644 media-libs/libogg/libogg-1.3.4.ebuild

(limited to 'media-libs/libogg')

diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index 2f2e5e60be5b..8c37556c0ae7 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -1,3 +1,4 @@
+AUX libogg-1.3.4-libdir-m4.patch 409 BLAKE2B 68ff8990afa20d42cd527ef9b46ddf0861f167648bba14661e00fc453d8b9df33e4feb94050c13d33bd6da38e68b44e0e179e4c7049582765b3d1e4b3bbf8c84 SHA512 f285cea745d8eb5c2f3356b007b9bd686a9a0331e1a0c96f85da48b258e6544de0c3cf8ba9cd8f0caaf7c0cccc9ea033162c7b4e9fa18c93463bc43d176e8316
 DIST libogg-1.3.4.tar.xz 428696 BLAKE2B 21814db2d45e32be56da1b56afacce4b906b34c7b71e7915ceb7b4a240b9a1c271085a4d19362c97c5bb825569094bd2940a92140204f0449eeeadaa40cc6b30 SHA512 09ffb72c3cbde5c05140f5879bd457106ed4070bd7aa5ea7720cf8910167f1d0fa6312f1f71625d51f21e3033219da858e1a8a2701bfd768b35061f7586f976c
-EBUILD libogg-1.3.4.ebuild 758 BLAKE2B d20b7f1998c1fdf3e47feacdf20aa891fb1935b60db2f889ab059c9d97e41d6948c0711af642f8790c9a4837970d02290839eb072a151509615c5357c704da98 SHA512 e3ecba0314a8006de505502e9d5ca124047c632050e2b707daed8f563c668995c4a46b7e7a101c1d3f64d7cb3da1c401ad49a959938f47726166f66a4fb5ea6a
+EBUILD libogg-1.3.4-r1.ebuild 796 BLAKE2B 08a72998e40a302156f66999b90e2677834b50c9ed289453fdeb33c95ecaa15056d9171e93b177811e989a0449049ea15a9d1be7d8f8187c1c0dec1999717132 SHA512 1e06f19cbb3d33d1ea9abc7632e9ba6dff1df2d2c9b4269841932075f58896fad1e39cb1f96c4eff0440a6491c74ef61af778ca6cf5829baa6b1d355c0af3ebd
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libogg/files/libogg-1.3.4-libdir-m4.patch b/media-libs/libogg/files/libogg-1.3.4-libdir-m4.patch
new file mode 100644
index 000000000000..144557b3add7
--- /dev/null
+++ b/media-libs/libogg/files/libogg-1.3.4-libdir-m4.patch
@@ -0,0 +1,13 @@
+diff --git a/ogg.m4 b/ogg.m4
+index 17235da..22956ef 100644
+--- a/ogg.m4
++++ b/ogg.m4
+@@ -21,7 +21,7 @@ AC_ARG_ENABLE(oggtest,AC_HELP_STRING([--disable-oggtest],[Do not try to compile
+   elif test "x$ogg_prefix" != "x" ; then
+     OGG_LIBS="-L$ogg_prefix/lib"
+   elif test "x$prefix" != "xNONE" ; then
+-    OGG_LIBS="-L$prefix/lib"
++    OGG_LIBS="-L${libdir}"
+   fi
+ 
+   if test "x$ogg_prefix" != "xno" ; then
diff --git a/media-libs/libogg/libogg-1.3.4-r1.ebuild b/media-libs/libogg/libogg-1.3.4-r1.ebuild
new file mode 100644
index 000000000000..0814202d3a0f
--- /dev/null
+++ b/media-libs/libogg/libogg-1.3.4-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="the Ogg media file format library"
+HOMEPAGE="https://xiph.org/ogg/"
+SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.4-libdir-m4.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ogg/config_types.h
+)
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/libogg/libogg-1.3.4.ebuild b/media-libs/libogg/libogg-1.3.4.ebuild
deleted file mode 100644
index fdaae8f84396..000000000000
--- a/media-libs/libogg/libogg-1.3.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib-minimal
-
-DESCRIPTION="the Ogg media file format library"
-HOMEPAGE="https://xiph.org/ogg/"
-SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-DOCS=( AUTHORS CHANGES )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ogg/config_types.h
-)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-- 
cgit v1.2.3