Fixes to dependency

4 files changed, 49 insertions, 6 deletions

diff --git a/x11-themes/gtk-qt-engine/ChangeLog b/x11-themes/gtk-qt-engine/ChangeLog
index 24d4a8f86fda..057d42249183 100644
--- a/x11-themes/gtk-qt-engine/ChangeLog
+++ b/x11-themes/gtk-qt-engine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/gtk-qt-engine
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-qt-engine/ChangeLog,v 1.1 2004/08/23 05:38:55 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-qt-engine/ChangeLog,v 1.2 2004/09/03 13:23:16 brad Exp $
+
+  03 Sep 2004; Brad Laue <brad@gentoo.org> +files/scrollbars.patch,
+  gtk-qt-engine-0.5.ebuild:
+  Add a small fix for GTK+ scrollbars, remove spurious dependency on qtpixmap,
+  and add arts support.
 
 *gtk-qt-engine-0.5 (23 Aug 2004)
 
diff --git a/x11-themes/gtk-qt-engine/Manifest b/x11-themes/gtk-qt-engine/Manifest
index 411a86d22569..fb6d94d91a09 100644
--- a/x11-themes/gtk-qt-engine/Manifest
+++ b/x11-themes/gtk-qt-engine/Manifest
@@ -1,4 +1,5 @@
-MD5 e834b311469395afe35ce9a33c0ba6e6 ChangeLog 418
-MD5 b4498ded29512a74f5ffe108e2e60774 gtk-qt-engine-0.5.ebuild 649
+MD5 d2777b52ac237f0dc7a2455ea9f58286 gtk-qt-engine-0.5.ebuild 799
+MD5 a7566fbc498b5d34db9f38dcb6a18b3b ChangeLog 618
 MD5 5d0c50012374761745d511ea0ff0fbb5 metadata.xml 195
+MD5 e196ce1ba2450ad5143189c23599dea7 files/scrollbars.patch 590
 MD5 c14fd0a50b68b19f5a9ad65022681cb1 files/digest-gtk-qt-engine-0.5 70
diff --git a/x11-themes/gtk-qt-engine/files/scrollbars.patch b/x11-themes/gtk-qt-engine/files/scrollbars.patch
new file mode 100644
index 000000000000..ee556ccb56a9
--- /dev/null
+++ b/x11-themes/gtk-qt-engine/files/scrollbars.patch
@@ -0,0 +1,31 @@
+--- src/qt_qt_wrapper.cpp.orig	2004-07-30 20:02:08.000000000 +0300
++++ src/qt_qt_wrapper.cpp	2004-09-03 07:49:57.210098392 +0300
+@@ -860,6 +860,16 @@
+ {
+ 	if (!gtkQtEnable)
+ 		return;
++
++	if (orientation == GTK_ORIENTATION_HORIZONTAL)
++	{
++		y--;
++	}
++	else
++	{
++		x--;
++	}
++
+ 	
+ 	if(CachedImage* it = cacheFind(CachedImage::ScrollBarSlider, state, w, h))
+ 	{
+@@ -885,9 +895,9 @@
+ 	delta += offset;
+ 
+ 	if (orientation) {
+-		sbar.resize(w, h + delta + 1);
++		sbar.resize(w, h + delta);
+ 	} else {
+-		sbar.resize(w + delta + 1, h);
++		sbar.resize(w + delta, h);
+ 	}
+ 
+ 	sbar.setMinValue(0);
diff --git a/x11-themes/gtk-qt-engine/gtk-qt-engine-0.5.ebuild b/x11-themes/gtk-qt-engine/gtk-qt-engine-0.5.ebuild
index 51dce1243fbf..359c5cc5a7ff 100644
--- a/x11-themes/gtk-qt-engine/gtk-qt-engine-0.5.ebuild
+++ b/x11-themes/gtk-qt-engine/gtk-qt-engine-0.5.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-qt-engine/gtk-qt-engine-0.5.ebuild,v 1.2 2004/08/23 19:54:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-qt-engine/gtk-qt-engine-0.5.ebuild,v 1.3 2004/09/03 13:23:16 brad Exp $
 
 inherit gtk-engines2 eutils kde-functions
 
+IUSE="arts"
 DESCRIPTION="GTK+2 Qt Theme Engine"
 HOMEPAGE="http://xserver.freedesktop.org/Software/gtk-qt"
 SRC_URI="http://xserver.freedesktop.org/Software/gtk-qt/${P}.tar.bz2"
@@ -13,14 +14,19 @@ SLOT="2"
 
 DEPEND="${DEPEND}
 	dev-util/pkgconfig
-	>=x11-themes/qtpixmap-0.25"
+	arts? ( kde-base/arts )"
 
 src_unpack() {
 	unpack ${A} || die
+	cd ${S}
+	epatch ${FILESDIR}/scrollbars.patch
 }
 
 src_compile() {
+	local myconf
+	use arts && myconf="$myconf --with-arts" || myconf="$myconf --without-arts"
+
 	set-qtdir 3
-	econf || die
+	econf $myconf || die
 	emake || die
 }