public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-office/texmaker: texmaker-4.4.1.ebuild ChangeLog
@ 2015-01-28 12:23 Justin Lecher (jlec)
  0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher (jlec) @ 2015-01-28 12:23 UTC (permalink / raw
  To: gentoo-commits

jlec        15/01/28 12:23:14

  Modified:             ChangeLog
  Added:                texmaker-4.4.1.ebuild
  Log:
  app-office/texmaker: Version BUmp, #461584
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.142                app-office/texmaker/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- ChangeLog	21 Aug 2014 07:38:16 -0000	1.141
+++ ChangeLog	28 Jan 2015 12:23:14 -0000	1.142
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/texmaker
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.141 2014/08/21 07:38:16 jlec Exp $
+# 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 $
+
+*texmaker-4.4.1 (28 Jan 2015)
+
+  28 Jan 2015; Justin Lecher <jlec@gentoo.org> +texmaker-4.4.1.ebuild:
+  Version BUmp, #461584
 
 *texmaker-4.3 (21 Aug 2014)
 



1.1                  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.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/texmaker-4.4.1.ebuild?rev=1.1&content-type=text/plain

Index: texmaker-4.4.1.ebuild
===================================================================
# 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 $

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}"

DESCRIPTION="A nice LaTeX-IDE"
HOMEPAGE="http://www.xm1math.net/texmaker/"
SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="qt4 qt5"

REQUIRED_USE="^^ ( qt4 qt5 )"

S="${WORKDIR}/${MY_P}"

COMMON_DEPEND="
	app-text/hunspell
	app-text/poppler:=[qt4?,qt5?]
	sys-libs/zlib
	x11-libs/libX11
	x11-libs/libXext
	dev-qt/qtsingleapplication[X,qt4?,qt5?]
	qt4? (
		dev-qt/qtgui:4
		dev-qt/qtcore:4
		dev-qt/qtscript:4
		dev-qt/qtwebkit:4
		)
	qt5? (
		dev-qt/qtconcurrent:5
		dev-qt/qtgui:5
		dev-qt/qtcore:5
		dev-qt/qtnetwork:5
		dev-qt/qtscript:5
		dev-qt/qtwebkit: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"
DEPEND="${COMMON_DEPEND}
	virtual/pkgconfig"

PATCHES=( "${FILESDIR}"/${PN}-4.1-unbundle.patch )

DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
HTML_DOCS=( doc/. )

src_prepare() {
	find singleapp hunspell -delete || die

	epatch "${PATCHES[@]}"

	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
}

src_configure() {
	local myeqmakeargs=(
		${PN}.pro
		PREFIX="${EPREFIX}/usr"
		DESKTOPDIR="${EPREFIX}/usr/share/applications"
		ICONDIR="${EPREFIX}/usr/share/pixmaps"
		)
	if use qt4; then
		eqmake4 ${myeqmakeargs[@]}
	else
		eqmake5 ${myeqmakeargs[@]}
	fi
}

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"
}





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/texmaker: texmaker-4.4.1.ebuild ChangeLog
@ 2015-01-28 12:36 Justin Lecher (jlec)
  0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher (jlec) @ 2015-01-28 12:36 UTC (permalink / raw
  To: gentoo-commits

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 <jlec@gentoo.org> texmaker-4.4.1.ebuild:
+  Import changes by Ben de Groot
 
 *texmaker-4.4.1 (28 Jan 2015)
 





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/texmaker: texmaker-4.4.1.ebuild ChangeLog
@ 2015-02-02  8:41 Justin Lecher (jlec)
  0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher (jlec) @ 2015-02-02  8:41 UTC (permalink / raw
  To: gentoo-commits

jlec        15/02/02 08:41:08

  Modified:             texmaker-4.4.1.ebuild ChangeLog
  Log:
  app-office/texmaker: Avoid sandbox violations on install with USE=qt4, #538246
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.3                  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.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/texmaker-4.4.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/texmaker-4.4.1.ebuild?r1=1.2&r2=1.3

Index: texmaker-4.4.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.4.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- texmaker-4.4.1.ebuild	28 Jan 2015 12:36:02 -0000	1.2
+++ texmaker-4.4.1.ebuild	2 Feb 2015 08:41:08 -0000	1.3
@@ -1,6 +1,6 @@
 # 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.2 2015/01/28 12:36:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.4.1.ebuild,v 1.3 2015/02/02 08:41:08 jlec Exp $
 
 EAPI=5
 
@@ -92,5 +92,5 @@
 src_install() {
 	emake INSTALL_ROOT="${D}" install
 	einstalldocs
-	readme.gentoo_src_install
+	readme.gentoo_create_doc
 }



1.144                app-office/texmaker/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- ChangeLog	28 Jan 2015 12:36:02 -0000	1.143
+++ ChangeLog	2 Feb 2015 08:41:08 -0000	1.144
@@ -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.143 2015/01/28 12:36:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.144 2015/02/02 08:41:08 jlec Exp $
+
+  02 Feb 2015; Justin Lecher <jlec@gentoo.org> texmaker-4.4.1.ebuild:
+  Avoid sandbox violations on install with USE=qt4, #538246
 
   28 Jan 2015; Justin Lecher <jlec@gentoo.org> texmaker-4.4.1.ebuild:
   Import changes by Ben de Groot





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/texmaker: texmaker-4.4.1.ebuild ChangeLog
@ 2015-03-09 17:26 Justin Lecher (jlec)
  0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher (jlec) @ 2015-03-09 17:26 UTC (permalink / raw
  To: gentoo-commits

jlec        15/03/09 17:26:44

  Modified:             texmaker-4.4.1.ebuild ChangeLog
  Log:
  Set default qt choice
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.6                  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.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/texmaker-4.4.1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/texmaker-4.4.1.ebuild?r1=1.5&r2=1.6

Index: texmaker-4.4.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.4.1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- texmaker-4.4.1.ebuild	2 Mar 2015 09:04:15 -0000	1.5
+++ texmaker-4.4.1.ebuild	9 Mar 2015 17:26:44 -0000	1.6
@@ -1,6 +1,6 @@
 # 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.5 2015/03/02 09:04:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.4.1.ebuild,v 1.6 2015/03/09 17:26:44 jlec Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="qt4 qt5"
+IUSE="+qt4 qt5"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"
 



1.147                app-office/texmaker/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- ChangeLog	2 Mar 2015 09:04:15 -0000	1.146
+++ ChangeLog	9 Mar 2015 17:26:44 -0000	1.147
@@ -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.146 2015/03/02 09:04:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.147 2015/03/09 17:26:44 jlec Exp $
+
+  09 Mar 2015; Justin Lecher <jlec@gentoo.org> texmaker-4.4.1.ebuild:
+  Set default qt choice
 
   02 Mar 2015; Agostino Sarubbo <ago@gentoo.org> texmaker-4.0.1.ebuild,
   texmaker-4.1.1.ebuild, texmaker-4.1.ebuild, texmaker-4.2.ebuild,





^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2015-03-09 17:26 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-28 12:36 [gentoo-commits] gentoo-x86 commit in app-office/texmaker: texmaker-4.4.1.ebuild ChangeLog Justin Lecher (jlec)
  -- strict thread matches above, loose matches on Subject: below --
2015-03-09 17:26 Justin Lecher (jlec)
2015-02-02  8:41 Justin Lecher (jlec)
2015-01-28 12:23 Justin Lecher (jlec)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox