* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-gui: ChangeLog qt-gui-4.7.0.ebuild
@ 2010-09-23 21:30 Alex Alexander (wired)
0 siblings, 0 replies; 3+ messages in thread
From: Alex Alexander (wired) @ 2010-09-23 21:30 UTC (permalink / raw
To: gentoo-commits
wired 10/09/23 21:30:15
Modified: ChangeLog qt-gui-4.7.0.ebuild
Log:
EAPI 3, prefix, other improvements
(Portage version: 2.2_rc85/cvs/Linux x86_64)
Revision Changes Path
1.113 x11-libs/qt-gui/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.113&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.113&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?r1=1.112&r2=1.113
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- ChangeLog 21 Sep 2010 14:55:53 -0000 1.112
+++ ChangeLog 23 Sep 2010 21:30:15 -0000 1.113
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/qt-gui
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.112 2010/09/21 14:55:53 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.113 2010/09/23 21:30:15 wired Exp $
+
+ 23 Sep 2010; Alex Alexander <wired@gentoo.org> qt-gui-4.7.0.ebuild:
+ EAPI 3, prefix, other improvements
*qt-gui-4.7.0 (21 Sep 2010)
1.2 x11-libs/qt-gui/qt-gui-4.7.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild?r1=1.1&r2=1.2
Index: qt-gui-4.7.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt-gui-4.7.0.ebuild 21 Sep 2010 14:55:53 -0000 1.1
+++ qt-gui-4.7.0.ebuild 23 Sep 2010 21:30:15 -0000 1.2
@@ -1,42 +1,45 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild,v 1.1 2010/09/21 14:55:53 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild,v 1.2 2010/09/23 21:30:15 wired Exp $
-EAPI="2"
+EAPI="3"
inherit confutils qt4-build
DESCRIPTION="The GUI module for the Qt toolkit"
SLOT="4"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="+accessibility cups dbus egl +glib gtk mng nas nis +raster tiff trace
-private-headers qt3support xinerama"
+IUSE="+accessibility cups dbus egl +glib gtk mng nas nis private-headers qt3support +raster tiff trace xinerama"
RDEPEND="media-libs/fontconfig
media-libs/freetype:2
media-libs/jpeg:0
media-libs/libpng
sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrandr
- x11-libs/libXcursor
- x11-libs/libXfont
- x11-libs/libSM
- x11-libs/libXi
- ~x11-libs/qt-core-${PV}[debug=,glib=,qt3support=]
- ~x11-libs/qt-script-${PV}[debug=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
+ ~x11-libs/qt-script-${PV}[aqua=,debug=]
+ !aqua? (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/libXcursor
+ x11-libs/libXfont
+ x11-libs/libSM
+ x11-libs/libXi
+ )
cups? ( net-print/cups )
- dbus? ( ~x11-libs/qt-dbus-${PV}[debug=] )
- gtk? ( x11-libs/gtk+:2 )
+ dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
+ gtk? ( x11-libs/gtk+:2[aqua=] )
mng? ( >=media-libs/libmng-1.0.9 )
nas? ( >=media-libs/nas-1.5 )
tiff? ( media-libs/tiff )
xinerama? ( x11-libs/libXinerama )"
DEPEND="${RDEPEND}
- xinerama? ( x11-proto/xineramaproto )
- x11-proto/xextproto
- x11-proto/inputproto"
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[debug=] )"
+ !aqua? (
+ x11-proto/xextproto
+ x11-proto/inputproto
+ )
+ xinerama? ( x11-proto/xineramaproto )"
+PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
pkg_setup() {
if ! use qt3support; then
@@ -148,12 +151,15 @@
# install correct designer and linguist icons, bug 241208
doicon tools/linguist/linguist/images/icons/linguist-128-32.png \
- tools/designer/src/designer/images/designer.png || die
+ tools/designer/src/designer/images/designer.png \
+ || die "doicon failed"
# Note: absolute image path required here!
- make_desktop_entry /usr/bin/linguist Linguist \
- /usr/share/pixmaps/linguist-128-32.png \
- 'Qt;Development;GUIDesigner' || die
- make_desktop_entry /usr/bin/designer Designer \
- /usr/share/pixmaps/designer.png \
- 'Qt;Development;GUIDesigner' || die
+ make_desktop_entry "${EPREFIX}"/usr/bin/linguist Linguist \
+ "${EPREFIX}"/usr/share/pixmaps/linguist-128-32.png \
+ 'Qt;Development;GUIDesigner' \
+ || die "linguist make_desktop_entry failed"
+ make_desktop_entry "${EPREFIX}"/usr/bin/designer Designer \
+ "${EPREFIX}"/usr/share/pixmaps/designer.png \
+ 'Qt;Development;GUIDesigner' \
+ || die "designer make_desktop_entry failed"
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-gui: ChangeLog qt-gui-4.7.0.ebuild
@ 2010-09-24 7:00 Alex Alexander (wired)
0 siblings, 0 replies; 3+ messages in thread
From: Alex Alexander (wired) @ 2010-09-24 7:00 UTC (permalink / raw
To: gentoo-commits
wired 10/09/24 07:00:33
Modified: ChangeLog qt-gui-4.7.0.ebuild
Log:
prefix fix, thanks to heiko_
(Portage version: 2.2_rc86/cvs/Linux x86_64)
Revision Changes Path
1.114 x11-libs/qt-gui/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.114&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.114&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?r1=1.113&r2=1.114
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- ChangeLog 23 Sep 2010 21:30:15 -0000 1.113
+++ ChangeLog 24 Sep 2010 07:00:33 -0000 1.114
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/qt-gui
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.113 2010/09/23 21:30:15 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.114 2010/09/24 07:00:33 wired Exp $
+
+ 24 Sep 2010; Alex Alexander <wired@gentoo.org> qt-gui-4.7.0.ebuild:
+ prefix fix, thanks to heiko_
23 Sep 2010; Alex Alexander <wired@gentoo.org> qt-gui-4.7.0.ebuild:
EAPI 3, prefix, other improvements
1.3 x11-libs/qt-gui/qt-gui-4.7.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild?r1=1.2&r2=1.3
Index: qt-gui-4.7.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt-gui-4.7.0.ebuild 23 Sep 2010 21:30:15 -0000 1.2
+++ qt-gui-4.7.0.ebuild 24 Sep 2010 07:00:33 -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-gui/qt-gui-4.7.0.ebuild,v 1.2 2010/09/23 21:30:15 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild,v 1.3 2010/09/24 07:00:33 wired Exp $
EAPI="3"
inherit confutils qt4-build
@@ -145,7 +145,7 @@
doins "${S}"/tools/designer/src/lib/sdk/* || die
#install private headers
if use private-headers; then
- insinto ${QTHEADERDIR}/QtGui/private
+ insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
find "${S}"/src/gui -type f -name "*_p.h" -exec doins {} \;
fi
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-gui: ChangeLog qt-gui-4.7.0.ebuild
@ 2010-10-10 11:51 Raul Porcel (armin76)
0 siblings, 0 replies; 3+ messages in thread
From: Raul Porcel (armin76) @ 2010-10-10 11:51 UTC (permalink / raw
To: gentoo-commits
armin76 10/10/10 11:51:07
Modified: ChangeLog qt-gui-4.7.0.ebuild
Log:
Mark -sparc because it sigbuses
(Portage version: 2.1.8.3/cvs/Linux ia64)
Revision Changes Path
1.116 x11-libs/qt-gui/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.116&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.116&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?r1=1.115&r2=1.116
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- ChangeLog 26 Sep 2010 13:32:36 -0000 1.115
+++ ChangeLog 10 Oct 2010 11:51:07 -0000 1.116
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/qt-gui
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.115 2010/09/26 13:32:36 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.116 2010/10/10 11:51:07 armin76 Exp $
+
+ 10 Oct 2010; Raúl Porcel <armin76@gentoo.org> qt-gui-4.7.0.ebuild:
+ Mark -sparc because it sigbuses
26 Sep 2010; Alex Alexander <wired@gentoo.org> qt-gui-4.5.3-r2.ebuild,
qt-gui-4.6.2.ebuild, qt-gui-4.6.2-r1.ebuild, qt-gui-4.6.3.ebuild,
1.5 x11-libs/qt-gui/qt-gui-4.7.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild?r1=1.4&r2=1.5
Index: qt-gui-4.7.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qt-gui-4.7.0.ebuild 26 Sep 2010 13:32:36 -0000 1.4
+++ qt-gui-4.7.0.ebuild 10 Oct 2010 11:51:07 -0000 1.5
@@ -1,13 +1,13 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild,v 1.4 2010/09/26 13:32:36 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0.ebuild,v 1.5 2010/10/10 11:51:07 armin76 Exp $
EAPI="3"
inherit confutils qt4-build
DESCRIPTION="The GUI module for the Qt toolkit"
SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="+accessibility cups dbus egl +glib gtk mng nas nis private-headers qt3support +raster tiff trace xinerama"
RDEPEND="media-libs/fontconfig
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-10-10 12:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-10 11:51 [gentoo-commits] gentoo-x86 commit in x11-libs/qt-gui: ChangeLog qt-gui-4.7.0.ebuild Raul Porcel (armin76)
-- strict thread matches above, loose matches on Subject: below --
2010-09-24 7:00 Alex Alexander (wired)
2010-09-23 21:30 Alex Alexander (wired)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox