Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 691866 - net-libs/libupnp-1.8* : remove gentoo specific slotting
Summary: net-libs/libupnp-1.8* : remove gentoo specific slotting
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Ian Whyman (thev00d00) (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2019-08-09 21:49 UTC by Alexander Tsoy
Modified: 2020-01-30 22:08 UTC (History)
1 user (show)

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


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Alexander Tsoy 2019-08-09 21:49:42 UTC
Upstream slotting support has been removed [1] due to complaints from other projects. But Gentoo still carries this slotting, and most reverse dependencies requires build system patches to support building against net-libs/libupnp-1.8*. E.g. from media-video/vlc:

    has_version '>=net-libs/libupnp-1.8.0' && \
        eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch

Can we please follow upstream?

[1] https://github.com/mrjimenez/pupnp/commit/07f504c61bd9e4d93eb3d373ffc8527cafe0b9af
Comment 1 Ian Whyman (thev00d00) (RETIRED) gentoo-dev 2019-08-13 20:09:55 UTC
We were actually the first distro to adopt the 1.8x branch back when it was still slotted upstream.

Even though Debian was at the time also shipping an old snapshot they decided to port all the lagging projects to 1.8.x

Then VLC moaned it was silly to slot once the movement had already been kicked off.

I imagine as a result, all the 1.6 deps have been ported by now, so we can get rid of the slotting, its served it purpose
Comment 2 Ian Whyman (thev00d00) (RETIRED) gentoo-dev 2019-08-13 20:15:37 UTC
FYI, here is the bug where I requested for the 1.8 branch to be _created_

https://github.com/mrjimenez/pupnp/issues/15
Comment 3 Ian Whyman (thev00d00) (RETIRED) gentoo-dev 2019-11-17 18:18:47 UTC
Ive pushed 1.10 (1.8 slot) and 1.10-r100 (0 slot) to the tree
Comment 4 Bernd Feige 2019-11-18 10:47:11 UTC
Today, world upgrade installed net-libs/libupnp-1.10.0-r100 here, and then media-video/vlc recompile by emerge @preserved-rebuild failed since libupnp 1.8 couldn't be found...

After emerge -1 net-libs/libupnp:1.8, vlc compiled again.
emerge --update --deep --newuse -pv --tree @world gives me:

[ebuild  rR    ] media-video/vlc-3.0.8:0/5-9::gentoo  USE="X a52 alsa bluray cddb dbus dvbpsi dvd encode ffmpeg flac fluidsynth fontconfig gcrypt gnome-keyring gstreamer jack jpeg libnotify libsamplerate lua mad matroska mp3 mpeg mtp musepack ncurses nfs ogg opus png postproc pulseaudio qt5 speex ssl svg taglib theora truetype twolame udev upnp v4l vaapi vdpau vorbis vpx wayland x264 xml (-altivec) -aom -archive -aribsub -bidi -chromaprint -chromecast -dav1d -dc1394 -debug (-directx) -dts -faad -fdk -gme -ieee1394 -kate -libass -libav -libcaca -libtar -libtiger -linsys -lirc -live -macosx-notifications -modplug (-neon) -omxil -opencv -optimisememory -projectm -rdp -run-as-root -samba -sdl-image -sftp -shout -sid -skins -soxr -srt -test -tremor -vnc -x265 -zeroconf -zvbi" CPU_FLAGS_X86="mmx sse" 0 KiB
[ebuild  NS    ]  net-libs/libupnp-1.10.0-r100:0::gentoo [1.10.0:1.8::gentoo] USE="ipv6 reuseaddr -blocking-tcp -debug -doc -samples -static-libs" 0 KiB

So it appears that the :0 version takes precedence which it shouldn't...
Comment 5 Alexander Tsoy 2019-11-18 15:18:27 UTC
(In reply to Bernd Feige from comment #4)
vlc ebuilds should be fixed:

@@ -241,7 +241,7 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
    xdg_src_prepare # bug 608256
 
-   has_version '>=net-libs/libupnp-1.8.0' && \
+   has_version 'net-libs/libupnp:1.8' && ! has_version '>=net-libs/libupnp-1.8.0:0' && \
        eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
 
    # Bootstrap when we are on a git checkout.
Comment 6 Alexander Tsoy 2019-11-18 15:33:43 UTC
(In reply to Bernd Feige from comment #4)
> So it appears that the :0 version takes precedence which it shouldn't...
Newer revision takes precedence, slot doesn't matter.
Comment 7 Larry the Git Cow gentoo-dev 2020-01-30 22:08:35 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c71f3501ba59325b5efe8751e1a18a9e279e3a3

commit 2c71f3501ba59325b5efe8751e1a18a9e279e3a3
Author:     Ian Whyman <thev00d00@gentoo.org>
AuthorDate: 2020-01-30 22:07:31 +0000
Commit:     Ian Whyman <thev00d00@gentoo.org>
CommitDate: 2020-01-30 22:08:29 +0000

    net-libs/libupnp: Drop 1.8 slot
    
    Closes: https://bugs.gentoo.org/691866
    Package-Manager: Portage-2.3.86, Repoman-2.3.20
    Signed-off-by: Ian Whyman <thev00d00@gentoo.org>

 net-libs/libupnp/Manifest                          |  1 -
 ...ibupnp-1.8.4.ebuild => libupnp-1.8.6-r1.ebuild} | 29 +--------
 net-libs/libupnp/libupnp-1.8.6.ebuild              | 70 ----------------------
 3 files changed, 3 insertions(+), 97 deletions(-)