gentoo auto-resync : 29:12:2022 - 20:15:49

4 files changed, 157 insertions, 0 deletions

diff --git a/media-libs/libquvi/Manifest b/media-libs/libquvi/Manifest
index e370492f863e..3e3d378fefb4 100644
--- a/media-libs/libquvi/Manifest
+++ b/media-libs/libquvi/Manifest
@@ -1,5 +1,8 @@
 AUX libquvi-0.9.1-headers-reinstall.patch 457 BLAKE2B 67b0509e6e10cfa1f10067f6522d91cc76f84f160f109d088fca9d5209e171d16a7381fa9ed09dc1b0507756610222d38c797f00d043930306abeafc98b977e6 SHA512 6acce5b6c5b6907d138bd4a8257e966ec9e77aedbc463d28e94813615cb1f5a703d241214d378778886ea629b8702b6bf5d0808f125cb9ebe4da49d30b0c2b77
 AUX libquvi-0.9.4-autoconf-2.70.patch 359 BLAKE2B de87ca7222d1073da64337eed378a8d231da4ccd99cffa48dac377fac040b93df752977c7cbf9fc872c5547a599cdeeedb25832c9102c0df39b991f5b0669e58 SHA512 a6c1a853013ff7cc128d8ec1599e9847c4f5ec94bd9eab389c589696d0af8ab5704a9c2861186fa51d84a18dac67000af9c20c0fcedb1af1f0ba6fd64cbd1d00
+AUX libquvi-0.9.4-luaL_setfuncs_ver.patch 2286 BLAKE2B aed40b5f96ed6f49ad4c240ebd0afd3de071aaa364e6bdce13983b0fd01848cc55f7e3f663ccc0a08ceab68d5aac374d4ba023693be37cea0b133eafaabda57a SHA512 600487db841f9e63f6d1d30cf72696120ade20d8252073468d89786dd8015591d87e4aac05a10936c85dac661f0f3e5a1f3616df09f5603b80af1086951c64d7
+AUX libquvi-0.9.4-luajit.patch 566 BLAKE2B 427c907166537d789c678e917b4bb8c0fab792d95db6d0a338708a36e98e5930ba2ffc33dc0b6024faad06dff442c15fea3c00a132c8c2b6b9500a583d02c8cb SHA512 2985cd1cd1929a2377f9f88a5da952398e1cf2cc5a5dbb1293e5b49f6b0a5d570470ca319ae4dade97ec25bd062a6b122e2046ce1ebb55c470a64139a393e0c3
 DIST libquvi-0.9.4.tar.xz 373172 BLAKE2B ab351a74d7cb3a19d3ddad615a476f139f76d1e8bfe4b6b049384bb6833f36cc5c0d1e87044f1d408241a90a898a55d7747eb5eb9daa009af512c281bc15cb94 SHA512 287015e370e7b7f98f0f4c3717f5b044c8fcfb8b823c7988cd248e56b5fbbfa1a1aa421fbdafb38d727b79495267ccd4dead71587052117db53f29236268b651
 EBUILD libquvi-0.9.4-r100.ebuild 1282 BLAKE2B e71315f932cdad6736b7b803d29c0fff5191eb5d8da13afdc625386ce58e03301a8c24f68cfb02fedfea2e763a811e1815b287b817ddc68302aa527716f7324d SHA512 e99c3cd8e0a2613a234c061c7e1dbe39096e1eb5e7dd994a5409cf6ac3b463f83f553adc59e748c1558dbbdb426e0103a8f2cbabd83dafd738c445f89b1e7285
+EBUILD libquvi-0.9.4-r101.ebuild 1421 BLAKE2B 3016f9cc03b4aa8373dc1043b68bf075593273e1229aa6ca553ba79c9eb899eb874252fcb8d270da6af7834c39ecf53986d36656b378b9d859d30e0758dba59c SHA512 c7b37c231ad061c4e5853fc068911deec7de3ef4d56f9cf95357c6cf77a3c77945bee150ea31bc6bd4fb4c1eac803f5eee3b669059b1ac726ca92397757ad983
 MISC metadata.xml 334 BLAKE2B e5583410be0753d6b5ae1a0c2fcf29c3cae42391633ee7d95aeb164c26fbd576376821ee2e8fec6a06e1e16e4a4813ff6a04cf5394f2fd2f9476e46290ebf272 SHA512 87faf3e940e97632fa9feb95c519741e5a051e12f3d91f727cabbe1e7013acdd7c9c65cc6a703bcfe0330bf7b3d7790d7f1184661c7f79eb23914662e12425e7
diff --git a/media-libs/libquvi/files/libquvi-0.9.4-luaL_setfuncs_ver.patch b/media-libs/libquvi/files/libquvi-0.9.4-luaL_setfuncs_ver.patch
new file mode 100644
index 000000000000..156468b0e7b1
--- /dev/null
+++ b/media-libs/libquvi/files/libquvi-0.9.4-luaL_setfuncs_ver.patch
@@ -0,0 +1,70 @@
+--- libquvi-0.9.4/src/lua/init.c	2013-11-04 13:55:26.000000000 +0100
++++ libquvi-0.9.4/src/lua/init.c	2022-12-29 09:25:41.579621070 +0100
+@@ -43,11 +43,19 @@ static const luaL_Reg quvi_reg_meth[] =
+ 
+ static const luaL_Reg quvi_http_reg_meth[] =
+ {
++#if (LUA_VERSION_NUM == 501)
+   {"metainfo", l_quvi_http_metainfo},
+   {"resolve", l_quvi_http_resolve},
+   {"cookie", l_quvi_http_cookie},
+   {"header", l_quvi_http_header},
+   {"fetch", l_quvi_http_fetch},
++#elif (LUA_VERSION_NUM >= 504)
++  {"quvi.http.metainfo", l_quvi_http_metainfo},
++  {"quvi.http.resolve", l_quvi_http_resolve},
++  {"quvi.http.cookie", l_quvi_http_cookie},
++  {"quvi.http.header", l_quvi_http_header},
++  {"quvi.http.fetch", l_quvi_http_fetch},
++#endif
+   {NULL, NULL}
+ };
+ 
+@@ -57,9 +65,15 @@ extern gint l_quvi_crypto_hash(lua_State
+ 
+ static const luaL_Reg quvi_crypto_reg_meth[] =
+ {
++#if (LUA_VERSION_NUM == 501)
+   {"encrypt", l_quvi_crypto_encrypt},
+   {"decrypt", l_quvi_crypto_decrypt},
+   {"hash",    l_quvi_crypto_hash},
++#elif (LUA_VERSION_NUM >= 504)
++  {"quvi.crypto.encrypt", l_quvi_crypto_encrypt},
++  {"quvi.crypto.decrypt", l_quvi_crypto_decrypt},
++  {"quvi.crypto.hash",    l_quvi_crypto_hash},
++#endif
+   {NULL, NULL}
+ };
+ 
+@@ -68,8 +82,13 @@ extern gint l_quvi_base64_decode(lua_Sta
+ 
+ static const luaL_Reg quvi_base64_reg_meth[] =
+ {
++#if (LUA_VERSION_NUM == 501)
+   {"encode",    l_quvi_base64_encode},
+   {"decode",    l_quvi_base64_decode},
++#elif (LUA_VERSION_NUM >= 504)
++  {"quvi.base64.encode",    l_quvi_base64_encode},
++  {"quvi.base64.decode",    l_quvi_base64_decode},
++#endif
+   {NULL, NULL}
+ };
+ 
+@@ -80,10 +99,17 @@ QuviError l_init(_quvi_t q)
+     return (QUVI_ERROR_LUA_INIT);
+ 
+   luaL_openlibs(q->handle.lua);
++#if (LUA_VERSION_NUM == 501)
+   luaL_register(q->handle.lua, "quvi", quvi_reg_meth);
+   luaL_register(q->handle.lua, "quvi.http", quvi_http_reg_meth);
+   luaL_register(q->handle.lua, "quvi.crypto", quvi_crypto_reg_meth);
+   luaL_register(q->handle.lua, "quvi.base64", quvi_base64_reg_meth);
++#elif (LUA_VERSION_NUM >= 504)
++  luaL_newlib(q->handle.lua, quvi_reg_meth);
++  luaL_newlib(q->handle.lua, quvi_http_reg_meth);
++  luaL_newlib(q->handle.lua, quvi_crypto_reg_meth);
++  luaL_newlib(q->handle.lua, quvi_base64_reg_meth);
++#endif
+ 
+   return (QUVI_OK);
+ }
diff --git a/media-libs/libquvi/files/libquvi-0.9.4-luajit.patch b/media-libs/libquvi/files/libquvi-0.9.4-luajit.patch
new file mode 100644
index 000000000000..dd4dc58238c9
--- /dev/null
+++ b/media-libs/libquvi/files/libquvi-0.9.4-luajit.patch
@@ -0,0 +1,15 @@
+--- libquvi-0.9.4/configure.ac 2021-10-20 13:44:09.834182117 +0200
++++ libquvi-0.9.4/configure.ac 2021-10-20 13:46:23.611188250 +0200
+@@ -85,7 +85,9 @@ AC_SUBST([VALGRIND])
+ PKG_CHECK_MODULES([liblua], [lua >= 5.1], [], [
+   PKG_CHECK_MODULES([liblua], [lua51 >= 5.1], [], [
+     PKG_CHECK_MODULES([liblua], [lua5.1 >= 5.1], [], [
+-      PKG_CHECK_MODULES(liblua, [lua-5.1 >= 5.1])])
++      PKG_CHECK_MODULES([liblua], [lua-5.1 >= 5.1], [], [
++        PKG_CHECK_MODULES(liblua, [luajit])])
++    ])
+   ])
+ ])
+ PKG_CHECK_MODULES([libproxy], [libproxy-1.0 >= 0.3.1])
+
+
diff --git a/media-libs/libquvi/libquvi-0.9.4-r101.ebuild b/media-libs/libquvi/libquvi-0.9.4-r101.ebuild
new file mode 100644
index 000000000000..81eb18afcb22
--- /dev/null
+++ b/media-libs/libquvi/libquvi-0.9.4-r101.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1,4} luajit )
+LUA_REQ_USE="deprecated(+)"
+
+inherit autotools lua-single
+
+DESCRIPTION="Library for parsing video download links"
+HOMEPAGE="http://quvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
+
+LICENSE="AGPL-3"
+SLOT="0/8" # subslot = libquvi soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples nls static-libs"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	>=dev-libs/glib-2.34.3:2
+	>=dev-libs/libgcrypt-1.5.3:0=
+	>=media-libs/libquvi-scripts-0.9.20130903[${LUA_SINGLE_USEDEP}]
+	!<media-libs/quvi-0.4.0
+	>=net-libs/libproxy-0.4.11-r1
+	>=net-misc/curl-7.36.0
+	nls? ( >=virtual/libintl-0-r1 )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.1-headers-reinstall.patch
+	"${FILESDIR}"/${PN}-0.9.4-autoconf-2.70.patch #749816
+	"${FILESDIR}"/${PN}-0.9.4-luajit.patch            # 504876
+	"${FILESDIR}"/${PN}-0.9.4-luaL_setfuncs_ver.patch # 504876
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable nls)
+		--with-manual
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	einstalldocs
+	use examples && dodoc -r examples
+
+	find "${ED}" -name '*.la' -delete || die
+}