Bugzilla Bug 230885

Following a world update, running emerge @preserved-rebuild failed

/bin/sh ../../../../libtool --silent --tag=CXX --mode=compile
i686-pc-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I. -I../../../..
-I../../../../amarok/src -I../../
../../amarok/src -I../../../../amarok/src/amarokcore
-I../../../../amarok/src/amarokcore -I../../../../amarok/src/engine
-I../../../../amarok/src/engine -I
../../../../amarok/src/mediadevice -I/usr/include/taglib  
-I/usr/kde/3.5/include -I/usr/qt/3/include -I.  -I/usr/kde/3.5/include 
-DQT_THREAD_SUPPORT  -D_
REENTRANT  -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE
-Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -DNDEBUG -DNO_DEBUG -O2
-
O2 -march=native -mtune=native -pipe -ggdb -Wformat-security
-Wmissing-format-attribute -Wno-non-virtual-dtor -fno-exceptions -fno-check-new
-fno-common -D
QT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT
-DQT_NO_TRANSLATION  -c -o mtpmediadevice.moc.lo mtpmediadevice.moc.cpp
In file included from ../../../../amarok/src/collectiondb.h:17,
                 from ../../../../amarok/src/collectionbrowser.h:21,
                 from mtpmediadevice.cpp:37:
../../../../amarok/src/threadmanager.h:100: warning: type qualifiers ignored on
function return type
../../../../amarok/src/threadmanager.h:196: warning: type qualifiers ignored on
function return type
../../../../amarok/src/threadmanager.h:417: warning: type qualifiers ignored on
function return type
In file included from ../../../../amarok/src/collectiondb.h:23,
                 from ../../../../amarok/src/collectionbrowser.h:21,
                 from mtpmediadevice.cpp:37:
/usr/qt/3/include/qimage.h: In member function 'bool
QImageTextKeyLang::operator<(const QImageTextKeyLang&) const':
/usr/qt/3/include/qimage.h:58: warning: suggest parentheses around && within ||
/usr/include/libmtp.h: In member function 'virtual MediaItem*
MtpMediaDevice::copyTrackToDevice(const MetaBundle&)':
/usr/include/libmtp.h:489: error: too many arguments to function 'int
LIBMTP_Send_Track_From_File(LIBMTP_mtpdevice_t*, const char*, LIBMTP_track_t*,
int (*
)(uint64_t, uint64_t, const void*), const void*)'
mtpmediadevice.cpp:302: error: at this point in file
mtpmediadevice.cpp: In member function 'uint32_t
MtpMediaDevice::getDefaultParentId()':
mtpmediadevice.cpp:383: warning: deprecated conversion from string constant to
'char*'
/usr/include/libmtp.h: In member function 'LIBMTP_album_t*
MtpMediaDevice::getOrCreateAlbum(QPtrList<MediaItem>*)':
/usr/include/libmtp.h:533: error: too many arguments to function 'int
LIBMTP_Create_New_Album(LIBMTP_mtpdevice_t*, LIBMTP_album_t*)'
mtpmediadevice.cpp:532: error: at this point in file
/usr/include/libmtp.h: In member function 'uint32_t
MtpMediaDevice::createFolder(const char*, uint32_t)':
/usr/include/libmtp.h:508: error: too few arguments to function 'uint32_t
LIBMTP_Create_Folder(LIBMTP_mtpdevice_t*, char*, uint32_t, uint32_t)'
mtpmediadevice.cpp:611: error: at this point in file
/usr/include/libmtp.h: In member function 'void
MtpMediaDevice::playlistFromItem(MtpMediaItem*)':
/usr/include/libmtp.h:521: error: too many arguments to function 'int
LIBMTP_Create_New_Playlist(LIBMTP_mtpdevice_t*, LIBMTP_playlist_t*)'
mtpmediadevice.cpp:916: error: at this point in file
make[5]: *** [mtpmediadevice.lo] Error 1

