* [gentoo-commits] gentoo-x86 commit in kde-misc/kdiff3: kdiff3-0.9.97-r1.ebuild ChangeLog
@ 2012-11-30 5:52 Chris Reffett (creffett)
0 siblings, 0 replies; 3+ messages in thread
From: Chris Reffett (creffett) @ 2012-11-30 5:52 UTC (permalink / raw
To: gentoo-commits
creffett 12/11/30 05:52:02
Modified: ChangeLog
Added: kdiff3-0.9.97-r1.ebuild
Log:
Revision bump. Do not append 'Categories' to .desktop file, bug 443562. Add patch to fix using file paths with -o, bug 443938.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 42618354)
Revision Changes Path
1.63 kde-misc/kdiff3/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?r1=1.62&r2=1.63
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ChangeLog 18 Nov 2012 19:03:20 -0000 1.62
+++ ChangeLog 30 Nov 2012 05:52:02 -0000 1.63
@@ -1,6 +1,13 @@
# 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.62 2012/11/18 19:03:20 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.63 2012/11/30 05:52:02 creffett Exp $
+
+*kdiff3-0.9.97-r1 (30 Nov 2012)
+
+ 30 Nov 2012; Chris Reffett <creffett@gentoo.org>
+ +files/kdiff3-0.9.97-relativepath.patch, +kdiff3-0.9.97-r1.ebuild:
+ Revision bump. Do not append 'Categories' to .desktop file, bug 443562. Add
+ patch to fix using file paths with -o, bug 443938.
18 Nov 2012; Maciej Mrozowski <reavertm@gentoo.org> kdiff3-0.9.97.ebuild:
No need to append 'Categories' to .desktop file anymore, bug 443562.
1.1 kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild?rev=1.1&content-type=text/plain
Index: kdiff3-0.9.97-r1.ebuild
===================================================================
# 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.97-r1.ebuild,v 1.1 2012/11/30 05:52:02 creffett Exp $
EAPI=4
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"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
KDE_HANDBOOK="optional"
else
ESVN_REPO_URI="https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/kdiff3"
KEYWORDS=""
fi
KDE_REQUIRED="optional"
inherit kde4-base qt4-r2
DESCRIPTION="Qt/KDE based frontend to diff3"
HOMEPAGE="http://kdiff3.sourceforge.net/"
LICENSE="GPL-2"
SLOT="4"
IUSE="debug kde"
DEPEND="
x11-libs/qt-core:4
x11-libs/qt-gui:4
kde? ( $(add_kdebase_dep kdelibs) )
"
RDEPEND="${DEPEND}
sys-apps/diffutils
"
PATCHES=(
"${FILESDIR}/${PN}-0.9.97-relativepath.patch"
)
RESTRICT="!kde? ( test )"
src_unpack(){
if [[ ${PV} == *9999* ]]; then
subversion_src_unpack
elif use kde; then
kde4-base_src_unpack
else
qt4-r2_src_unpack
fi
}
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
else
kde4-base_src_prepare
fi
}
src_configure() {
if use kde; then
kde4-base_src_configure
else
eqmake4 "${S}"/src-QT4/kdiff3_fixed.pro
fi
}
src_compile() {
if use kde; then
kde4-base_src_compile
else
qt4-r2_src_compile
fi
}
src_install() {
if use kde; then
kde4-base_src_install
else
qt4-r2_src_install
fi
}
src_test() {
if use kde; then
kde4-base_src_test
fi
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in kde-misc/kdiff3: kdiff3-0.9.97-r1.ebuild ChangeLog
@ 2013-01-13 11:29 Agostino Sarubbo (ago)
0 siblings, 0 replies; 3+ messages in thread
From: Agostino Sarubbo (ago) @ 2013-01-13 11:29 UTC (permalink / raw
To: gentoo-commits
ago 13/01/13 11:29:53
Modified: kdiff3-0.9.97-r1.ebuild ChangeLog
Log:
Stable for x86, wrt bug #450548
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.4 kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild?r1=1.3&r2=1.4
Index: kdiff3-0.9.97-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdiff3-0.9.97-r1.ebuild 6 Jan 2013 16:00:07 -0000 1.3
+++ kdiff3-0.9.97-r1.ebuild 13 Jan 2013 11:29:53 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild,v 1.3 2013/01/06 16:00:07 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild,v 1.4 2013/01/13 11:29:53 ago Exp $
EAPI=4
@@ -9,7 +9,7 @@
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"
- KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux"
+ KEYWORDS="amd64 ~ppc x86 ~amd64-linux"
KDE_HANDBOOK="optional"
else
ESVN_REPO_URI="https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/kdiff3"
1.67 kde-misc/kdiff3/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?rev=1.67&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?rev=1.67&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?r1=1.66&r2=1.67
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ChangeLog 6 Jan 2013 16:02:12 -0000 1.66
+++ ChangeLog 13 Jan 2013 11:29:53 -0000 1.67
@@ -1,6 +1,9 @@
# ChangeLog for kde-misc/kdiff3
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.66 2013/01/06 16:02:12 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.67 2013/01/13 11:29:53 ago Exp $
+
+ 13 Jan 2013; Agostino Sarubbo <ago@gentoo.org> kdiff3-0.9.97-r1.ebuild:
+ Stable for x86, wrt bug #450548
06 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> kdiff3-0.9.97-r1.ebuild:
Stable on amd64, wrt bug #450548
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in kde-misc/kdiff3: kdiff3-0.9.97-r1.ebuild ChangeLog
@ 2013-03-02 21:29 Markos Chandras (hwoarang)
0 siblings, 0 replies; 3+ messages in thread
From: Markos Chandras (hwoarang) @ 2013-03-02 21:29 UTC (permalink / raw
To: gentoo-commits
hwoarang 13/03/02 21:29:51
Modified: kdiff3-0.9.97-r1.ebuild ChangeLog
Log:
Move Qt dependencies to the new category
(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)
Revision Changes Path
1.5 kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild?r1=1.4&r2=1.5
Index: kdiff3-0.9.97-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdiff3-0.9.97-r1.ebuild 13 Jan 2013 11:29:53 -0000 1.4
+++ kdiff3-0.9.97-r1.ebuild 2 Mar 2013 21:29:51 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild,v 1.4 2013/01/13 11:29:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild,v 1.5 2013/03/02 21:29:51 hwoarang Exp $
EAPI=4
@@ -27,8 +27,8 @@
IUSE="debug kde"
DEPEND="
- x11-libs/qt-core:4
- x11-libs/qt-gui:4
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
kde? ( $(add_kdebase_dep kdelibs) )
"
RDEPEND="${DEPEND}
1.69 kde-misc/kdiff3/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?rev=1.69&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?rev=1.69&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?r1=1.68&r2=1.69
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- ChangeLog 28 Jan 2013 17:01:52 -0000 1.68
+++ ChangeLog 2 Mar 2013 21:29:51 -0000 1.69
@@ -1,6 +1,9 @@
# ChangeLog for kde-misc/kdiff3
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.68 2013/01/28 17:01:52 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.69 2013/03/02 21:29:51 hwoarang Exp $
+
+ 02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> kdiff3-0.9.97-r1.ebuild:
+ Move Qt dependencies to the new category
28 Jan 2013; Michael Palimaka <kensington@gentoo.org> -kdiff3-0.9.97.ebuild:
Remove old.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-03-02 21:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-02 21:29 [gentoo-commits] gentoo-x86 commit in kde-misc/kdiff3: kdiff3-0.9.97-r1.ebuild ChangeLog Markos Chandras (hwoarang)
-- strict thread matches above, loose matches on Subject: below --
2013-01-13 11:29 Agostino Sarubbo (ago)
2012-11-30 5:52 Chris Reffett (creffett)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox