Add patch to build with GCC 4.6; add missing cppunit dependency for tests, but also...

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

diff --git a/net-print/dymo-cups-drivers/ChangeLog b/net-print/dymo-cups-drivers/ChangeLog
index 1bb6451b7adde20f65e86f0de6b2e1e556e27ba4..e055941060f0f84498f56eaa5411342a792e8a44 100644 (file)
--- 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/Manifest b/net-print/dymo-cups-drivers/Manifest
index e010ed23c15dc0f8c6a8ec70570d8e1a3f34729c..107c19ace9a3113adedbb6f29b6a49333ed17776 100644 (file)
--- a/net-print/dymo-cups-drivers/Manifest
+++ b/net-print/dymo-cups-drivers/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX dymo-cups-drivers-1.2.0+gcc-4.6.patch 1831 RMD160 2654e3a177e7305e9227a0360c00833da2b28ee4 SHA1 e550b92f5732d8b0078c4d3164888d00d1341b06 SHA256 68b162aa28893f718c8e6502cff7133c8ab7867677707aaf1d081e833164ccce
 DIST dymo-cups-drivers-1.2.0.tar.gz 280453 RMD160 cfb2d7b399e111adc521d189150249105be107f7 SHA1 1d8f5917029903f11b514ab3ce4b0f0f34592b39 SHA256 23cc45f9e128ec229c3fcdcbf4e6e7b16fc196be466c24dd4e39dcc3432df5af
-EBUILD dymo-cups-drivers-1.2.0.ebuild 723 RMD160 b6f976246dfcfd5a57b33c722e38c2039647622f SHA1 e5210ab7bab59cd3ae5131c8146a060080e3ce11 SHA256 def2a8069aea307cbf0a7a7565e8629b6b4af881ba2de7b00ad9953efb94a7b9
-MISC ChangeLog 457 RMD160 2a0ddf0ca9f49fa40f2a34decd8e30d5e92a3272 SHA1 076d031dae8e11ab9d944a56ae07cac2ed6b2c8b SHA256 ea96edb3753e8467a05164fb4cda6f7e82824a06ac60ce0c0d12bfa3e4b93739
+EBUILD dymo-cups-drivers-1.2.0.ebuild 888 RMD160 3d45f731c4fe854aded840ad5748759af83ccae5 SHA1 fb876a01ea639498328a6993edb4726c76002456 SHA256 71318c53d2496ffa141de4149c3cbb4054a1fbc40ce625518ed222eeff515f6d
+MISC ChangeLog 724 RMD160 6612a9f548ad9adde97c09654611883f6910c739 SHA1 e113819e4452e601eda7c09d577066de51bfeee8 SHA256 5c611ee8492b8a13da492b26a5e228ae6de56e814e1e570d9b4a5af1334e8a24
 MISC metadata.xml 233 RMD160 da5a1d3b7836dcebb5fec29696b5bfb583fe346c SHA1 1c7142c677598358888a6cfc6f6f65df2e8b6901 SHA256 4d1294dc1b2a6f96aa637a0b8d340bc67191103af0f15197d07fc62446b4a709
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4d3g0ACgkQAiZjviIA2XinwQCghX33BzcQSuqjLuymJMRswEL2
-0vkAoNgdbaR1U0MZZPEdQfMABrzLH7GZ
-=pkHZ
+iEYEARECAAYFAk5aRa0ACgkQAiZjviIA2Xj/NgCfYgm5aN5B+Gjad09fPTzq5BkB
+g78Ani/PzjWuZnAmxzQNZ70EXMXSaM++
+=1cyo
 -----END PGP SIGNATURE-----

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 155c1428328b62e30937af1ddb7b9b52d8f9283d..bc2f88342f4e0c4d5af36467cbe341c9bd37a9c4 100644 (file)
--- 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 (file)
index 0000000..3f60290
--- /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;