Fix compilation error when build using qt-3.3.6 (#130386).

Package-Manager: portage-2.0.54

4 files changed, 33 insertions, 15 deletions

diff --git a/dev-util/esvn/ChangeLog b/dev-util/esvn/ChangeLog
index e6b3fed1d3a5..d844e9010556 100644
--- a/dev-util/esvn/ChangeLog
+++ b/dev-util/esvn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/esvn
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/esvn/ChangeLog,v 1.11 2006/01/06 15:03:32 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/esvn/ChangeLog,v 1.12 2006/04/25 06:24:28 mrness Exp $
+
+  25 Apr 2006; Alin Nastac <mrness@gentoo.org>
+  +files/esvn-0.6.11-include-cmd_lineedit.patch, esvn-0.6.11.ebuild:
+  Fix compilation error when build using qt-3.3.6 (#130386).
 
   06 Jan 2006; Alin Nastac <mrness@gentoo.org> esvn-0.6.11.ebuild:
   Stable on x86.
diff --git a/dev-util/esvn/Manifest b/dev-util/esvn/Manifest
index 63e2c7b0daad..ea53beb62839 100644
--- a/dev-util/esvn/Manifest
+++ b/dev-util/esvn/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d54b479fc1ee28dfe203bf2fc9b33d4e ChangeLog 1574
-MD5 6d92d497890a4eacbe53634da85f6b15 esvn-0.6.11.ebuild 989
+MD5 f683b82b2db9873b5d6d71790b83734f ChangeLog 1752
+MD5 58f2f29bb571281aaeacbe962c0f2cc3 esvn-0.6.11.ebuild 1021
 MD5 60ddcbe9222651f7b01134bb1d48cca7 files/digest-esvn-0.6.11 66
+MD5 db796caa4b47ed9af47a7c8701b109ac files/esvn-0.6.11-include-cmd_lineedit.patch 298
 MD5 5082a7fd5f87d44ac35fc01a046116c0 metadata.xml 331
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDvobWjG8pv1lIUX4RAhZOAKDO3flYY6hhcv+dhmCmu2iaM0nXugCgkV0h
-xv8jDxku/2mt2DsWvg0PDMs=
-=/Cvn
+iD8DBQFETcCsjG8pv1lIUX4RAo0EAKDFOXB6CfHLppDZg7JB0FiEIV/IEwCg5wS3
+mlu+IwYo17fPYwPDBvqDBBg=
+=X86U
 -----END PGP SIGNATURE-----
diff --git a/dev-util/esvn/esvn-0.6.11.ebuild b/dev-util/esvn/esvn-0.6.11.ebuild
index b0bad04554bc..7ee04dabbe00 100644
--- a/dev-util/esvn/esvn-0.6.11.ebuild
+++ b/dev-util/esvn/esvn-0.6.11.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/esvn/esvn-0.6.11.ebuild,v 1.4 2006/01/06 15:03:32 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/esvn/esvn-0.6.11.ebuild,v 1.5 2006/04/25 06:24:28 mrness Exp $
 
-inherit kde-functions
+inherit kde-functions eutils
 
 MY_P="${P}-1"
 DESCRIPTION="GUI frontend to the Subversion revision system"
@@ -22,18 +22,21 @@ need-qt 3
 S="${WORKDIR}/${PN}"
 
 src_unpack() {
-	unpack ${A} || die "failed to unpack sources"
-	sed -i "s:qmake:${QTDIR}/bin/qmake:" ${S}/Makefile && \
-		sed -i "s:/usr/share/doc/esvn/html-docs:/usr/share/doc/${PF}/html:" "${S}/src/mainwindow.cpp" || \
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-include-cmd_lineedit.patch"
+	sed -i "s:qmake:${QTDIR}/bin/qmake:" Makefile && \
+		sed -i "s:/usr/share/doc/esvn/html-docs:/usr/share/doc/${PF}/html:" src/mainwindow.cpp || \
 			die "at least one sed has failed"
 }
 
-src_compile() {
-	emake || die "emake failed"
-}
+#src_compile() {
+#	emake || die "emake failed"
+#}
 
 src_install() {
-	make -f esvn.mak INSTALL_ROOT=${D} install
+	make -f esvn.mak INSTALL_ROOT="${D}" install
 	dobin esvn esvn-diff-wrapper
 
 	dodoc AUTHORS ChangeLog README
diff --git a/dev-util/esvn/files/esvn-0.6.11-include-cmd_lineedit.patch b/dev-util/esvn/files/esvn-0.6.11-include-cmd_lineedit.patch
new file mode 100644
index 000000000000..b5011d060192
--- /dev/null
+++ b/dev-util/esvn/files/esvn-0.6.11-include-cmd_lineedit.patch
@@ -0,0 +1,10 @@
+--- .ui/frm_main.ui.orig	2006-04-24 13:22:25.000000000 +0200
++++ .ui/frm_main.ui	2006-04-24 13:22:47.000000000 +0200
+@@ -3006,7 +3006,4 @@
+ </slots>
+ <pixmapinproject/>
+ <layoutdefaults spacing="1" margin="1"/>
+-<includehints>
+-    <includehint>cmd_lineedit.h</includehint>
+-</includehints>
+ </UI>