Bug 296624

Summary:	dev-vcs/qsvn collides with dev-vcs/kdesvn
Product:	Gentoo Linux	Reporter:	Diego Elio Pettenò (RETIRED) <flameeyes>
Component:	New packages	Assignee:	Theo Chatzimichos (RETIRED) <tampakrap>
Status:	RESOLVED FIXED
Severity:	normal	CC:	kde, qt, sping, yselkowitz
Priority:	High	Keywords:	Inclusion
Version:	unspecified
Hardware:	All
OS:	Linux
Whiteboard:
Package list:		Runtime testing required:	---
Attachments:	don't install libsvnqt from qsvn

Description Diego Elio Pettenò (RETIRED) gentoo-dev

2009-12-12 14:15:25 UTC

* Searching all installed packages for file collisions...
 * 
 * Press Ctrl-C to Stop
 * 
 * dev-util/kdesvn-1.4.1
 *      /usr/include/svnqt/annotate_line.hpp
 *      /usr/include/svnqt/apr.hpp
 *      /usr/include/svnqt/cache/DatabaseException.hpp
 *      /usr/include/svnqt/cache/LogCache.hpp
 *      /usr/include/svnqt/cache/ReposConfig.hpp
 *      /usr/include/svnqt/cache/ReposLog.hpp
 *      /usr/include/svnqt/cache/conversion_check.hpp
 *      /usr/include/svnqt/check.hpp
 *      /usr/include/svnqt/client.hpp
 *      /usr/include/svnqt/client_parameter.hpp
 *      /usr/include/svnqt/commititem.hpp
 *      /usr/include/svnqt/conflictdescription.hpp
 *      /usr/include/svnqt/conflictresult.hpp
 *      /usr/include/svnqt/context.hpp
 *      /usr/include/svnqt/context_listener.hpp
 *      /usr/include/svnqt/datetime.hpp
 *      /usr/include/svnqt/diffoptions.hpp
 *      /usr/include/svnqt/dirent.hpp
 *      /usr/include/svnqt/entry.hpp
 *      /usr/include/svnqt/exception.hpp
 *      /usr/include/svnqt/info_entry.hpp
 *      /usr/include/svnqt/lock_entry.hpp
 *      /usr/include/svnqt/log_entry.hpp
 *      /usr/include/svnqt/path.hpp
 *      /usr/include/svnqt/pool.hpp
 *      /usr/include/svnqt/repoparameter.cpp
 *      /usr/include/svnqt/repoparameter.hpp
 *      /usr/include/svnqt/repository.hpp
 *      /usr/include/svnqt/repositorylistener.hpp
 *      /usr/include/svnqt/revision.hpp
 *      /usr/include/svnqt/shared_pointer.hpp
 *      /usr/include/svnqt/smart_pointer.hpp
 *      /usr/include/svnqt/status.hpp
 *      /usr/include/svnqt/stringarray.hpp
 *      /usr/include/svnqt/svnfilestream.hpp
 *      /usr/include/svnqt/svnqt_defines.hpp
 *      /usr/include/svnqt/svnqttypes.hpp
 *      /usr/include/svnqt/svnstream.hpp
 *      /usr/include/svnqt/targets.hpp
 *      /usr/include/svnqt/url.hpp
 *      /usr/include/svnqt/version_check.hpp
 *      /usr/include/svnqt/wc.hpp
 *      /usr/lib/libsvnqt.so
 *      /usr/lib/libsvnqt.so.6
 *      /usr/lib/libsvnqt.so.6.0.0
 * 
 * Package 'dev-util/qsvn-0.8.3' NOT merged due to file collisions. If
 * necessary, refer to your elog messages for the whole content of the
 * above message.

Comment 1 Ben de Groot (RETIRED) gentoo-dev

2009-12-17 14:32:19 UTC

If kdesvn uses qsvn, as it apparently does, shouldn't it just depend on qsvn instead of bundling a copy?

Comment 2 Theo Chatzimichos (RETIRED) archtester

2009-12-17 15:45:32 UTC

wrong, those svnqt libraries are provided by kdesvn and qsvn uses them. So i guess the best solution is to split kdesvn and bug upstream developer to offically split the packages.

Comment 3 Ben de Groot (RETIRED) gentoo-dev

2009-12-17 16:39:14 UTC

Fair enough. Lets add a mutual block for the time being.

Comment 4 Markos Chandras (RETIRED) gentoo-dev

2009-12-17 17:18:18 UTC

I added the blockers

Comment 5 Yaakov S 2009-12-17 19:25:36 UTC

Unfortunately qsvn's copy of libsvnqt is often out of sync with the latest from kdesvn.  So my workaround is to build the qsvn copy as a static "convenience library" instead and not install it.

Comment 6 Yaakov S 2009-12-17 19:27:19 UTC

Created attachment 213317 [details, diff]
don't install libsvnqt from qsvn

Here's a patch for qsvn-0.8.3 which does just that.

Comment 7 Theo Chatzimichos (RETIRED) archtester

2010-03-30 23:43:30 UTC

I really liked Yaakov's patch and it is commited now, somehow it slipped from me. I am still willing to work on my idea and bug upstream though, but it is irrelevant to Gentoo. Thanks