summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregorio Guidi <greg_g@gentoo.org>2005-03-07 10:17:38 +0000
committerGregorio Guidi <greg_g@gentoo.org>2005-03-07 10:17:38 +0000
commit8def2cda3eb3619c0b597ce56c654bce64f73f2d (patch)
tree5d52088f966ae951d195bc5cbb3381210ebec740 /x11-libs/qt-embedded
parentVersion bump as per bug #83992 (diff)
downloadhistorical-8def2cda3eb3619c0b597ce56c654bce64f73f2d.tar.gz
historical-8def2cda3eb3619c0b597ce56c654bce64f73f2d.tar.bz2
historical-8def2cda3eb3619c0b597ce56c654bce64f73f2d.zip
Stable on x86. Remove old ebuilds.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'x11-libs/qt-embedded')
-rw-r--r--x11-libs/qt-embedded/ChangeLog8
-rw-r--r--x11-libs/qt-embedded/Manifest15
-rw-r--r--x11-libs/qt-embedded/files/47qt-embedded34
-rw-r--r--x11-libs/qt-embedded/files/50qt-embeddeddir31
-rw-r--r--x11-libs/qt-embedded/files/digest-qt-embedded-3.0.51
-rw-r--r--x11-libs/qt-embedded/files/digest-qt-embedded-3.1.21
-rw-r--r--x11-libs/qt-embedded/files/digest-qt-embedded-3.3.21
-rw-r--r--x11-libs/qt-embedded/files/digest-qt-embedded-3.3.2-r11
-rw-r--r--x11-libs/qt-embedded/files/tools-Makefile66
-rw-r--r--x11-libs/qt-embedded/qt-embedded-3.0.5.ebuild153
-rw-r--r--x11-libs/qt-embedded/qt-embedded-3.1.2.ebuild156
-rw-r--r--x11-libs/qt-embedded/qt-embedded-3.3.2-r1.ebuild149
-rw-r--r--x11-libs/qt-embedded/qt-embedded-3.3.2.ebuild135
-rw-r--r--x11-libs/qt-embedded/qt-embedded-3.3.4.ebuild4
14 files changed, 11 insertions, 684 deletions
diff --git a/x11-libs/qt-embedded/ChangeLog b/x11-libs/qt-embedded/ChangeLog
index 6824e36bc372..c7721a92a386 100644
--- a/x11-libs/qt-embedded/ChangeLog
+++ b/x11-libs/qt-embedded/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-libs/qt-embedded
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/ChangeLog,v 1.15 2005/02/23 11:12:01 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/ChangeLog,v 1.16 2005/03/07 10:17:38 greg_g Exp $
+
+ 07 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> -files/47qt-embedded3,
+ -files/50qt-embeddeddir3, -files/tools-Makefile, -qt-embedded-3.0.5.ebuild,
+ -qt-embedded-3.1.2.ebuild, -qt-embedded-3.3.2-r1.ebuild,
+ -qt-embedded-3.3.2.ebuild, qt-embedded-3.3.4.ebuild:
+ Stable on x86. Remove old ebuilds.
*qt-embedded-3.3.4 (23 Feb 2005)
diff --git a/x11-libs/qt-embedded/Manifest b/x11-libs/qt-embedded/Manifest
index 58d3975d0278..d5b64e715f86 100644
--- a/x11-libs/qt-embedded/Manifest
+++ b/x11-libs/qt-embedded/Manifest
@@ -1,15 +1,4 @@
MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 616c7c1a19cb6ebc52d1fde9fc82e13e qt-embedded-3.1.2.ebuild 4394
-MD5 93269b1aa9694496199c162b2b494803 qt-embedded-3.3.2.ebuild 4619
-MD5 55bdea2caffae2cb269f25f45f29515e qt-embedded-3.0.5.ebuild 4318
-MD5 1c96d5e48967990a613a29aabf6d7b7e ChangeLog 2505
-MD5 821565eb21702b45fb910a33438754b6 qt-embedded-3.3.4.ebuild 4810
-MD5 c901b061b2a25ed0c40b90be4344b3f2 qt-embedded-3.3.2-r1.ebuild 4776
-MD5 fc553746a0c77730e1785fc7fc0da47d files/digest-qt-embedded-3.3.2 77
-MD5 5f0cacec360762cefef2d5219aee443a files/50qt-embeddeddir3 25
-MD5 b0719cf6e99f249585e84430fbbc2883 files/47qt-embedded3 118
-MD5 1fcffbb83d84af4b0d6d074ec508db20 files/digest-qt-embedded-3.0.5 77
-MD5 097bb712d277f17864951d77b56ca46b files/tools-Makefile 2053
-MD5 fc553746a0c77730e1785fc7fc0da47d files/digest-qt-embedded-3.3.2-r1 77
+MD5 9dc7de70220cb55f52c5e5b0fa337d30 ChangeLog 2808
+MD5 de40c84660b36924feec01725a4975ba qt-embedded-3.3.4.ebuild 4809
MD5 e94af6ef3445834da6a0b225f5753f75 files/digest-qt-embedded-3.3.4 77
-MD5 81e8e195b18cba662da2c540ce2a1dbc files/digest-qt-embedded-3.1.2 77
diff --git a/x11-libs/qt-embedded/files/47qt-embedded3 b/x11-libs/qt-embedded/files/47qt-embedded3
deleted file mode 100644
index c07f4e78c4cb..000000000000
--- a/x11-libs/qt-embedded/files/47qt-embedded3
+++ /dev/null
@@ -1,4 +0,0 @@
-PATH=/usr/qt/3-embedded/bin
-ROOTPATH=/usr/qt/3-embedded/bin
-LDPATH=/usr/qt/3-embedded/lib
-QMAKESPEC=qws/linux-x86-g++
diff --git a/x11-libs/qt-embedded/files/50qt-embeddeddir3 b/x11-libs/qt-embedded/files/50qt-embeddeddir3
deleted file mode 100644
index eb72a8adaf59..000000000000
--- a/x11-libs/qt-embedded/files/50qt-embeddeddir3
+++ /dev/null
@@ -1 +0,0 @@
-QTDIR=/usr/qt/3-embedded
diff --git a/x11-libs/qt-embedded/files/digest-qt-embedded-3.0.5 b/x11-libs/qt-embedded/files/digest-qt-embedded-3.0.5
deleted file mode 100644
index 53aa8d6eb06a..000000000000
--- a/x11-libs/qt-embedded/files/digest-qt-embedded-3.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0f62114644a598848d59e65b3507a290 qt-embedded-free-3.0.5.tar.bz2 18539706
diff --git a/x11-libs/qt-embedded/files/digest-qt-embedded-3.1.2 b/x11-libs/qt-embedded/files/digest-qt-embedded-3.1.2
deleted file mode 100644
index 04fc2b2462df..000000000000
--- a/x11-libs/qt-embedded/files/digest-qt-embedded-3.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bce45755ed942d72f78f686f574106c5 qt-embedded-free-3.1.2.tar.bz2 18602499
diff --git a/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.2 b/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.2
deleted file mode 100644
index d9199500b33e..000000000000
--- a/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d93fecc080455dbfbbc0f1807e0bd53b qt-embedded-free-3.3.2.tar.bz2 19619660
diff --git a/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.2-r1 b/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.2-r1
deleted file mode 100644
index d9199500b33e..000000000000
--- a/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d93fecc080455dbfbbc0f1807e0bd53b qt-embedded-free-3.3.2.tar.bz2 19619660
diff --git a/x11-libs/qt-embedded/files/tools-Makefile b/x11-libs/qt-embedded/files/tools-Makefile
deleted file mode 100644
index 95f8405895bb..000000000000
--- a/x11-libs/qt-embedded/files/tools-Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-#############################################################################
-# Makefile for building: tools
-# Generated by qmake (1.03a) on: Tue Aug 20 13:16:21 2002
-# Project: tools.pro
-# Template: subdirs
-# Command: $(QMAKE) tools.pro
-#############################################################################
-
-MAKEFILE = Makefile
-QMAKE = qmake
-SUBDIRS = designer \
- assistant \
- linguist \
- qtconfig
-DEL_FILE = rm -f
-SUBTARGETS = \
- sub-designer \
- sub-assistant \
- sub-linguist \
- sub-qtconfig
-
-first: all
-
-all: Makefile $(SUBTARGETS)
-
-designer/$(MAKEFILE):
- cd designer && $(QMAKE) -o $(MAKEFILE)
-sub-designer: designer/$(MAKEFILE) FORCE
- cd designer && $(MAKE) -f $(MAKEFILE)
-
-assistant/$(MAKEFILE):
- cd assistant && $(QMAKE) -o $(MAKEFILE)
-sub-assistant: assistant/$(MAKEFILE) FORCE
- cd assistant && $(MAKE) -f $(MAKEFILE)
-
-linguist/$(MAKEFILE):
- cd linguist && $(QMAKE) -o $(MAKEFILE)
-sub-linguist: linguist/$(MAKEFILE) FORCE
- cd linguist && $(MAKE) -f $(MAKEFILE)
-
-qtconfig/$(MAKEFILE):
- cd qtconfig && $(QMAKE) -o $(MAKEFILE)
-sub-qtconfig: qtconfig/$(MAKEFILE) FORCE
- cd qtconfig && $(MAKE) -f $(MAKEFILE)
-
-sub-assistant: sub-designer
-sub-linguist: sub-assistant
-sub-qtconfig: sub-linguist
-
-Makefile: tools.pro ../.qmake.cache $(QTDIR)/mkspecs/linux-g++/qmake.conf
- $(QMAKE) tools.pro
-qmake: qmake_all
- @$(QMAKE) tools.pro
-
-qmake_all: designer/$(MAKEFILE) assistant/$(MAKEFILE) linguist/$(MAKEFILE) qtconfig/$(MAKEFILE)
- for i in $(SUBDIRS); do ( if [ -d $$i ]; then cd $$i ; grep "^qmake_all:" $(MAKEFILE) 2>/dev/null >/dev/null && $(MAKE) -f $(MAKEFILE) qmake_all || true; fi; ) ; done
-
-clean: qmake_all FORCE
- for i in $(SUBDIRS); do ( if [ -d $$i ]; then cd $$i ; $(MAKE) -f $(MAKEFILE) clean; fi; ) ; done
-uninstall install uiclean mocclean: qmake_all FORCE
- for i in $(SUBDIRS); do ( if [ -d $$i ]; then cd $$i ; $(MAKE) -f $(MAKEFILE) $@; fi; ) ; done
-distclean: qmake_all FORCE
- for i in $(SUBDIRS); do ( if [ -d $$i ]; then cd $$i ; $(MAKE) -f $(MAKEFILE) $@ ; $(DEL_FILE) $(MAKEFILE) ; fi; ) ; done
-
-FORCE:
-
diff --git a/x11-libs/qt-embedded/qt-embedded-3.0.5.ebuild b/x11-libs/qt-embedded/qt-embedded-3.0.5.ebuild
deleted file mode 100644
index 3ffbbce91396..000000000000
--- a/x11-libs/qt-embedded/qt-embedded-3.0.5.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/qt-embedded-3.0.5.ebuild,v 1.14 2004/11/06 07:44:32 mr_bones_ Exp $
-
-DESCRIPTION="QT version ${PV}"
-HOMEPAGE="http://www.trolltech.com/"
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2"
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="3"
-KEYWORDS="x86"
-IUSE="gif opengl mysql odbc postgres debug build"
-
-DEPEND="media-libs/lcms
- >=media-libs/freetype-2
- !build? (
- media-libs/libpng
- media-libs/jpeg
- >=media-libs/libmng-1.0.0
- odbc? ( >=dev-db/unixODBC-2.0 )
- mysql? ( >=dev-db/mysql-3.2.10 )
- opengl? ( virtual/opengl virtual/glu )
- postgres? ( >=dev-db/postgresql-7.2 )
- )"
-
-S=${WORKDIR}/qt-embedded-free-${PV}
-
-QTBASE=/usr/qt/3-embedded
-export QTDIR=${S}
-
-pkg_setup() {
- if use build ; then
- return 0
- else
- ewarn "Note: this will build a rather bloated qt/e, with all features enabled."
- ewarn "It may be suitable for testing, but definitely not for real embedded systems"
- ewarn "where memory is precious. I advise you select your own featureset (e.g. by"
- ewarn "editing this ebuild) if building for such a system."
- fi
-}
-
-src_unpack() {
- unpack ${A}
-
- cd ${S}
- cp configure configure.orig
- sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
-
- # avoid wasting time building things we won't install
- rm -rf tutorial examples
-}
-
-src_compile() {
- export YACC='byacc -d'
- export LDFLAGS="-ldl"
-
- if ! use build; then
- # ordinary setup, rather bloated
- use gif && myconf="${myconf} -qt-gif"
- use mysql && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql"
- use postgres && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server"
- use odbc && myconf="${myconf} -plugin-sql-odbc"
- use debug && myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions"
-
- if use x86; then
- myconf="$myconf -embedded x86" # -xplatform linux-g++ -platform linux-g++"
- else
- # and i've no idea if it'll work
- myconf="$myconf -xplatform generic -embedded generic"
- fi
-
- # -accel-{voodoo3,mach64,matrox} -vnc -depths v,4,8,16,24,32 # this stuff miscompiles :-(
-
- ./configure $myconf -depths 8,16 -system-zlib -thread -stl -freetype -qvfb \
- -plugin-imgfmt-{jpeg,mng,png} -system-lib{png,jpeg,mng} || die
- else
- # use build == we're building for the gentoo isntaller project
- # and know exactly which features we'll need
-
- # not all of these features are as yet reflected in the configure call below
-
- #png only, builtin. also zlib, system.
- #no sql or other fancy stuff.
- #no debug
- #thread support
- #freetype2 support
- #vnc
- #all styles as plugins
- ./configure -depths 8,16 -no-gif -no-lib{jpeg,mng} -qt-libpng -system-zlib -release \
- -no-g++-exceptions -no-qvfb -thread -freetype -vnc || die
- fi
-
- cp ${FILESDIR}/tools-Makefile ${S}/tools/Makefile
- sed -i -e 's:lqt-mt:lqte-mt:g' tools/designer/designer/Makefile
- emake src-qmake src-moc sub-src sub-tools || die
-}
-
-src_install() {
- # binaries
- into $QTBASE
- dobin bin/*
-
- # libraries
- dolib lib/libqte-mt.so.${PV} lib/libqui.so.1.0.0 lib/libeditor.so.1.0.0
- cd ${D}$QTBASE/lib
- for x in libqui.so libeditor.so ; do
- ln -s $x.1.0.0 $x.1.0
- ln -s $x.1.0 $x.1
- ln -s $x.1 $x
- done
-
- # version symlinks - 3.0.3->3.0->3->.so
- ln -s libqte-mt.so.${PV} libqte-mt.so.3.0
- ln -s libqte-mt.so.3.0 libqte-mt.so.3
- ln -s libqte-mt.so.3 libqte-mt.so
-
- # libqt -> libqt-mt symlinks
- ln -s libqte-mt.so.${PV} libqte.so.${PV}
- ln -s libqte-mt.so.3.0 libqte.so.3.0
- ln -s libqte-mt.so.3 libqte.so.3
- ln -s libqte-mt.so libqte.so
-
- # fonts
- cp -r ${S}/lib/fonts ${D}/$QTBASE/lib
-
- # includes
- cd ${S}
- dodir ${QTBASE}/include/private
- cp include/* ${D}/${QTBASE}/include/
- cp include/private/* ${D}/${QTBASE}/include/private/
-
- # misc
- insinto /etc/env.d
- doins ${FILESDIR}/47qt-embedded3
-
- # misc build reqs
- dodir ${QTBASE}/mkspecs
- cp -R ${S}/mkspecs/linux-g++ ${D}/${QTBASE}/mkspecs/
-
- sed -e "s:${D}::g" \
- -e "s:qt-x11-free-3.0.1::g" \
- -e "s:${WORKDIR}:${QTBASE}:" \
- -e "s:/usr/local/qt:${QTBASE}:" \
- ${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
-
- # plugins
- cd ${S}
- plugins=`find plugins -name "lib*.so" -print`
- for x in $plugins; do
- insinto ${QTBASE}/`dirname $x`
- doins $x
- done
-}
diff --git a/x11-libs/qt-embedded/qt-embedded-3.1.2.ebuild b/x11-libs/qt-embedded/qt-embedded-3.1.2.ebuild
deleted file mode 100644
index 02d152fd493c..000000000000
--- a/x11-libs/qt-embedded/qt-embedded-3.1.2.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/qt-embedded-3.1.2.ebuild,v 1.10 2004/11/06 07:44:32 mr_bones_ Exp $
-
-DESCRIPTION="QT version ${PV}"
-HOMEPAGE="http://www.trolltech.com/"
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2"
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="3"
-KEYWORDS="x86"
-IUSE="gif opengl mysql odbc postgres debug build"
-
-DEPEND="media-libs/lcms
- >=media-libs/freetype-2
- !build? (
- media-libs/libpng
- media-libs/jpeg
- >=media-libs/libmng-1.0.0
- odbc? ( >=dev-db/unixODBC-2.0 )
- mysql? ( >=dev-db/mysql-3.2.10 )
- opengl? ( virtual/opengl virtual/glu )
- postgres? ( >=dev-db/postgresql-7.2 )
- )"
-
-S=${WORKDIR}/qt-embedded-free-${PV}
-
-QTBASE=/usr/qt/3-embedded
-export QTDIR=${S}
-
-pkg_setup() {
- if use build ; then
- return 0
- else
- ewarn "Note: this will build a rather bloated qt/e, with all features enabled."
- ewarn "It may be suitable for testing, but definitely not for real embedded systems"
- ewarn "where memory is precious. I advise you select your own featureset (e.g. by"
- ewarn "editing this ebuild) if building for such a system."
- fi
-}
-
-src_unpack() {
- unpack ${A}
-
- cd ${S}
- cp configure configure.orig
- sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
-
- # avoid wasting time building things we won't install
- rm -rf tutorial examples
-}
-
-src_compile() {
- export YACC='byacc -d'
- export LDFLAGS="-ldl"
-
- if ! use build; then
- # ordinary setup, rather bloated
- use gif && myconf="${myconf} -qt-gif"
- use mysql && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql"
- use postgres && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server"
- use odbc && myconf="${myconf} -plugin-sql-odbc"
- use debug && myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions"
-
- if use x86; then
- myconf="$myconf -embedded x86" # -xplatform linux-g++ -platform linux-g++"
- else
- # and i've no idea if it'll work
- myconf="$myconf -xplatform generic -embedded generic"
- fi
-
- # -accel-{voodoo3,mach64,matrox} -vnc -depths v,4,8,16,24,32 # this stuff miscompiles :-(
-
- ./configure $myconf -depths 8,16 -system-zlib -thread -stl -freetype -qvfb \
- -plugin-imgfmt-{jpeg,mng,png} -system-lib{png,jpeg,mng} || die
- else
- # use build == we're building for the gentoo isntaller project
- # and know exactly which features we'll need
-
- # not all of these features are as yet reflected in the configure call below
-
- #png only, builtin. also zlib, system.
- #no sql or other fancy stuff.
- #no debug
- #thread support
- #freetype2 support
- #vnc
- #all styles as plugins
- ./configure -depths 8,16 -no-gif -no-lib{jpeg,mng} -qt-libpng -system-zlib -release \
- -no-g++-exceptions -no-qvfb -thread -freetype -vnc || die
- fi
-
- cp ${FILESDIR}/tools-Makefile ${S}/tools/Makefile
- sed -i -e 's:lqt-mt:lqte-mt:g' tools/designer/designer/Makefile
- emake src-qmake src-moc sub-src sub-tools || die "making main"
-
- cd ${S}/tools/designer/uic
- emake || die "making designer"
-}
-
-src_install() {
- # binaries
- into $QTBASE
- dobin bin/*
-
- # libraries
- dolib lib/libqte-mt.so.${PV} lib/libqui.so.1.0.0 lib/libeditor.so.1.0.0
- cd ${D}$QTBASE/lib
- for x in libqui.so libeditor.so ; do
- ln -s $x.1.0.0 $x.1.0
- ln -s $x.1.0 $x.1
- ln -s $x.1 $x
- done
-
- # version symlinks - 3.1.2->3.1->3->.so
- ln -s libqte-mt.so.${PV} libqte-mt.so.3.1
- ln -s libqte-mt.so.3.1 libqte-mt.so.3
- ln -s libqte-mt.so.3 libqte-mt.so
-
- # libqt -> libqt-mt symlinks
- ln -s libqte-mt.so.${PV} libqte.so.${PV}
- ln -s libqte-mt.so.3.1 libqte.so.3.1
- ln -s libqte-mt.so.3 libqte.so.3
- ln -s libqte-mt.so libqte.so
-
- # fonts
- cp -r ${S}/lib/fonts ${D}/$QTBASE/lib
-
- # includes
- cd ${S}
- dodir ${QTBASE}/include/private
- cp include/* ${D}/${QTBASE}/include/
- cp include/private/* ${D}/${QTBASE}/include/private/
-
- # misc
- insinto /etc/env.d
- doins ${FILESDIR}/47qt-embedded3
-
- # misc build reqs
- dodir ${QTBASE}/mkspecs
- cp -R ${S}/mkspecs/linux-g++ ${D}/${QTBASE}/mkspecs/
-
- sed -e "s:${D}::g" \
- -e "s:qt-x11-free-3.0.1::g" \
- -e "s:${WORKDIR}:${QTBASE}:" \
- -e "s:/usr/local/qt:${QTBASE}:" \
- ${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
-
- # plugins
- cd ${S}
- plugins=`find plugins -name "lib*.so" -print`
- for x in $plugins; do
- insinto ${QTBASE}/`dirname $x`
- doins $x
- done
-}
diff --git a/x11-libs/qt-embedded/qt-embedded-3.3.2-r1.ebuild b/x11-libs/qt-embedded/qt-embedded-3.3.2-r1.ebuild
deleted file mode 100644
index 952756388daa..000000000000
--- a/x11-libs/qt-embedded/qt-embedded-3.3.2-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/qt-embedded-3.3.2-r1.ebuild,v 1.6 2004/11/06 07:44:32 mr_bones_ Exp $
-
-DESCRIPTION="QT version ${PV}"
-HOMEPAGE="http://www.trolltech.com/"
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2"
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="3"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="gif opengl mysql odbc postgres debug build doc"
-
-DEPEND="media-libs/lcms
- >=media-libs/freetype-2
- !build? (
- media-libs/libpng
- media-libs/jpeg
- >=media-libs/libmng-1.0.0
- odbc? ( >=dev-db/unixODBC-2.0 )
- mysql? ( >=dev-db/mysql-3.2.10 )
- opengl? ( virtual/opengl virtual/glu )
- postgres? ( >=dev-db/postgresql-7.2 )
- )"
-
-S=${WORKDIR}/qt-embedded-free-${PV}
-
-QTBASE=/usr/qt/3-embedded
-export QTDIR=${S}
-
-pkg_setup() {
- if use build; then
- return 0
- else
- ewarn "Note: this will build a rather bloated qt/e, with all features enabled."
- ewarn "It may be suitable for testing, but definitely not for real embedded systems"
- ewarn "where memory is precious. I advise you select your own featureset (e.g. by"
- ewarn "editing this ebuild) if building for such a system."
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- cp configure configure.orig
- sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
-}
-
-src_compile() {
- export QTDIR=${S}
-
- if ! use build; then
- # ordinary setup, rather bloated
- use gif && myconf="${myconf} -qt-gif"
- use mysql && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql" || myconf="${myconf} -no-sql-mysql"
- use postgres && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf="${myconf} -no-sql-psql"
- use odbc && myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
- use debug && myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions"
- case ${ARCH} in
- x86)
- myconf="$myconf -embedded x86"
- ;;
- amd64)
- myconf="$myconf -embedded x86"
- ;;
- ppc)
- myconf="$myconf -embedded generic"
- ;;
- *)
- myconf="$myconf -xplatform generic -embedded generic"
- ;;
- esac
-
- ./configure $myconf -shared -depths 8,16,24,32 -system-zlib -thread -stl \
- -freetype -qvfb -plugin-imgfmt-{jpeg,mng,png} -system-lib{png,jpeg,mng} \
- -prefix ${QTBASE} || die
- else
- # use build == we're building for the gentoo intaller project
- # and know exactly which features we'll need
- # not all of these features are as yet reflected in the configure call below
- #png only, builtin. also zlib, system.
- #no sql or other fancy stuff.
- #no debug
- #thread support
- #freetype2 support
- #vnc
- #all styles as plugins
- ./configure -depths 8,16 -no-gif -no-lib{jpeg,mng} -qt-libpng -system-zlib \
- -release -no-g++-exceptions -no-qvfb -thread -freetype -vnc || die
- fi
-
- emake symlinks src-qmake src-moc sub-src sub-tools || die "making main"
- cd ${S}/tools/designer/uic && emake || die "making uic"
- cd ${S}/tools/assistant/lib && emake || die "making qassistantclientlib"
-
- if use doc; then
- cd ${S} && emake sub-tutorial || die "making tutorial"
- cd ${S} && \
- LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" emake sub-examples \
- || die "making examples"
- fi
-}
-
-src_install() {
- INSTALL_ROOT=${D} emake install
-
- # symlinks shouldn't be necessary! The qmakespec file tells qmake to use the
- # correct library. Uncomment these if it causes a problem
- # libqt -> libqt-mt symlinks
-# into ${QTBASE}/lib
-# dosym libqte-mt.so.3.3.2 ${QTBASE}/lib/libqt.so.3.3.2
-# dosym libqte-mt.so.3.3 ${QTBASE}/lib/libqt.so.3.3
-# dosym libqte-mt.so.3 ${QTBASE}/lib/libqt.so.3
-# dosym libqte-mt.so ${QTBASE}/lib/libqt.so
-# dosym libqte-mt.so.3.3.2 ${QTBASE}/lib/libqt-mt.so.3.3.2
-# dosym libqte-mt.so.3.3 ${QTBASE}/lib/libqt-mt.so.3.3
-# dosym libqte-mt.so.3 ${QTBASE}/lib/libqt-mt.so.3
-# dosym libqte-mt.so ${QTBASE}/lib/libqt-mt.so
-
- # fonts
- dodir ${QTBASE}/lib/fonts
- insinto ${QTBASE}/lib/fonts
- doins ${S}/lib/fonts/*
-
- # environment variables
- insinto /etc/env.d
- doins ${FILESDIR}/{47qt-embedded3,50qt-embeddeddir3}
-
- # qmake cache file
- dodir ${QTBASE}/mkspecs/linux-g++
- insinto ${QTBASE}/mkspecs/linux-g++
- cd ${S}
- doins mkspecs/linux-g++/*
- sed -e "s:${S}:${QTBASE}:" .qmake.cache > .qmake.cache.fixed
- insinto ${QTBASE}
- newins .qmake.cache.fixed .qmake.cache
-
- # documentation
- if use doc; then
- cp -r ${S}/{examples,tutorial} ${D}/${QTBASE}
- cd ${D}/${QTBASE}
- find examples tutorial -name Makefile -exec sed -i -e 's:${S}:${QTBASE}:g' {} \;
- fi
-
- # default target link (overriden by QMAKESPEC env var)
- cd ${D}/${QTBASE}/mkspecs
- rm -f default
- ln -s qws/linux-x86-g++ default
-}
diff --git a/x11-libs/qt-embedded/qt-embedded-3.3.2.ebuild b/x11-libs/qt-embedded/qt-embedded-3.3.2.ebuild
deleted file mode 100644
index 7e2a3f0919f9..000000000000
--- a/x11-libs/qt-embedded/qt-embedded-3.3.2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/qt-embedded-3.3.2.ebuild,v 1.3 2004/11/06 07:44:32 mr_bones_ Exp $
-
-DESCRIPTION="QT version ${PV}"
-HOMEPAGE="http://www.trolltech.com/"
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2"
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="3"
-KEYWORDS="~x86"
-IUSE="gif opengl mysql odbc postgres debug build doc"
-
-DEPEND="media-libs/lcms
- >=media-libs/freetype-2
- !build? (
- media-libs/libpng
- media-libs/jpeg
- >=media-libs/libmng-1.0.0
- odbc? ( >=dev-db/unixODBC-2.0 )
- mysql? ( >=dev-db/mysql-3.2.10 )
- opengl? ( virtual/opengl virtual/glu )
- postgres? ( >=dev-db/postgresql-7.2 )
- )"
-
-S=${WORKDIR}/qt-embedded-free-${PV}
-
-QTBASE=/usr/qt/3-embedded
-export QTDIR=${S}
-
-pkg_setup() {
- if use build; then
- return 0
- else
- ewarn "Note: this will build a rather bloated qt/e, with all features enabled."
- ewarn "It may be suitable for testing, but definitely not for real embedded systems"
- ewarn "where memory is precious. I advise you select your own featureset (e.g. by"
- ewarn "editing this ebuild) if building for such a system."
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- cp configure configure.orig
- sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
-}
-
-src_compile() {
- export QTDIR=${S}
-
- if ! use build; then
- # ordinary setup, rather bloated
- use gif && myconf="${myconf} -qt-gif"
- use mysql && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql" || myconf="${myconf} -no-sql-mysql"
- use postgres && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf="${myconf} -no-sql-psql"
- use odbc && myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
- use debug && myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions"
- use x86 && myconf="$myconf -embedded x86" || myconf="$myconf -xplatform generic -embedded generic"
-
- ./configure $myconf -shared -depths 8,16,24,32 -system-zlib -thread -stl \
- -freetype -qvfb -plugin-imgfmt-{jpeg,mng,png} -system-lib{png,jpeg,mng} \
- -prefix ${QTBASE} || die
- else
- # use build == we're building for the gentoo intaller project
- # and know exactly which features we'll need
- # not all of these features are as yet reflected in the configure call below
- #png only, builtin. also zlib, system.
- #no sql or other fancy stuff.
- #no debug
- #thread support
- #freetype2 support
- #vnc
- #all styles as plugins
- ./configure -depths 8,16 -no-gif -no-lib{jpeg,mng} -qt-libpng -system-zlib \
- -release -no-g++-exceptions -no-qvfb -thread -freetype -vnc || die
- fi
-
- emake symlinks src-qmake src-moc sub-src sub-tools || die "making main"
- cd ${S}/tools/designer/uic && emake || die "making uic"
- cd ${S}/tools/assistant/lib && emake || die "making qassistantclientlib"
-
- if ! use doc; then
- cd ${S} && emake sub-tutorial || die "making tutorial"
- LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" \
- cd ${S} && emake sub-examples || die "making examples"
- fi
-}
-
-src_install() {
- INSTALL_ROOT=${D} emake install
-
- # symlinks shouldn't be necessary! The qmakespec file tells qmake to use the
- # correct library. Uncomment these if it causes a problem
- # libqt -> libqt-mt symlinks
-# into ${QTBASE}/lib
-# dosym libqte-mt.so.3.3.2 ${QTBASE}/lib/libqt.so.3.3.2
-# dosym libqte-mt.so.3.3 ${QTBASE}/lib/libqt.so.3.3
-# dosym libqte-mt.so.3 ${QTBASE}/lib/libqt.so.3
-# dosym libqte-mt.so ${QTBASE}/lib/libqt.so
-# dosym libqte-mt.so.3.3.2 ${QTBASE}/lib/libqt-mt.so.3.3.2
-# dosym libqte-mt.so.3.3 ${QTBASE}/lib/libqt-mt.so.3.3
-# dosym libqte-mt.so.3 ${QTBASE}/lib/libqt-mt.so.3
-# dosym libqte-mt.so ${QTBASE}/lib/libqt-mt.so
-
- # fonts
- dodir ${QTBASE}/lib/fonts
- insinto ${QTBASE}/lib/fonts
- doins ${S}/lib/fonts/*
-
- # environment variables
- insinto /etc/env.d
- doins ${FILESDIR}/{47qt-embedded3,50qt-embeddeddir3}
-
- # qmake cache file
- dodir ${QTBASE}/mkspecs/linux-g++
- insinto ${QTBASE}/mkspecs/linux-g++
- cd ${S}
- doins mkspecs/linux-g++/*
- sed -e "s:${S}:${QTBASE}:" .qmake.cache > .qmake.cache.fixed
- insinto ${QTBASE}
- newins .qmake.cache.fixed .qmake.cache
-
- # documentation
- if use doc; then
- cp -r ${S}/{examples,tutorial} ${D}/${QTBASE}
- cd ${D}/${QTBASE}
- find examples tutorial -name Makefile -exec sed -i -e 's:${S}:${QTBASE}:g' {} \;
- fi
-
- # default target link (overriden by QMAKESPEC env var)
- cd ${D}/${QTBASE}/mkspecs
- rm -f default
- ln -s qws/linux-x86-g++ default
-}
diff --git a/x11-libs/qt-embedded/qt-embedded-3.3.4.ebuild b/x11-libs/qt-embedded/qt-embedded-3.3.4.ebuild
index f5344daa58f9..740adbcde0b2 100644
--- a/x11-libs/qt-embedded/qt-embedded-3.3.4.ebuild
+++ b/x11-libs/qt-embedded/qt-embedded-3.3.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/qt-embedded-3.3.4.ebuild,v 1.1 2005/02/23 11:12:01 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/qt-embedded-3.3.4.ebuild,v 1.2 2005/03/07 10:17:38 greg_g Exp $
DESCRIPTION="Embedded Linux port of Qt"
HOMEPAGE="http://www.trolltech.com/products/embedded/"
@@ -8,7 +8,7 @@ SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2"
LICENSE="|| ( QPL-1.0 GPL-2 )"
SLOT="3"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 ~amd64 ~ppc"
IUSE="cups debug doc firebird gif ipv6 mysql nis odbc opengl postgres sqlite"
DEPEND="media-libs/libpng