Rev bump to add qt-no-rpath.patch from qt ebuild to make the portage RUNPATH error...

Package-Manager: portage-2.0.52-r1

diff --git a/dev-db/qt-unixODBC/ChangeLog b/dev-db/qt-unixODBC/ChangeLog
index 0d658389ec9f16dfec0f50bfecee2e31eb92e1c2..b0a23c16d506e8e52ddfc8cd6243ea068ecb1c07 100644 (file)
--- a/dev-db/qt-unixODBC/ChangeLog
+++ b/dev-db/qt-unixODBC/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/qt-unixODBC
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/ChangeLog,v 1.7 2005/09/17 16:35:10 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/ChangeLog,v 1.8 2005/09/20 02:07:33 caleb Exp $
+
+*qt-unixODBC-3.3.4-r1 (20 Sep 2005)
+
+  20 Sep 2005; Caleb Tennis <caleb@gentoo.org> +files/qt-no-rpath.patch,
+  +qt-unixODBC-3.3.4-r1.ebuild, qt-unixODBC-3.3.5.ebuild:
+  Rev bump to add qt-no-rpatch.patch from qt ebuild to make the portage
+  RUNPATH error checker happy
 
 *qt-unixODBC-3.3.5 (17 Sep 2005)
 

diff --git a/dev-db/qt-unixODBC/Manifest b/dev-db/qt-unixODBC/Manifest
index a7123c60815ac5aee128af8f22b8be5074a383a9..2503204ff440af9d68af8026a473701b8ace22f9 100644 (file)
--- a/dev-db/qt-unixODBC/Manifest
+++ b/dev-db/qt-unixODBC/Manifest
@@ -1,6 +1,9 @@
-MD5 f85a25e3535527ec1bbc42a0376e01e6 qt-unixODBC-3.3.5.ebuild 1575
+MD5 cf97247e5887c5605d2bde1aedab1bb1 qt-unixODBC-3.3.5.ebuild 1615
 MD5 2a1ae045ff7268b117acc2d64cfa5469 qt-unixODBC-3.3.4.ebuild 1575
-MD5 d3c62bdf032319a02d49f0f939c88fd0 ChangeLog 1007
+MD5 e3419d132be7d1fd861f92683cd3c16d qt-unixODBC-3.3.4-r1.ebuild 1615
+MD5 d46e1e505069ede0f97a7d82d764559b ChangeLog 1278
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
+MD5 74acd4c098f2c4bd70bdea585f0cb096 files/qt-no-rpath.patch 352
 MD5 07a5c97eddc68da556434cdd09a7a903 files/digest-qt-unixODBC-3.3.4 72
 MD5 d09855ad814a45f5c624cd6680628f96 files/digest-qt-unixODBC-3.3.5 72
+MD5 07a5c97eddc68da556434cdd09a7a903 files/digest-qt-unixODBC-3.3.4-r1 72

diff --git a/dev-db/qt-unixODBC/files/digest-qt-unixODBC-3.3.4-r1 b/dev-db/qt-unixODBC/files/digest-qt-unixODBC-3.3.4-r1
new file mode 100644 (file)
index 0000000..ad1fcbb
--- /dev/null
+++ b/dev-db/qt-unixODBC/files/digest-qt-unixODBC-3.3.4-r1
@@ -0,0 +1 @@
+MD5 027f4e82fbe592b39d2f160bfb3a73af qt-x11-free-3.3.4.tar.bz2 14439722

diff --git a/dev-db/qt-unixODBC/files/qt-no-rpath.patch b/dev-db/qt-unixODBC/files/qt-no-rpath.patch
new file mode 100644 (file)
index 0000000..a7d7854
--- /dev/null
+++ b/dev-db/qt-unixODBC/files/qt-no-rpath.patch
@@ -0,0 +1,11 @@
+--- mkspecs/linux-g++/qmake.conf.orig  2004-12-21 14:57:27.315410728 -0500
++++ mkspecs/linux-g++/qmake.conf       2004-12-21 14:57:40.129462696 -0500
+@@ -56,7 +56,7 @@
+ QMAKE_LFLAGS_PLUGIN   = $$QMAKE_LFLAGS_SHLIB
+ QMAKE_LFLAGS_SONAME   = -Wl,-soname,
+ QMAKE_LFLAGS_THREAD   =
+-QMAKE_RPATH           = -Wl,-rpath,
++QMAKE_RPATH           =
+ 
+ QMAKE_LIBS            =
+ QMAKE_LIBS_DYNLOAD    = -ldl

diff --git a/dev-db/qt-unixODBC/qt-unixODBC-3.3.4-r1.ebuild b/dev-db/qt-unixODBC/qt-unixODBC-3.3.4-r1.ebuild
new file mode 100644 (file)
index 0000000..73fef28
--- /dev/null
+++ b/dev-db/qt-unixODBC/qt-unixODBC-3.3.4-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/qt-unixODBC-3.3.4-r1.ebuild,v 1.1 2005/09/20 02:07:33 caleb Exp $
+
+inherit eutils
+
+SRCTYPE="free"
+DESCRIPTION="QT version ${PV}"
+HOMEPAGE="http://www.trolltech.com/"
+SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2"
+IUSE=""
+LICENSE="|| ( QPL-1.0 GPL-2 )"
+SLOT="3"
+KEYWORDS="alpha ~amd64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc ~x86"
+
+DEPEND="~x11-libs/qt-$PV
+       dev-db/unixODBC"
+
+S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
+
+QTBASE=/usr/qt/3
+export QTDIR=${S}
+export PLATFORM=linux-g++
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       epatch ${FILESDIR}/qt-no-rpath.patch
+
+
+       cp configure configure.orig
+       sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
+}
+
+src_compile() {
+       export QTDIR=${S}
+       export SYSCONF=${D}${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"
+
+       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 ${QTBASE} -fast ${myconf} \
+               -dlopen-opengl -plugin-sql-odbc -L${QTBASE}/lib || die
+
+       export QTDIR=${S}
+
+       cd $S/plugins/src/sqldrivers/odbc
+       emake || die
+}
+
+src_install() {
+       mkdir -p $D/$QTBASE/plugins/sqldrivers
+       cp $S/plugins/sqldrivers/libqsqlodbc.so $D/$QTBASE/plugins/sqldrivers/ || die
+}

diff --git a/dev-db/qt-unixODBC/qt-unixODBC-3.3.5.ebuild b/dev-db/qt-unixODBC/qt-unixODBC-3.3.5.ebuild
index 8b9576d5e04c807c28cdfb93909819e116787370..d363c9f2f4228abfe82c733d382b5c1fe1b91ef5 100644 (file)
--- a/dev-db/qt-unixODBC/qt-unixODBC-3.3.5.ebuild
+++ b/dev-db/qt-unixODBC/qt-unixODBC-3.3.5.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/dev-db/qt-unixODBC/qt-unixODBC-3.3.5.ebuild,v 1.1 2005/09/17 16:35:10 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/qt-unixODBC-3.3.5.ebuild,v 1.2 2005/09/20 02:07:33 caleb Exp $
 
 inherit eutils
 
@@ -24,8 +24,11 @@ export PLATFORM=linux-g++
 
 src_unpack() {
        unpack ${A}
-
        cd ${S}
+
+       epatch ${FILESDIR}/qt-no-rpath.patch
+
+
        cp configure configure.orig
        sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
 }