Revision bump. Do not append 'Categories' to .desktop file, bug 443562. Add patch to fix using file paths with -o, bug 443938.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x42618354

4 files changed, 173 insertions, 5 deletions

diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index ac4300a17cfb..849735f02f20 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -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.
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 7b4295e4ed28..c0d8cafeccc7 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX kdiff3-0.9.97-relativepath.patch 2542 SHA256 affa8b351b96109748a1909d83d89e32c9ff51308f7cce438c314486793035e7 SHA512 dfff58aa2bd277eb771fbfd09270532a03ec9d534d28b199499b626ea6467aba3bd116dd5a74e0709f7c24a98cc4a2c2ab807a4762b1a547af706ce01961e19b WHIRLPOOL fe4fcd896df8d9a64e24bbe1aad73aa6a79d241dba8327b07d2781cf17f63029b170645537523d846e81383d31967b709a2b1992252146cdbee03f794d518eba
 DIST kdiff3-0.9.97.tar.gz 1803769 SHA256 e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a SHA512 8f4e89e594894a3fbfaa2e5c9cc345ab16e6787c4efc4324fffe55fbe45b94c2ff10ba411279d2b433a0a5fa752653f7b3e663577cc0d658dfc4d5b797a22fab WHIRLPOOL 190590f3c4290afee73672a77ec4f16a923d156f097bcbb4dce1893f57b1199d1f7ed19166a8173292a7bedda5e54f792474f169a50ed8eb47a92b24f7b1c57c
+EBUILD kdiff3-0.9.97-r1.ebuild 1893 SHA256 aee12f391e93c563522ef8980d33f22999a53725454d8ed6f27760fcad852e3c SHA512 b1b741542bc1ae2703c7bd04f15d7da971287beff0b0d64551c27fb1ec8289afefc2600579e5197b528851b3d5206030752aa53b80bbcd0b5ab7908075c8f009 WHIRLPOOL 633f687ccefc84cce81ab874854ace78bf8cd05d78e74087fa5a0b0998e985a6c3a72fa9616625c10384e874503b4615dd47dfd2d6be3496db2e96d32649ebbf
 EBUILD kdiff3-0.9.97.ebuild 1897 SHA256 388e01031eee600c1421351ba898235f89dbb8254db75320717e68a8b98e4fab SHA512 3d35a84c4a10fd4996fb7cfe1dd975de84f2c7fb42f342a721c4236ca9d763b621882dd98e8f0e66f97656becebfd670b76064557618fd9a0023ec86015b9ba9 WHIRLPOOL 189bdef818a7e0af4ea8c16fc940f66f216c7f02379dd209e1951cdf6ac7fd4160e958d504514aa5382b5375cf0e88838f3f69264184c7abf504da0f68e06985
-MISC ChangeLog 10168 SHA256 7e86cf88e7e2df014bbb8aded8ec43836154080cd30f7a6f5891f8e411655b0e SHA512 ef68cd830187d250c845cf4310ded654a4e7cbdf3963c860b47ef142072941cdeb8129bfd23dc1ee47eb07751a2b3327e8d9c6980d5221467a0e13d08c4e0383 WHIRLPOOL f7e174fc28c406e9216a62458573117e0195e7bea316cc66196aa6b3a9f4a924462bcb65345d7ab92705f67ef951a9425a3e5cf6a1502055f3b77592f8c5d18f
+MISC ChangeLog 10453 SHA256 370b2ef2e8e7072ba7fcf5314cc6efddb8ec721115d548dbed6f3171cb3a9f83 SHA512 28151d1a5690dd1b922bb8e83f70ef9d16fbfad427e58059fdd5f3ddaa6c40c58c1fd70b4c6d3ebe0b0441bd92d54327a9ab2810bac2ad7172c83e8dc83f7afd WHIRLPOOL 018daab37d69d8fb5b91095a5a9719eaca6e8ceec060a022dc2caf0aea4c6b2a1367c34618e049ff0e1e272398b67de29e0656eb84642f36e2dd95797de68c18
 MISC metadata.xml 256 SHA256 53ee238b560db384f60c055e935009dc11608a62ad34f0aab2657ece46d75839 SHA512 9fde5d60815147e6baff866eec6908cad7a6b1eda5b93daaae21b2aaa8db5e7257276476d46d7bf1164d44afe81cf9c6d20526b2a0b2d2cf65596f550d026c2b WHIRLPOOL 2cd0b5ee996efd9f0d19e77361e7fd354e698aec9547280cdc7ec6e5a2904dfa9e983cddb75b23bac157bed152b331da0dce42908e61d441ef94829b70317a61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCpMPkACgkQFuHa/bHpVdvbEQCgwcNrBxVJK+eRr2j7o1ThyShm
