Add patch to build with GCC 4.6; add missing cppunit dependency for tests, but also restrict tests until they are sorted out.

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

3 files changed, 67 insertions, 4 deletions

diff --git a/net-print/dymo-cups-drivers/ChangeLog b/net-print/dymo-cups-drivers/ChangeLog
index 1bb6451b7add..e055941060f0 100644
--- a/net-print/dymo-cups-drivers/ChangeLog
+++ b/net-print/dymo-cups-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/dymo-cups-drivers
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/dymo-cups-drivers/ChangeLog,v 1.1 2011/07/13 18:04:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/dymo-cups-drivers/ChangeLog,v 1.2 2011/08/28 13:42:11 flameeyes Exp $
+
+  28 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  dymo-cups-drivers-1.2.0.ebuild, +files/dymo-cups-drivers-1.2.0+gcc-4.6.patch:
+  Add patch to build with GCC 4.6; add missing cppunit dependency for tests,
+  but also restrict tests until they are sorted out.
 
 *dymo-cups-drivers-1.2.0 (13 Jul 2011)
 
diff --git a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.2.0.ebuild b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.2.0.ebuild
index 155c1428328b..bc2f88342f4e 100644
--- a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.2.0.ebuild
+++ b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.2.0.ebuild
@@ -1,21 +1,31 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/dymo-cups-drivers/dymo-cups-drivers-1.2.0.ebuild,v 1.1 2011/07/13 18:04:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/dymo-cups-drivers/dymo-cups-drivers-1.2.0.ebuild,v 1.2 2011/08/28 13:42:11 flameeyes Exp $
 
 EAPI=4
 
+inherit eutils
+
 DESCRIPTION="Dymo SDK for LabelWriter/LabelManager printers"
 HOMEPAGE="http://sites.dymo.com/DeveloperProgram/Pages/LW_SDK_Linux.aspx"
 SRC_URI="http://download.dymo.com/Download%20Drivers/Linux/Download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="test"
 
 KEYWORDS="~amd64"
 
 RDEPEND="net-print/cups"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+# tests fail but needs to be investigated
+RESTRICT=test
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}+gcc-4.6.patch
+}
 
 src_install() {
 	emake DESTDIR="${D}" install
diff --git a/net-print/dymo-cups-drivers/files/dymo-cups-drivers-1.2.0+gcc-4.6.patch b/net-print/dymo-cups-drivers/files/dymo-cups-drivers-1.2.0+gcc-4.6.patch
new file mode 100644
index 000000000000..3f60290af837
--- /dev/null
+++ b/net-print/dymo-cups-drivers/files/dymo-cups-drivers-1.2.0+gcc-4.6.patch
@@ -0,0 +1,48 @@
+Index: dymo-cups-drivers-1.2.0/src/common/Halftoning.h
+===================================================================
+--- dymo-cups-drivers-1.2.0.orig/src/common/Halftoning.h
++++ dymo-cups-drivers-1.2.0/src/common/Halftoning.h
+@@ -22,6 +22,7 @@
+ #ifndef h4D098F6A_47C6_4e9d_BD74_2DC6034F8EEF
+ #define h4D098F6A_47C6_4e9d_BD74_2DC6034F8EEF
+ 
++#include <cstdlib>
+ #include "CommonTypedefs.h"
+ 
+ //namespace dymo
+Index: dymo-cups-drivers-1.2.0/src/lw/LabelWriterDriver.h
+===================================================================
+--- dymo-cups-drivers-1.2.0.orig/src/lw/LabelWriterDriver.h
++++ dymo-cups-drivers-1.2.0/src/lw/LabelWriterDriver.h
+@@ -21,6 +21,7 @@
+ #ifndef h53a93353_4968_443a_a5aa_1167526295fc
+ #define h53a93353_4968_443a_a5aa_1167526295fc
+ 
++#include <cstdlib>
+ #include "PrinterDriver.h"
+ 
+ namespace DymoPrinterDriver
+Index: dymo-cups-drivers-1.2.0/src/lw/tests/MOCK_LWLMPrintEnvironment.h
+===================================================================
+--- dymo-cups-drivers-1.2.0.orig/src/lw/tests/MOCK_LWLMPrintEnvironment.h
++++ dymo-cups-drivers-1.2.0/src/lw/tests/MOCK_LWLMPrintEnvironment.h
+@@ -21,6 +21,7 @@
+ #ifndef hc8e31bb3_01a5_4422_84b8_64c017e18521
+ #define hc8e31bb3_01a5_4422_84b8_64c017e18521
+ 
++#include <cstdlib>
+ #include "../PrinterDriver.h"
+ #include "MOCK_PrintEnvironment.h"
+ 
+Index: dymo-cups-drivers-1.2.0/src/lw/tests/MOCK_LWLMPrintEnvironment.cpp
+===================================================================
+--- dymo-cups-drivers-1.2.0.orig/src/lw/tests/MOCK_LWLMPrintEnvironment.cpp
++++ dymo-cups-drivers-1.2.0/src/lw/tests/MOCK_LWLMPrintEnvironment.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include "MOCK_LWLMPrintEnvironment.h"
+ #include "../LabelWriterDriver.h"
++#include <cassert>
+ 
+ static const byte TOF_BIT           = 0x02;
+ static const byte ROLL_CHANGED_BIT  = 0x08;