public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-assistant: ChangeLog qt-assistant-4.6.1.ebuild
@ 2010-01-19 14:47 Ben de Groot (yngwin)
  0 siblings, 0 replies; 4+ messages in thread
From: Ben de Groot (yngwin) @ 2010-01-19 14:47 UTC (permalink / raw
  To: gentoo-commits

yngwin      10/01/19 14:47:52

  Modified:             ChangeLog
  Added:                qt-assistant-4.6.1.ebuild
  Log:
  Version bump
  (Portage version: 2.2_rc61/cvs/Linux x86_64)

Revision  Changes    Path
1.66                 x11-libs/qt-assistant/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.66&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.66&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/ChangeLog?r1=1.65&r2=1.66

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- ChangeLog	14 Jan 2010 18:35:05 -0000	1.65
+++ ChangeLog	19 Jan 2010 14:47:51 -0000	1.66
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-assistant
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.65 2010/01/14 18:35:05 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.66 2010/01/19 14:47:51 yngwin Exp $
+
+*qt-assistant-4.6.1 (19 Jan 2010)
+
+  19 Jan 2010; Ben de Groot <yngwin@gentoo.org> +qt-assistant-4.6.1.ebuild:
+  Version bump
 
   14 Jan 2010; Jonathan Callen <abcd@gentoo.org>
   qt-assistant-4.6.0-r1.ebuild:



1.1                  x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild?rev=1.1&content-type=text/plain

Index: qt-assistant-4.6.1.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild,v 1.1 2010/01/19 14:47:51 yngwin Exp $

EAPI="2"
inherit qt4-build

DESCRIPTION="The assistant help module for the Qt toolkit"
SLOT="4"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""

DEPEND="~x11-libs/qt-gui-${PV}[aqua=]
	~x11-libs/qt-sql-${PV}[aqua=,sqlite]
	~x11-libs/qt-webkit-${PV}[aqua=]"
RDEPEND="${DEPEND}"

PATCHES=( "${FILESDIR}/${P}_rc1-tools.patch" )

# Pixeltool isn't really assistant related, but it relies on
# the assistant libraries. doc/qch/
QT4_TARGET_DIRECTORIES="
tools/assistant
tools/pixeltool
tools/qdoc3"
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
tools/
demos/
examples/
src/
include/
doc/"
src_configure() {
	myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr
		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
		-no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon
		-no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
		-no-fontconfig -no-glib -no-multimedia -no-qt3support -no-svg"
	qt4-build_src_configure
}

src_compile() {
	# help libQtHelp find freshly built libQtCLucene (bug #289811)
	export LD_LIBRARY_PATH="${S}/lib"
	export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
	qt4-build_src_compile
	# ugly hack to build docs
	cd "${S}"
	qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die "qmake projects faied"
	emake qch_docs || die "emake docs failed"
}

src_install() {
	qt4-build_src_install
	# install documentation
	# note that emake install_qchdocs fails for undefined reason so we use a
	# workaround
	cd "${S}"
	insinto ${QTDOCDIR#${EPREFIX}}
	doins -r "${S}"/doc/qch || die "doins qch documentation failed"
	dobin "${S}"/bin/qdoc3 || die "Installing qdoc3 failed"
	#emake INSTALL_ROOT="${D}" install_qchdocs || die "emake install_qchdocs	failed"
	# install correct assistant icon, bug 241208
	dodir /usr/share/pixmaps/ || die "dodir failed"
	insinto /usr/share/pixmaps/ || die "insinto failed"
	doins tools/assistant/tools/assistant/images/assistant.png \
		|| die "doins failed"
	# Note: absolute image path required here!
	make_desktop_entry /usr/bin/assistant Assistant \
		/usr/share/pixmaps/assistant.png 'Qt;Development;GUIDesigner' \
			|| die "make_desktop_entry failed"
}






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

* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-assistant: ChangeLog qt-assistant-4.6.1.ebuild
@ 2010-01-19 17:15 Ben de Groot (yngwin)
  0 siblings, 0 replies; 4+ messages in thread
From: Ben de Groot (yngwin) @ 2010-01-19 17:15 UTC (permalink / raw
  To: gentoo-commits

yngwin      10/01/19 17:15:30

  Modified:             ChangeLog qt-assistant-4.6.1.ebuild
  Log:
  Fix patch filename
  (Portage version: 2.2_rc61/cvs/Linux x86_64)

Revision  Changes    Path
1.67                 x11-libs/qt-assistant/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.67&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.67&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/ChangeLog?r1=1.66&r2=1.67

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ChangeLog	19 Jan 2010 14:47:51 -0000	1.66
+++ ChangeLog	19 Jan 2010 17:15:30 -0000	1.67
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt-assistant
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.66 2010/01/19 14:47:51 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.67 2010/01/19 17:15:30 yngwin Exp $
+
+  19 Jan 2010; Ben de Groot <yngwin@gentoo.org> qt-assistant-4.6.1.ebuild:
+  Fix patch filename
 
 *qt-assistant-4.6.1 (19 Jan 2010)
 



1.2                  x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild?r1=1.1&r2=1.2

Index: qt-assistant-4.6.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt-assistant-4.6.1.ebuild	19 Jan 2010 14:47:51 -0000	1.1
+++ qt-assistant-4.6.1.ebuild	19 Jan 2010 17:15:30 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild,v 1.1 2010/01/19 14:47:51 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild,v 1.2 2010/01/19 17:15:30 yngwin Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -15,7 +15,7 @@
 	~x11-libs/qt-webkit-${PV}[aqua=]"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}_rc1-tools.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.6.0_rc1-tools.patch" )
 
 # Pixeltool isn't really assistant related, but it relies on
 # the assistant libraries. doc/qch/






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

* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-assistant: ChangeLog qt-assistant-4.6.1.ebuild
@ 2010-01-19 19:08 Dror Levin (spatz)
  0 siblings, 0 replies; 4+ messages in thread
From: Dror Levin (spatz) @ 2010-01-19 19:08 UTC (permalink / raw
  To: gentoo-commits

spatz       10/01/19 19:08:50

  Modified:             ChangeLog qt-assistant-4.6.1.ebuild
  Log:
  Fix patch for 4.6.1, bug 301559.
  (Portage version: 2.2_rc61/cvs/Linux x86_64)

Revision  Changes    Path
1.68                 x11-libs/qt-assistant/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.68&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.68&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/ChangeLog?r1=1.67&r2=1.68

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ChangeLog	19 Jan 2010 17:15:30 -0000	1.67
+++ ChangeLog	19 Jan 2010 19:08:50 -0000	1.68
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-assistant
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.67 2010/01/19 17:15:30 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.68 2010/01/19 19:08:50 spatz Exp $
+
+  19 Jan 2010; Dror Levin <spatz@gentoo.org> qt-assistant-4.6.1.ebuild,
+  +files/qt-assistant-4.6.1-tools.patch:
+  Fix patch for 4.6.1, bug 301559.
 
   19 Jan 2010; Ben de Groot <yngwin@gentoo.org> qt-assistant-4.6.1.ebuild:
   Fix patch filename



1.3                  x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild?r1=1.2&r2=1.3

Index: qt-assistant-4.6.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt-assistant-4.6.1.ebuild	19 Jan 2010 17:15:30 -0000	1.2
+++ qt-assistant-4.6.1.ebuild	19 Jan 2010 19:08:50 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild,v 1.2 2010/01/19 17:15:30 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild,v 1.3 2010/01/19 19:08:50 spatz Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -15,7 +15,7 @@
 	~x11-libs/qt-webkit-${PV}[aqua=]"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-4.6.0_rc1-tools.patch" )
+PATCHES=( "${FILESDIR}/${P}-tools.patch" )
 
 # Pixeltool isn't really assistant related, but it relies on
 # the assistant libraries. doc/qch/






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

* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-assistant: ChangeLog qt-assistant-4.6.1.ebuild
@ 2010-06-24 17:31 Markos Chandras (hwoarang)
  0 siblings, 0 replies; 4+ messages in thread
From: Markos Chandras (hwoarang) @ 2010-06-24 17:31 UTC (permalink / raw
  To: gentoo-commits

hwoarang    10/06/24 17:31:22

  Modified:             ChangeLog
  Removed:              qt-assistant-4.6.1.ebuild
  Log:
  Removing Qt-4.6.1
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.80                 x11-libs/qt-assistant/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.80&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.80&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/ChangeLog?r1=1.79&r2=1.80

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- ChangeLog	8 Jun 2010 12:14:22 -0000	1.79
+++ ChangeLog	24 Jun 2010 17:31:22 -0000	1.80
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-assistant
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.79 2010/06/08 12:14:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.80 2010/06/24 17:31:22 hwoarang Exp $
+
+  24 Jun 2010; Markos Chandras <hwoarang@gentoo.org>
+  -qt-assistant-4.6.1.ebuild:
+  Drop Qt-4.6.1
 
 *qt-assistant-4.6.3 (08 Jun 2010)
 






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

end of thread, other threads:[~2010-06-24 17:31 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-19 19:08 [gentoo-commits] gentoo-x86 commit in x11-libs/qt-assistant: ChangeLog qt-assistant-4.6.1.ebuild Dror Levin (spatz)
  -- strict thread matches above, loose matches on Subject: below --
2010-06-24 17:31 Markos Chandras (hwoarang)
2010-01-19 17:15 Ben de Groot (yngwin)
2010-01-19 14:47 Ben de Groot (yngwin)

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