8 files changed, 28 insertions, 14 deletions
diff --git a/net-print/foomatic-db-engine/ChangeLog b/net-print/foomatic-db-engine/ChangeLog
index d18e427b8a14..4970993c30e8 100644
--- a/net-print/foomatic-db-engine/ChangeLog
+++ b/net-print/foomatic-db-engine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/foomatic-db-engine
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/ChangeLog,v 1.4 2003/12/10 18:31:04 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/ChangeLog,v 1.5 2003/12/31 12:49:03 lanius Exp $
+
+*foomatic-db-engine-3.0.20031018 (31 Dec 2003)
+
+  31 Dec 2003; Heinrich Wendel <lanius@gentoo.org>
+  foomatic-db-engine-20031018.ebuild, foomatic-db-engine-3.0.20031018.ebuild:
+  fixed version scheme
 
   10 Dec 2003; Heinrich Wendel <lanius@gentoo.org>
   foomatic-db-engine-20031018.ebuild:
diff --git a/net-print/foomatic-db-engine/Manifest b/net-print/foomatic-db-engine/Manifest
index 2d4c692b00b1..bc8654b7bb90 100644
--- a/net-print/foomatic-db-engine/Manifest
+++ b/net-print/foomatic-db-engine/Manifest
@@ -1,8 +1,7 @@
-MD5 4dba10180c5e55642ae682ebacaac6da foomatic-db-engine-3.0.20031018.ebuild 923
-MD5 eadfe5e7cb45027fff35aacfe560623b ChangeLog 694
+MD5 51bc4832b7edfc72e0361d6c324d0fbc foomatic-db-engine-3.0.20031018.ebuild 927
+MD5 86fa6d3b551f8ecda16c35d96556279e ChangeLog 895
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 5a8b5f424ca9e77c3aa2ef21d2a83b84 foomatic-db-engine-3.0.0.ebuild 894
 MD5 8d4bb9556fc4abdf74109f920db4dfff files/digest-foomatic-db-engine-3.0.0 76
 MD5 038b96ec618bdb4276688efb460374d9 files/digest-foomatic-db-engine-3.0.20031018 83
-MD5 038b96ec618bdb4276688efb460374d9 files/digest-foomatic-db-engine-20031018 83
 MD5 a61100174a95d158d5ce23eedf1f2cea files/perl-module.diff 1050
diff --git a/net-print/foomatic-db-engine/files/digest-foomatic-db-engine-3.0.20031018 b/net-print/foomatic-db-engine/files/digest-foomatic-db-engine-3.0.20031018
new file mode 100644
index 000000000000..481ce73979a3
--- /dev/null
+++ b/net-print/foomatic-db-engine/files/digest-foomatic-db-engine-3.0.20031018
@@ -0,0 +1 @@
+MD5 5b1b4520d24af2969bc8582273d20996 foomatic-db-engine-3.0-20031018.tar.gz 273690
diff --git a/net-print/foomatic-db-engine/foomatic-db-engine-20031018.ebuild b/net-print/foomatic-db-engine/foomatic-db-engine-3.0.20031018.ebuild
index c1b5c80ef30c..454b40aa825f 100644
--- a/net-print/foomatic-db-engine/foomatic-db-engine-20031018.ebuild
+++ b/net-print/foomatic-db-engine/foomatic-db-engine-3.0.20031018.ebuild
@@ -1,18 +1,20 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/foomatic-db-engine-20031018.ebuild,v 1.2 2003/12/10 18:31:04 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/foomatic-db-engine-3.0.20031018.ebuild,v 1.1 2003/12/31 12:49:03 lanius Exp $
 
 inherit perl-module
 
+MY_P=${P/3.0./3.0-}
+
 DESCRIPTION="Foomatic printer database engine"
 HOMEPAGE="http://www.linuxprinting.org/foomatic"
-SRC_URI="http://www.linuxprinting.org/download/foomatic/${PN}-3.0-${PV}.tar.gz"
+SRC_URI="http://www.linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha hppa amd64"
 IUSE=""
 
-S=${WORKDIR}/${PN}-3.0-${PV}
+S=${WORKDIR}/${MY_P}
 
 DEPEND="dev-libs/libxml2
 	net-misc/wget
diff --git a/net-print/foomatic/ChangeLog b/net-print/foomatic/ChangeLog
index 842311a8fd18..1e4910721979 100644
--- a/net-print/foomatic/ChangeLog
+++ b/net-print/foomatic/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/foomatic
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic/ChangeLog,v 1.16 2003/12/10 18:34:34 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic/ChangeLog,v 1.17 2003/12/31 12:50:04 lanius Exp $
+
+*foomatic-3.0.20031018 (31 Dec 2003)
+
+  31 Dec 2003; Heinrich Wendel <lanius@gentoo.org> foomatic-20031018.ebuild,
+  foomatic-3.0.20031018.ebuild:
+  fixed version scheme
 
   10 Dec 2003; Heinrich Wendel <lanius@gentoo.org> foomatic-20031018.ebuild:
   stable
diff --git a/net-print/foomatic/Manifest b/net-print/foomatic/Manifest
index 86d5c4cf7907..ecd452f3c503 100644
--- a/net-print/foomatic/Manifest
+++ b/net-print/foomatic/Manifest
@@ -1,7 +1,7 @@
-MD5 a3f04f57d8d3f06b4882173ef89fa5a9 foomatic-3.0.20031018.ebuild 705
+MD5 c88ebac38a3f319cc9b7db3a049e59a8 foomatic-3.0.20031018.ebuild 709
 MD5 71cd9f13701b29a8ac1a59466e1e98ad foomatic-3.0.0.ebuild 674
 MD5 6c100182d17f156e3879fb77bca33361 foomatic-2.0.2.ebuild 1177
-MD5 696416543bfb9eaf188b89251ed327be ChangeLog 2365
+MD5 e39f68462fa77ac1c1e0fcce8dc811a1 ChangeLog 2365
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 6a9b6266c601f3cac0d0e7b58179f7ce files/digest-foomatic-2.0.2 66
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-foomatic-3.0.0 0
diff --git a/net-print/foomatic/files/digest-foomatic-3.0.20031018 b/net-print/foomatic/files/digest-foomatic-3.0.20031018
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/net-print/foomatic/files/digest-foomatic-3.0.20031018
diff --git a/net-print/foomatic/foomatic-20031018.ebuild b/net-print/foomatic/foomatic-3.0.20031018.ebuild
index 3fb180c8bb59..a0e7c2226d6b 100644
--- a/net-print/foomatic/foomatic-20031018.ebuild
+++ b/net-print/foomatic/foomatic-3.0.20031018.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic/foomatic-20031018.ebuild,v 1.2 2003/12/10 18:34:34 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic/foomatic-3.0.20031018.ebuild,v 1.1 2003/12/31 12:50:04 lanius Exp $
 
 DESCRIPTION="The Foomatic printing meta package"
 HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
@@ -10,9 +10,9 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc alpha hppa amd64"
 IUSE=""
 
-DEPEND="=net-print/foomatic-filters-20031018
-	=net-print/foomatic-db-engine-20031018
-	=net-print/foomatic-db-20031018"
+DEPEND="=net-print/foomatic-filters-3.0.20031018
+	=net-print/foomatic-db-engine-3.0.20031018
+	net-print/foomatic-db"
 
 pkg_postinst () {
 	einfo