diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-07-31 14:13:16 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-07-31 14:13:16 +0000 |
| commit | 7610e0f97007ebca468d30ab263c4f88a3755adb (patch) | |
| tree | 7205beab90fc1611352978886c9786e7330f0e87 /net-print | |
| parent | Added ~x86 keyword. All non-interactive tests pass on x86. (diff) | |
| download | gentoo-2-7610e0f97007ebca468d30ab263c4f88a3755adb.tar.gz gentoo-2-7610e0f97007ebca468d30ab263c4f88a3755adb.tar.bz2 gentoo-2-7610e0f97007ebca468d30ab263c4f88a3755adb.zip | |
Add a patch to respect CXXFLAGS; slightly simplify ebuild.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'net-print')
3 files changed, 32 insertions, 10 deletions
diff --git a/net-print/dymo-cups-drivers/ChangeLog b/net-print/dymo-cups-drivers/ChangeLog index 5c35a6a78f8e..7bf26766a76d 100644 --- a/net-print/dymo-cups-drivers/ChangeLog +++ b/net-print/dymo-cups-drivers/ChangeLog @@ -1,6 +1,10 @@ # 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.3 2011/11/13 16:21:25 maekke Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/dymo-cups-drivers/ChangeLog,v 1.4 2012/07/31 14:13:16 flameeyes Exp $ + + 31 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> + +files/dymo-cups-drivers-1.2.0-cxxflags.patch, dymo-cups-drivers-1.2.0.ebuild: + Add a patch to respect CXXFLAGS; slightly simplify ebuild. 13 Nov 2011; Markus Meier <maekke@gentoo.org> dymo-cups-drivers-1.2.0.ebuild: add ~x86, bug #390175 @@ -15,4 +19,3 @@ 13 Jul 2011; Diego E. Pettenò <flameeyes@gentoo.org> +dymo-cups-drivers-1.2.0.ebuild, +metadata.xml: Initial import of the Dymo SDK for Linux (actually, mostly the CUPS drivers). - 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 4a52b66e8e0f..ac3b0b712b3c 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,10 +1,10 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 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.3 2011/11/13 16:21:25 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/dymo-cups-drivers/dymo-cups-drivers-1.2.0.ebuild,v 1.4 2012/07/31 14:13:16 flameeyes Exp $ EAPI=4 -inherit eutils +inherit eutils autotools DESCRIPTION="Dymo SDK for LabelWriter/LabelManager printers" HOMEPAGE="http://sites.dymo.com/DeveloperProgram/Pages/LW_SDK_Linux.aspx" @@ -24,13 +24,17 @@ DEPEND="${RDEPEND} RESTRICT=test src_prepare() { - epatch "${FILESDIR}"/${P}+gcc-4.6.patch + epatch \ + "${FILESDIR}"/${P}+gcc-4.6.patch \ + "${FILESDIR}"/${P}-cxxflags.patch + eautoreconf } +DOCS=( AUTHORS README ChangeLog docs/SAMPLES ) + src_install() { - emake DESTDIR="${D}" install + default - dodoc AUTHORS README ChangeLog insinto /usr/share/doc/${PF} - doins docs/*.{txt,rtf,ps,png} docs/SAMPLES + doins docs/*.{txt,rtf,ps,png} } diff --git a/net-print/dymo-cups-drivers/files/dymo-cups-drivers-1.2.0-cxxflags.patch b/net-print/dymo-cups-drivers/files/dymo-cups-drivers-1.2.0-cxxflags.patch new file mode 100644 index 000000000000..03d233acb1e2 --- /dev/null +++ b/net-print/dymo-cups-drivers/files/dymo-cups-drivers-1.2.0-cxxflags.patch @@ -0,0 +1,15 @@ +Index: dymo-cups-drivers-1.2.0/configure.ac +=================================================================== +--- dymo-cups-drivers-1.2.0.orig/configure.ac ++++ dymo-cups-drivers-1.2.0/configure.ac +@@ -87,9 +87,7 @@ AM_CONDITIONAL([SAMPLES], [test x$sample + AC_SUBST(cups_cflags) + + warning_flags="-Wall -Wno-unknown-pragmas" +-debug_flags="" +-optimization_flags="-O2" +-CXXFLAGS="${optimization_flags} ${warning_flags} ${debug_flags} ${cups_cflags}" ++CXXFLAGS="${CXXFLAGS} ${warning_flags} ${debug_flags} ${cups_cflags}" + + + AC_CHECK_LIB(cups, cupsMarkOptions, , AC_ERROR([Can't find cups library])) |