jlec        15/01/28 12:36:02

  Modified:             texmaker-4.4.1.ebuild ChangeLog
  Log:
  app-office/texmaker: Import changes by Ben de Groot
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 
B9D4F231BD1558AB!)

Revision  Changes    Path
1.2                  app-office/texmaker/texmaker-4.4.1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/texmaker-4.4.1.ebuild?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/texmaker-4.4.1.ebuild?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/texmaker-4.4.1.ebuild?r1=1.1&r2=1.2

Index: texmaker-4.4.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.4.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- texmaker-4.4.1.ebuild       28 Jan 2015 12:23:14 -0000      1.1
+++ texmaker-4.4.1.ebuild       28 Jan 2015 12:36:02 -0000      1.2
@@ -1,27 +1,14 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.4.1.ebuild,v 
1.1 2015/01/28 12:23:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.4.1.ebuild,v 
1.2 2015/01/28 12:36:02 jlec Exp $
 
 EAPI=5
 
-inherit qmake-utils versionator
-
-# The upstream version numbering is bad, so we have to remove a dot in the
-# minor version number
-MAJOR="$(get_major_version)"
-MINOR_1="$(($(get_version_component_range 2)/10))"
-MINOR_2="$(($(get_version_component_range 2)%10))"
-if [ ${MINOR_2} -eq "0" ] ; then
-       MY_P="${PN}-${MAJOR}.${MINOR_1}"
-else
-       MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
-fi
-
-MY_P="${P}"
+inherit eutils qmake-utils readme.gentoo
 
 DESCRIPTION="A nice LaTeX-IDE"
 HOMEPAGE="http://www.xm1math.net/texmaker/";
-SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2";
+SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -30,8 +17,6 @@
 
 REQUIRED_USE="^^ ( qt4 qt5 )"
 
-S="${WORKDIR}/${MY_P}"
-
 COMMON_DEPEND="
        app-text/hunspell
        app-text/poppler:=[qt4?,qt5?]
@@ -51,16 +36,17 @@
                dev-qt/qtcore:5
                dev-qt/qtnetwork:5
                dev-qt/qtscript:5
-               dev-qt/qtwebkit:5
+               dev-qt/qtwebkit:5[printsupport]
+               dev-qt/qtwidgets:5
                dev-qt/qtxml:5
                )
 "
 RDEPEND="${COMMON_DEPEND}
        virtual/latex-base
-       app-i18n/ibus-qt
        app-text/psutils
        app-text/ghostscript-gpl
-       media-libs/netpbm"
+       media-libs/netpbm
+       qt4? ( app-i18n/ibus-qt )"
 DEPEND="${COMMON_DEPEND}
        virtual/pkgconfig"
 
@@ -84,6 +70,9 @@
                -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() {
@@ -100,14 +89,8 @@
        fi
 }
 
-src_install(){
+src_install() {
        emake INSTALL_ROOT="${D}" install
-       dodoc -r ${DOCS[@]}
-       docinto html
-       dodoc -r ${HTML_DOCS[@]}
-}
-
-pkg_postinst() {
-       elog "A user manual with many screenshots is available at:"
-       elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
+       einstalldocs
+       readme.gentoo_src_install
 }



1.143                app-office/texmaker/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/ChangeLog?rev=1.143&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/ChangeLog?rev=1.143&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/ChangeLog?r1=1.142&r2=1.143

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- ChangeLog   28 Jan 2015 12:23:14 -0000      1.142
+++ ChangeLog   28 Jan 2015 12:36:02 -0000      1.143
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/texmaker
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.142 
2015/01/28 12:23:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.143 
2015/01/28 12:36:02 jlec Exp $
+
+  28 Jan 2015; Justin Lecher <j...@gentoo.org> texmaker-4.4.1.ebuild:
+  Import changes by Ben de Groot
 
 *texmaker-4.4.1 (28 Jan 2015)
 




Reply via email to