new version

9 files changed, 55 insertions, 86 deletions

diff --git a/gnome-base/libgnomeprint/ChangeLog b/gnome-base/libgnomeprint/ChangeLog
index a5ba63213ed9..7f49726e8813 100644
--- a/gnome-base/libgnomeprint/ChangeLog
+++ b/gnome-base/libgnomeprint/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/libgnomeprint
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/ChangeLog,v 1.19 2003/03/01 14:45:10 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/ChangeLog,v 1.20 2003/03/12 12:55:40 foser Exp $
+
+*libgnomeprint-2.2.1.2 (12 Mar 2003)
+
+  12 Mar 2003; foser <foser@gentoo.org> libgnomeprint-2.2.1.2.ebuild :
+  New version, added cups USE
 
   07 Feb 2003; Aron Griffis <agriffis@gentoo.org> libgnomeprint-2.2.1.1.ebuild :
   Add ~alpha to KEYWORDS
diff --git a/gnome-base/libgnomeprint/files/digest-libgnomeprint-1.115.0-r2 b/gnome-base/libgnomeprint/files/digest-libgnomeprint-1.115.0-r2
deleted file mode 100644
index e47df9c759a5..000000000000
--- a/gnome-base/libgnomeprint/files/digest-libgnomeprint-1.115.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e44cf8558c5d82a49c495a894f48539a libgnomeprint-1.115.0.tar.bz2 470579
diff --git a/gnome-base/libgnomeprint/files/digest-libgnomeprint-2.2.1.2 b/gnome-base/libgnomeprint/files/digest-libgnomeprint-2.2.1.2
new file mode 100644
index 000000000000..18790f37da32
--- /dev/null
+++ b/gnome-base/libgnomeprint/files/digest-libgnomeprint-2.2.1.2
@@ -0,0 +1 @@
+MD5 fac3ff1cd7c57f20234a0ccd3abfec42 libgnomeprint-2.2.1.2.tar.bz2 555140
diff --git a/gnome-base/libgnomeprint/libgnomeprint-1.115.0-r2.ebuild b/gnome-base/libgnomeprint/libgnomeprint-1.115.0-r2.ebuild
deleted file mode 100644
index dcce2e8d9963..000000000000
--- a/gnome-base/libgnomeprint/libgnomeprint-1.115.0-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/libgnomeprint-1.115.0-r2.ebuild,v 1.9 2003/02/13 12:13:07 vapier Exp $
-
-IUSE="doc"
-
-# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
-DEBUG="yes"
-RESTRICT="nostrip"
-# force debug information
-CFLAGS="${CFLAGS} -g"
-CXXFLAGS="${CXXFLAGS} -g"
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Printer handling for Gnome"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="2"
-KEYWORDS="x86 ppc sparc "
-LICENSE="GPL-2 LGPL-2.1"
-
-
-RDEPEND=">=gnome-base/libbonobo-2.0.0
-	>=media-libs/libart_lgpl-2.3.8
-	>=x11-libs/pango-1.0.0
-	>=dev-libs/libxml2-2.4.22
-	>=dev-libs/glib-2.0.0
-	>=media-libs/freetype-2.0.9"
-		
-DEPEND="${RDEPEND} 
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( dev-util/gtk-doc )"
-	
-src_compile() {
-	local myconf
-	 use doc && myconf="--enable-gtk-doc" || myconf="--disable-gtk-doc"
-	 
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--disable-font-install \
-		--enable-platform-gnome-2 \
-		${myconf} || die "configure failure"
-
-	emake || die "compile failure"
-}
-
-src_install() {
-	make DESTDIR=${D} \
-		prefix=/usr \
-		sysconfdir=/etc \
-		infodir=/usr/share/info \
-		mandir=/usr/share/man \
-		install || die
-    
-	dodoc AUTHORS COPYING*  ChangeLog* INSTALL NEWS README 
-}
-
-pkg_postinst() {
-	echo ">>> Updating Fonts"
-	libgnomeprint-2.0-font-install \
-		--debug \
-		--smart \
-		--static \
-		--aliases=/usr/share/gnome/libgnomeprint-2.0/fonts/adobe-urw.font \
-		--target=/usr/share/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap
-				
-} 
-
-
diff --git a/gnome-base/libgnomeprint/libgnomeprint-2.2.1.2.ebuild b/gnome-base/libgnomeprint/libgnomeprint-2.2.1.2.ebuild
new file mode 100644
index 000000000000..75e76effab5d
--- /dev/null
+++ b/gnome-base/libgnomeprint/libgnomeprint-2.2.1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/libgnomeprint-2.2.1.2.ebuild,v 1.1 2003/03/12 12:55:40 foser Exp $
+
+inherit gnome2
+
+IUSE="cups doc"
+DESCRIPTION="Printer handling for Gnome"
+HOMEPAGE="http://www.gnome.org/"
+SLOT="2.2"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+LICENSE="GPL-2 LGPL-2.1"
+
+RDEPEND=">=dev-libs/glib-2
+	>=x11-libs/pango-1
+	>=media-libs/fontconfig-1
+	>=media-libs/libart_lgpl-2.3.7
+	>=dev-libs/libxml2-2.4.23
+	>=media-libs/freetype-2.0.5
+	cups? ( >=net-print/cups-1.1 )"
+		
+DEPEND="${RDEPEND} 
+	>=dev-util/pkgconfig-0.12.0
+	doc? ( >=dev-util/gtk-doc-0.9 )"
+
+use cups \
+	&& G2CONF="${G2CONF} --with-cups" \
+	|| G2CONF="${G2CONF} --without-cups"
+
+DOCS="AUTHORS COPYING* ChangeLog* INSTALL NEWS README"
diff --git a/gnome-base/libgnomeprintui/ChangeLog b/gnome-base/libgnomeprintui/ChangeLog
index 04e3f43cb0e2..02e7852a27cd 100644
--- a/gnome-base/libgnomeprintui/ChangeLog
+++ b/gnome-base/libgnomeprintui/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/libgnomeprintui
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprintui/ChangeLog,v 1.16 2003/03/01 14:45:10 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprintui/ChangeLog,v 1.17 2003/03/12 12:58:53 foser Exp $
+
+*libgnomeprint-2.2.1.2 (12 Mar 2003)
+
+  12 Mar 2003; foser <foser@gentoo.org> libgnomeprintui-2.2.1.2.ebuild :
+  New version
 
   07 Feb 2003; Aron Griffis <agriffis@gentoo.org> libgnomeprintui-2.2.1.1.ebuild :
   Add ~alpha to KEYWORDS
