From fd8500daf0024e269b6afede68e284f3df44fe0c Mon Sep 17 00:00:00 2001 From: geos_one Date: Wed, 5 Aug 2009 18:59:03 +0000 Subject: [PATCH] add new foomatic ebuilds git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1446 6952d904-891a-0410-993b-d76249ca496b --- net-print/foomatic-db-ppds/ChangeLog | 81 +++++ net-print/foomatic-db-ppds/Manifest | 5 + .../files/Makefile.in-20070508.patch | 24 ++ .../foomatic-db-ppds-4.0.20090805.ebuild | 31 ++ net-print/foomatic-db-ppds/metadata.xml | 5 + net-print/foomatic-db/ChangeLog | 282 ++++++++++++++++++ net-print/foomatic-db/Manifest | 4 + .../foomatic-db-4.0.20090805.ebuild | 40 +++ net-print/foomatic-db/metadata.xml | 5 + 9 files changed, 477 insertions(+) create mode 100644 net-print/foomatic-db-ppds/ChangeLog create mode 100644 net-print/foomatic-db-ppds/Manifest create mode 100644 net-print/foomatic-db-ppds/files/Makefile.in-20070508.patch create mode 100644 net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20090805.ebuild create mode 100644 net-print/foomatic-db-ppds/metadata.xml create mode 100644 net-print/foomatic-db/ChangeLog create mode 100644 net-print/foomatic-db/Manifest create mode 100644 net-print/foomatic-db/foomatic-db-4.0.20090805.ebuild create mode 100644 net-print/foomatic-db/metadata.xml diff --git a/net-print/foomatic-db-ppds/ChangeLog b/net-print/foomatic-db-ppds/ChangeLog new file mode 100644 index 00000000..1d0affc7 --- /dev/null +++ b/net-print/foomatic-db-ppds/ChangeLog @@ -0,0 +1,81 @@ +# ChangeLog for net-print/foomatic-db-ppds +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-ppds/ChangeLog,v 1.16 2008/05/07 23:33:03 tgurr Exp $ + +*foomatic-db-ppds-3.0.20080507 (07 May 2008) +*foomatic-db-ppds-3.0.20070508 (07 May 2008) +*foomatic-db-ppds-3.0.20060720 (07 May 2008) + + 07 May 2008; Timo Gurr + +foomatic-db-ppds-3.0.20060720.ebuild, + +foomatic-db-ppds-3.0.20070508.ebuild, + +foomatic-db-ppds-3.0.20080507.ebuild, -foomatic-db-ppds-20060720.ebuild, + -foomatic-db-ppds-20070508.ebuild: + Add new snapshot, change versioning to reflect upstream naming, move mips + to unstable. + + 20 Nov 2007; Joshua Kinard + foomatic-db-ppds-20060720.ebuild: + Stable on mips, per #155545. + + 12 Jul 2007; Roy Marples + foomatic-db-ppds-20070508.ebuild: + Keyworded ~sparc-fbsd. + + 11 May 2007; Denis Dupeyron + foomatic-db-ppds-20070508.ebuild: + Added mirror URI. + +*foomatic-db-ppds-20070508 (08 May 2007) + + 08 May 2007; Denis Dupeyron + +files/Makefile.in-20070508.patch, +foomatic-db-ppds-20070508.ebuild: + Version bump. Fixed copyright dates. + + 03 Dec 2006; Tobias Scherbaum + foomatic-db-ppds-20060720.ebuild: + ppc stable, bug #155545 + + 01 Dec 2006; Gustavo Zacarias + foomatic-db-ppds-20060720.ebuild: + Stable on hppa wrt #155545 + + 25 Nov 2006; Bryan Østergaard + foomatic-db-ppds-20060720.ebuild: + Stable on Alpha + ia64. + + 24 Nov 2006; Markus Rothe + foomatic-db-ppds-20060720.ebuild: + Stable on ppc64; bug #155545 + + 23 Nov 2006; foomatic-db-ppds-20060720.ebuild: + stable on amd64 + + 22 Nov 2006; Christian Faulhammer + foomatic-db-ppds-20060720.ebuild: + stable x86, bug #155545 + + 20 Nov 2006; Gustavo Zacarias + foomatic-db-ppds-20060720.ebuild: + Stable on sparc wrt #155545 + + 18 Nov 2006; Stefan Schweizer + -foomatic-db-ppds-20060601.ebuild: + remove old + + 28 Oct 2006; Diego Pettenò + foomatic-db-ppds-20060720.ebuild: + Add ~x86-fbsd keyword. + +*foomatic-db-ppds-20060720 (20 Jul 2006) + + 20 Jul 2006; Stefan Schweizer + +foomatic-db-ppds-20060720.ebuild: + version bump + +*foomatic-db-ppds-20060601 (04 Jun 2006) + + 04 Jun 2006; Stefan Schweizer +metadata.xml, + +foomatic-db-ppds-20060601.ebuild: + Split up foomatic-db + diff --git a/net-print/foomatic-db-ppds/Manifest b/net-print/foomatic-db-ppds/Manifest new file mode 100644 index 00000000..8190bd5f --- /dev/null +++ b/net-print/foomatic-db-ppds/Manifest @@ -0,0 +1,5 @@ +AUX Makefile.in-20070508.patch 1168 RMD160 d17a30ed722c9608b63635acc8a18074d3422d92 SHA1 85d2099be96e6b5d8d80e847e5f420389386d221 SHA256 3ee3cb908c4b4b223b8ed7591e0a0c9c9056623964b19f498599dca97f351b3c +DIST foomatic-db-4.0-20090805.tar.gz 22374438 RMD160 a42c3384702adb017466909942e29f823a2824dc SHA1 34fbde31e59150be14d024dbb686b127df95c2cb SHA256 3302b7d4f8c03e35feb3b7caec38fc11304de065f15738baefddd7fa6bdd96aa +EBUILD foomatic-db-ppds-4.0.20090805.ebuild 914 RMD160 d1d2e4cdd09a9625c0fd277e102d52b55a88101a SHA1 4c3690c4a24b34c3ff9e83a7fa2b6671dd24e8b2 SHA256 53969f6035122a47171568a1436a67ce5658d592571fd0c0ac84b80900021b6e +MISC ChangeLog 2568 RMD160 ff1a6a19d8daca3057117ab3140bc569bb786c9a SHA1 f79f413f26e5b03955845aaecf6e458911fef2f0 SHA256 64131cd70c450bc678e5ceb94a546ed052634dc67768669400fdb6a49ca26b25 +MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 diff --git a/net-print/foomatic-db-ppds/files/Makefile.in-20070508.patch b/net-print/foomatic-db-ppds/files/Makefile.in-20070508.patch new file mode 100644 index 00000000..3f2950f4 --- /dev/null +++ b/net-print/foomatic-db-ppds/files/Makefile.in-20070508.patch @@ -0,0 +1,24 @@ +diff -urN foomatic-db-20070508.orig/Makefile.in foomatic-db-20070508/Makefile.in +--- foomatic-db-20070508.orig/Makefile.in 2007-05-08 09:22:03.000000000 +0200 ++++ foomatic-db-20070508/Makefile.in 2007-05-08 13:08:48.000000000 +0200 +@@ -65,13 +65,13 @@ + install -d $(DESTDIR)$(LIBDIR)/db/source/driver + install -d $(DESTDIR)$(LIBDIR)/db/source/opt + install -d $(DESTDIR)$(LIBDIR)/db/source/PPD +- cp db/oldprinterids $(DESTDIR)$(LIBDIR)/db +- cp db/source/printer/*.xml $(DESTDIR)$(LIBDIR)/db/source/printer +- ( cd db/source/driver/; \ +- for d in $(DRIVERXMLS); do \ +- cp $$d $(DESTDIR)$(LIBDIR)/db/source/driver; \ +- done ) +- cp db/source/opt/*.xml $(DESTDIR)$(LIBDIR)/db/source/opt ++# cp db/oldprinterids $(DESTDIR)$(LIBDIR)/db ++# cp db/source/printer/*.xml $(DESTDIR)$(LIBDIR)/db/source/printer ++# ( cd db/source/driver/; \ ++# for d in $(DRIVERXMLS); do \ ++# cp $$d $(DESTDIR)$(LIBDIR)/db/source/driver; \ ++# done ) ++# cp db/source/opt/*.xml $(DESTDIR)$(LIBDIR)/db/source/opt + ( cd db/source && tar cf - --exclude=.svn PPD ) | \ + ( cd $(DESTDIR)$(LIBDIR)/db/source && tar xf -) + if test $(GZIP) != GZIP_NOT_FOUND -a $(GZIP_PPDS) != no ; then \ diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20090805.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20090805.ebuild new file mode 100644 index 00000000..3f26ab45 --- /dev/null +++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20090805.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit eutils versionator + +DESCRIPTION="linuxprinting.org PPD files for postscript printers" +HOMEPAGE="http://www.linuxprinting.org/foomatic.html" +SRC_URI="http://linuxprinting.org/download/foomatic/${PN/-ppds}-$(replace_version_separator 2 '-').tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="" + +S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3)" + +src_prepare() { + epatch "${FILESDIR}/Makefile.in-20070508.patch" + # scripts do not belong to this package, no translated ppds, no html and text files + rm -r "${S}"/db/source/PPD/Kyocera/{de,es,fr,it,pt,*.htm,*.txt} +} + +src_compile() { + return +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" +} diff --git a/net-print/foomatic-db-ppds/metadata.xml b/net-print/foomatic-db-ppds/metadata.xml new file mode 100644 index 00000000..1fa0ca56 --- /dev/null +++ b/net-print/foomatic-db-ppds/metadata.xml @@ -0,0 +1,5 @@ + + + +printing + diff --git a/net-print/foomatic-db/ChangeLog b/net-print/foomatic-db/ChangeLog new file mode 100644 index 00000000..8d114bc7 --- /dev/null +++ b/net-print/foomatic-db/ChangeLog @@ -0,0 +1,282 @@ +# ChangeLog for net-print/foomatic-db +# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/ChangeLog,v 1.65 2008/05/07 23:13:53 tgurr Exp $ + +*foomatic-db-3.0.20080507 (07 May 2008) +*foomatic-db-3.0.20070508 (07 May 2008) +*foomatic-db-3.0.20060720 (07 May 2008) + + 07 May 2008; Timo Gurr + -files/fix-sandbox-20050910.patch, +foomatic-db-3.0.20060720.ebuild, + +foomatic-db-3.0.20070508.ebuild, +foomatic-db-3.0.20080507.ebuild, + -foomatic-db-20050910.ebuild, -foomatic-db-20060720.ebuild, + -foomatic-db-20070508.ebuild: + Add new snapshot, change versioning to reflect upstream naming, move mips + to unstable, remove old snapshot. + + 20 Nov 2007; Joshua Kinard foomatic-db-20060720.ebuild: + Stable on mips, per #155545. + + 14 Oct 2007; Stefan Schweizer + foomatic-db-20070508.ebuild: + Avoid collision with foo2zjs, thanks robbat2 in bug 185486 + + 11 May 2007; Denis Dupeyron + foomatic-db-20070508.ebuild: + Added mirror URI. + +*foomatic-db-20070508 (08 May 2007) + + 08 May 2007; Denis Dupeyron + +foomatic-db-20070508.ebuild: + Version bump. Fixed copyright dates. + + 28 Dec 2006; Javier Villavicencio + foomatic-db-20060720.ebuild: + Added ~x86-fbsd keyword. + + 03 Dec 2006; Tobias Scherbaum + foomatic-db-20060720.ebuild: + ppc stable, bug #155545 + + 01 Dec 2006; Gustavo Zacarias + foomatic-db-20060720.ebuild: + Stable on hppa wrt #155545 + + 25 Nov 2006; Bryan Østergaard + foomatic-db-20060720.ebuild: + Stable on Alpha + ia64. + + 24 Nov 2006; Markus Rothe + foomatic-db-20060720.ebuild: + Stable on ppc64; bug #155545 + + 23 Nov 2006; foomatic-db-20060720.ebuild: + stable on amd64 + + 22 Nov 2006; Christian Faulhammer + foomatic-db-20060720.ebuild: + stable x86, bug #155545 + + 20 Nov 2006; Gustavo Zacarias + foomatic-db-20060720.ebuild: + Stable on sparc wrt #155545 + + 18 Nov 2006; Stefan Schweizer + -foomatic-db-20041220.ebuild, -foomatic-db-20050606.ebuild, + -foomatic-db-20060601.ebuild: + remove old + + 05 Sep 2006; Joshua Kinard foomatic-db-20050910.ebuild: + Marked stable on mips. + +*foomatic-db-20060720 (20 Jul 2006) + + 20 Jul 2006; Stefan Schweizer + +foomatic-db-20060720.ebuild: + version bump + + 13 Jul 2006; Aron Griffis + foomatic-db-20050910.ebuild: + Mark 20050910 stable on ia64 + + 04 Jun 2006; Stefan Schweizer + foomatic-db-20060601.ebuild: + Split up foomatic-db + +*foomatic-db-20060601 (01 Jun 2006) + + 01 Jun 2006; Stefan Schweizer + +foomatic-db-20060601.ebuild: + New version, bug 135124, thanks to Thomas Stein + + 09 May 2006; Gustavo Zacarias + foomatic-db-20050910.ebuild: + Stable on hppa wrt #130209 + + 27 Apr 2006; Mark Loeser foomatic-db-20050910.ebuild: + Stable on x86; bug #130209 + + 20 Apr 2006; Thomas Cort foomatic-db-20050910.ebuild: + Stable on alpha wrt Bug #130209. + + 19 Apr 2006; Patrick McLean + foomatic-db-20050910.ebuild: + Stable on amd64 (bug 130209) + + 19 Apr 2006; Jason Wever foomatic-db-20050910.ebuild: + Stable on SPARC wrt bug #130209. + + 17 Apr 2006; Markus Rothe + foomatic-db-20050910.ebuild: + Stable on ppc64; bug #130209 + + 17 Apr 2006; Tobias Scherbaum + foomatic-db-20050910.ebuild: + ppc stable, bug #130209 + + 19 Jan 2006; Marcelo Goes + foomatic-db-20050910.ebuild: + Fix file collision with foomatic-filters. + + 15 Sep 2005; Aron Griffis + foomatic-db-20050606.ebuild: + Mark 20050606 stable on alpha + + 11 Sep 2005; Stefan Schweizer + foomatic-db-20050910.ebuild: + Make patch apply only conditionally thanks to Piojo + in bug 105503 + + 10 Sep 2005; Joshua Baergen + +files/fix-sandbox-20050910.patch, foomatic-db-20050910.ebuild: + Fixed sandbox violation (bug #105503). + +*foomatic-db-20050910 (10 Sep 2005) + + 10 Sep 2005; Luis Medinas + -foomatic-db-20050909.ebuild, +foomatic-db-20050910.ebuild: + New snapshot. Remove older snapshot due a wrong src url. + +*foomatic-db-20050909 (10 Sep 2005) + + 10 Sep 2005; Luis Medinas + -foomatic-db-20040302.ebuild, +foomatic-db-20050909.ebuild: + Update to the latest snapshot. + + 25 Aug 2005; Aron Griffis + foomatic-db-20050606.ebuild: + stable on ia64 + + 21 Aug 2005; Rene Nussbaumer + foomatic-db-20050606.ebuild: + Stable on hppa. + + 13 Aug 2005; Michael Hanselmann + foomatic-db-20050606.ebuild: + Stable on ppc. + + 08 Aug 2005; Markus Rothe + foomatic-db-20050606.ebuild: + Stable on ppc64 + + 02 Aug 2005; Gustavo Zacarias + foomatic-db-20050606.ebuild: + Stable on sparc + + 02 Aug 2005; foomatic-db-20050606.ebuild: + Stable on amd64 and x86 thanks to Daniel Webert closes + bug #100993 + +*foomatic-db-20050606 (06 Jun 2005) + + 06 Jun 2005; Heinrich Wendel + +foomatic-db-20050606.ebuild: + version bump + + 06 Jun 2005; Heinrich Wendel + -foomatic-db-20031018.ebuild, -foomatic-db-20031231.ebuild, + -foomatic-db-20040916.ebuild, foomatic-db-20041220.ebuild: + cleanups, mark 20041220 stable on all arches, this are only ppd and xml files + + 09 Apr 2005; Markus Rothe + foomatic-db-20040302.ebuild, foomatic-db-20040916.ebuild, + foomatic-db-20041220.ebuild: + Stable on ppc64/added ~ppc64 to KEYWORDS + + 01 Apr 2005; Aron Griffis + foomatic-db-20040302.ebuild: + stable on ia64 + + 29 Dec 2004; Ciaran McCreesh : + Change encoding to UTF-8 for GLEP 31 compliance + + 20 Dec 2004; Sven Wegener : + Added missing digest entries. + +*foomatic-db-20041220 (20 Dec 2004) + + 20 Dec 2004; Heinrich Wendel + +foomatic-db-20041220.ebuild: + version bump + + 22 Sep 2004; Joshua Kinard foomatic-db-20040302.ebuild: + Marked stable on mips. + +*foomatic-db-20040916 (16 Sep 2004) + + 16 Sep 2004; Heinrich Wendel + +foomatic-db-20040916.ebuild: + version bump + + 19 Jul 2004; Bryan Østergaard + foomatic-db-20040302.ebuild: + Stable on alpha. + + 17 Jul 2004; Tom Gall foomatic-db-20031231.ebuild: + stable on ppc64, bug #55797 + + 25 Jun 2004; Danny van Dyk + foomatic-db-20040302.ebuild: + Marked stable on amd64. + + 19 Apr 2004; Guy Martin foomatic-db-20040302.ebuild: + Marked stable on hppa. + + 11 Apr 2004; Gustavo Zacarias + foomatic-db-20040302.ebuild: + stable on sparc + + 09 Apr 2004; Heinrich Wendel + foomatic-db-20040302.ebuild: + stable on x86 + +*foomatic-db-20040302 (13 Mar 2004) + + 13 Mar 2004; Stephen P. Becker + foomatic-db-20040302.ebuild: + Added ~mips keyword. + + 22 Feb 2004; Aron Griffis foomatic-db-20031018.ebuild, + foomatic-db-20031231.ebuild: + add ia64 keywords + + 02 Mar 2004; Heinrich Wendel + foomatic-db-20030716.ebuild, foomatic-db-20031231.ebuild: + remove old version; mark 20031231 stable, add 20040302 + +*foomatic-db-20031231 (31 Dec 2003) + + 31 Dec 2003; Heinrich Wendel + foomatic-db-20031231.ebuild: + version bump + + 12 Dec 2003; Heinrich Wendel + foomatic-db-20031018.ebuild: + Permissions to all files were set to 755 and portage tried to strip them, + although they are .xml files + + 10 Dec 2003; Heinrich Wendel + foomatic-db-20031018.ebuild: + stable + +*foomatic-db-20031018 (18 Oct 2003) + + 18 Oct 2003; Heinrich Wendel + foomatic-db-20031018.ebuild: + fixed sandbox violation, thx to Chainsaw + + 18 Oct 2003; Heinrich Wendel : + bump + + 29 Jul 2003; lanius@gentoo.org foomatic-db-20030716.ebuild: + stable bump + +*foomatic-db-20030716 (18 Jul 2003) + + 18 Jul 2003; lanius@gentoo.org foomatic-db-20030716.ebuild: + fixed bug 24726 + + 16 Jul 2003; Heinrich Wendel files/perl-module.diff: + initial release + diff --git a/net-print/foomatic-db/Manifest b/net-print/foomatic-db/Manifest new file mode 100644 index 00000000..573e5c59 --- /dev/null +++ b/net-print/foomatic-db/Manifest @@ -0,0 +1,4 @@ +DIST foomatic-db-4.0-20090805.tar.gz 22374438 RMD160 a42c3384702adb017466909942e29f823a2824dc SHA1 34fbde31e59150be14d024dbb686b127df95c2cb SHA256 3302b7d4f8c03e35feb3b7caec38fc11304de065f15738baefddd7fa6bdd96aa +EBUILD foomatic-db-4.0.20090805.ebuild 1233 RMD160 c862ced501c7b919b57580dc14fecf4da43d9eb3 SHA1 41efcd5df7dea5a52fe5b3c9db37db5b2eafdae0 SHA256 f1469a664227eade6b17db07e76e6211cbd6f641926f84e9fbdb9c47d132decf +MISC ChangeLog 8612 RMD160 00e976df85a9d344f568c64d2c839fe05d94efb2 SHA1 06eaa078f03d5cb96d4138c669123b3db264510e SHA256 f9a251464f3be9a0bef2a9f6af41b271f696d5b5ca3f2df74539d96541a8fc17 +MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 diff --git a/net-print/foomatic-db/foomatic-db-4.0.20090805.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20090805.ebuild new file mode 100644 index 00000000..d9ae060e --- /dev/null +++ b/net-print/foomatic-db/foomatic-db-4.0.20090805.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit versionator + +DESCRIPTION="Printer information files for foomatic-db-engine to generate ppds" +HOMEPAGE="http://www.linuxprinting.org/foomatic.html" +SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_separator 2 -).tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="" + +DEPEND="" +RDEPEND="net-print/foomatic-db-engine" + +S="${WORKDIR}/${PN}-$(get_version_component_range 3)" + +src_prepare() { + # ppd files do not belong to this package + rm -r "${S}/db/source/PPD" +} + +src_configure() { + econf \ + --disable-gzip-ppds \ + --disable-ppds-to-cups +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc ChangeLog README USAGE + + # Avoid collision with foo2zjs, bug 185486 + # TODO: still valid? + rm "${D}"/usr/share/foomatic/db/source/{driver/foo2{hp,lava,xqx,zjs}.xml,printer/{Generic-ZjStream_Printer,HP-{Color_LaserJet_{1500,1600,2600n},LaserJet_{10{00,05,18,20,22},M1005_MFP}},Minolta-{Color_PageWorks_Pro_L,magicolor_2{20,30,43}0_DL},Samsung-CLP-{3,6}00}.xml} +} diff --git a/net-print/foomatic-db/metadata.xml b/net-print/foomatic-db/metadata.xml new file mode 100644 index 00000000..1fa0ca56 --- /dev/null +++ b/net-print/foomatic-db/metadata.xml @@ -0,0 +1,5 @@ + + + +printing +