From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D0997139694 for ; Thu, 20 Jul 2017 10:57:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 267F2E0E98; Thu, 20 Jul 2017 10:57:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EAEDAE0E98 for ; Thu, 20 Jul 2017 10:57:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 88D0F341714 for ; Thu, 20 Jul 2017 10:57:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1A93774BA for ; Thu, 20 Jul 2017 10:57:10 +0000 (UTC) From: "Kristian Fiskerstrand" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kristian Fiskerstrand" Message-ID: <1500548168.e4d38e2fca1719e3e3e32009ceb6d6d3ea819e64.k_f@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/texmaker/files/, app-office/texmaker/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/texmaker/Manifest app-office/texmaker/files/texmaker-5.0-unbundle-hunspell-singleapp.patch app-office/texmaker/texmaker-5.0.ebuild X-VCS-Directories: app-office/texmaker/ app-office/texmaker/files/ X-VCS-Committer: k_f X-VCS-Committer-Name: Kristian Fiskerstrand X-VCS-Revision: e4d38e2fca1719e3e3e32009ceb6d6d3ea819e64 X-VCS-Branch: master Date: Thu, 20 Jul 2017 10:57:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c8f9eb58-9166-404d-93e8-cc2070ff9f63 X-Archives-Hash: 31f39e7f1bd86b1a4aa7d390e64fa5ea commit: e4d38e2fca1719e3e3e32009ceb6d6d3ea819e64 Author: Kristian Fiskerstrand gentoo org> AuthorDate: Thu Jul 20 10:54:30 2017 +0000 Commit: Kristian Fiskerstrand gentoo org> CommitDate: Thu Jul 20 10:56:08 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4d38e2f app-office/texmaker: New upstream version 5.0 Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-office/texmaker/Manifest | 1 + .../texmaker-5.0-unbundle-hunspell-singleapp.patch | 67 +++++++++++++++++ app-office/texmaker/texmaker-5.0.ebuild | 84 ++++++++++++++++++++++ 3 files changed, 152 insertions(+) diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest index eeb351dc15c..a7e7bb3036a 100644 --- a/app-office/texmaker/Manifest +++ b/app-office/texmaker/Manifest @@ -1 +1,2 @@ DIST texmaker-4.5.tar.bz2 11287724 SHA256 2ce9966e410bf878649d1c756e3dc2a077e55e1eaa9f4beb10aa7224cd94d614 SHA512 623ae1496f11e5cd1328b997dbb29ec7188d6c1b256b6370c6fdd4fcda4bfc4b301d29cfa3b2ce529391b8f9913ea4678a6895abfb4fa6f9820e7177c676ab11 WHIRLPOOL 0fb00957cb6fe2f3181ac6a6ad917fd60d90ca05bcbaa14da62045ac6c5d78126d9abeb1429bd1fe48a25416d95a1a52c53f83cad91cb0540fcd043a9ea63045 +DIST texmaker-5.0.tar.bz2 15728938 SHA256 2a0b329c0ff5c408f72bcefbef16361d26da74e3ca1f39d6b8c78d84c37245a9 SHA512 2473e0ad701da399f428caf8b067129c069a86d8cc5f1d0993ba53025961f7caab816195495d63788d58dafa7a208ca8fbcebbac118a49b20f3f639ee377a636 WHIRLPOOL 5989c926d6f4b770cfc0d0cf346d47c7244540b2873d2c7f54d52590debca85271acba10307f24f77e1446db01e7404d4b0b6fc4125360843a4bd32957467c15 diff --git a/app-office/texmaker/files/texmaker-5.0-unbundle-hunspell-singleapp.patch b/app-office/texmaker/files/texmaker-5.0-unbundle-hunspell-singleapp.patch new file mode 100644 index 00000000000..d7073b8547d --- /dev/null +++ b/app-office/texmaker/files/texmaker-5.0-unbundle-hunspell-singleapp.patch @@ -0,0 +1,67 @@ +diff --git a/texmaker.pro b/texmaker.pro +index 0a9205d..62bc46d 100644 +--- a/texmaker.pro ++++ b/texmaker.pro +@@ -117,29 +117,6 @@ HEADERS += texmaker.h \ + unicodeview.h \ + svnhelper.h \ + quickbeamerdialog.h \ +- hunspell/affentry.hxx \ +- hunspell/affixmgr.hxx \ +- hunspell/atypes.hxx \ +- hunspell/baseaffix.hxx \ +- hunspell/csutil.hxx \ +- hunspell/dictmgr.hxx \ +- hunspell/hashmgr.hxx \ +- hunspell/htypes.hxx \ +- hunspell/hunspell.hxx \ +- hunspell/hunspell.h \ +- hunspell/langnum.hxx \ +- hunspell/license.hunspell \ +- hunspell/phonet.hxx \ +- hunspell/suggestmgr.hxx \ +- hunspell/license.myspell \ +- hunspell/filemgr.hxx \ +- hunspell/hunzip.hxx \ +- hunspell/replist.hxx \ +- hunspell/w_char.hxx \ +- singleapp/qtlocalpeer.h \ +- singleapp/qtlockedfile.h \ +- singleapp/qtsingleapplication.h \ +- singleapp/qtsinglecoreapplication.h \ + encodingprober/CharDistribution.h \ + encodingprober/ChineseGroupProber.h \ + encodingprober/ctype_test_p.h \ +@@ -502,22 +479,6 @@ SOURCES += main.cpp \ + unicodeview.cpp \ + quickbeamerdialog.cpp \ + svnhelper.cpp \ +- hunspell/affentry.cxx \ +- hunspell/affixmgr.cxx \ +- hunspell/csutil.cxx \ +- hunspell/dictmgr.cxx \ +- hunspell/hashmgr.cxx \ +- hunspell/hunspell.cxx \ +- hunspell/phonet.cxx \ +- hunspell/suggestmgr.cxx \ +- hunspell/utf_info.cxx \ +- hunspell/filemgr.cxx \ +- hunspell/replist.cxx \ +- hunspell/hunzip.cxx \ +- singleapp/qtlocalpeer.cpp \ +- singleapp/qtlockedfile.cpp \ +- singleapp/qtsingleapplication.cpp \ +- singleapp/qtsinglecoreapplication.cpp \ + encodingprober/CharDistribution.cpp \ + encodingprober/ChineseGroupProber.cpp \ + encodingprober/JapaneseGroupProber.cpp \ +@@ -1088,8 +1049,7 @@ metainfo.path = texmaker_linux64 + + INSTALLS = target + HEADERS += x11fontdialog.h +-SOURCES += x11fontdialog.cpp \ +- singleapp/qtlockedfile_unix.cpp ++SOURCES += x11fontdialog.cpp + FORMS += x11fontdialog.ui + + utilities.files = doc/doc10.png \ diff --git a/app-office/texmaker/texmaker-5.0.ebuild b/app-office/texmaker/texmaker-5.0.ebuild new file mode 100644 index 00000000000..6e6dacfa835 --- /dev/null +++ b/app-office/texmaker/texmaker-5.0.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils qmake-utils readme.gentoo-r1 + +DESCRIPTION="A nice LaTeX-IDE" +HOMEPAGE="http://www.xm1math.net/texmaker/" +SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="" + +COMMON_DEPEND=" + app-text/hunspell + sys-libs/zlib + x11-libs/libX11 + x11-libs/libXext + app-text/poppler:=[qt5] + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtlockedfile + dev-qt/qtnetwork:5 + dev-qt/qtscript:5 + dev-qt/qtsingleapplication[X,qt5] + dev-qt/qtwebkit:5[printsupport] + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 +" +RDEPEND="${COMMON_DEPEND} + app-text/ghostscript-gpl + app-text/psutils + media-libs/netpbm + virtual/latex-base" + +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}-unbundle-hunspell-singleapp.patch" +) + +DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt ) +HTML_DOCS=( doc/. ) + +src_prepare() { + default + + find singleapp hunspell -delete || die + + cat >> ${PN}.pro <<- EOF + exists(texmakerx_my.pri):include(texmakerx_my.pri) + EOF + + cp "${FILESDIR}"/texmakerx_my.pri . || die + + sed \ + -e '/^#include/s:hunspell/::g' \ + -e '/^#include/s:singleapp/::g' \ + -i *.cpp *.h || die + + DOC_CONTENTS="A user manual with many screenshots is available at: + ${EPREFIX}/usr/share/${PN}/usermanual_en.html" +} + +src_configure() { + local myeqmakeargs=( + ${PN}.pro + PREFIX="${EPREFIX}/usr" + DESKTOPDIR="${EPREFIX}/usr/share/applications" + ICONDIR="${EPREFIX}/usr/share/pixmaps" + ) + eqmake5 ${myeqmakeargs[@]} +} + +src_install() { + emake INSTALL_ROOT="${D}" install + einstalldocs + readme.gentoo_create_doc +}