version bump

(Portage version: 2.0.51.19)

7 files changed, 89 insertions, 59 deletions

diff --git a/net-print/omni/ChangeLog b/net-print/omni/ChangeLog
index ed6f7e0241ef..071cee8ea689 100644
--- a/net-print/omni/ChangeLog
+++ b/net-print/omni/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/omni
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/omni/ChangeLog,v 1.7 2004/07/11 10:03:28 lanius Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/omni/ChangeLog,v 1.8 2005/06/07 14:59:54 lanius Exp $
+
+*omni-0.9.2 (07 Jun 2005)
+
+  07 Jun 2005; Heinrich Wendel <lanius@gentoo.org> -omni-0.9.0.ebuild,
+  omni-0.9.1.ebuild, +omni-0.9.2.ebuild:
+  version bump
 
   11 Jul 2004; Heinrich Wendel <lanius@gentoo.org> :
   version bump, bug #52170
diff --git a/net-print/omni/Manifest b/net-print/omni/Manifest
index 299b16baec30..ec29bbcc4a88 100644
--- a/net-print/omni/Manifest
+++ b/net-print/omni/Manifest
@@ -1,6 +1,7 @@
-MD5 32c05ad43481aed129300d9bc06b008c omni-0.9.1.ebuild 1371
-MD5 c60a08cba144da3856c3be78bca37788 omni-0.9.0.ebuild 1265
-MD5 21808ddf567431f7809e9ad2b0d3199a ChangeLog 857
+MD5 ea96a34efe960f96d392f61805675ae9 omni-0.9.1.ebuild 1398
+MD5 fc0d5204bd9c1aaa1aa3b6b740f219a6 ChangeLog 1012
+MD5 5c93a81386015363aed90dcf9de22dcf omni-0.9.2.ebuild 1749
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 a0f001bbeec0ec15dff8fac7e9790527 files/digest-omni-0.9.0 63
+MD5 a0ac0e2bb7ea94821f7b2b880bb2bd28 files/digest-omni-0.9.1-r1 206
 MD5 b4fb01c3394f59f16ff3ecffb7457ec1 files/digest-omni-0.9.1 63
+MD5 5f38319cf6eea5039d30e6f7630580e2 files/digest-omni-0.9.2 208
diff --git a/net-print/omni/files/digest-omni-0.9.0 b/net-print/omni/files/digest-omni-0.9.0
deleted file mode 100644
index 1218724fc372..000000000000
--- a/net-print/omni/files/digest-omni-0.9.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f161e4acc5e4db0669c58274af5d2b10 Omni-0.9.0.tar.gz 4104688
diff --git a/net-print/omni/files/digest-omni-0.9.2 b/net-print/omni/files/digest-omni-0.9.2
new file mode 100644
index 000000000000..ba78cf75d089
--- /dev/null
+++ b/net-print/omni/files/digest-omni-0.9.2
@@ -0,0 +1,3 @@
+MD5 89a175da726ce02d68d8c33ec840129b Omni-0.9.2.tar.gz 4222308
+MD5 e45986dc765b5245deef871a015a3b86 OmniEpsonVendor-0.9.2.tar.gz 8493387
+MD5 2765d44747f5b8352fe27240a5371584 omni-0.9.2-foomatic.tar.bz2 91000
diff --git a/net-print/omni/omni-0.9.0.ebuild b/net-print/omni/omni-0.9.0.ebuild
deleted file mode 100644
index c1765394466e..000000000000
--- a/net-print/omni/omni-0.9.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/omni/omni-0.9.0.ebuild,v 1.9 2004/06/25 00:40:58 agriffis Exp $
-
-DESCRIPTION="Omni provides support for many printers with a pluggable framework (easy to add devices)"
-HOMEPAGE="http://sourceforge.net/projects/omniprint"
-SRC_URI="mirror://sourceforge/omniprint/${P/o/O}.tar.gz"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86"
-DEPEND=""
-RDEPEND="virtual/ghostscript
-	>=dev-libs/libxml-1.8.6
-	dev-libs/glib
-	cups? ( >=net-print/cups-1.1.14 )
-	X? ( >=dev-cpp/gtkmm-1.2.5 )
-	>=dev-libs/libsigc++-1.01
-	foomaticdb? ( net-print/foomatic-db-engine )"
-
-S=${WORKDIR}/Omni
-
-IUSE="cups X ppds foomaticdb static"
-
-src_compile() {
-	local myconf=" \
-		$(use_enable X jobdialog) \
-		$(use_enable cups) \
-		$(use_enable static)"
-
-	./setupOmni ${myconf} || die
-
-	if use ppds || use cups; then
-		sed -i -e "s/model\/foomatic/model\/omni/g" CUPS/Makefile \
-			|| die 'sed failed'
-		make -C CUPS generateBuildPPDs || die
-	fi
-
-	if use foomaticdb; then
-		make -C Foomatic generateFoomaticData || die
-	fi
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	if use foomaticdb; then
-		make -C Foomatic DESTDIR=${D} localInstall || die
-	fi
-}
diff --git a/net-print/omni/omni-0.9.1.ebuild b/net-print/omni/omni-0.9.1.ebuild
index 3659cefcebbe..e7babcc33d95 100644
--- a/net-print/omni/omni-0.9.1.ebuild
+++ b/net-print/omni/omni-0.9.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/omni/omni-0.9.1.ebuild,v 1.1 2004/07/11 10:03:28 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/omni/omni-0.9.1.ebuild,v 1.2 2005/06/07 14:59:54 lanius Exp $
 
 DESCRIPTION="Omni provides support for many printers with a pluggable framework (easy to add devices)"
 HOMEPAGE="http://sourceforge.net/projects/omniprint"
 SRC_URI="mirror://sourceforge/omniprint/${P/o/O}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 DEPEND=""
 RDEPEND="virtual/ghostscript
 	>=dev-libs/libxml-1.8.6