diff --git a/gnome-base/libgnomeprintui/files/digest-libgnomeprintui-1.115.0 b/gnome-base/libgnomeprintui/files/digest-libgnomeprintui-1.115.0
deleted file mode 100644
index e4c4049a339e..000000000000
--- a/gnome-base/libgnomeprintui/files/digest-libgnomeprintui-1.115.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f0dea2bc7071c1e149f379a9b267e5b3 libgnomeprintui-1.115.0.tar.bz2 276066
diff --git a/gnome-base/libgnomeprintui/files/digest-libgnomeprintui-2.2.1.2 b/gnome-base/libgnomeprintui/files/digest-libgnomeprintui-2.2.1.2
new file mode 100644
index 000000000000..959174922449
--- /dev/null
+++ b/gnome-base/libgnomeprintui/files/digest-libgnomeprintui-2.2.1.2
@@ -0,0 +1 @@
+MD5 32086eb2bb18eafc6c76a7f8ef98582d libgnomeprintui-2.2.1.2.tar.bz2 432121
diff --git a/gnome-base/libgnomeprintui/libgnomeprintui-1.115.0.ebuild b/gnome-base/libgnomeprintui/libgnomeprintui-2.2.1.2.ebuild
index e2f577ce0471..1d1ee3da4a99 100644
--- a/gnome-base/libgnomeprintui/libgnomeprintui-1.115.0.ebuild
+++ b/gnome-base/libgnomeprintui/libgnomeprintui-2.2.1.2.ebuild
@@ -1,22 +1,24 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprintui/libgnomeprintui-1.115.0.ebuild,v 1.9 2003/02/13 12:13:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprintui/libgnomeprintui-2.2.1.2.ebuild,v 1.1 2003/03/12 12:58:53 foser Exp $
 
 inherit gnome2
 
+IUSE="doc"
+
 S=${WORKDIR}/${P}
 DESCRIPTION="user interface libraries for gnome print"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.gnome.org/"
-SLOT="2"
-KEYWORDS="x86 ppc sparc "
+
+SLOT="2.2"
+KEYWORDS="~x86 ~ppc alpha ~sparc"
 LICENSE="GPL-2 LGPL-2.1"
 
-RDEPEND=">=gnome-base/libgnomeui-1.117.2
-	>=gnome-base/libgnomeprint-1.115.0
-	>=gnome-base/libgnomecanvas-1.117.0"
+RDEPEND=">=gnome-base/libgnomeprint-${PV}*
+	>=gnome-base/libgnomecanvas-2"
 
-DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.12.0"
+DEPEND="${RDEPEND} 
+	>=dev-util/pkgconfig-0.12.0
+	doc? ( >=dev-util/gtk-doc-0.10 )"
 
 DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README"
-