-3dIAoMOSAxrhTPqijdnctg5lQogxIbZG
-=NPO5
+iEYEAREIAAYFAlC4SXUACgkQ23laikJhg1ReKwCfWjeNbTQzxZzN2cRY/L4cyL85
+3u4An0vqSBzSX20YevaAtulFvyxNfVHQ
+=Iaym
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.97-relativepath.patch b/kde-misc/kdiff3/files/kdiff3-0.9.97-relativepath.patch
new file mode 100644
index 000000000000..f0f43e8a8f1a
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-0.9.97-relativepath.patch
@@ -0,0 +1,66 @@
+
+
+--- a/kdiff3/src-QT4/fileaccess.cpp
++++ b/kdiff3/src-QT4/fileaccess.cpp
+@@ -183,7 +183,8 @@
+ 
+ void FileAccess::setFile( const QFileInfo& fi, FileAccess* pParent )
+ {
+-   m_filePath   = nicePath( fi.filePath() ); // remove "./" at start   
++   m_filePath   = pParent == 0 ? fi.absoluteFilePath() : 
++                                 nicePath( fi.filePath() ); // remove "./" at start   
+ 
+    m_bSymLink   = fi.isSymLink();
+    if ( m_bSymLink || (!m_bExists  && m_filePath.contains("@@") ) )
+@@ -566,7 +567,16 @@
+    if ( parent() != 0 )
+       return parent()->absoluteFilePath() + "/" + m_filePath;
+    else
+-      return m_filePath;
++   {
++      if ( m_filePath.isEmpty() )
++	 return QString();
++      
++      QFileInfo fi( m_filePath );
++      if ( fi.isAbsolute() )
++	 return m_filePath;
++      else
++	 return fi.absoluteFilePath(); // Probably never reached
++   }
+ }  // Full abs path
+ 
+ // Just the name-part of the path, without parent directories
+@@ -1184,7 +1194,7 @@
+       m_bSuccess = false;
+       KIO::FileCopyJob* pJob = KIO::file_move( m_pFileAccess->url(), kurl, permissions, KIO::HideProgressInfo );
+       connect( pJob, SIGNAL(result(KJob*)), this, SLOT(slotSimpleJobResult(KJob*)));
+-      connect( pJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long)));
++      connect( pJob, SIGNAL(percent(KJob*,unsigned long)), &pp, SLOT(slotPercent(KJob*, unsigned long)));
+ 
+       ProgressProxy::enterEventLoop( pJob,
+          i18n("Renaming file: %1 -> %2",m_pFileAccess->prettyAbsPath(),dest) );
+@@ -1673,7 +1683,7 @@
+                   &pp,      SLOT( slotListDirInfoMessage(KJob*, const QString&) ));
+ 
+          // This line makes the transfer via fish unreliable.:-(
+-         //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long)));
++         //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), &pp, SLOT(slotPercent(KJob*, unsigned long)));
+ 
+          ProgressProxy::enterEventLoop( pListJob,
+             i18n("Listing directory: %1",m_pFileAccess->prettyAbsPath()) );
+
+kdiff3/src-QT4/kdiff3.cpp Diff
+
+--- a/kdiff3/src-QT4/kdiff3.cpp
++++ b/kdiff3/src-QT4/kdiff3.cpp
+@@ -211,6 +211,8 @@
+       m_outputFilename = args->getOption("output");
+       if ( m_outputFilename.isEmpty() )
+          m_outputFilename = args->getOption("out");
++      if ( ! m_outputFilename.isEmpty() )
++         m_outputFilename = FileAccess( m_outputFilename, true ).absoluteFilePath();
+    }
+ 
+    m_bAutoFlag = args!=0  && args->isSet("auto");
+
+
diff --git a/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild
new file mode 100644
index 000000000000..65e820bc5d5c
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild
@@ -0,0 +1,93 @@
+# 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
+}