diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /kde-misc/kdiff3 | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'kde-misc/kdiff3')
-rw-r--r-- | kde-misc/kdiff3/Manifest | 2 | ||||
-rw-r--r-- | kde-misc/kdiff3/files/kdiff3-0.9.97-relativepath.patch | 66 | ||||
-rw-r--r-- | kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild | 96 | ||||
-rw-r--r-- | kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild | 100 | ||||
-rw-r--r-- | kde-misc/kdiff3/kdiff3-0.9.98.ebuild | 93 | ||||
-rw-r--r-- | kde-misc/kdiff3/metadata.xml | 12 |
6 files changed, 369 insertions, 0 deletions
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest new file mode 100644 index 000000000000..a06addf167ef --- /dev/null +++ b/kde-misc/kdiff3/Manifest @@ -0,0 +1,2 @@ +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 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..5110ede66337 --- /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 +# $Id$ + +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 +} diff --git a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild new file mode 100644 index 000000000000..268ec2dd8ad7 --- /dev/null +++ b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 + KEYWORDS="" +fi + +KDE_REQUIRED="optional" +inherit kde4-base qmake-utils + +DESCRIPTION="Qt/KDE based frontend to diff3" +HOMEPAGE="http://kdiff3.sourceforge.net/" +EGIT_REPO_URI=( "git://git.code.sf.net/p/kdiff3/code" ) + +LICENSE="GPL-2" +SLOT="4" +IUSE="debug kde +qt4 qt5" + +REQUIRED_USE="kde? ( qt4 ) + ^^ ( qt4 qt5 )" + +CDEPEND=" + qt4? ( dev-qt/qtcore:4 + dev-qt/qtgui:4 ) + qt5? ( dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 ) + kde? ( $(add_kdebase_dep kdelibs) ) +" +DEPEND="${CDEPEND} + sys-devel/gettext +" +RDEPEND="${CDEPEND} + sys-apps/diffutils +" + +RESTRICT="!kde? ( test )" + +src_unpack(){ + if [[ ${PV} == *9999* ]]; then + git-r3_src_unpack + mv "${S}"/${PN}/* "${S}" || die + else + default + 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 + elif use qt4; then + eqmake4 "${S}"/src-QT4/kdiff3_fixed.pro + else + eqmake5 "${S}"/src-QT4/kdiff3_fixed.pro + fi +} + +src_compile() { + if use kde; then + kde4-base_src_compile + else + default + fi +} + +src_install() { + if use kde; then + kde4-base_src_install + else + emake INSTALL_ROOT="${D}" install + fi +} + +src_test() { + if use kde; then + kde4-base_src_test + fi +} diff --git a/kde-misc/kdiff3/kdiff3-0.9.98.ebuild b/kde-misc/kdiff3/kdiff3-0.9.98.ebuild new file mode 100644 index 000000000000..2d0bd1e725a5 --- /dev/null +++ b/kde-misc/kdiff3/kdiff3-0.9.98.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 + KEYWORDS="" +fi + +KDE_REQUIRED="optional" +inherit kde4-base qt4-r2 + +DESCRIPTION="Qt/KDE based frontend to diff3" +HOMEPAGE="http://kdiff3.sourceforge.net/" +EGIT_REPO_URI=( "git://git.code.sf.net/p/kdiff3/code" ) + +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 +" + +RESTRICT="!kde? ( test )" + +src_unpack(){ + if [[ ${PV} == *9999* ]]; then + git-r3_src_unpack + mv "${S}"/${PN}/* "${S}" || die + 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 +} diff --git a/kde-misc/kdiff3/metadata.xml b/kde-misc/kdiff3/metadata.xml new file mode 100644 index 000000000000..c107fb34862c --- /dev/null +++ b/kde-misc/kdiff3/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>kde</herd> + <maintainer> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">kdiff3</remote-id> + </upstream> +</pkgmetadata> |