summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-07-09 11:43:33 +0000
committerJohannes Huber <johu@gentoo.org>2012-07-09 11:43:33 +0000
commit5af868c2b0b30098077905b9391aae5596a8168a (patch)
tree61ea1b9c5994a48bd0b0062617197281e0cda5f5 /x11-libs/qt-gui
parentStable for amd64, wrt bug #422131 (diff)
downloadhistorical-5af868c2b0b30098077905b9391aae5596a8168a.tar.gz
historical-5af868c2b0b30098077905b9391aae5596a8168a.tar.bz2
historical-5af868c2b0b30098077905b9391aae5596a8168a.zip
Removing Qt-4.6.3
Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64
Diffstat (limited to 'x11-libs/qt-gui')
-rw-r--r--x11-libs/qt-gui/ChangeLog6
-rw-r--r--x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild159
-rw-r--r--x11-libs/qt-gui/qt-gui-4.6.3.ebuild159
3 files changed, 5 insertions, 319 deletions
diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 9001f5f3e4dc..f61a6c3a6392 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/qt-gui
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.192 2012/07/09 04:27:00 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.193 2012/07/09 11:36:35 johu Exp $
+
+ 09 Jul 2012; Johannes Huber <johu@gentoo.org> -qt-gui-4.6.3.ebuild,
+ -qt-gui-4.6.3-r2.ebuild:
+ Drop Qt-4.6.3
09 Jul 2012; Joseph Jezak <josejx@gentoo.org> qt-gui-4.8.2.ebuild:
Marked ppc/ppc64 for bug #424625.
diff --git a/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild b/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild
deleted file mode 100644
index cdd2b4d81edc..000000000000
--- a/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2012 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.6.3-r2.ebuild,v 1.7 2012/03/30 19:53:22 hwoarang Exp $
-
-EAPI="2"
-inherit confutils eutils 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 ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+accessibility cups dbus +glib gtk mng nas nis raster tiff trace qt3support xinerama"
-
-RDEPEND="media-libs/fontconfig
- media-libs/freetype:2
- media-libs/libpng:0
- sys-libs/zlib
- virtual/jpeg
- ~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}[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:0 )
- xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
- !aqua? (
- x11-proto/xextproto
- x11-proto/inputproto
- )
- gtk? ( || ( >=x11-libs/cairo-1.10.0[-qt4] <x11-libs/cairo-1.10.0 ) )
- xinerama? ( x11-proto/xineramaproto )"
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
-
-PATCHES=( "${FILESDIR}/${PN}-4.6-libpng-1.5.patch" )
-
-pkg_setup() {
- if ! use qt3support; then
- ewarn "WARNING: if you need 'qtconfig', you _must_ enable qt3support."
- fi
-
- confutils_use_depend_all gtk glib
-
- QT4_TARGET_DIRECTORIES="
- src/gui
- src/scripttools
- tools/designer
- tools/linguist/linguist
- src/plugins/imageformats/gif
- src/plugins/imageformats/ico
- src/plugins/imageformats/jpeg
- src/plugins/inputmethods"
-
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools/linguist/phrasebooks
- tools/linguist/shared
- tools/shared"
-
- use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
- use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
- use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
- use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
- use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/graphicssystems/trace"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
-
- qt4-build_pkg_setup
-}
-
-src_prepare() {
- qt4-build_src_prepare
-
- # Don't build plugins this go around, because they depend on qt3support lib
- sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro
-}
-
-src_configure() {
- export PATH="${S}/bin:${PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
- myconf="$(qt_use accessibility)
- $(qt_use cups)
- $(qt_use glib)
- $(qt_use mng libmng system)
- $(qt_use nis)
- $(qt_use tiff libtiff system)
- $(qt_use dbus qdbus)
- $(qt_use qt3support)
- $(qt_use gtk gtkstyle)
- $(qt_use xinerama)"
-
- use nas && myconf="${myconf} -system-nas-sound"
- use raster && myconf="${myconf} -graphicssystem raster"
-
- myconf="${myconf} -qt-gif -system-libpng -system-libjpeg
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
- -xrender -xrandr -xkb -xshape -sm -no-svg"
-
- # Explicitly don't compile these packages.
- # Emerge "qt-webkit", "qt-phonon", etc for their functionality.
- myconf="${myconf} -no-webkit -no-phonon -no-dbus -no-opengl"
-
- qt4-build_src_configure
-}
-
-src_install() {
- QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig
- $(usev accessibility) $(usev xinerama) $(usev cups) $(usev nas)
- gif png system-png system-jpeg
- $(use mng && echo system-mng)
- $(use tiff && echo system-tiff)"
- QCONFIG_REMOVE="no-gif no-png"
- QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
- $(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG
- $(use mng && echo QT_IMAGEFORMAT_MNG)
- $(use nas && echo QT_NAS)
- $(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE
- $(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
- $(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
-
- qt4-build_src_install
-
- # qt-creator
- # some qt-creator headers are located
- # under /usr/include/qt4/QtDesigner/private.
- # those headers are just includes of the headers
- # which are located under tools/designer/src/lib/*
- # So instead of installing both, we create the private folder
- # and drop tools/designer/src/lib/* headers in it.
- dodir /usr/include/qt4/QtDesigner/private/
- insinto /usr/include/qt4/QtDesigner/private/
- doins "${S}"/tools/designer/src/lib/shared/*
- doins "${S}"/tools/designer/src/lib/sdk/*
-
- # 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 "doicon failed"
- # Note: absolute image path required here!
- 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"
-}
diff --git a/x11-libs/qt-gui/qt-gui-4.6.3.ebuild b/x11-libs/qt-gui/qt-gui-4.6.3.ebuild
deleted file mode 100644
index c4ab9ec1dc25..000000000000
--- a/x11-libs/qt-gui/qt-gui-4.6.3.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2012 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.6.3.ebuild,v 1.15 2012/03/30 19:53:22 hwoarang Exp $
-
-EAPI="2"
-inherit confutils eutils 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 +glib gtk mng nas nis raster tiff trace qt3support xinerama"
-
-RDEPEND="media-libs/fontconfig
- media-libs/freetype:2
- media-libs/libpng:0
- sys-libs/zlib
- virtual/jpeg
- ~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}[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:0 )
- xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
- !aqua? (
- x11-proto/xextproto
- x11-proto/inputproto
- )
- gtk? ( || ( >=x11-libs/cairo-1.10.0[-qt4] <x11-libs/cairo-1.10.0 ) )
- xinerama? ( x11-proto/xineramaproto )"
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
-
-PATCHES=( "${FILESDIR}/${PN}-4.6-libpng-1.5.patch" )
-
-pkg_setup() {
- if ! use qt3support; then
- ewarn "WARNING: if you need 'qtconfig', you _must_ enable qt3support."
- fi
-
- confutils_use_depend_all gtk glib
-
- QT4_TARGET_DIRECTORIES="
- src/gui
- src/scripttools
- tools/designer
- tools/linguist/linguist
- src/plugins/imageformats/gif
- src/plugins/imageformats/ico
- src/plugins/imageformats/jpeg
- src/plugins/inputmethods"
-
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools/linguist/phrasebooks
- tools/linguist/shared
- tools/shared"
-
- use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
- use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
- use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
- use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
- use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/graphicssystems/trace"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
-
- qt4-build_pkg_setup
-}
-
-src_prepare() {
- qt4-build_src_prepare
-
- # Don't build plugins this go around, because they depend on qt3support lib
- sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro
-}
-
-src_configure() {
- export PATH="${S}/bin:${PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
- myconf="$(qt_use accessibility)
- $(qt_use cups)
- $(qt_use glib)
- $(qt_use mng libmng system)
- $(qt_use nis)
- $(qt_use tiff libtiff system)
- $(qt_use dbus qdbus)
- $(qt_use qt3support)
- $(qt_use gtk gtkstyle)
- $(qt_use xinerama)"
-
- use nas && myconf="${myconf} -system-nas-sound"
- use raster && myconf="${myconf} -graphicssystem raster"
-
- myconf="${myconf} -qt-gif -system-libpng -system-libjpeg
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
- -xrender -xrandr -xkb -xshape -sm -no-svg"
-
- # Explicitly don't compile these packages.
- # Emerge "qt-webkit", "qt-phonon", etc for their functionality.
- myconf="${myconf} -no-webkit -no-phonon -no-dbus -no-opengl"
-
- qt4-build_src_configure
-}
-
-src_install() {
- QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig
- $(usev accessibility) $(usev xinerama) $(usev cups) $(usev nas)
- gif png system-png system-jpeg
- $(use mng && echo system-mng)
- $(use tiff && echo system-tiff)"
- QCONFIG_REMOVE="no-gif no-png"
- QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
- $(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG
- $(use mng && echo QT_IMAGEFORMAT_MNG)
- $(use nas && echo QT_NAS)
- $(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE
- $(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
- $(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
-
- qt4-build_src_install
-
- # qt-creator
- # some qt-creator headers are located
- # under /usr/include/qt4/QtDesigner/private.
- # those headers are just includes of the headers
- # which are located under tools/designer/src/lib/*
- # So instead of installing both, we create the private folder
- # and drop tools/designer/src/lib/* headers in it.
- dodir /usr/include/qt4/QtDesigner/private/
- insinto /usr/include/qt4/QtDesigner/private/
- doins "${S}"/tools/designer/src/lib/shared/*
- doins "${S}"/tools/designer/src/lib/sdk/*
-
- # 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 "doicon failed"
- # Note: absolute image path required here!
- 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"
-}