version bump

9 files changed, 64 insertions, 56 deletions

diff --git a/dev-libs/qsa/ChangeLog b/dev-libs/qsa/ChangeLog
index 3b7eb9b24224..70b11aa7ae84 100644
--- a/dev-libs/qsa/ChangeLog
+++ b/dev-libs/qsa/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/qsa
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/ChangeLog,v 1.6 2003/11/16 18:35:35 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/ChangeLog,v 1.7 2003/11/28 13:29:16 caleb Exp $
+
+*qsa-1.0.1 (28 Nov 2003)
+
+  28 Nov 2003; Caleb Tennis <caleb@gentoo.org> qsa-1.0.1.ebuild,
+  qsa-1.0_pre20030513.ebuild, files/qsa-1.0.1-no-examples.diff,
+  files/qsa-1.0.1-sandbox-fix.diff,
+  files/qsa-1.0_pre20030513-libdir-patch.diff:
+  Version bump
 
   16 Nov 2003; Brad House <brad_mssw@gentoo.org> qsa-1.0.0.ebuild:
   mark stable on amd64
diff --git a/dev-libs/qsa/Manifest b/dev-libs/qsa/Manifest
index 054828fb76dd..a70c14ac391a 100644
--- a/dev-libs/qsa/Manifest
+++ b/dev-libs/qsa/Manifest
@@ -1,11 +1,10 @@
-MD5 a7de3ab8e3827c36f0c1a2708a5fe8ca qsa-1.0.1.ebuild 850
-MD5 4b3e92246081c83f8065e62622c98134 qsa-1.0_pre20030513.ebuild 1147
+MD5 a362fe9a1024405574b6dca4d794c788 qsa-1.0.1.ebuild 847
 MD5 a7de3ab8e3827c36f0c1a2708a5fe8ca qsa-1.0.0.ebuild 850
-MD5 2dc814fdf3c6d2e72f20f21d0f9a824b ChangeLog 755
+MD5 2f9bec71c9a1541088fb273e33a4d8ae ChangeLog 1005
 MD5 34c522a277c81942598b1dc6872b4caf metadata.xml 219
-MD5 0f2c8d390dff8aafa5d5e952af3ed4fe files/qsa-1.0_pre20030513-libdir-patch.diff 356
-MD5 07a92e22f605243fa3e6efcb4a1e7da5 files/digest-qsa-1.0_pre20030513 74
+MD5 005ebaeb3996a2a42c0440168a47d1d7 files/qsa-1.0.1-no-examples.diff 219
 MD5 b4f80b2107bf151f4232a2e25290ff9f files/qsa-1.0.0-sandbox-fix.diff 319
 MD5 005ebaeb3996a2a42c0440168a47d1d7 files/qsa-1.0.0-no-examples.diff 219
 MD5 40102ad29fae0f586b3e6116374627ef files/digest-qsa-1.0.0 71
 MD5 6a32e03879c62fd776070a687ae3d9a2 files/digest-qsa-1.0.1 71
+MD5 b4f80b2107bf151f4232a2e25290ff9f files/qsa-1.0.1-sandbox-fix.diff 319
diff --git a/dev-libs/qsa/files/digest-qsa-1.0.1 b/dev-libs/qsa/files/digest-qsa-1.0.1
new file mode 100644
index 000000000000..6167763637b1
--- /dev/null
+++ b/dev-libs/qsa/files/digest-qsa-1.0.1
@@ -0,0 +1 @@
+MD5 5a6f938b933d1329cf9e6f0062ee8c1b qsa-x11-free-1.0.1.tar.gz 2060183
diff --git a/dev-libs/qsa/files/digest-qsa-1.0_pre20030513 b/dev-libs/qsa/files/digest-qsa-1.0_pre20030513
deleted file mode 100644
index 14da2aed09b9..000000000000
--- a/dev-libs/qsa/files/digest-qsa-1.0_pre20030513
+++ /dev/null
@@ -1 +0,0 @@
-MD5 59301944035b8995801522beff5ffd40 qsa-x11-free-20030513.tar.gz 1607441
diff --git a/dev-libs/qsa/files/qsa-1.0.1-no-examples.diff b/dev-libs/qsa/files/qsa-1.0.1-no-examples.diff
new file mode 100644
index 000000000000..21419fdf5929
--- /dev/null
+++ b/dev-libs/qsa/files/qsa-1.0.1-no-examples.diff
@@ -0,0 +1,7 @@
+--- qsa.pro.orig	2003-07-02 12:16:55.000000000 +0200
++++ qsa.pro	2003-07-03 13:42:53.000000000 +0200
+@@ -1,3 +1,3 @@
+ TEMPLATE	= subdirs
+ CONFIG		= ordered
+-SUBDIRS 	= src examples configure2
++SUBDIRS 	= src configure2
diff --git a/dev-libs/qsa/files/qsa-1.0.1-sandbox-fix.diff b/dev-libs/qsa/files/qsa-1.0.1-sandbox-fix.diff
new file mode 100644
index 000000000000..3ee14bb3ee0c
--- /dev/null
+++ b/dev-libs/qsa/files/qsa-1.0.1-sandbox-fix.diff
@@ -0,0 +1,11 @@
+--- src/plugin/plugin.pro.orig	2003-07-03 13:43:09.000000000 +0200
++++ src/plugin/plugin.pro	2003-07-03 13:43:34.000000000 +0200
+@@ -14,7 +14,7 @@
+ }
+ 
+ !isEmpty(QSA_INSTALL_PREFIX)
+-  target.path=$$plugins.path/designer
++  target.path=$$QSA_INSTALL_PREFIX/plugins/designer
+ 
+ INSTALLS    += target
+ TEMPLATE     = lib
diff --git a/dev-libs/qsa/files/qsa-1.0_pre20030513-libdir-patch.diff b/dev-libs/qsa/files/qsa-1.0_pre20030513-libdir-patch.diff
deleted file mode 100644
index 5273e566b7b4..000000000000
--- a/dev-libs/qsa/files/qsa-1.0_pre20030513-libdir-patch.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure2/main.cpp.old	2003-05-24 10:52:23.000000000 +0200
-+++ configure2/main.cpp	2003-05-24 10:53:03.000000000 +0200
-@@ -379,6 +379,7 @@
- 	args.append( "CONFIG+=" + configs.join( " " ) );
-     if ( !prefix.isEmpty() )
- 	args.append( "QSA_INSTALL_PREFIX=" + prefix );
-+	args.append( "LIBS+=-L../../lib" );
-     if( !execute( args ) )
- 	warnings++;
- 
diff --git a/dev-libs/qsa/qsa-1.0.1.ebuild b/dev-libs/qsa/qsa-1.0.1.ebuild
new file mode 100644
index 000000000000..3f0ac41ed467
--- /dev/null
+++ b/dev-libs/qsa/qsa-1.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/qsa-1.0.1.ebuild,v 1.1 2003/11/28 13:29:16 caleb Exp $
+
+inherit eutils kde-functions
+
+IUSE=""
+S="${WORKDIR}/${PN}-x11-free-${PV}"
+DESCRIPTION="QSA version ${PV}"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~ppc ~amd64"
+SRC_URI="ftp://ftp.trolltech.com/qsa/source/${PN}-x11-free-${PV}.tar.gz"
+HOMEPAGE="http://www.trolltech.com/"
+DEPEND=">=x11-libs/qt-3.1.2-r3"
+
+set-qtdir 3.1
+
+src_compile() {
+	epatch ${FILESDIR}/${P}-no-examples.diff
+	epatch ${FILESDIR}/${P}-sandbox-fix.diff
+	./configure -prefix ${D}${QTDIR} -no-ide || die
+	emake || die
+}
+
+src_install() {
+
+	sed -e "s:${S}:${QTBASE}:g" ${S}/.qmake.cache > ${D}/${QTBASE}/.qmake.cache
+
+	make install
+	dodoc INSTALL README LICENSE.GPL
+}
diff --git a/dev-libs/qsa/qsa-1.0_pre20030513.ebuild b/dev-libs/qsa/qsa-1.0_pre20030513.ebuild
deleted file mode 100644
index b5eeb144982c..000000000000
--- a/dev-libs/qsa/qsa-1.0_pre20030513.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/qsa-1.0_pre20030513.ebuild,v 1.4 2003/09/11 01:10:02 msterret Exp $
-
-inherit eutils kde-functions
-
-IUSE=""
-S="${WORKDIR}/qsa-x11-free-20030513"
-DESCRIPTION="QSA version ${PV}"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-SRC_URI="ftp://ftp.trolltech.com/qsa/qsa-x11-free-20030513.tar.gz"
-HOMEPAGE="http://www.trolltech.com/"
-DEPEND=">=x11-libs/qt-3.1.2-r3"
-
-set-qtdir 3.1
-
-src_compile() {
-	epatch ${FILESDIR}/${P}-libdir-patch.diff
-	./configure -prefix ${D}${QTDIR} || die
-	emake || die
-}
-
-src_install() {
-	into ${QTDIR}
-	dolib.so lib/*
-	insinto ${QTDIR}/plugins/designer/
-	doins plugins/designer/* -m0775
-	insinto ${QTDIR}/include
-	doins src/qsa/qsaglobal.h src/qsa/qsobjectfactory.h \
-	src/qsa/qswrapperfactory.h src/qsa/qseditor.h \
-	src/qsa/qsproject.h src/qsa/qsinterpreter.h \
-	src/qsa/qsargument.h src/qsa/qsinputdialogfactory.h \
-	src/qsa/qsscript.h src/qsa/qsconfig.h src/ide/qsscripter.h -m0644
-	insinto ${QTDIR}/mkspecs/features
-	doins src/qsa/qsa.prf -m0644
-	dodoc INSTALL
-}