summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2015-05-05 09:19:44 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2015-05-05 09:19:44 +0000
commit77daed7a473dfd36657800c4b1ab13044063737f (patch)
tree782066c272f3c75f92405b05205982beaf67152b /kde-misc
parentRemoving x11-themes/gtk-engines-qtcurve (bug #544406) (diff)
downloadhistorical-77daed7a473dfd36657800c4b1ab13044063737f.tar.gz
historical-77daed7a473dfd36657800c4b1ab13044063737f.tar.bz2
historical-77daed7a473dfd36657800c4b1ab13044063737f.zip
Restore previous stable version, bug #546494
Package-Manager: portage-2.2.18/cvs/Linux x86_64 RepoMan-Options: --force Manifest-Sign-Key: 0x00F7AB331B0F097F
Diffstat (limited to 'kde-misc')
-rw-r--r--kde-misc/kdiff3/ChangeLog6
-rw-r--r--kde-misc/kdiff3/Manifest35
-rw-r--r--kde-misc/kdiff3/files/kdiff3-0.9.97-relativepath.patch66
-rw-r--r--kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild96
4 files changed, 187 insertions, 16 deletions
diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index 2d5ce9b623b2..d32ceaf4b281 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-misc/kdiff3
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.79 2015/03/28 21:47:04 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.80 2015/05/05 09:19:38 voyageur Exp $
+
+ 05 May 2015; Bernard Cafarelli <voyageur@gentoo.org>
+ +kdiff3-0.9.97-r2.ebuild, +files/kdiff3-0.9.97-relativepath.patch:
+ Restore previous stable version, bug #546494
28 Mar 2015; Johannes Huber <johu@gentoo.org>
-files/kdiff3-0.9.97-relativepath.patch, -kdiff3-0.9.97-r2.ebuild:
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index fa1ba064ff10..724bc13986f7 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,25 +1,30 @@
-----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
DIST kdiff3-0.9.98.tar.gz 1762715 SHA256 802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668 SHA512 867f0b1d5beb421f1bf84e6044d8d9279d434900faa1962fd5417653ef6b1cc71a8f5dd6c29cd4826a1c70a6075786faeaee780548521ce2ce221d83229b52e6 WHIRLPOOL 4099488985182d36fc4ecf532914c1439273036e38b66f7584282b6b232c3c4a738ecab35dd8b1a30b9a368cf6a6f9aeebea38e921063b55ac3972f46e118c98
+EBUILD kdiff3-0.9.97-r2.ebuild 1920 SHA256 a87a3794571af387a143ddf99b89687f3b3ec478a6468572a00137aad646bc19 SHA512 647e4d839bea7adfe5cd03a324784c390e27a6415ab6c4908c2cbc6b93f16728dba71de2d95eae95e8549775ba530eebbd18e7dee45cbae3edf5abdeb3e9a730 WHIRLPOOL e9dbb07284f40c7413fefa9869e6aa9661fefce38dc80bfacf258c2888a5bbac605a37b89f89e496ef9388f7ce025155e4ed45d6234240dc781241eecd4ee5c4
EBUILD kdiff3-0.9.98-r1.ebuild 2040 SHA256 891091b2a9cdec052a9c94ec4f4ec7fe1ccf88eed964b5c22c8d8d01d4317a96 SHA512 058b30fd5745c5cb3152d8dd7e323add861d23d77f5ae9f55a034d89f7ae6b7215dac59b01e9888cf4c1fb97cc559dff95df062e6661fdf0007929ef21af4fef WHIRLPOOL f28fd639639bd0d7f97452859615c6c12c074691168a7f8d385df12fe69dcecd273b396bd352b5958ce1a410c5a513b7a265e33522ee73e9344a98ea439b9094
EBUILD kdiff3-0.9.98.ebuild 1858 SHA256 8d9c6213e8f2d5b91aa188affc9724c03f79dc847e16e23bfa8ffdc002cc295f SHA512 60db8b07892e35cb3410b231436ca7ad2b9deec607401421aae2096deac593a021cff32cda34b5ebe1b16a6b10eb054e2c11152b29d8c5415595cc9187c6bda0 WHIRLPOOL 509e6bab5cb5dc0fe4a9359e71b3022c473b3017ff37df42208005613cb41798d512e7e7c3665fc046e87c20dd2272067b75f7c1b85ff46e61aee0b6a097b11c
-MISC ChangeLog 12382 SHA256 d4aa8acc2cebbc78dfc5768c3be2c8c861f8e671fbebd948618a19db34811528 SHA512 c81e9ed389930ab856f0d92bb753e201004d73482e16e63fa297974354f23839e1ff31ecbb4e0dfb307769fc8d11def9a6ba80fe4ed2021cb3dd37e08db6805f WHIRLPOOL 2f503086c2ea7c36690cda9914f2a6a3e8d4e37c0282941b4c81fddd213afbc8ed14c476bc122fc9bb393f356787beed7aea498b849377bd56a4f3bc99e00467
+MISC ChangeLog 12558 SHA256 ab29cc49dc0fdcafed4211e11c1e5ecc5030522010af407deef227047bbf1820 SHA512 e8b09aaff1139e02d8bef6a755d5d744dca70a3a315ef2dfc666fcc920ef08191e6d013db81625b28abcecbcaea81eb0c4f6aca35dba9ba38f0665bcd88b57e9 WHIRLPOOL 4b325d03974d8108b1ea7883a033e3ac187c69c45449418e0dd39cdd7841a3e8420c39697619564684e793835538c7bec3f274039b2c4a14cda26a69bec21105
MISC metadata.xml 256 SHA256 53ee238b560db384f60c055e935009dc11608a62ad34f0aab2657ece46d75839 SHA512 9fde5d60815147e6baff866eec6908cad7a6b1eda5b93daaae21b2aaa8db5e7257276476d46d7bf1164d44afe81cf9c6d20526b2a0b2d2cf65596f550d026c2b WHIRLPOOL 2cd0b5ee996efd9f0d19e77361e7fd354e698aec9547280cdc7ec6e5a2904dfa9e983cddb75b23bac157bed152b331da0dce42908e61d441ef94829b70317a61
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
-iQIcBAEBCAAGBQJVFyFcAAoJEGVpnaTzz9K9uPIP+wTiKESLqL22O9unsWqfILMF
-NYqNDQJF5Jg+MWCiiwCY4djtlGBWo1Ds6Fn1TchNxYSQsfEPIAU1+7mRFnoFG1MA
-lWaaYcz63NQaNbZUnKF3ij3UTb76OKV//i0K85A/gZNZEuNa3yQ0QEbcs9d0HGTH
-cezaeg8JGCYBHPI1v/hYc4Rccsfp0sFiEZbzqKD1pL9an7HWDkptwE1MxUx2gKuH
-g5Zv/B0qtAkfqslZqQ34ZXr0dcc/qYnPfikOWcFn5CAuCKx8sCqYg4FCMeMhtT0o
-yMP8R8kZTwDwVJcrnfsLM80QhMUI53/rxqyjSicWs7/tiQ5e8wakG6gTVpXQ5Etd
-t5Du5qkWjj1hD2gsz+6lcSnLwwyVJt/edI7bpzqbdr+xPlZ+8VIF8ikZytQh9WrL
-OBtdpCc2Yy9TAoZtRaJ7Yvg9dFAaBkoX+pC8D6QQSN1AWhKDBkImX+sw6AgMQ0w6
-j96mV0bTTU5Qr9sE8WTfFJuECx4jQchSHvPALA5eABUP7uX3PPjOn53Tc60HZzNB
-XCAePgia2jDEJnUMuXwkPq2axLZJ8QFEaQZRyRL+V54YvXdZkAQ+htSOVZdAaeAb
-vHpq5B1JUIlOgq9bbHwMXWyeTivwZZ6+nGftz4+u+5qRtzdpT4Fib24e/8f8gO1e
-32eYknu8hEeYRljad0ed
-=oO9k
+iQJ8BAEBCABmBQJVSIsrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREMzFDRDFGNEQwRTAyNjc2QzRDNjRFQzAw
+MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/T7wQAJi96D1ITcphrKW0rLDfo7KW
+N6G2Rcjf5uEiWyXE+8ReL8zKASIpAkMVNEwsg0TrwHg3lYpvjvzsFvzUR3b3rlwJ
+Vd6UpLLkuQ3JlTzvMSP5RfERrpRmHQuSWmYaLbi/PdMc3LZ45ewOkoBr2Cc8SMB3
+CaCR9DcsvCEBOdOcW55Q1fNlwVnrbOGWRmRqlDxyfmFhtb35ZSa88YdFuToxRczr
+iivkgkiNRWuWz7Sl/kuog2NPgiX3nipFjhrK82hDI4NX9fhC5r1t7rOZsRTMQNqv
+WX2VaeyOtf3wD8f0DMwCmmDYKiDcahNimmykUPcd2+BnIdwwGsx27IjGQWUM7P/I
+YTGWfTbFtRr2OC8Atl2hN9j599FMKzTxJVo8INKneK363Y2olmtLYrKHBXz9LtAu
+VWV4Kf2zxhS2LO+110DbYPED3QW/tyA/x8woB6c0QwUb3WDSyKIAQ44CewiqOcGj
+Nsi6ELodshsuPfo2Obxjk3B38IzLUEtVdwkW8UUnlBkR/FLyTJ6FncCgc94hCB5P
+g1hHds+kyl84B+ZYyYoBjX65xCy9iJylerr6BvtlyChrIHPaZC1HCLqGeztD9cf9
+Ys9sGwI8Vh/sUOpX2dytOz/lxnSAbSh7XDxFseMtWLv3JFJdFEClM+sID9HkN3Ih
+v/d6AgZpxGaHDTvEtBaP
+=JiP9
-----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-r2.ebuild b/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
new file mode 100644
index 000000000000..ef02930d0178
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2014 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-r2.ebuild,v 1.5 2015/05/05 09:19:38 voyageur Exp $
+
+EAPI=5
+
+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 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"
+
+CDEPEND="
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ kde? ( $(add_kdebase_dep kdelibs) )
+"
+DEPEND="${CDEPEND}
+ sys-devel/gettext
+"
+RDEPEND="${CDEPEND}
+ 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
+}