Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 629374 - media-sound/audacious-3.9 version bump request
Summary: media-sound/audacious-3.9 version bump request
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Jason A. Donenfeld
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-08-30 12:24 UTC by Michael Hofmann
Modified: 2017-11-06 11:07 UTC (History)
4 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
patch-ebuild-audacious-3.8.2-3.9.txt (patch-ebuild-audacious-3.8.2-3.9.txt,682 bytes, text/plain)
2017-08-30 12:24 UTC, Michael Hofmann
Details
build.log.gz (erroneous 3.9 ebuild) (build.log.gz,643 bytes, application/gzip)
2017-11-05 15:05 UTC, Michael Hofmann
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Michael Hofmann 2017-08-30 12:24:29 UTC
Created attachment 491106 [details]
patch-ebuild-audacious-3.8.2-3.9.txt

audacious 3.9 was released on 2017-08-19.

I could install audacious 3.9 with the steps below:
1) I copied audacious-3.8.2.ebuild to audacious-3.9.ebuild
2) Since upstream doesn't seem to provide a separate tar file for gtk3 any more,
I removed a few lines that handle the gtk3 file (see attachment)
Comment 1 Sander Sweers 2017-10-01 10:58:34 UTC
(In reply to Michael Hofmann from comment #0)
> 2) Since upstream doesn't seem to provide a separate tar file for gtk3 any
> more,

We can get the source from github but then we will need to modify the ebuild to generate the build system.  I'll post diffs switching to github for both versions
Comment 2 Sander Sweers 2017-10-01 11:56:38 UTC
The version is now 2 digits compared to before with 3. I could not find an example from how this was handled before so the renaming of the tarbal and using versionator may not be required or wanted.

audacious
----------------------------------------------------------------------
--- audacious-3.8.2.ebuild	2017-10-01 12:43:29.778340269 +0200
+++ audacious-3.9.0.ebuild	2017-10-01 13:50:53.410612580 +0200
@@ -2,15 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils
+inherit autotools eutils versionator
 
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
+MY_P="${PN}-$(get_version_component_range 1-2)"
+S="${WORKDIR}/${PN}-${MY_P}"
 
 DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
 HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
