Add new snapshot, change versioning to reflect upstream naming, move mips to unstable, remove old snapshot.

(Portage version: 2.1.5_rc7, RepoMan options: --force)

6 files changed, 76 insertions, 81 deletions

diff --git a/net-print/foomatic-db/ChangeLog b/net-print/foomatic-db/ChangeLog
index 977dfabea9b6..8d114bc70efb 100644
--- a/net-print/foomatic-db/ChangeLog
+++ b/net-print/foomatic-db/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-print/foomatic-db
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/ChangeLog,v 1.64 2007/11/20 03:22:37 kumba Exp $
+# 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 <tgurr@gentoo.org>
+  -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 <kumba@gentoo.org> foomatic-db-20060720.ebuild:
   Stable on mips, per #155545.
diff --git a/net-print/foomatic-db/files/fix-sandbox-20050910.patch b/net-print/foomatic-db/files/fix-sandbox-20050910.patch
deleted file mode 100644
index 58a38b7336ba..000000000000
--- a/net-print/foomatic-db/files/fix-sandbox-20050910.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- foomatic-filters-ppds-20050910/install.orig	2005-09-10 10:33:59.575638920 -0600
-+++ foomatic-filters-ppds-20050910/install	2005-09-10 10:34:16.842014032 -0600
-@@ -69,7 +69,6 @@
-   fi
-   mkdir -p $destdir$ppddir
-   rm -f $destdir$ppddir/foomatic-ppds
--  ln -s $prefix/share/ppd $destdir$ppddir/foomatic-ppds
-   cups=1
- fi
- 
diff --git a/net-print/foomatic-db/foomatic-db-20050910.ebuild b/net-print/foomatic-db/foomatic-db-20050910.ebuild
deleted file mode 100644
index 711aaaa46244..000000000000
--- a/net-print/foomatic-db/foomatic-db-20050910.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-20050910.ebuild,v 1.14 2006/09/05 05:26:47 kumba Exp $
-
-inherit eutils
-
-DESCRIPTION="Foomatic printer database"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://linuxprinting.org/download/foomatic/${PN}-3.0-${PV}.tar.gz
-	ppds? ( http://linuxprinting.org/download/foomatic/foomatic-filters-ppds-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="cups ppds"
-
-DEPEND="dev-libs/libxml2
-	net-misc/wget
-	net-misc/curl
-	net-print/foomatic-filters
-	net-print/foomatic-db-engine"
-
-src_unpack() {
-	unpack ${A}
-	cd ${WORKDIR}
-	use ppds && epatch ${FILESDIR}/fix-sandbox-${PV}.patch
-	cd ${S}
-}
-
-src_compile() {
-	econf || die
-	rm db/source/driver/stp.xml
-
-	if use ppds ; then
-		cd ../foomatic-filters-ppds-${PV}
-		rm -f `find . -name "*gimp-print*" `
-		rm -f `find . -name "*hpijs*" `
-		# conflicts with foomatic-filters
-		rm -f bin/{foomatic-gswrapper,foomatic-rip}
-		rm -f share/man/man1/{foomatic-gswrapper,foomatic-rip}.1
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	chmod -R 644 ${D}/usr/share/foomatic/db/
-	chmod 755 ${D}/usr/share/foomatic/db/
-	chmod 755 ${D}/usr/share/foomatic/db/source
-	chmod 755 ${D}/usr/share/foomatic/db/source/{driver,opt,printer}
-
-	if use ppds ; then
-		cd ../foomatic-filters-ppds-${PV}
-		./install -d ${D} -p /usr -z
-		if use cups ; then
-			dodir /usr/share/cups/model
-			dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
-		fi
-	fi
-}
diff --git a/net-print/foomatic-db/foomatic-db-20060720.ebuild b/net-print/foomatic-db/foomatic-db-3.0.20060720.ebuild
index 089bcf0502c1..e06c92058252 100644
--- a/net-print/foomatic-db/foomatic-db-20060720.ebuild
+++ b/net-print/foomatic-db/foomatic-db-3.0.20060720.ebuild
@@ -1,19 +1,24 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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/foomatic-db-20060720.ebuild,v 1.12 2007/11/20 03:22:37 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-3.0.20060720.ebuild,v 1.1 2008/05/07 23:13:53 tgurr Exp $
 
+inherit versionator
+
+MY_P=${PN}-$(replace_version_separator 2 '-')
 DESCRIPTION="Printer information files for foomatic-db-engine to generate ppds"
 HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://gentooexperimental.org/~genstef/dist/${PN}-3.0-${PV}.tar.gz
-	http://linuxprinting.org/download/foomatic/${PN}-3.0-${PV}.tar.gz"
+SRC_URI="http://gentooexperimental.org/~genstef/dist/${MY_P}.tar.gz
+	http://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"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="net-print/foomatic-db-engine"
 
+S="${WORKDIR}/${PN}-$(get_version_component_range 3 ${PV})"
+
 src_compile() {
 	econf --disable-gzip-ppds --disable-ppds-to-cups || die "econf failed"
 	# ppd files do not belong to this package
diff --git a/net-print/foomatic-db/foomatic-db-20070508.ebuild b/net-print/foomatic-db/foomatic-db-3.0.20070508.ebuild
index 4eb7a80e241b..1035fa8b6a1f 100644
--- a/net-print/foomatic-db/foomatic-db-20070508.ebuild
+++ b/net-print/foomatic-db/foomatic-db-3.0.20070508.ebuild
@@ -1,11 +1,14 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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/foomatic-db-20070508.ebuild,v 1.3 2007/10/14 14:01:09 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-3.0.20070508.ebuild,v 1.1 2008/05/07 23:13:53 tgurr Exp $
 
+inherit versionator
+
+MY_P=${PN}-$(replace_version_separator 2 '-')
 DESCRIPTION="Printer information files for foomatic-db-engine to generate ppds"
 HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://gentooexperimental.org/~calchan/distfiles/${PN}-3.0-${PV}.tar.gz
-	http://linuxprinting.org/download/foomatic/${PN}-3.0-${PV}.tar.gz"
+SRC_URI="http://gentooexperimental.org/~calchan/distfiles/${MY_P}.tar.gz
+	http://linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -14,6 +17,8 @@ IUSE=""
 
 RDEPEND="net-print/foomatic-db-engine"
 
+S="${WORKDIR}/${PN}-$(get_version_component_range 3 ${PV})"
+
 src_compile() {
 	econf --disable-gzip-ppds --disable-ppds-to-cups || die "econf failed"
 	# ppd files do not belong to this package
@@ -25,5 +30,5 @@ src_install() {
 	dodoc ChangeLog README TODO USAGE
 
 	# Avoid collision with foo2zjs, bug 185486
-	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}
+	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/foomatic-db-3.0.20080507.ebuild b/net-print/foomatic-db/foomatic-db-3.0.20080507.ebuild
new file mode 100644
index 000000000000..d2a2da3231bb
--- /dev/null
+++ b/net-print/foomatic-db/foomatic-db-3.0.20080507.ebuild
@@ -0,0 +1,42 @@
+# 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/foomatic-db-3.0.20080507.ebuild,v 1.1 2008/05/07 23:13:53 tgurr Exp $
+
+inherit versionator
+
+MY_P=${PN}-$(replace_version_separator 2 '-')
+DESCRIPTION="Printer information files for foomatic-db-engine to generate ppds"
+HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
+SRC_URI="http://gentooexperimental.org/~genstef/dist/${MY_P}.tar.gz
+	http://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="net-print/foomatic-db-engine"
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 3 ${PV})"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# ppd files do not belong to this package
+	rm -r "${S}"/db/source/PPD
+}
+
+src_compile() {
+	econf \
+		--disable-gzip-ppds \
+		--disable-ppds-to-cups \
+	|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc ChangeLog README TODO USAGE
+
+	# Avoid collision with foo2zjs, bug 185486
+	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}
+}