[gentoo-commits] gentoo-x86 commit in dev-util/kdevplatform: kdevplatform-1.2.2.ebuild ChangeLog kdevplatform-1.2.3-r1.ebuild kdevplatform-1.2.3.ebuild

[Andreas HAttel (dilfridge)]

dilfridge    11/11/20 22:32:27

  Modified:             kdevplatform-1.2.2.ebuild ChangeLog
                        kdevplatform-1.2.3.ebuild
  Added:                kdevplatform-1.2.3-r1.ebuild
  Log:
  Fix crash with subversion-1.7, bug 388029
  
  (Portage version: 2.1.10.36/cvs/Linux x86_64)

Revision  Changes    Path
1.7                  dev-util/kdevplatform/kdevplatform-1.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.2.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.2.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.2.ebuild?r1=1.6&r2=1.7

Index: kdevplatform-1.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.2.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kdevplatform-1.2.2.ebuild	7 Jun 2011 02:58:47 -0000	1.6
+++ kdevplatform-1.2.2.ebuild	20 Nov 2011 22:32:26 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.2.ebuild,v 1.6 2011/06/07 02:58:47 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.2.ebuild,v 1.7 2011/11/20 22:32:26 dilfridge Exp $
 
 EAPI=4
 
@@ -28,7 +28,7 @@
 DEPEND="
 	dev-libs/boost
 	reviewboard? ( dev-libs/qjson )
-	subversion? ( >=dev-vcs/subversion-1.3 )
+	subversion? ( <dev-vcs/subversion-1.7 )
 "
 RDEPEND="${DEPEND}
 	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4



1.60                 dev-util/kdevplatform/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevplatform/ChangeLog?rev=1.60&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevplatform/ChangeLog?rev=1.60&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevplatform/ChangeLog?r1=1.59&r2=1.60

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ChangeLog	30 Jun 2011 00:26:30 -0000	1.59
+++ ChangeLog	20 Nov 2011 22:32:26 -0000	1.60
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/kdevplatform
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v 1.59 2011/06/30 00:26:30 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v 1.60 2011/11/20 22:32:26 dilfridge Exp $
+
+*kdevplatform-1.2.3-r1 (20 Nov 2011)
+
+  20 Nov 2011; Andreas K. Huettel <dilfridge@g.o>
+  kdevplatform-1.2.2.ebuild, kdevplatform-1.2.3.ebuild,
+  +kdevplatform-1.2.3-r1.ebuild, +files/kdevplatform-1.2.3-svn17-1.patch,
+  +files/kdevplatform-1.2.3-svn17-2.patch:
+  Fix crash with subversion-1.7, bug 388029
 
 *kdevplatform-1.2.3 (29 Jun 2011)
 



1.2                  dev-util/kdevplatform/kdevplatform-1.2.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.3.ebuild?r1=1.1&r2=1.2

Index: kdevplatform-1.2.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdevplatform-1.2.3.ebuild	30 Jun 2011 00:26:30 -0000	1.1
+++ kdevplatform-1.2.3.ebuild	20 Nov 2011 22:32:27 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.3.ebuild,v 1.1 2011/06/30 00:26:30 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.3.ebuild,v 1.2 2011/11/20 22:32:27 dilfridge Exp $
 
 EAPI=4
 
@@ -28,7 +28,7 @@
 DEPEND="
 	dev-libs/boost
 	reviewboard? ( dev-libs/qjson )
-	subversion? ( >=dev-vcs/subversion-1.3 )
+	subversion? ( <dev-vcs/subversion-1.7 )
 "
 RDEPEND="${DEPEND}
 	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4



1.1                  dev-util/kdevplatform/kdevplatform-1.2.3-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.3-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.3-r1.ebuild?rev=1.1&content-type=text/plain

Index: kdevplatform-1.2.3-r1.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.3-r1.ebuild,v 1.1 2011/11/20 22:32:27 dilfridge Exp $

EAPI=4

KMNAME="kdevelop"
KDE_SCM="git"
EGIT_REPONAME="${PN}"
KDE_MINIMAL="4.6"
VIRTUALX_REQUIRED=test
KDE_LINGUAS="ca ca@valencia da de en_GB es et fr it nb nds nl pt pt_BR ru sl sv th uk zh_CN zh_TW"
inherit kde4-base

DESCRIPTION="KDE development support libraries and apps"

KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
# Moved to playground for now
# bazaar kompare mercurial
LICENSE="GPL-2 LGPL-2"
IUSE="cvs debug git reviewboard subversion"

# Moved to playground for now
# bazaar? ( dev-vcs/bzr )
# kompare? ( $(add_kdebase_dep kompare) )
# mercurial? ( dev-vcs/mercurial )
# block - some plugins moved to kdevplatform from kdevelop
DEPEND="
	dev-libs/boost
	reviewboard? ( dev-libs/qjson )
	subversion? ( dev-vcs/subversion )
"
RDEPEND="${DEPEND}
	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4
	!dev-util/kdevelop-git
	$(add_kdebase_dep konsole)
	cvs? ( dev-vcs/cvs )
	git? ( dev-vcs/git )
"

# Quite few fails and upstream is aware
RESTRICT="test"

PATCHES=(
	"${FILESDIR}/${P}"-svn17-[12].patch
)

src_prepare() {
	kde4-base_src_prepare

	# FindKDevPlatform.cmake is installed by kdelibs
	sed -i \
		-e '/cmakeFiles/s/^/#DONOTINSTALL/' \
		cmake/modules/CMakeLists.txt || die
}

# Moved to playground for now
# $(cmake-utils_use_build bazaar)
# $(cmake-utils_use_with kompare)
# $(cmake-utils_use_build mercurial)
src_configure() {
	mycmakeargs=(
		$(cmake-utils_use_build cvs)
		$(cmake-utils_use_build git)
		$(cmake-utils_use_with reviewboard QJSON)
		$(cmake-utils_use_build subversion)
		$(cmake-utils_use_with subversion SubversionLibrary)
	)

	kde4-base_src_configure
}