emerge --info
Portage 2.2_rc1 (default/linux/x86/2008.0/desktop, gcc-4.3.1,
glibc-2.8_p20080602-r0, 2.6.25-gentoo-r6 i686)
=================================================================
System uname:
Linux-2.6.25-gentoo-r6-i686-Intel-R-_Core-TM-2_CPU_6700_@_2.66GHz-with-glibc2.0
Timestamp of tree: Sat, 05 Jul 2008 16:47:01 +0000
app-shells/bash:     3.2_p39
dev-java/java-config: 1.3.7, 2.1.6-r1
dev-lang/python:     2.4.4-r11, 2.5.2-r5
dev-python/pycrypto: 2.0.1-r6
sys-apps/baselayout: 2.0.0
sys-apps/openrc:     0.2.5
sys-apps/sandbox:    1.2.18.1-r3
sys-devel/autoconf:  2.13, 2.62-r1
sys-devel/automake:  1.5, 1.7.9-r1, 1.8.5-r3, 1.9.6-r2, 1.10.1-r1
sys-devel/binutils:  2.18-r3
sys-devel/gcc-config: 1.4.0-r4
sys-devel/libtool:   2.2.4
virtual/os-headers:  2.6.25-r4
ACCEPT_KEYWORDS="x86 ~x86"
CBUILD="i686-pc-linux-gnu"
CFLAGS="-O2 -march=native -mtune=native -pipe -ggdb"
CHOST="i686-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/kde/3.5/env /usr/kde/3.5/share/config
/usr/kde/3.5/shutdown /usr/share/config /var/bind /var/lib/hsqldb"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/env.d/java/
/etc/eselect/postgresql /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release
/etc/revdep-rebuild /etc/terminfo /etc/texmf/web2c /etc/udev/rules.d"
CXXFLAGS="-O2 -march=native -mtune=native -pipe -ggdb"
DISTDIR="/usr/portage/distfiles"
EMERGE_DEFAULT_OPTS="--with-bdeps y"
FEATURES="buildsyspkg distlocks installsources parallel-fetch preserve-libs
sandbox sfperms splitdebug strict unmerge-orphans userfetch"
GENTOO_MIRRORS="http://linux.rz.ruhr-uni-bochum.de/download/gentoo-mirror/
http://gentoo.blueyonder.co.uk http://gentoo.tiscali.nl/
http://gentoo.mirror.solnet.ch http://pandemonium.tiscali.de/pub/gentoo/"
LANG="en_GB.UTF-8"
LC_ALL="en_GB.UTF-8"
LDFLAGS=""
LINGUAS="en_GB en"
MAKEOPTS="-j3"
PKGDIR="/usr/portage/packages"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress
--force --whole-file --delete --stats --timeout=180 --exclude=/distfiles
--exclude=/local --exclude=/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/portage/local/layman/sunrise /usr/local/portage"
SYNC="rsync://rsync.europe.gentoo.org/gentoo-portage"
USE="X a52 aac aalib acl acpi aim alsa apache2 arts audiofile avi
bash-completion berkdb bluetooth bonobo branding browserplugin bzip2 bzlib
cairo caps cddb cdparanoia cdr cjk cli cracklib crypt cups curl cvs cxx dbus
directfb doc dri dts dvd dvdr dvdread eds emacs emboss encode esd ethereal evo
examples exif expat fam fbcon ffmpeg fftw flac fontconfig foomaticdb fortran
ftp gcj gd gdbm gif glut gmp gnome gnome-keyring gnutls gphoto2 gpm graphviz
gstreamer gtk gtk2 gtkhtml guile hal iconv icq idn ieee1394 imagemagick imlib
ipv6 isdnlog jabber jack java javascript jbig jce jpeg jpeg2k junit kde
kdehiddenvisibility kerberos ladspa latex lcms ldap leim libgda libnotify
libsamplerate libwww lirc lm_sensors logrotate lua m17n-lib mad matroska mbox
midi mikmod milter mime mmap mmx mng modplug mono mozilla mp3 mpeg mpi mplayer
msn mudflap musepack ncurses nls nptl nptlonly nsplugin odbc offensive ogg
oggvorbis openal opengl openmp oscar oss pam pcntl pcre pdf perl png postgres
ppds pppd profile pulseaudio python qt3 qt3support qt4 quicktime readline
recode reflection ruby sasl sdl session sharedmem sndfile snmp sockets sox
speex spell spl sqlite sqlite3 sse sse2 ssl startup-notification subversion svg
sysvipc tcl tcltk tcpd theora threads tiff tk truetype uicktime unicode usb v4l
v4l2 vim-syntax vorbis wavpack win32codecs wmf wxwindows x264 x86 xattr xcb
xface xine xml xml2 xorg xulrunner xv xvid yahoo zlib" ALSA_CARDS="hda-intel"
ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file
hooks iec958 ioplug ladspa lfloat linear meter mulaw multi null plug rate route
share shm softvol" APACHE2_MODULES="actions alias auth_basic auth_digest
authn_anon authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
authz_groupfile authz_host authz_owner authz_user autoindex cache dav dav_fs
dav_lock dbd deflate dir disk_cache env expires ext_filter file_cache filter
headers ident imagemap include info log_config logio mem_cache mime mime_magic
negotiation proxy proxy_ajp proxy_balancer proxy_connect proxy_http rewrite
setenvif so speling status unique_id userdir usertrack vhost_alias"
APACHE2_MPMS="worker" CAMERAS="canon ptp2" ELIBC="glibc"
INPUT_DEVICES="keyboard mouse evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz
cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LINGUAS="en_GB en"
LIRC_DEVICES="asusdh" USERLAND="GNU" VIDEO_CARDS="radeon vesa fbdev vga"
Unset:  CPPFLAGS, CTARGET, INSTALL_MASK, PORTAGE_COMPRESS,
PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS

I fixed this, Diego. Hope you don't mind, but it was sound@g.o as broke it,
figured we might as well fix it.

+*amarok-1.4.9.1-r1 (05 Jul 2008)
+
+  05 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/amarok-1.4.9.1-libmtp-0.3.0-API.patch, amarok-1.4.9.1.ebuild,
+  +amarok-1.4.9.1-r1.ebuild:
+  Rev bump for libmtp-0.3.0 compat. Bug #230885.
+

Can you please share the patch with the rest of the Amarok packagers on the
mailing list?

Thanks.