From e19b21c73e5feac42ade97baf3eeb45c58a2f234 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 24 Jul 2022 02:52:00 +0100 Subject: gentoo auto-resync : 24:07:2022 - 02:51:59 --- app-cdr/cdck/Manifest | 7 +++- app-cdr/cdck/cdck-0.7.0-r2.ebuild | 30 ----------------- app-cdr/cdck/cdck-0.7.0-r3.ebuild | 32 ++++++++++++++++++ app-cdr/cdck/files/cdck-0.7.0-automake.patch | 42 +++++++++++++++++++++++ app-cdr/cdck/files/cdck-0.7.0-cross.patch | 20 +++++++++++ app-cdr/cdck/files/cdck-0.7.0-gcc-10.patch | 18 ++++++++++ app-cdr/cdck/files/cdck-0.7.0-man.patch | 50 ++++++++++++++++++++++++++++ app-cdr/cdck/files/cdck-0.7.0-wording.patch | 25 ++++++++++++++ 8 files changed, 193 insertions(+), 31 deletions(-) delete mode 100644 app-cdr/cdck/cdck-0.7.0-r2.ebuild create mode 100644 app-cdr/cdck/cdck-0.7.0-r3.ebuild create mode 100644 app-cdr/cdck/files/cdck-0.7.0-automake.patch create mode 100644 app-cdr/cdck/files/cdck-0.7.0-cross.patch create mode 100644 app-cdr/cdck/files/cdck-0.7.0-gcc-10.patch create mode 100644 app-cdr/cdck/files/cdck-0.7.0-man.patch create mode 100644 app-cdr/cdck/files/cdck-0.7.0-wording.patch (limited to 'app-cdr/cdck') diff --git a/app-cdr/cdck/Manifest b/app-cdr/cdck/Manifest index 4e19c425ab6b..11378b85d0ef 100644 --- a/app-cdr/cdck/Manifest +++ b/app-cdr/cdck/Manifest @@ -1,3 +1,8 @@ +AUX cdck-0.7.0-automake.patch 1014 BLAKE2B 18de71eeb6a16c1f3f2d13e89f05529db2be2d447a3b45da633e3b3fce81a708d37f2e105dae22237c76f6d0f067f91565db6f345a7266d5c7df40173c77eac0 SHA512 a3b6ebe8e2b5214bbb0e64d7db13a95dea13cbea6938c00b4e3ddf9f34c266e9cd9dc73dbe8538981b5edb260839686f4902e47a7a4bcb964b75a69e7f925763 +AUX cdck-0.7.0-cross.patch 567 BLAKE2B c2c8918846a538a9cd691b3e8ed0c652e5a877e883e686c16d4ef7b8c2b11b6edf8604ed63497d8740a472eb56916bfed3fa9d76e90f99c49ec3cf8e9731d873 SHA512 69e66148bbcf292d1a0203a161aca4427934c8ea3b3057d1aac94dcefb58e834aee4f192eb4687520bfee14e371e39629a724c69f2093aec8a1d1abc92de35e0 +AUX cdck-0.7.0-gcc-10.patch 778 BLAKE2B ec561616410032168670f7296c0bedbfb527a67d05e228cef22dd1aa6107d70538d4d441251926fa23a5a05c17ad996642b3b5d4bbb64a3895ec9ce517b21c51 SHA512 fddea13b657cf0559af6707155eec5b9d46dfd46008dab5be81cc213e71e07bbc4e61d1047ea0d765526c136fa8b08314dbc957d7a1cf59d48cefbf574e89239 +AUX cdck-0.7.0-man.patch 1333 BLAKE2B d30ee613f824ed32e37b98abc1f9bb0f05404170e16dadb7875e1f4801d6d7ef832c288b26120ec4355d3f1536bdb6cb1e285d73df488073881deb705b58238b SHA512 87a81800f6b55373e16fa74963c901e7bdc043424fec57a51451067d3ae0d52d3b3384633d8d22c87aaf99745c21ee92608ef21df178950a2a1dfa20e66cf85c +AUX cdck-0.7.0-wording.patch 712 BLAKE2B e08817be37f907a634e387261393512de394d1a0e53efd8aaad844184c98ca4b039f930ef12cc5dff6f02456e68506c22c5eb9207ef24ef97ccad8d22e1ac50a SHA512 2f479d4764f6f2fc7798005761838f9035ee0c654aaea85c5b5512d52aa95b80256a0feb02ad7ecdbcd36dd25936c52309f0068ec699a51a2e5df2aad2698b38 DIST cdck-0.7.0.tar.gz 240285 BLAKE2B 78b0d4949dd39b12ba6813586d956c3f11cd4119b196edbbfcd09487b360ebc3968c7f9f946945e3fbf1e2c4a8c033ed672ff7d84c876a10d73dfd3c1058aaa7 SHA512 aa53a2270fdf4f7d9b61bfe5b4a876ea63baad18b7cc7c920049b446f5518aee3c8389a9c5990bd96ce7e641222d39a70da86e2c6235bb68f054c576ddbc3730 -EBUILD cdck-0.7.0-r2.ebuild 536 BLAKE2B 52ff0a14aae4756d6a4a4f4a51eb15cce44e4a4307203b4dcbbb4c136b32830ef3863f23148aedb3965fb0df3c0562878141f014d893082c6bda9a5225c8c671 SHA512 49a144f0c1051c533bfef10d8c8cea62ca04b692501d8131709421bb3aa44449d668548d8275f479eb40793bf5df3dbb5c1b0ead01c23606c3488c9c912685b7 +EBUILD cdck-0.7.0-r3.ebuild 654 BLAKE2B f2a6f7d3f90f69dcba24c05c0f16297f092b1a58d284c10e2c448e5d12d5d184a84c56de8eec8ff6ac33660c0b24d116db9dece9f34bb6fb66caa3eb7b10122f SHA512 1ce65998adcb7db3697a87f6e88dfcef8649f872caf49088465cb22d2250af1eadcfcecaee1a329608e6c23565bdbcaaf241a6c2b1dacf4e23525be1a0e00c40 MISC metadata.xml 688 BLAKE2B bd6f3196c5d361d64249c7ee491c330dc81dca7c2f2226bd464402a2618cff15d8cc0a6843ee3a7d9db77c02264ab1166527f574c47e12395b607ccdd0a6eb8c SHA512 c528112bf233634a9413505becae98956bbd64038c5abcb9accd90286cfef7df12a615e1f929e4781cb56b4d583f04760ef59f08a8891c90d939b5f12e5cedf5 diff --git a/app-cdr/cdck/cdck-0.7.0-r2.ebuild b/app-cdr/cdck/cdck-0.7.0-r2.ebuild deleted file mode 100644 index cfbbfbbd6480..000000000000 --- a/app-cdr/cdck/cdck-0.7.0-r2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Measure the read time per sector on CD or DVD to check the quality" -HOMEPAGE="http://swaj.net/unix/index.html#cdck" -SRC_URI="http://swaj.net/unix/cdck/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -src_prepare() { - default - - sed -e '1d' -i man/cdck_man.in || die "sed failed" -} - -src_configure() { - econf --disable-shared -} - -src_install() { - default - - dobin src/cdck - doman man/cdck.1 -} diff --git a/app-cdr/cdck/cdck-0.7.0-r3.ebuild b/app-cdr/cdck/cdck-0.7.0-r3.ebuild new file mode 100644 index 000000000000..ca0805885897 --- /dev/null +++ b/app-cdr/cdck/cdck-0.7.0-r3.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Measure the read time per sector on CD or DVD to check the quality" +HOMEPAGE="http://swaj.net/unix/index.html#cdck" +SRC_URI="http://swaj.net/unix/cdck/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +PATCHES=( + "${FILESDIR}"/${P}-man.patch + "${FILESDIR}"/${P}-wording.patch + "${FILESDIR}"/${P}-automake.patch + "${FILESDIR}"/${P}-cross.patch + "${FILESDIR}"/${P}-gcc-10.patch +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/app-cdr/cdck/files/cdck-0.7.0-automake.patch b/app-cdr/cdck/files/cdck-0.7.0-automake.patch new file mode 100644 index 000000000000..629b48d8b4a4 --- /dev/null +++ b/app-cdr/cdck/files/cdck-0.7.0-automake.patch @@ -0,0 +1,42 @@ +Description: allow libtool to auto(re)conf +Origin: vendor +Forwarded: no +Author: tony mancill +Last-Update: 2015-03-04 + +--- a/configure.ac ++++ b/configure.ac +@@ -16,7 +16,6 @@ + + AC_SYS_LARGEFILE + +-AC_DISABLE_SHARED + AM_PROG_LIBTOOL + AC_SUBST(LIBTOOL_DEPS) + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -10,12 +10,12 @@ CLEANFILES = *~ *.o *.la *.lo *.a + EXTRA_DIST = config.h cdck template.plot template-ps.plot + + INCLUDES = @CPPFLAGS@ +-CFLAGS = @CFLAGS@ -DBUILD=\"@target@\" -DDATE=\""`date`"\" ++AM_CFLAGS = @CFLAGS@ -DBUILD=\"@target@\" -DDATE=\""`date`"\" + + CXXLINK = $(LIBTOOL) --mode=link $(CC) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + + lib_LTLIBRARIES = libcdck.la +-noinst_LIBRARIES = libcdck.a ++#noinst_LIBRARIES = libcdck.a + + LIBCDCK_SRCS = \ + lib_main.cpp \ +@@ -28,7 +28,7 @@ LIBCDCK_SRCS = \ + lib_cdinfo.h + + libcdck_la_SOURCES = $(LIBCDCK_SRCS) +-libcdck_a_SOURCES = $(LIBCDCK_SRCS) ++#libcdck_a_SOURCES = $(LIBCDCK_SRCS) + + bin_PROGRAMS = cdck + diff --git a/app-cdr/cdck/files/cdck-0.7.0-cross.patch b/app-cdr/cdck/files/cdck-0.7.0-cross.patch new file mode 100644 index 000000000000..dae65e604898 --- /dev/null +++ b/app-cdr/cdck/files/cdck-0.7.0-cross.patch @@ -0,0 +1,20 @@ +Description: replace hard-coded `gcc' with $CC in configure.ac + to allow cross-building. +Origin: vendor +Bug-Debian: https://bugs.debian.org/901177 +Forwarded: not-yet +Author: Helmut Grohne +Reviewed-by: gregor herrmann +Last-Update: 2018-06-09 + +--- a/configure.ac ++++ b/configure.ac +@@ -96,7 +96,7 @@ + CXXFLAGS="$CXXFLAGS -Wall -Wwrite-strings -Woverloaded-virtual -fno-exceptions -fno-rtti -export-dynamic " + fi + +-SUPCXX=`gcc -print-file-name=libsupc++.a` ++SUPCXX=`$CC -print-file-name=libsupc++.a` + + LIBS="$SUPCXX $LIBS" + diff --git a/app-cdr/cdck/files/cdck-0.7.0-gcc-10.patch b/app-cdr/cdck/files/cdck-0.7.0-gcc-10.patch new file mode 100644 index 000000000000..145503096b0b --- /dev/null +++ b/app-cdr/cdck/files/cdck-0.7.0-gcc-10.patch @@ -0,0 +1,18 @@ +Description: Fix detection of gcc version. + Use numeric instead of string comparison, then gcc version 10 is greater then 3. +Origin: vendor +Bug-Debian: https://bugs.debian.org/957073 +Author: gregor herrmann +Last-Update: 2020-04-17 + +--- a/configure.ac ++++ b/configure.ac +@@ -50,7 +50,7 @@ + echo $_echo_n "checking version of ${CC} ... $_echo_c" + exec 15> ./.gcc.test + cat >&15 <&1 | perl -e '\$/=undef;\$_=;s/.*ver.+?([[0-9\.]]+).*//s;\$_=\$1;print; s/\.//sg;s/^.*?(\d{0,4}).*\$/\$1/; exit 0 if (\$_ gt 300); exit -1' ++${CC} -v 2>&1 | perl -e '\$/=undef;\$_=;s/.*ver.+?([[0-9\.]]+).*//s;\$_=\$1;print; s/\.//sg;s/^.*?(\d{0,4}).*\$/\$1/; exit 0 if (\$_ >= 300); exit -1' + EOF + sh ./.gcc.test 2>/dev/null + if test $? -ne 0 ; then diff --git a/app-cdr/cdck/files/cdck-0.7.0-man.patch b/app-cdr/cdck/files/cdck-0.7.0-man.patch new file mode 100644 index 000000000000..664b5e77872d --- /dev/null +++ b/app-cdr/cdck/files/cdck-0.7.0-man.patch @@ -0,0 +1,50 @@ +Author: gregor herrmann +Last-Update: 2015-03-04 +Description: + - fix calls to pod2man + - remove stray "=cut", leads to pod2man errors + - add a note about using the gnuplot datafile +Bugs-Ubuntu: https://bugs.launchpad.net/bugs/476591 + +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -11,7 +11,7 @@ + EXTRA_DIST = cdck_man.in + + cdck.1: +- pod2man --section=cdck.1 --verbose cdck_man.in > cdck.1 ++ pod2man --section=1 --verbose --name=cdck cdck_man.in > cdck.1 + + + # +--- a/man/cdck_man.in ++++ b/man/cdck_man.in +@@ -1,5 +1,3 @@ +-=cut +- + =head1 NAME + + cdck - simple CD/DVD check program +@@ -17,6 +15,8 @@ + -i Print CD/DVD information and quit, perform no timings (default mode) + + -t Perform timing test ++ ++ Note: this option will not work for audio CDs. + + -p Save data for gnuplot(1) program + +@@ -26,7 +26,11 @@ + + -v Verbose operations + ++ To actually plot your data you have to start gnuplot and plot the datafile: ++ $ gnuplot ++ gnuplot> plot "cdck-plot.dat" ++ + =head1 COPYRIGHT + +- This manpage was written by gregor herrmann for the +- Debian project but may be used by others. ++ This manpage was written by gregor herrmann ++ for the Debian project, but may be used by others. diff --git a/app-cdr/cdck/files/cdck-0.7.0-wording.patch b/app-cdr/cdck/files/cdck-0.7.0-wording.patch new file mode 100644 index 000000000000..74e91c1f6bb6 --- /dev/null +++ b/app-cdr/cdck/files/cdck-0.7.0-wording.patch @@ -0,0 +1,25 @@ +Description: improve wording +Author: DenverD +Reviewed-by: gregor herrmann +Last-Update: 2010-05-25 + +--- a/src/lib_main.cpp ++++ b/src/lib_main.cpp +@@ -566,7 +566,7 @@ + fprintf (stdout, "\nConclusion:\n"); + + if (bad_sectors > 0) { +- fprintf (stdout, " Disc contains BAD or even readable sectors, put it into trash can!\n"); ++ fprintf (stdout, " Disc contains BAD or even unreadable sectors, put it into trash can!\n"); + return; + } + +@@ -580,7 +580,7 @@ + return; + } + +- fprintf (stdout, " Even there is no unreadable sectors, disc is unstable!\n"); ++ fprintf (stdout, " Even though there are no unreadable sectors, disc is unstable!\n"); + } + + void Ccdrom::DeallocateTimings() -- cgit v1.2.3