public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in mail-client/trojita: trojita-9999.ebuild ChangeLog
@ 2013-01-15 19:41 Markos Chandras (hwoarang)
  0 siblings, 0 replies; 3+ messages in thread
From: Markos Chandras (hwoarang) @ 2013-01-15 19:41 UTC (permalink / raw
  To: gentoo-commits

hwoarang    13/01/15 19:41:25

  Modified:             trojita-9999.ebuild ChangeLog
  Log:
  Update git repo. Add virtualx eclass for tests. Bug #451328. Thanks to Jan Kundrát <jkt@gentoo.org>
  
  (Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2)

Revision  Changes    Path
1.12                 mail-client/trojita/trojita-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/trojita-9999.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/trojita-9999.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/trojita-9999.ebuild?r1=1.11&r2=1.12

Index: trojita-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- trojita-9999.ebuild	28 Nov 2012 07:37:32 -0000	1.11
+++ trojita-9999.ebuild	15 Jan 2013 19:41:25 -0000	1.12
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v 1.11 2012/11/28 07:37:32 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v 1.12 2013/01/15 19:41:25 hwoarang Exp $
 
 EAPI=4
 
@@ -16,12 +16,16 @@
 	KEYWORDS=""
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc ~x86"
+	MY_LANGS="bs cs de es et ga gl hu ia lt nl pt pt_BR sk sv uk zh_CN"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 IUSE="debug test +zlib"
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+done
 
 RDEPEND="
 	>=x11-libs/qt-gui-${QT_REQUIRED}:4
@@ -41,5 +45,18 @@
 	use debug && myopts="$myopts CONFIG+=debug"
 	use test || myopts="$myopts CONFIG+=disable_tests"
 	use zlib || myopts="$myopts CONFIG+=disable_zlib"
+	if [[ ${MY_LANGS} ]]; then
+		rm po/trojita_common_x-test.po
+		for x in po/*.po; do
+			mylang=${x#po/trojita_common_}
+			mylang=${mylang%.po}
+			use linguas_$mylang || rm $x
+		done
+	fi
+
 	eqmake4 PREFIX=/usr $myopts
 }
+
+src_test() {
+	Xemake test
+}



1.18                 mail-client/trojita/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/ChangeLog?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/ChangeLog?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/ChangeLog?r1=1.17&r2=1.18

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog	10 Dec 2012 19:13:02 -0000	1.17
+++ ChangeLog	15 Jan 2013 19:41:25 -0000	1.18
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/trojita
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v 1.17 2012/12/10 19:13:02 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v 1.18 2013/01/15 19:41:25 hwoarang Exp $
+
+  15 Jan 2013; Markos Chandras <hwoarang@gentoo.org> trojita-9999.ebuild:
+  Update git repo. Add virtualx eclass for tests. Bug #451328. Thanks to Jan
+  Kundrát <jkt@gentoo.org>
 
   10 Dec 2012; Agostino Sarubbo <ago@gentoo.org> -trojita-0.2.9.4.ebuild,
   -trojita-0.3.ebuild, trojita-0.3.90.ebuild:





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

* [gentoo-commits] gentoo-x86 commit in mail-client/trojita: trojita-9999.ebuild ChangeLog
@ 2013-06-20 13:13 Agostino Sarubbo (ago)
  0 siblings, 0 replies; 3+ messages in thread
From: Agostino Sarubbo (ago) @ 2013-06-20 13:13 UTC (permalink / raw
  To: gentoo-commits

ago         13/06/20 13:13:20

  Modified:             trojita-9999.ebuild ChangeLog
  Log:
  Port the 9999 ebuil to cmake, wrt to bug #473930
  
  (Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 7194459F)

Revision  Changes    Path
1.18                 mail-client/trojita/trojita-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/trojita-9999.ebuild?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/trojita-9999.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/trojita-9999.ebuild?r1=1.17&r2=1.18

Index: trojita-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- trojita-9999.ebuild	7 May 2013 08:14:42 -0000	1.17
+++ trojita-9999.ebuild	20 Jun 2013 13:13:20 -0000	1.18
@@ -1,13 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v 1.17 2013/05/07 08:14:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v 1.18 2013/06/20 13:13:20 ago Exp $
 
-EAPI=4
+EAPI=5
 
 QT_REQUIRED="4.6.0"
 EGIT_REPO_URI="git://anongit.kde.org/${PN}.git"
 [[ ${PV} == "9999" ]] && GIT_ECLASS="git-2"
-inherit qt4-r2 virtualx ${GIT_ECLASS}
+
+inherit qt4-r2 virtualx cmake-utils ${GIT_ECLASS}
 
 DESCRIPTION="A Qt IMAP e-mail client"
 HOMEPAGE="http://trojita.flaska.net/"
@@ -40,11 +41,12 @@
 	)
 "
 
+DOCS="README LICENSE"
+
 src_configure() {
-	local myopts=""
-	use debug && myopts="$myopts CONFIG+=debug"
-	use test || myopts="$myopts CONFIG+=disable_tests"
-	use zlib || myopts="$myopts CONFIG+=disable_zlib"
+	local mycmakeargs=""
+	use test || mycmakeargs="$mycmakeargs -DWITHOUT_TESTS=1"
+	use zlib || mycmakeargs="$mycmakeargs -DWITHOUT_ZLIB=1"
 	if [[ ${MY_LANGS} ]]; then
 		rm po/trojita_common_x-test.po
 		for x in po/*.po; do
@@ -54,9 +56,13 @@
 		done
 	fi
 
-	eqmake4 PREFIX=/usr $myopts
+	# the build system is taking a look at `git describe ... --dirty` and
+	# gentoo's modifications to CMakeLists.txt break these
+	sed -i "s/--dirty//" "${S}/cmake/GitVersion.cmake"
+
+	cmake-utils_src_configure
 }
 
 src_test() {
-	Xemake test
+	VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
 }



1.26                 mail-client/trojita/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/ChangeLog?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/ChangeLog?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/ChangeLog?r1=1.25&r2=1.26

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog	7 May 2013 08:14:42 -0000	1.25
+++ ChangeLog	20 Jun 2013 13:13:20 -0000	1.26
@@ -1,6 +1,9 @@
 # ChangeLog for mail-client/trojita
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v 1.25 2013/05/07 08:14:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v 1.26 2013/06/20 13:13:20 ago Exp $
+
+  20 Jun 2013; Agostino Sarubbo <ago@gentoo.org> trojita-9999.ebuild:
+  Port the 9999 ebuil to cmake, wrt to bug #473930
 
 *trojita-0.3.93 (07 May 2013)
 





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

* [gentoo-commits] gentoo-x86 commit in mail-client/trojita: trojita-9999.ebuild ChangeLog
@ 2015-01-29 15:22 Michael Palimaka (kensington)
  0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka (kensington) @ 2015-01-29 15:22 UTC (permalink / raw
  To: gentoo-commits

kensington    15/01/29 15:22:13

  Modified:             trojita-9999.ebuild ChangeLog
  Log:
  Add Qt 5 support by Andreas Sturmlechner <andreas.sturmlechner@gmail.com> wrt bug #533600.
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

Revision  Changes    Path
1.25                 mail-client/trojita/trojita-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/trojita-9999.ebuild?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/trojita-9999.ebuild?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/trojita-9999.ebuild?r1=1.24&r2=1.25

Index: trojita-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- trojita-9999.ebuild	29 Apr 2014 16:44:18 -0000	1.24
+++ trojita-9999.ebuild	29 Jan 2015 15:22:13 -0000	1.25
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v 1.24 2014/04/29 16:44:18 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v 1.25 2015/01/29 15:22:13 kensington Exp $
 
 EAPI=5
 
-QT_REQUIRED="4.8.0"
+QT4_REQUIRED="4.8.0"
 EGIT_REPO_URI="git://anongit.kde.org/${PN}.git"
 [[ ${PV} == "9999" ]] && GIT_ECLASS="git-2"
 
@@ -23,20 +23,36 @@
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="debug +password test +zlib"
+IUSE="debug +password qt5 test +zlib"
 for MY_LANG in ${MY_LANGS} ; do
 	IUSE="${IUSE} linguas_${MY_LANG}"
 done
 
 RDEPEND="
-	>=dev-qt/qtbearer-${QT_REQUIRED}:4
-	>=dev-qt/qtgui-${QT_REQUIRED}:4
-	>=dev-qt/qtsql-${QT_REQUIRED}:4[sqlite]
-	>=dev-qt/qtwebkit-${QT_REQUIRED}:4
+	qt5? (
+		dev-qt/linguist-tools:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+	)
+	!qt5? (
+		>=dev-qt/qtbearer-${QT4_REQUIRED}:4
+		>=dev-qt/qtgui-${QT4_REQUIRED}:4
+		>=dev-qt/qtsql-${QT4_REQUIRED}:4[sqlite]
+		>=dev-qt/qtwebkit-${QT4_REQUIRED}:4
+	)
 "
 DEPEND="${RDEPEND}
-	password? ( dev-libs/qtkeychain[qt4] )
-	test? ( >=dev-qt/qttest-${QT_REQUIRED}:4 )
+	password? (
+		qt5?	( dev-libs/qtkeychain[qt5] )
+		!qt5?	( dev-libs/qtkeychain[qt4] )
+	)
+	test? (
+		qt5?	( dev-qt/qttest:5 )
+		!qt5?	( >=dev-qt/qttest-${QT4_REQUIRED}:4 )
+	)
 	zlib? (
 		virtual/pkgconfig
 		sys-libs/zlib
@@ -47,6 +63,7 @@
 
 src_configure() {
 	local mycmakeargs=(
+		$(cmake-utils_use_with qt5 QT5)
 		$(cmake-utils_use_with password QTKEYCHAIN_PLUGIN)
 		$(cmake-utils_use_with test TESTS)
 		$(cmake-utils_use_with zlib ZLIB)



1.37                 mail-client/trojita/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/ChangeLog?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/ChangeLog?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/ChangeLog?r1=1.36&r2=1.37

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ChangeLog	14 Jun 2014 10:34:50 -0000	1.36
+++ ChangeLog	29 Jan 2015 15:22:13 -0000	1.37
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/trojita
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v 1.36 2014/06/14 10:34:50 phajdan.jr Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v 1.37 2015/01/29 15:22:13 kensington Exp $
+
+  29 Jan 2015; Michael Palimaka <kensington@gentoo.org> trojita-9999.ebuild:
+  Add Qt 5 support by Andreas Sturmlechner <andreas.sturmlechner@gmail.com> wrt
+  bug #533600.
 
   14 Jun 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> trojita-0.4.1.ebuild:
   x86 stable wrt bug #508776





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

end of thread, other threads:[~2015-01-29 15:22 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-20 13:13 [gentoo-commits] gentoo-x86 commit in mail-client/trojita: trojita-9999.ebuild ChangeLog Agostino Sarubbo (ago)
  -- strict thread matches above, loose matches on Subject: below --
2015-01-29 15:22 Michael Palimaka (kensington)
2013-01-15 19:41 Markos Chandras (hwoarang)

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