From 8a5f3383bbc5f817d89554020a3600d06985bc4a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Nov 2024 03:02:59 +0000 Subject: gentoo auto-resync : 20:11:2024 - 03:02:59 --- dev-perl/Manifest.gz | Bin 287969 -> 287979 bytes dev-perl/Net-FreeDB/Manifest | 4 +- dev-perl/Net-FreeDB/Net-FreeDB-0.100.0-r1.ebuild | 38 ------------ dev-perl/Net-FreeDB/Net-FreeDB-0.100.0-r2.ebuild | 43 +++++++++++++ .../Net-FreeDB/files/Net-FreeDB-0.100.0-c99.patch | 69 +++++++++++++++++++++ .../files/Net-FreeDB-0.100.0-gnudb.patch | 52 ++++++++++++++++ 6 files changed, 167 insertions(+), 39 deletions(-) delete mode 100644 dev-perl/Net-FreeDB/Net-FreeDB-0.100.0-r1.ebuild create mode 100644 dev-perl/Net-FreeDB/Net-FreeDB-0.100.0-r2.ebuild create mode 100644 dev-perl/Net-FreeDB/files/Net-FreeDB-0.100.0-c99.patch create mode 100644 dev-perl/Net-FreeDB/files/Net-FreeDB-0.100.0-gnudb.patch (limited to 'dev-perl') diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz index 182be9af7b6c..9174ba27d525 100644 Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ diff --git a/dev-perl/Net-FreeDB/Manifest b/dev-perl/Net-FreeDB/Manifest index 5a0238e41341..468275579ef0 100644 --- a/dev-perl/Net-FreeDB/Manifest +++ b/dev-perl/Net-FreeDB/Manifest @@ -1,3 +1,5 @@ +AUX Net-FreeDB-0.100.0-c99.patch 1459 BLAKE2B 6c383ffd84b76f7c10d4585654cb4c5e15da1a3862d792f507c3b7de3772ad3bb0b0c5e6313098afc6c6aaa37c3bd118e5578d77f5882511775004aaf833084e SHA512 5ef05bd54bd2a6593464b0f6d5138ad644ac1c5d523b25973dbbcd8a25eec6ded4e5eb2b294d8369a9899300dc510f8b1e79b1dc8916f9aa19637b3d9aca2609 +AUX Net-FreeDB-0.100.0-gnudb.patch 1836 BLAKE2B 41c3677126eb8a40731f6ed1e033908a791babf4a0c7ac31a7b680759dbe23344127429938dd9247d29dd609ba5f4d8516543d58392a0caee006414259d44d4e SHA512 f8c2f9b77f85b2d5fdaab7129540df5feec22e6d8958c0afe144489901d24888165b2804d6b3878579c92c7b969ba74726e460dacbd58043fadddfff5aa48378 DIST Net-FreeDB-0.10.tar.gz 23869 BLAKE2B 4fcd4e38db84efd55f96738ebe04330cc46005038282857a55095a25cc72bc1a1bdd4d12282a38e738eabcaf4efe318cf1505e60e41e88f7156fc6768be51f04 SHA512 b1b249dfb81128645e6e3481f93d914fc11ecf931b91f6a21a065fa2fde8674f9c8b5466b3112be4f4f28556c0ec899cf8723e60adaaf26b5165e61d61445368 -EBUILD Net-FreeDB-0.100.0-r1.ebuild 751 BLAKE2B cb287b4f2bbb8ecc16c3302112bfe66370adbbeb7b119e7c15fe8bd0559039f79ef0bfde6eb76629eee82e4e0fff8911f05ed680ca931fd52a5f843d9b2a3073 SHA512 960228aa8550430513fb99d16e6939671e0fc63339e05cd50987631aa4230c8edfdb5c6231a9591b5a71ca2870daaf22238c6a368a6139f6c2a78850faff3a93 +EBUILD Net-FreeDB-0.100.0-r2.ebuild 845 BLAKE2B 314f343c2b48e0f661c7678bf715244554a543c84e026e551d7c8e9b2a7efdfd9f76b87f5f6f6742da42830efd2027c2bcfeb5a6552e55046d54d6d1ed51fe4b SHA512 527b54e8cf7611911819d75f2a7e7a6eec736edd45b884ed81a75a18f91a95b1fe4023c8902a89e61b4e804474375a7e2f5db6559ee81aa80d782e56edfbb1be MISC metadata.xml 393 BLAKE2B abcd209b992ed6d35147d2a04aa2acfa37ec4af7be0ccf2acccf49b25413fdebeefe85a59578a0d76a769558ccd065a5a3de4c927ce2448f93e41738b8c88dd9 SHA512 d8b4aa6a2b775118ab66ef616a19ea4d8e3d42fac35fa19064be6087496a63bd069b6cc84d04804168eb34cdd6c46a820633ccc1cda3c2dc0637a73d3778572f diff --git a/dev-perl/Net-FreeDB/Net-FreeDB-0.100.0-r1.ebuild b/dev-perl/Net-FreeDB/Net-FreeDB-0.100.0-r1.ebuild deleted file mode 100644 index c5c62a0121a2..000000000000 --- a/dev-perl/Net-FreeDB/Net-FreeDB-0.100.0-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DIST_AUTHOR=DSHULTZ -DIST_VERSION=0.10 -inherit perl-module - -DESCRIPTION="OOP interface to the FreeDB database" - -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - >=dev-perl/CDDB-File-1.10.0 - >=virtual/perl-File-Temp-0.50.0 - virtual/perl-IO - dev-perl/Moo - >=virtual/perl-libnet-2.120.0 -" - -BDEPEND="${RDEPEND} - virtual/perl-ExtUtils-MakeMaker - test? ( - dev-perl/Test-Most - ) -" - -src_test() { - local my_test_control; - my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}} - if has network ${my_test_control} ; then - export HAVE_INTERNET=1 - perl_rm_files "t/16-get_local_disc_id.t" "t/17-get_local_disc_data.t" - fi - perl-module_src_test -} diff --git a/dev-perl/Net-FreeDB/Net-FreeDB-0.100.0-r2.ebuild b/dev-perl/Net-FreeDB/Net-FreeDB-0.100.0-r2.ebuild new file mode 100644 index 000000000000..b0c747f8de46 --- /dev/null +++ b/dev-perl/Net-FreeDB/Net-FreeDB-0.100.0-r2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DIST_AUTHOR=DSHULTZ +DIST_VERSION=0.10 +inherit perl-module + +DESCRIPTION="OOP interface to the FreeDB database" + +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND=" + >=dev-perl/CDDB-File-1.10.0 + >=virtual/perl-File-Temp-0.50.0 + virtual/perl-IO + dev-perl/Moo + >=virtual/perl-libnet-2.120.0 +" +BDEPEND=" + ${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( + dev-perl/Test-Most + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.100.0-c99.patch + "${FILESDIR}"/${PN}-0.100.0-gnudb.patch +) + +src_test() { + local my_test_control; + my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}} + if has network ${my_test_control} ; then + export HAVE_INTERNET=1 + perl_rm_files "t/16-get_local_disc_id.t" "t/17-get_local_disc_data.t" + fi + perl-module_src_test +} diff --git a/dev-perl/Net-FreeDB/files/Net-FreeDB-0.100.0-c99.patch b/dev-perl/Net-FreeDB/files/Net-FreeDB-0.100.0-c99.patch new file mode 100644 index 000000000000..fc05d9863cd4 --- /dev/null +++ b/dev-perl/Net-FreeDB/files/Net-FreeDB-0.100.0-c99.patch @@ -0,0 +1,69 @@ +https://bugs.gentoo.org/883603 +https://rt.cpan.org/Public/Bug/Display.html?id=152242 + +Description: define read_toc() before using it in discdata get_disc_id() + otherwise the build fails with -Werror=implicit-function-declaration +Origin: vendor +Bug-Debian: https://bugs.debian.org/1065999 +Author: gregor herrmann +Last-Update: 2024-03-10 + +--- a/lib/linux.h ++++ b/lib/linux.h +@@ -46,28 +46,6 @@ + return ((n % 0xff) << 24 | t << 8 | tot_trks); + } + +-struct discdata get_disc_id(char* dev) +-{ +- struct discdata data; +- int i; +- +- data.num_of_trks = read_toc(dev); +- +- if (data.num_of_trks == -1) { +- return data; +- } +- +- data.discid = cddb_discid(data.num_of_trks); +- +- for (i = 0; i < data.num_of_trks; i++) { +- data.track_offsets[i] = (cdtoc[i].frame); +- } +- +- data.seconds = (cdtoc[data.num_of_trks].frame)/75; +- +- return data; +-} +- + int read_toc(char* dev) + { + int drive, i, status; +@@ -151,4 +129,26 @@ + return tochdr.cdth_trk1; + } + ++struct discdata get_disc_id(char* dev) ++{ ++ struct discdata data; ++ int i; ++ ++ data.num_of_trks = read_toc(dev); ++ ++ if (data.num_of_trks == -1) { ++ return data; ++ } ++ ++ data.discid = cddb_discid(data.num_of_trks); ++ ++ for (i = 0; i < data.num_of_trks; i++) { ++ data.track_offsets[i] = (cdtoc[i].frame); ++ } ++ ++ data.seconds = (cdtoc[data.num_of_trks].frame)/75; ++ ++ return data; ++} ++ + #endif //LINUX_H + diff --git a/dev-perl/Net-FreeDB/files/Net-FreeDB-0.100.0-gnudb.patch b/dev-perl/Net-FreeDB/files/Net-FreeDB-0.100.0-gnudb.patch new file mode 100644 index 000000000000..d2a780ae0ce2 --- /dev/null +++ b/dev-perl/Net-FreeDB/files/Net-FreeDB-0.100.0-gnudb.patch @@ -0,0 +1,52 @@ +https://rt.cpan.org/Public/Bug/Display.html?id=137752 + +Description: replace default host freedb.freedb.org with gnudb.gnudb.org. + Also remove reference to inaccessible documentation, and fix the non-online + test which checks for the default host. +Origin: vendor +Bug-Debian: https://bugs.debian.org/991089 +Author: gregor herrmann +Last-Update: 2021-07-16 + +--- a/FreeDB.pm ++++ b/FreeDB.pm +@@ -7,7 +7,7 @@ + use File::Temp; + + has hostname => (is => 'ro', default => $ENV{HOSTNAME} // 'unknown'); +-has remote_host => (is => 'rw', default => 'freedb.freedb.org'); ++has remote_host => (is => 'rw', default => 'gnudb.gnudb.org'); + has remote_port => (is => 'rw', default => 8880); + has user => (is => 'rw', default => $ENV{USER} // 'unknown'); + has timeout => (is => 'rw', default => 120); +@@ -449,7 +449,7 @@ + + + new() creates and returns a new Net::FreeDB object that is connected +- to either the given host or freedb.freedb.org as default. ++ to either the given host or gnudb.gnudb.org as default. + + =item lscat + +@@ -723,10 +723,6 @@ + giving the correct drive number will return in an + accurate return. + +-=head1 Resources +- The current version of the CDDB Server Protocol can be +- found at: http://ftp.freedb.org/pub/freedb/latest/CDDBPROTO +- + =head1 AUTHOR + David Shultz Edshultz@cpan.orgE + Peter Pentchev Eroam@ringlet.netE +--- a/t/00-basic.t ++++ b/t/00-basic.t +@@ -10,7 +10,7 @@ + ok($freedb->hostname eq 'unknown', 'Error setting hostname'); + } + +-ok($freedb->remote_host eq 'freedb.freedb.org', 'Error setting default host'); ++ok($freedb->remote_host eq 'gnudb.gnudb.org', 'Error setting default host'); + + ok($freedb->remote_port == 8880, 'Error setting default port'); + -- cgit v1.2.3