-	 gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )
+SRC_URI="!gtk3? ( https://github.com/audacious-media-player/audacious/archive/${MY_P}.tar.gz -> ${P}.tar.gz )
+	 gtk3? ( https://github.com/audacious-media-player/audacious/archive/${MY_P}-gtk3.tar.gz -> ${P}-gtk3.tar.gz )
 	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
 
 LICENSE="BSD-2"
@@ -43,10 +43,14 @@
 src_unpack() {
 	default
 	if use gtk3 ; then
-		mv "${MY_P}-gtk3" "${MY_P}"
+		mv "${PN}-${MY_P}-gtk3" "${PN}-${MY_P}"
 	fi
 }
 
+src_prepare() {
+	eautoreconf
+}
+
 src_configure() {
 	if use gtk ;then
 		gtk="--enable-gtk"
----------------------------------------------------------------------

audacious-plugins
----------------------------------------------------------------------
--- audacious-plugins-3.8.2.ebuild	2017-10-01 12:45:44.115349316 +0200
+++ audacious-plugins-3.9.0.ebuild	2017-10-01 13:50:47.101612155 +0200
@@ -2,20 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils
+inherit autotools eutils versionator
+
+MY_P="${PN}-$(get_version_component_range 1-2)"
+S="${WORKDIR}/${PN}-${MY_P}"
 
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
 DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
 HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
-	 gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
+SRC_URI="!gtk3? ( https://github.com/audacious-media-player/audacious-plugins/archive/${MY_P}.tar.gz -> ${P}.tar.gz )
+	gtk3? ( https://github.com/audacious-media-player/audacious-plugins/archive/${MY_P}-gtk3.tar.gz -> ${P}-gtk3.tar.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="aac +adplug alsa aosd bs2b cdda cue ffmpeg flac fluidsynth gnome http gtk gtk3 jack
-lame libnotify libsamplerate lirc mms mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile vorbis wavpack"
+lame libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile vorbis wavpack"
 REQUIRED_USE="
 	^^ ( gtk gtk3 qt5 )
 "
@@ -40,7 +41,7 @@
 RDEPEND="app-arch/unzip
 	>=dev-libs/dbus-glib-0.60
 	dev-libs/libxml2:2
-	media-libs/libmodplug
+	modplug? ( media-libs/libmodplug )
 	~media-sound/audacious-${PV}
 	>=media-sound/audacious-3.7.1-r1
 	media-libs/adplug
@@ -99,11 +100,13 @@
 src_unpack() {
 	default
 	if use gtk3 ; then
-		mv "${MY_P}-gtk3" "${MY_P}"
+		mv "${PN}-${MY_P}-gtk3" "${PN}-${MY_P}"
 	fi
 }
 
 src_prepare() {
+	eautoreconf
+
 	has_version "<dev-libs/glib-2.32" && \
 		cd "${S}"/src/mpris2 && \
 		gdbus-codegen --interface-prefix org.mpris. \
@@ -142,7 +145,6 @@
 		${ffmpeg} \
 		${gtk} \
 		${notify} \
-		--enable-modplug \
 		--enable-mpris2 \
 		--disable-soxr \
 		--disable-oss4 \
@@ -162,6 +164,7 @@
 		$(use_enable libsamplerate resample) \
 		$(use_enable lirc) \
 		$(use_enable mms) \
+		$(use_enable modplug) \
 		$(use_enable mp3 mpg123) \
 		$(use_enable nls) \
 		$(use_enable pulseaudio pulse) \
----------------------------------------------------------------------
Comment 3 Larry the Git Cow gentoo-dev 2017-11-05 11:49:50 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=927ebb39d786188f784a45395f293cccfc95dec5

commit 927ebb39d786188f784a45395f293cccfc95dec5
Author:     David Seifert <soap@gentoo.org>
AuthorDate: 2017-11-05 11:48:59 +0000
Commit:     David Seifert <soap@gentoo.org>
CommitDate: 2017-11-05 11:48:59 +0000

    media-sound/audacious: Version bump to 3.9
    
    * USE='gtk3' removed, seeing that upstream wants to
      remove GTK+3 support anyways.
    * Remove all the minor arches, they are just pose a
      maintenance burden.
    
    Closes: https://bugs.gentoo.org/556700
    Closes: https://bugs.gentoo.org/629374
    Package-Manager: Portage-2.3.13, Repoman-2.3.4

 media-sound/audacious/Manifest              |  1 +
 media-sound/audacious/audacious-3.9.ebuild  | 76 +++++++++++++++++++++++++++++
 media-sound/audacious/audacious-9999.ebuild | 76 +++++++++++++++++++++++++++++
 3 files changed, 153 insertions(+)
Comment 4 Michael Hofmann 2017-11-05 15:02:52 UTC
Thanks for the 3.9 ebuild! But there seems to be an error. It is in line 16 where the wrong source for audacious is defined. Emerge fails and the output is:

 >>> Unpacking source...
 >>> Unpacking gentoo_ice-xmms-0.2.tar.bz2 to /var/tmp/portage/
     media- sound/audacious-3.9/work
 >>> Source unpacked in /var/tmp/portage/media-sound/audacious-3.9/work
  * ERROR: media-sound/audacious-3.9::gentoo failed (prepare phase):
  *   The source directory '/var/tmp/portage/media-sound/audacious-3.9/
      work/audacious-3.9' doesn't exist
Comment 5 Michael Hofmann 2017-11-05 15:05:48 UTC
Created attachment 502702 [details]
build.log.gz (erroneous 3.9 ebuild)
Comment 6 Michael Hofmann 2017-11-05 17:55:59 UTC
The wrong package source in the ebuild is fixed, but now I get the message below:

 Calculating dependencies... done!

 >>> Verifying ebuild manifests

 !!! Digest verification failed:
 !!! /usr/portage/media-sound/audacious/audacious-3.9.ebuild
 !!! Reason: Filesize does not match recorded size
 !!! Got: 1734
 !!! Expected: 1717

and

 !!! Digest verification failed:
 !!! /usr/portage/media-sound/audacious/audacious-9999.ebuild
 !!! Reason: Filesize does not match recorded size
 !!! Got: 1734
 !!! Expected: 1717
Comment 7 Michael Hofmann 2017-11-05 18:51:35 UTC
manifest is fine now. audacious-3.9 installs cleanly and works as expected.
Comment 8 Maxim Britov 2017-11-06 11:07:31 UTC
Can't build audacious and audacious-plugins with gtk3 without autoreconf:

Configuration:

  Install path:                           /usr

  D-Bus support:                          yes
  GTK+ support:                           yes
  Qt support:                             no
  Valgrind analysis support:              no

>>> Source configured.
>>> Compiling source in /var/tmp/portage/media-sound/audacious-3.9/work/audacious-3.9 ...
make -j4 
buildsys.mk:795: .deps: No such file or directory
make: *** No rule to make target '.deps'.  Stop.
 * ERROR: media-sound/audacious-3.9::gentoo failed (compile phase):
 *   emake failed