[arch-commits] Commit in abcde/repos/community-any (PKGBUILD PKGBUILD hostname.patch)

[Andreas Radke]

    Date: Friday, May 7, 2021 @ 08:31:19
  Author: andyrtr
Revision: 928573

archrelease: copy trunk to community-any

Added:
  abcde/repos/community-any/PKGBUILD
    (from rev 928572, abcde/trunk/PKGBUILD)
  abcde/repos/community-any/hostname.patch
    (from rev 928572, abcde/trunk/hostname.patch)
Deleted:
  abcde/repos/community-any/PKGBUILD

----------------+
 PKGBUILD       |   82 ++++++++++++++++++++++++++++---------------------------
 hostname.patch |   11 +++++++
 2 files changed, 54 insertions(+), 39 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-07 08:31:08 UTC (rev 928572)
+++ PKGBUILD	2021-05-07 08:31:19 UTC (rev 928573)
@@ -1,39 +0,0 @@
-# Contributor: Jochem Kossen <j.kossen at home.nl>
-# Contributor: Kevin Piche <kevin at archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-# Maintainer: schuay <jakob.gruber at gmail.com>
-
-pkgname=abcde
-pkgver=2.9.3
-pkgrel=4
-pkgdesc='Frontend command-line utility that grabs tracks off a CD, encodes them to ogg or mp3 format, and tags them, all in one go'
-arch=('any')
-url='https://abcde.einval.com/'
-license=('GPL')
-depends=('bash' 'cd-discid' 'wget' 'vorbis-tools' 'which' 'inetutils')
-optdepends=('cdparanoia: Paranoia ripping support'
-            'flac: FLAC encoding support'
-            'glyr: album art support'
-            'imagemagick: album art support'
-            'lame: MP3 encoding support'
-            'opus-tools: Opus encoding support'
-            'python-eyed3: ID3 tag support'
-            'vorbisgain: Ogg Vorbis normalization support')
-backup=("etc/${pkgname}.conf")
-source=("https://abcde.einval.com/download/abcde-${pkgver}.tar.gz"{,.sign})
-validpgpkeys=('CEBB52301D617E910390FE16587979573442684E'
-              '742D444A5AFAF2951EF33E7BF8FB375D9CC820B3') # Steve McIntyre, Andrew Strong
-sha256sums=('046cd0bba78dd4bbdcbcf82fe625865c60df35a005482de13a6699c5a3b83124'
-            'SKIP')
-
-build() {
-  cd "${pkgname}-${pkgver}"
-  sed -e "s:normalize-audio:normalize:g" -i ${pkgname}
-  # https://bugs.archlinux.org/task/58046
-  sed -i 's/^#CDDBMETHOD=musicbrainz/CDDBMETHOD=cddb/' abcde.conf
-}
-
-package() {
-  make -C "${pkgname}-${pkgver}" DESTDIR="${pkgdir}" prefix=/usr sysconfdir=/etc install
-}
-

Copied: abcde/repos/community-any/PKGBUILD (from rev 928572, abcde/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-05-07 08:31:19 UTC (rev 928573)
@@ -0,0 +1,43 @@
+# Contributor: Jochem Kossen <j.kossen at home.nl>
+# Contributor: Kevin Piche <kevin at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Maintainer: schuay <jakob.gruber at gmail.com>
+
+pkgname=abcde
+pkgver=2.9.3
+pkgrel=5
+pkgdesc='Frontend command-line utility that grabs tracks off a CD, encodes them to ogg or mp3 format, and tags them, all in one go'
+arch=('any')
+url='https://abcde.einval.com/'
+license=('GPL')
+depends=('bash' 'cd-discid' 'wget' 'vorbis-tools' 'which')
+optdepends=('cdparanoia: Paranoia ripping support'
+            'flac: FLAC encoding support'
+            'glyr: album art support'
+            'imagemagick: album art support'
+            'lame: MP3 encoding support'
+            'opus-tools: Opus encoding support'
+            'python-eyed3: ID3 tag support'
+            'vorbisgain: Ogg Vorbis normalization support')
+backup=("etc/${pkgname}.conf")
+source=("https://abcde.einval.com/download/abcde-${pkgver}.tar.gz"{,.sign}
+        hostname.patch)
+validpgpkeys=('CEBB52301D617E910390FE16587979573442684E'
+              '742D444A5AFAF2951EF33E7BF8FB375D9CC820B3') # Steve McIntyre, Andrew Strong
+sha256sums=('046cd0bba78dd4bbdcbcf82fe625865c60df35a005482de13a6699c5a3b83124'
+            'SKIP'
+            '6b4d8e70dbd34ad269db44fdb9f63eccc448b632cfc98d1b635c3ee6a77362ad')
+
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  sed -e "s:normalize-audio:normalize:g" -i ${pkgname}
+  # https://bugs.archlinux.org/task/58046
+  sed -i 's/^#CDDBMETHOD=musicbrainz/CDDBMETHOD=cddb/' abcde.conf
+  # replace inetutils hostname with coreutils uname -n
+  patch -Np1 -i ../hostname.patch
+}
+
+package() {
+  make -C "${pkgname}-${pkgver}" DESTDIR="${pkgdir}" prefix=/usr sysconfdir=/etc install
+}
+

Copied: abcde/repos/community-any/hostname.patch (from rev 928572, abcde/trunk/hostname.patch)
===================================================================
--- hostname.patch	                        (rev 0)
+++ hostname.patch	2021-05-07 08:31:19 UTC (rev 928573)
@@ -0,0 +1,11 @@
+--- abcde-2.9.3/abcde	2019-02-05 11:19:03.000000000 +0100
++++ abcde-2.9.3/abcde.new	2021-05-07 10:27:29.273996818 +0200
+@@ -3773,7 +3773,7 @@
+ CDDBURL="http://freedb.freedb.org/~cddb/cddb.cgi"
+ CDDBSUBMIT=freedb-submit at freedb.org
+ CDDBPROTO=6
+-HELLOINFO="$(whoami)@$(hostname)"
++HELLOINFO="$(whoami)@$(uname -n)"
+ CDDBCOPYLOCAL="n"
+ CDDBLOCALPOLICY="always"
+ CDDBLOCALRECURSIVE="y"