@@ -30,6 +30,8 @@ src_compile() {
 	export WANT_AUTOMAKE="1.6"
 	export WANT_AUTOCONF="2.5"
 
+	libtoolize --copy --force
+
 	LANG="" ./setupOmni ${myconf} || die
 
 	if use ppds && use cups; then
diff --git a/net-print/omni/omni-0.9.2.ebuild b/net-print/omni/omni-0.9.2.ebuild
new file mode 100644
index 000000000000..9f89484928c9
--- /dev/null
+++ b/net-print/omni/omni-0.9.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/omni/omni-0.9.2.ebuild,v 1.1 2005/06/07 14:59:54 lanius Exp $
+
+inherit eutils
+
+DESCRIPTION="Omni provides support for many printers with a pluggable framework (easy to add devices)"
+HOMEPAGE="http://sourceforge.net/projects/omniprint"
+SRC_URI="mirror://sourceforge/omniprint/${P/o/O}.tar.gz
+	doc? ( mirror://sourceforge/omniprint/OmniArchitecture.0.3.pdf )
+	epson? ( mirror://sourceforge/omniprint/OmniEpsonVendor-${PV}.tar.gz )
+	foomaticdb? ( mirror://gentoo/omni-${PV}-foomatic.tar.bz2 )"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+DEPEND=""
+RDEPEND="virtual/ghostscript
+	dev-libs/libxml2
+	dev-libs/glib
+	cups? ( >=net-print/cups-1.1.14 )
+	X? ( >=dev-cpp/gtkmm-1.2.5 )
+	>=dev-libs/libsigc++-1.01
+	foomaticdb? ( net-print/foomatic-db-engine )"
+
+S="${WORKDIR}/Omni"
+
+IUSE="cups X ppds foomaticdb static doc epson"
+
+src_unpack() {
+	unpack ${P/o/O}.tar.gz
+	cd ${S}
+	if use epson; then
+		unpack OmniEpsonVendor-${PV}.tar.gz
+	fi
+}
+
+src_compile() {
+	local myconf=" \
+		$(use_enable X jobdialog) \
+		$(use_enable cups) \
+		$(use_enable static)"
+
+	export WANT_AUTOMAKE="1.6"
+	export WANT_AUTOCONF="2.5"
+
+	libtoolize --copy --force
+
+	LANG="" ./setupOmni ${myconf} --disable-device-xml --enable-device-compile || die
+
+	if use ppds && use cups; then
+		sed -i -e "s/model\/foomatic/model\/omni/g" CUPS/Makefile \
+			|| die 'sed failed'
+		make -C CUPS generateBuildPPDs || die
+	fi
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+
+	dodoc docs/*  # never forget this! ;-)
+	use doc && dodoc ${DISTDIR}/OmniArchitecture.0.3.pdf
+
+	if use foomaticdb; then
+		cd ${D}
+		unpack omni-${PV}-foomatic.tar.bz2
+	fi
+}
+