diff options
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/qt/Manifest | 5 | ||||
-rw-r--r-- | x11-libs/qt/files/digest-qt-3.3.0_beta1 | 1 | ||||
-rw-r--r-- | x11-libs/qt/files/qt-3.3.0_beta1-freetype.patch | 14 | ||||
-rw-r--r-- | x11-libs/qt/qt-3.3.0.ebuild | 5 | ||||
-rw-r--r-- | x11-libs/qt/qt-3.3.0_beta1.ebuild | 174 |
5 files changed, 4 insertions, 195 deletions
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index 9195d7043c18..3fd6e881138f 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -1,10 +1,9 @@ -MD5 b3045e2892168b72ba4bceaa16211778 qt-3.3.0.ebuild 4968 +MD5 8aedfe2ee7bb1ba79638682b410aa12f qt-3.3.0.ebuild 5018 MD5 9e84006a240b69c02e0aa8b957d48662 qt-3.1.2-r3.ebuild 4984 MD5 17042c3146d3b939079defa0835af1ab qt-3.2.2-r1.ebuild 6291 MD5 15cb67cf0a0a71f8c86c4aa91714360c qt-2.3.2-r1.ebuild 2285 MD5 cb5821e5f6b043cf99e56d42245b1573 qt-3.2.1.ebuild 4952 MD5 913367613ee452605a107179d5fa1c76 qt-3.0.5-r2.ebuild 3907 -MD5 3dbd8e7a0a549b02e45d4ff41b2492a7 qt-3.3.0_beta1.ebuild 5167 MD5 8ba2f35348af78eaa4cf70cdfef1ba01 qt-3.1.2-r4.ebuild 5347 MD5 9f108c7dc7da011bc4bf38cedf8c578e ChangeLog 18916 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 @@ -53,9 +52,7 @@ MD5 3b9e1d14819114b64b8bf770e1a474cd files/0011-listview_keys.patch 2520 MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65 MD5 8c9b47edf5949643d8dbeb3fecc40e7c files/qt-3.1.2-qfont-jp-family-subst-20030421.patch 22730 MD5 bf7aed227565288222ea889c81b1e363 files/qt-3.1.2-qlistview-dnd.diff 469 -MD5 911441657af4920cc73a05abdd04d2a8 files/digest-qt-3.3.0_beta1 74 MD5 e6052859850285f5334e722a73b2645b files/qt-3.2.2-crash-fix.patch 1035 -MD5 f7c2e87383c3888af1404e8024815acb files/qt-3.3.0_beta1-freetype.patch 748 MD5 cf7fad8d582c6b517b3555aba4e26fd1 files/0018-qlistview-paintcell.patch 1442 MD5 057679471a1149cfba2cabd7a1fd2b55 files/qt-3.2.3-qfontdatabase-i18n-20031024.patch 10536 MD5 39f840d6723a7e898394bc84efb224a2 files/qt-3.1.0-minimized.diff 272 diff --git a/x11-libs/qt/files/digest-qt-3.3.0_beta1 b/x11-libs/qt/files/digest-qt-3.3.0_beta1 deleted file mode 100644 index b0d5176e0782..000000000000 --- a/x11-libs/qt/files/digest-qt-3.3.0_beta1 +++ /dev/null @@ -1 +0,0 @@ -MD5 061a042218010bc1c90a1bda44977ad1 qt-x11-free-3.3.0b1.tar.bz2 14381448 diff --git a/x11-libs/qt/files/qt-3.3.0_beta1-freetype.patch b/x11-libs/qt/files/qt-3.3.0_beta1-freetype.patch deleted file mode 100644 index f0506040887d..000000000000 --- a/x11-libs/qt/files/qt-3.3.0_beta1-freetype.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- config.tests/x11/xfreetype.test 2003-12-08 12:19:14 -0000 -+++ config.tests/x11/xfreetype.test 2003-12-08 12:19:14 -0000 - -@@ -129,7 +129,9 @@ - FREETYPE_PATCH=`grep "#define FREETYPE_PATCH" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'` - [ "$VERBOSE" = "yes" ] && \ - echo " Found Freetype version $FREETYPE_MAJOR.$FREETYPE_MINOR.$FREETYPE_PATCH" -- if [ "$FREETYPE_MAJOR" -eq "2" -a "$FREETYPE_MINOR" -ge "0" -a "$FREETYPE_PATCH" -ge "9" ]; then -+ if [ "$FREETYPE_MAJOR" -eq "2" ] \ -+ && [ "$FREETYPE_MINOR" -ge "0" -a "$FREETYPE_PATCH" -ge "9" ] \ -+ || [ "$FREETYPE_MINOR" -ge "1" ]; then - F=yes - FREETYPE2_INCDIR=$INCDIR/freetype2 - [ "$VERBOSE" = "yes" ] && echo " Found $INC in $INCDIR" diff --git a/x11-libs/qt/qt-3.3.0.ebuild b/x11-libs/qt/qt-3.3.0.ebuild index f1064f6e0d52..57b65c9e1f03 100644 --- a/x11-libs/qt/qt-3.3.0.ebuild +++ b/x11-libs/qt/qt-3.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.0.ebuild,v 1.2 2004/02/09 16:01:04 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.0.ebuild,v 1.3 2004/02/09 19:32:00 caleb Exp $ SRCTYPE="free" DESCRIPTION="QT version ${PV}" @@ -10,7 +10,8 @@ SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2" LICENSE="QPL-1.0 | GPL-2" SLOT="3" -KEYWORDS="~x86 ~alpha" +KEYWORDS="~x86" +# removed ~alpha keyword as firebird db breaks in DEPEND IUSE="cups nas postgres opengl mysql odbc gif doc firebird zlib icc sqlite" DEPEND="virtual/x11 virtual/xft diff --git a/x11-libs/qt/qt-3.3.0_beta1.ebuild b/x11-libs/qt/qt-3.3.0_beta1.ebuild deleted file mode 100644 index 449487cd0f4d..000000000000 --- a/x11-libs/qt/qt-3.3.0_beta1.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.0_beta1.ebuild,v 1.14 2004/01/07 19:36:35 caleb Exp $ - -SRCTYPE="free" -DESCRIPTION="QT version ${PV}" -HOMEPAGE="http://www.trolltech.com/" - -MY_PV=${PV/_beta1/b1} -SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${MY_PV}.tar.bz2" - -LICENSE="QPL-1.0 | GPL-2" -SLOT="3" -KEYWORDS="~x86 ~alpha" -IUSE="cups nas postgres opengl mysql odbc gif doc firebird zlib icc sqlite" - -DEPEND="virtual/x11 virtual/xft - media-libs/libpng media-libs/jpeg media-libs/libmng - >=media-libs/freetype-2 - gif? ( media-libs/giflib media-libs/libungif ) - nas? ( >=media-libs/nas-1.5 ) - odbc? ( dev-db/unixODBC ) - mysql? ( dev-db/mysql ) - sqlite? ( dev-db/sqlite ) - firebird? ( dev-db/firebird ) - opengl? ( virtual/opengl virtual/glu ) - postgres? ( dev-db/postgresql ) - cups? ( net-print/cups ) - zlib? ( sys-libs/zlib ) - icc? ( dev-lang/icc )" - -RDEPEND="${DEPEND}" - -S=${WORKDIR}/qt-x11-${SRCTYPE}-${MY_PV} - -QTBASE=/usr/qt/3 -export QTDIR=${S} - -src_unpack() { - unpack ${A} - - export QTDIR=${S} - cd ${S} - - cp configure configure.orig - sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure - - epatch ${FILESDIR}/${P}-freetype.patch - - export PLATFORM=linux-g++ - use icc && export PLATFORM=linux-icc - use amd64 && export PLATFORM=linux-g++-64 - use ia64 && export PLATFORM=linux-g++-64 -} - -src_compile() { - export QTDIR=${S} - export SYSCONF=${D}${QTBASE}/etc/settings - LD_LIBRARY_PATH_OLD=${LD_LIBRARY_PATH} - export LD_LIBRARY_PATH=${S}/lib:${LD_LIBRARY_PATH} - - # fix #11144; qt wants to create lock files etc. in that directory - # [ -d "$QTBASE/etc/settings" ] && addwrite "$QTBASE/etc/settings" - # [ ! -d "$QTBASE/etc/settings" ] && dodir ${QTBASE}/etc/settings - - # Let's just allow writing to these directories during Qt emerge - # as it makes Qt much happier. - addwrite "${QTBASE}/etc/settings" - addwrite "$HOME/.qt" - dodir "${QTBASE}/etc/settings" - - use nas && myconf="${myconf} -system-nas-sound" - 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 -I/usr/include/postgresql/pgsql" - use firebird && myconf="${myconf} -plugin-sql-ibase" -# use oci8 && myconf="${myconf} -plugin-sql-oci" - use sqlite && myconf="${myconf} -plugin-sql-sqlite" - use odbc && myconf="${myconf} -plugin-sql-odbc" - use cups && myconf="${myconf} -cups" || myconf="${myconf} -no-cups" - use opengl && myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl" - use debug && myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions" - use xinerama && myconf="${myconf} -xinerama" - use zlib && myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib" - use ipv6 && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6" - - export YACC='byacc -d' - - ./configure -sm -thread -stl -system-libjpeg -verbose -largefile \ - -qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \ - -system-libpng -lpthread -xft -platform ${PLATFORM} -xplatform \ - ${PLATFORM} -xrender -prefix ${D}${QTBASE} -plugindir ${QTBASE}/plugins \ - -docdir ${QTBASE}/doc -translationdir ${QTBASE}/translations \ - -datadir ${QTBASE} -sysconfdir ${QTBASE}/etc/settings -fast ${myconf} -dlopen-opengl || die - - export QTDIR=${S} - emake src-qmake src-moc sub-src sub-tools || die - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH_OLD} - export HOME="$REALHOME" -} - -src_install() { - export QTDIR=${S} - - # binaries - into $QTBASE - dobin bin/* - - # libraries - dolib lib/libqt-mt.so.3.3.0 lib/libqui.so.1.0.0 lib/lib{editor,qassistantclient,designercore}.a - cd ${D}/$QTBASE/lib - for x in libqui.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.3.0->3.3->3->.so - ln -s libqt-mt.so.3.3.0 libqt-mt.so.3.3 - ln -s libqt-mt.so.3.3 libqt-mt.so.3 - ln -s libqt-mt.so.3 libqt-mt.so - - # libqt -> libqt-mt symlinks - ln -s libqt-mt.so.3.3.0 libqt.so.3.3.0 - ln -s libqt-mt.so.3.3 libqt.so.3.3 - ln -s libqt-mt.so.3 libqt.so.3 - ln -s libqt-mt.so libqt.so - - # 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}/{45qt3,50qtdir3} - - dodir ${QTBASE}/tools/designer/templates - cd ${S} - cp tools/designer/templates/* ${D}/${QTBASE}/tools/designer/templates - - dodir ${QTBASE}/translations - cd ${S} - cp translations/* ${D}/${QTBASE}/translations - - dodir ${QTBASE}/doc - - if [ `use doc` ]; then - cd ${S}/doc - for x in html flyers; do - cp -r $x ${D}/${QTBASE}/doc - done - - cp -r ${S}/doc/man ${D}/${QTBASE} - cp -r ${S}/examples ${D}/${QTBASE} - cp -r ${S}/tutorial ${D}/${QTBASE} - fi - - # misc build reqs - dodir ${QTBASE}/mkspecs - cp -R ${S}/mkspecs/${PLATFORM} ${D}/${QTBASE}/mkspecs/ - - sed -e "s:${S}:${QTBASE}:g" \ - ${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 -} |