summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-05-06 16:03:31 +0000
committerJustin Lecher <jlec@gentoo.org>2011-05-06 16:03:31 +0000
commit08e289ace1e0df01ff205822d743e915835dd182 (patch)
tree85d91593e89646f11af698cc16bf9ab256de90b7 /net-print/foomatic-db-engine
parentNon-maintainer Version Bump, notified by euscan (diff)
downloadgentoo-2-08e289ace1e0df01ff205822d743e915835dd182.tar.gz
gentoo-2-08e289ace1e0df01ff205822d743e915835dd182.tar.bz2
gentoo-2-08e289ace1e0df01ff205822d743e915835dd182.zip
Non-maintainer Version Bump, notified by euscan
(Portage version: 2.2.0_alpha31/cvs/Linux x86_64)
Diffstat (limited to 'net-print/foomatic-db-engine')
-rw-r--r--net-print/foomatic-db-engine/ChangeLog12
-rw-r--r--net-print/foomatic-db-engine/files/4.0.7-perl-module.patch13
-rw-r--r--net-print/foomatic-db-engine/files/4.0.7-respect-ldflag.patch15
-rw-r--r--net-print/foomatic-db-engine/foomatic-db-engine-3.0.20070508.ebuild49
-rw-r--r--net-print/foomatic-db-engine/foomatic-db-engine-3.0.20080507.ebuild49
-rw-r--r--net-print/foomatic-db-engine/foomatic-db-engine-4.0.7.ebuild (renamed from net-print/foomatic-db-engine/foomatic-db-engine-4.0.3.ebuild)8
6 files changed, 42 insertions, 104 deletions
diff --git a/net-print/foomatic-db-engine/ChangeLog b/net-print/foomatic-db-engine/ChangeLog
index 2c6e04baafde..c86f10d889de 100644
--- a/net-print/foomatic-db-engine/ChangeLog
+++ b/net-print/foomatic-db-engine/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for net-print/foomatic-db-engine
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/ChangeLog,v 1.45 2010/05/17 20:33:42 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/ChangeLog,v 1.46 2011/05/06 16:03:31 jlec Exp $
+
+*foomatic-db-engine-4.0.7 (06 May 2011)
+
+ 06 May 2011; Justin Lecher <jlec@gentoo.org> +files/4.0.7-perl-module.patch,
+ -foomatic-db-engine-3.0.20070508.ebuild,
+ -foomatic-db-engine-3.0.20080507.ebuild, -foomatic-db-engine-4.0.3.ebuild,
+ +foomatic-db-engine-4.0.7.ebuild, +files/4.0.7-respect-ldflag.patch:
+ Non-maintainer Version Bump, notified by euscan
*foomatic-db-engine-4.0.4 (17 May 2010)
diff --git a/net-print/foomatic-db-engine/files/4.0.7-perl-module.patch b/net-print/foomatic-db-engine/files/4.0.7-perl-module.patch
new file mode 100644
index 000000000000..dbb53feb2a87
--- /dev/null
+++ b/net-print/foomatic-db-engine/files/4.0.7-perl-module.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index 3014185..81e090d 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -42,7 +42,7 @@ LOCAL_LIBDIR=@LOCAL_LIBDIR@
+ FOOMATIC_RIP=@FOOMATIC_RIP@
+
+ # foomatic-rip path for a "make inplace" installation
+-LOCAL_FOOMATIC_RIP=@LOCAL_FOOMATIC_RIP@
++LOCAL_FOOMATIC_RIP=@FOOMATIC_RIP@
+
+ # Locations for installing the components of this package
+ BINDIR=$(bindir)
diff --git a/net-print/foomatic-db-engine/files/4.0.7-respect-ldflag.patch b/net-print/foomatic-db-engine/files/4.0.7-respect-ldflag.patch
new file mode 100644
index 000000000000..9e6071276a4e
--- /dev/null
+++ b/net-print/foomatic-db-engine/files/4.0.7-respect-ldflag.patch
@@ -0,0 +1,15 @@
+--- foomatic-db-engine-4.0.2/Makefile.in.orig 2009-07-23 11:45:28.487999828 +0200
++++ foomatic-db-engine-4.0.2/Makefile.in 2009-07-23 11:45:53.939525006 +0200
+@@ -231,10 +231,10 @@
+ ( cd lib && $(PERL) Makefile.PL verbose INSTALLDIRS=$(PERL_INSTALLDIRS) )
+
+ foomatic-combo-xml: foomatic-combo-xml.c
+- $(CC) $(CFLAGS) -o foomatic-combo-xml foomatic-combo-xml.c
++ $(CC) $(CFLAGS) $(LDFLAGS) -o foomatic-combo-xml foomatic-combo-xml.c
+
+ foomatic-perl-data: foomatic-perl-data.c
+- $(CC) $(CFLAGS) $(XML_CFLAGS) -o foomatic-perl-data foomatic-perl-data.c $(XML_LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o foomatic-perl-data foomatic-perl-data.c $(XML_CFLAGS) $(XML_LIBS)
+
+ man: lib/Foomatic/Defaults.pm
+ chmod a+rx ./makeMan
diff --git a/net-print/foomatic-db-engine/foomatic-db-engine-3.0.20070508.ebuild b/net-print/foomatic-db-engine/foomatic-db-engine-3.0.20070508.ebuild
deleted file mode 100644
index 24daf325c46f..000000000000
--- a/net-print/foomatic-db-engine/foomatic-db-engine-3.0.20070508.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/foomatic-db-engine-3.0.20070508.ebuild,v 1.2 2007/05/11 11:12:17 calchan Exp $
-
-inherit perl-app eutils versionator
-
-MY_P=${PN}-$(replace_version_separator 2 '-')
-DESCRIPTION="Generates ppds out of xml foomatic printer description files"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://gentooexperimental.org/~calchan/distfiles/${MY_P}.tar.gz
- http://www.linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2
- net-print/foomatic-filters"
-PDEPEND="net-print/foomatic-db"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/perl-module-${PV}.diff
- sed -i -e "s:@LIB_CUPS@:$(cups-config --serverbin):" Makefile.in
-}
-
-src_compile() {
- econf || die "econf failed"
- emake || die "emake failed"
-
- cd lib
- perl-app_src_compile
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- cd lib
- perl-module_src_install
-}
-
-src_test() {
- cd lib
- perl-module_src_test
-}
diff --git a/net-print/foomatic-db-engine/foomatic-db-engine-3.0.20080507.ebuild b/net-print/foomatic-db-engine/foomatic-db-engine-3.0.20080507.ebuild
deleted file mode 100644
index b4106b1ae8c0..000000000000
--- a/net-print/foomatic-db-engine/foomatic-db-engine-3.0.20080507.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/foomatic-db-engine-3.0.20080507.ebuild,v 1.1 2008/05/07 23:14:38 tgurr Exp $
-
-inherit eutils perl-app versionator
-
-MY_P=${PN}-$(replace_version_separator 2 '-')
-DESCRIPTION="Generates ppds out of xml foomatic printer description files"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://gentooexperimental.org/~genstef/dist/${MY_P}.tar.gz
- http://www.linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2
- net-print/foomatic-filters"
-PDEPEND="net-print/foomatic-db"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/perl-module-3.0.20070508.diff"
- sed -i -e "s:@LIB_CUPS@:$(cups-config --serverbin):" "${S}"/Makefile.in
-}
-
-src_compile() {
- econf || die "econf failed"
- emake || die "emake failed"
-
- cd lib
- perl-app_src_compile
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- cd lib
- perl-module_src_install
-}
-
-src_test() {
- cd lib
- perl-module_src_test
-}
diff --git a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.3.ebuild b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.7.ebuild
index dac4eb48d5a4..62b4824a9361 100644
--- a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.3.ebuild
+++ b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/foomatic-db-engine-4.0.3.ebuild,v 1.2 2010/02/10 08:25:49 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/foomatic-db-engine-4.0.7.ebuild,v 1.1 2011/05/06 16:03:31 jlec Exp $
EAPI="2"
@@ -22,8 +22,8 @@ PDEPEND="net-print/foomatic-db"
src_prepare() {
epatch \
- "${FILESDIR}/${PV}-perl-module.patch" \
- "${FILESDIR}/${PV}-respect-ldflag.patch"
+ "${FILESDIR}"/${PV}-perl-module.patch \
+ "${FILESDIR}"/${PV}-respect-ldflag.patch
sed -i -e "s:@LIB_CUPS@:$(cups-config --serverbin):" "${S}"/Makefile.in
}