diff options
| -rw-r--r-- | app-editors/kile/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/kile/Manifest | 19 | ||||
| -rw-r--r-- | app-editors/kile/files/kile-2.1.2-cwd.patch | 89 | ||||
| -rw-r--r-- | app-editors/kile/kile-2.1.2-r1.ebuild | 62 |
4 files changed, 20 insertions, 156 deletions
diff --git a/app-editors/kile/ChangeLog b/app-editors/kile/ChangeLog index ff46fdfaaafa..7f75681ec84c 100644 --- a/app-editors/kile/ChangeLog +++ b/app-editors/kile/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/kile # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/kile/ChangeLog,v 1.163 2012/11/23 19:39:18 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/kile/ChangeLog,v 1.164 2012/11/24 15:29:13 johu Exp $ + + 24 Nov 2012; Johannes Huber <johu@gentoo.org> -files/kile-2.1.2-cwd.patch, + -kile-2.1.2-r1.ebuild: + Remove old. 23 Nov 2012; Agostino Sarubbo <ago@gentoo.org> kile-2.1.3.ebuild: Stable for x86, wrt bug #442394 diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest index 531d02513a53..6dd502bd52a5 100644 --- a/app-editors/kile/Manifest +++ b/app-editors/kile/Manifest @@ -1,7 +1,18 @@ -AUX kile-2.1.2-cwd.patch 3012 SHA256 08bfb58e4273835541c0c10351f0422cd67c8020988619114f2f0371db3b1762 SHA512 ce782566471b2f6a7f952b6259ca0350e72c3fe89c068725be4017833439e5aaacf0e773f2e7987460cbefc939915888160a58afa7f0beed18dd4dd98e6cf9c4 WHIRLPOOL 3257d467c0573a875994bfdd161a8da00bbbc947ee101522e7dc4dc919774c37854a1d7d450850bcf658f591952a66fadef2608fb8487fe716e98fa4e2bcf76f -DIST kile-2.1.2.tar.bz2 4858519 SHA256 82d1e405e0b2aa8125cdc2dbf5bbfbb20488515bde763bf7b7cde69e6575a55b SHA512 b6963f4d69547a534d2382027900cf4493784dcb7ffdb2b0836785eca1714b96dfb76598414221addf7e42667204ab702cbf5992491fc8cdc3b3c9dbdcd770e5 WHIRLPOOL 6152b695653d46557d97a27cfc4e99f22af1f50509d3c17334fb5c11d73fa9ce2d8e8f57ce9a91a63ca6606d240834b8fa42ea92e46080333a48f23d320ccaa6 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + DIST kile-2.1.3.tar.bz2 4911212 SHA256 a063ec4fca1ba5a063ffdcdb538967af35ade01d71fa7db6ea691ba2cf88cea2 SHA512 820cb5e2579f243ce87409aa4d483a58b0a2cf1d86bff72dd12264570bfe72e7819c88aa4333080f8281e54e8315e2c11f961b41f13a6215913dfa4f7bd3feda WHIRLPOOL 1bc56ad82c72807fcf93ffeb4dbd4222a7660c00e852378a9007c7aa4a96a5130497ca23815a74c92f631fcb261dbf35f7d5453e849f6fb82c9f3c802058ab31 -EBUILD kile-2.1.2-r1.ebuild 1321 SHA256 4e452f4c7f9b4c16f53d5444efb098fd70a69b70ccbca1532a63201741199c32 SHA512 43ef0bfb409cc901b740ce255547688031a65f23e116b93441962a23bd0e43925f745ebdccb7fce2f76e08e76d5f932f290fa38eb8cf3ab6acdba1fb9092c694 WHIRLPOOL eaed413b17e4ee8cc18b2c893a300dc45d1120cb2c73d01c683d0d80f6b1076f1e5a91d0582e492165e52d77d0aec667766bde3614a76bfb7a079102859ee557 EBUILD kile-2.1.3.ebuild 1275 SHA256 1aa7287bc622d11d43cab442cc709938abece27cc1193536beb9cc8ce77f96ad SHA512 c3430d25ae0422fc655c5622e9487750ec586df945320d5b4b3064c56a38be4905aa32d6e352ab5d7187834f3a865eedd09483e99bcc4c3221cea17f9ee300b0 WHIRLPOOL 59c9bb624a0925b136d7497d9b8fef2b11ba9787087c974461f78cab1c09376b94c6f5ed3413e56c102f1830dbe65b97f6dd4400f3d46a87655f8e31251140ba -MISC ChangeLog 20160 SHA256 3b59ad31b05c46d8d7a4935172869508903d008194bf4c43611b064a72423e6f SHA512 e8fe550c9a43baab5196adf8650e8d4de8633dc6b1b3900d8cd774b2d0fa699fa1566885b4e4f594c67dfe72f3932bde76c5ed7858fc16d662e81f836ee7029d WHIRLPOOL d34869412c0a18a981eb57b7b9ebc5febcfcd58d891364387f92ae383fb0cadd367349ffbb4d32d7be161fbef1ed4b62b7a1168b7ae279f39d513f570f944d98 +MISC ChangeLog 20278 SHA256 e70241ee7ef19b69589e586309face273df1445bfef3a9ce38e6d07a589b5825 SHA512 e8ed4a766774f7fd67dc61aced6647fbd05442e95848a954b5427235e38f1be81bad592601972b09afca2cabb75728e5a6d440af8d39cebedb2c758ea064f373 WHIRLPOOL 3830c59c00abb9b382c47cf2e360746214dc3a1c274b32157366416f07298bd085421f5ca5b8d8240ea90f40db0d17ccf03a797d54595ece1c6368bd2d2cbcc2 MISC metadata.xml 292 SHA256 d8fd6886b6cc1c1ad5316cd214bc6c240df5253f779403f841a054fec43b5453 SHA512 28f8ee8b8f2fbe6cb5a625e1533220bdf77cb9718bb588bf7457984e9d3a009631025e5e17e2247b23b462bdcbfda4551c952fd47fbfe0674b88b8b8dbee7f37 WHIRLPOOL d5ffc631dd4b49e2b25bb93f77211ebef1b7afb2b5c7a40f7dacd1e50f823d5d487a23e4613d0684beaaec0daf3fc1f9bf604c0abb1c73a9e373282bf0a4ff3d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAEBCAAGBQJQsPXjAAoJEO+t9ga+3I3aQHQH/3I5slo5Qx5Q60R9J28NZa/1 +WVfNN9IiS3kchm6RnMWgeEHH86hy+aS2uwns/9INYsXdB8sU6NeKSp5u8SEsgwrk +V4kooti0mODinCeSOUVsu6tntvRmkuhZ7CAXuLLTvXKVbvkXo7M4DZmQ4OoM5BSV +N0UI+z7gG9X0I8iAQPPwuoF54MnIVG/1Nj5qKfotbFIcYIFl1g3Hq3N3zLHUrnQ/ +ltwKWyluPFdC0ezIAolCokBOGdKJbcu75X/+o5pT6aVR86fW+sM5Y40zHXDpW5Ej +V2u4kYtur9hHeOYiRAePzUYpxn9rotYTG+DXVpffBd4eTRY5gsEG4jRy3GAACAo= +=Rprt +-----END PGP SIGNATURE----- diff --git a/app-editors/kile/files/kile-2.1.2-cwd.patch b/app-editors/kile/files/kile-2.1.2-cwd.patch deleted file mode 100644 index cf09b56c7c5c..000000000000 --- a/app-editors/kile/files/kile-2.1.2-cwd.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -ruN kile-2.1.2.orig/src/main.cpp kile-2.1.2/src/main.cpp ---- kile-2.1.2.orig/src/main.cpp 2012-04-22 18:54:51.000000000 +0200 -+++ kile-2.1.2/src/main.cpp 2012-06-19 00:10:46.096292174 +0200 -@@ -43,19 +43,19 @@ - * Complete a relative paths to absolute ones. - * Also accepts URLs of the form file:relativepath. - */ --QString completePath(const QString &path) -+QString completePath(const QString &path, const QString& currentPath) - { - QString fullpath(path); - - KILE_DEBUG() << "==complete path is " << path; -- if( QDir::isRelativePath(path) ) { -+ if(QDir::isRelativePath(path)) { - if(path.startsWith("file:")) { - KUrl url(path); -- url.setFileName(completePath(url.toLocalFile())); -+ url.setFileName(completePath(url.toLocalFile(), currentPath)); - fullpath = url.url(); - } - else if(path.indexOf(QRegExp("^[a-z]+:")) == -1) { -- fullpath = QDir::currentPath() + QDir::separator() + path; -+ fullpath = currentPath + QDir::separator() + path; - } - } - -@@ -138,6 +138,10 @@ - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); - bool running = false; - -+ // we save the current path here to avoid problems when it's (erroneously) changed later -+ // (for instance, when a new KonsoleWidget is created, see #301808) -+ const QString currentPath = QDir::currentPath(); -+ - // this has to go before the DBus connection - KApplication app; - -@@ -151,13 +155,13 @@ - for(int i = 0; i < args->count(); ++i) { - //FIXME: check whether this can be used to open Urls - if(isProject(args->arg(i))) { -- kile->openProject(completePath(args->arg(i))); -+ kile->openProject(completePath(args->arg(i), currentPath)); - } - else if(args->arg(i) == "-"){ - kile->openDocument(readDataFromStdin()); - } - else { -- kile->openDocument(completePath(args->arg(i))); -+ kile->openDocument(completePath(args->arg(i), currentPath)); - } - } - -@@ -175,16 +179,16 @@ - - for ( int i = 0; i < args->count(); ++i ) { - QString path = args->arg(i); -- path = completePath(path); -+ path = completePath(path, currentPath); - -- if ( isProject(args->arg(i)) ){ -- interface->call("openProject",path); -+ if (isProject(args->arg(i))) { -+ interface->call("openProject", path); - } -- else if(args->arg(i) == "-"){ -- interface->call("openDocument",readDataFromStdin()); -+ else if(args->arg(i) == "-") { -+ interface->call("openDocument", readDataFromStdin()); - } - else { -- interface->call("openDocument",path); -+ interface->call("openDocument", path); - } - } - -diff -ruN kile-2.1.2.orig/src/widgets/konsolewidget.cpp kile-2.1.2/src/widgets/konsolewidget.cpp ---- kile-2.1.2.orig/src/widgets/konsolewidget.cpp 2012-04-22 18:54:51.000000000 +0200 -+++ kile-2.1.2/src/widgets/konsolewidget.cpp 2012-06-19 00:12:18.451297729 +0200 -@@ -78,8 +78,6 @@ - layout()->addWidget(m_part->widget()); - setFocusProxy(m_part->widget()); - connect(m_part, SIGNAL(destroyed()), this, SLOT(slotDestroyed())); -- -- m_term->showShellInDir(QString()); - } - - diff --git a/app-editors/kile/kile-2.1.2-r1.ebuild b/app-editors/kile/kile-2.1.2-r1.ebuild deleted file mode 100644 index a68331493330..000000000000 --- a/app-editors/kile/kile-2.1.2-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/kile/kile-2.1.2-r1.ebuild,v 1.3 2012/08/04 12:14:58 johu Exp $ - -EAPI=4 - -if [[ ${PV} != *9999* ]]; then - KDE_DOC_DIRS="doc" - KDE_HANDBOOK="optional" - MY_P=${P/_beta/b} - SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" -else - EGIT_REPO_URI="http://anongit.kde.org/kile" - GIT_ECLASS="git" -fi - -inherit kde4-base ${GIT_ECLASS} - -DESCRIPTION="A Latex Editor and TeX shell for KDE" -HOMEPAGE="http://kile.sourceforge.net/" - -LICENSE="FDL-1.2 GPL-2" -KEYWORDS="amd64 ~ppc ~ppc64 x86" -SLOT="4" -IUSE="debug +pdf +png" - -DEPEND=" - x11-misc/shared-mime-info -" -RDEPEND="${DEPEND} - $(add_kdebase_dep kdebase-data) - || ( - $(add_kdebase_dep okular 'pdf?,postscript') - app-text/acroread - ) - virtual/latex-base - virtual/tex-base - pdf? ( - app-text/dvipdfmx - app-text/ghostscript-gpl - ) - png? ( - app-text/dvipng - media-gfx/imagemagick[png] - ) -" - -S=${WORKDIR}/${MY_P} - -DOCS=( kile-remote-control.txt ) - -PATCHES=( "${FILESDIR}/${P}-cwd.patch" ) - -src_prepare() { - kde4-base_src_prepare - - # I know upstream wants to help us but it doesn't work.. - sed -e '/INSTALL( FILES AUTHORS/s/^/#DISABLED /' \ - -i CMakeLists.txt || die - - [[ ${PV} != *9999* ]] && { use handbook || rm -fr doc ; } -} |