public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in kde-misc/kdiff3: kdiff3-0.9.96.ebuild ChangeLog
@ 2012-01-16 16:26 Johannes Huber (johu)
  0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber (johu) @ 2012-01-16 16:26 UTC (permalink / raw
  To: gentoo-commits

johu        12/01/16 16:26:05

  Modified:             kdiff3-0.9.96.ebuild ChangeLog
  Log:
  Fix repoman warnings.
  
  (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  kde-misc/kdiff3/kdiff3-0.9.96.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild?r1=1.2&r2=1.3

Index: kdiff3-0.9.96.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdiff3-0.9.96.ebuild	22 Nov 2011 20:43:57 -0000	1.2
+++ kdiff3-0.9.96.ebuild	16 Jan 2012 16:26:04 -0000	1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild,v 1.2 2011/11/22 20:43:57 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild,v 1.3 2012/01/16 16:26:04 johu Exp $
 
 EAPI=4
 
@@ -8,9 +8,9 @@
 QT_MINIMAL="4.4.0"
 
 if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="ar bg br bs ca ca@valencia cs cy da de el en_GB eo es et fr ga gl hi hne
-                     hr hu is it ja ka lt mai ml nb nds nl nn pl pt pt_BR ro ru rw sk sv ta tg
-                     tr ug uk zh_CN zh_TW"
+	KDE_LINGUAS="ar bg br bs ca ca@valencia cs cy da de el en_GB eo es et fr ga
+	gl hi hne hr hu is it ja ka lt mai ml nb nds nl nn pl pt pt_BR ro ru rw sk
+	sv ta tg tr ug uk zh_CN zh_TW"
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 	KDE_HANDBOOK="optional"
 fi
@@ -50,9 +50,10 @@
 src_prepare() {
 	if ! use kde; then
 		# adapt to Gentoo paths
-		sed -e s,documentation.path.*$,documentation.path\ =\ ${EPREFIX}/usr/share/doc/${PF}, \
-			-e s,target.path.*$,target.path\ =\ ${EPREFIX}/usr/bin, \
-			"${S}"/src-QT4/kdiff3.pro > "${S}"/src-QT4/kdiff3_fixed.pro
+		sed -e s,documentation.path.*$,documentation.path\ =\
+		"${EPREFIX}"/usr/share/doc/"${PF}", \
+		-e s,target.path.*$,target.path\ =\ "${EPREFIX}"/usr/bin, \
+		"${S}"/src-QT4/kdiff3.pro > "${S}"/src-QT4/kdiff3_fixed.pro
 	else
 		kde4-base_src_prepare
 	fi



1.51                 kde-misc/kdiff3/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?r1=1.50&r2=1.51

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ChangeLog	22 Nov 2011 20:43:57 -0000	1.50
+++ ChangeLog	16 Jan 2012 16:26:04 -0000	1.51
@@ -1,6 +1,9 @@
 # ChangeLog for kde-misc/kdiff3
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.50 2011/11/22 20:43:57 darkside Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.51 2012/01/16 16:26:04 johu Exp $
+
+  16 Jan 2012; Johannes Huber <johu@gentoo.org> kdiff3-0.9.96.ebuild:
+  Fix repoman warnings.
 
   22 Nov 2011; Jeremy Olexa <darkside@gentoo.org> kdiff3-0.9.96.ebuild:
   modify path for Gentoo Prefix, bug 330427






^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in kde-misc/kdiff3: kdiff3-0.9.96.ebuild ChangeLog
@ 2012-01-16 17:37 Agostino Sarubbo (ago)
  0 siblings, 0 replies; 4+ messages in thread
From: Agostino Sarubbo (ago) @ 2012-01-16 17:37 UTC (permalink / raw
  To: gentoo-commits

ago         12/01/16 17:37:40

  Modified:             kdiff3-0.9.96.ebuild ChangeLog
  Log:
  Stable for AMD64, wrt bug #399093
  
  (Portage version: 2.1.10.41/cvs/Linux i686)

Revision  Changes    Path
1.4                  kde-misc/kdiff3/kdiff3-0.9.96.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild?r1=1.3&r2=1.4

Index: kdiff3-0.9.96.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdiff3-0.9.96.ebuild	16 Jan 2012 16:26:04 -0000	1.3
+++ kdiff3-0.9.96.ebuild	16 Jan 2012 17:37:40 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild,v 1.3 2012/01/16 16:26:04 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild,v 1.4 2012/01/16 17:37:40 ago Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@
 HOMEPAGE="http://kdiff3.sourceforge.net/"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 SLOT="4"
 IUSE="debug kde"
 



1.52                 kde-misc/kdiff3/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?r1=1.51&r2=1.52

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ChangeLog	16 Jan 2012 16:26:04 -0000	1.51
+++ ChangeLog	16 Jan 2012 17:37:40 -0000	1.52
@@ -1,6 +1,9 @@
 # ChangeLog for kde-misc/kdiff3
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.51 2012/01/16 16:26:04 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.52 2012/01/16 17:37:40 ago Exp $
+
+  16 Jan 2012; Agostino Sarubbo <ago@gentoo.org> kdiff3-0.9.96.ebuild:
+  Stable for AMD64, wrt bug #399093
 
   16 Jan 2012; Johannes Huber <johu@gentoo.org> kdiff3-0.9.96.ebuild:
   Fix repoman warnings.






^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in kde-misc/kdiff3: kdiff3-0.9.96.ebuild ChangeLog
@ 2012-01-17  7:22 Johannes Huber (johu)
  0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber (johu) @ 2012-01-17  7:22 UTC (permalink / raw
  To: gentoo-commits

johu        12/01/17 07:22:20

  Modified:             kdiff3-0.9.96.ebuild ChangeLog
  Log:
  Fix sed, thanks to Clemmitt M. Sigler <cmsigler@gmail.com>.
  
  (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  kde-misc/kdiff3/kdiff3-0.9.96.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild?r1=1.4&r2=1.5

Index: kdiff3-0.9.96.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdiff3-0.9.96.ebuild	16 Jan 2012 17:37:40 -0000	1.4
+++ kdiff3-0.9.96.ebuild	17 Jan 2012 07:22:20 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild,v 1.4 2012/01/16 17:37:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild,v 1.5 2012/01/17 07:22:20 johu Exp $
 
 EAPI=4
 
@@ -50,8 +50,7 @@
 src_prepare() {
 	if ! use kde; then
 		# adapt to Gentoo paths
-		sed -e s,documentation.path.*$,documentation.path\ =\
-		"${EPREFIX}"/usr/share/doc/"${PF}", \
+		sed -e s,documentation.path.*$,documentation.path\ =\ "${EPREFIX}"/usr/share/doc/"${PF}", \
 		-e s,target.path.*$,target.path\ =\ "${EPREFIX}"/usr/bin, \
 		"${S}"/src-QT4/kdiff3.pro > "${S}"/src-QT4/kdiff3_fixed.pro
 	else



1.53                 kde-misc/kdiff3/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?rev=1.53&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?rev=1.53&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?r1=1.52&r2=1.53

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ChangeLog	16 Jan 2012 17:37:40 -0000	1.52
+++ ChangeLog	17 Jan 2012 07:22:20 -0000	1.53
@@ -1,6 +1,9 @@
 # ChangeLog for kde-misc/kdiff3
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.52 2012/01/16 17:37:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.53 2012/01/17 07:22:20 johu Exp $
+
+  17 Jan 2012; Johannes Huber <johu@gentoo.org> kdiff3-0.9.96.ebuild:
+  Fix sed, thanks to Clemmitt M. Sigler <cmsigler@gmail.com>.
 
   16 Jan 2012; Agostino Sarubbo <ago@gentoo.org> kdiff3-0.9.96.ebuild:
   Stable for AMD64, wrt bug #399093






^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in kde-misc/kdiff3: kdiff3-0.9.96.ebuild ChangeLog
@ 2012-07-26 17:03 Johannes Huber (johu)
  0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber (johu) @ 2012-07-26 17:03 UTC (permalink / raw
  To: gentoo-commits

johu        12/07/26 17:03:43

  Modified:             kdiff3-0.9.96.ebuild ChangeLog
  Log:
  Add missing slot dependencies on Qt.
  
  (Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

Revision  Changes    Path
1.7                  kde-misc/kdiff3/kdiff3-0.9.96.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild?r1=1.6&r2=1.7

Index: kdiff3-0.9.96.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kdiff3-0.9.96.ebuild	28 Jan 2012 15:07:48 -0000	1.6
+++ kdiff3-0.9.96.ebuild	26 Jul 2012 17:03:43 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild,v 1.6 2012/01/28 15:07:48 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild,v 1.7 2012/07/26 17:03:43 johu Exp $
 
 EAPI=4
 
@@ -26,8 +26,8 @@
 IUSE="debug kde"
 
 DEPEND="
-	>=x11-libs/qt-core-${QT_MINIMAL}
-	>=x11-libs/qt-gui-${QT_MINIMAL}
+	>=x11-libs/qt-core-${QT_MINIMAL}:4
+	>=x11-libs/qt-gui-${QT_MINIMAL}:4
 	kde? ( $(add_kdebase_dep kdelibs) )
 "
 RDEPEND="${DEPEND}



1.57                 kde-misc/kdiff3/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?r1=1.56&r2=1.57

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ChangeLog	28 Jan 2012 23:15:10 -0000	1.56
+++ ChangeLog	26 Jul 2012 17:03:43 -0000	1.57
@@ -1,6 +1,9 @@
 # ChangeLog for kde-misc/kdiff3
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.56 2012/01/28 23:15:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.57 2012/07/26 17:03:43 johu Exp $
+
+  26 Jul 2012; Johannes Huber <johu@gentoo.org> kdiff3-0.9.96.ebuild:
+  Add missing slot dependencies on Qt.
 
   28 Jan 2012; Johannes Huber <johu@gentoo.org> metadata.xml:
   Fix repoman warning.





^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-07-26 17:03 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-17  7:22 [gentoo-commits] gentoo-x86 commit in kde-misc/kdiff3: kdiff3-0.9.96.ebuild ChangeLog Johannes Huber (johu)
  -- strict thread matches above, loose matches on Subject: below --
2012-07-26 17:03 Johannes Huber (johu)
2012-01-16 17:37 Agostino Sarubbo (ago)
2012-01-16 16:26 Johannes Huber (johu)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox