fixed einfo in pkg_postinst, bug #40195, removed -r1

5 files changed, 14 insertions, 53 deletions

diff --git a/net-print/xprint/ChangeLog b/net-print/xprint/ChangeLog
index dd637015dc79..6151f00a7db2 100644
--- a/net-print/xprint/ChangeLog
+++ b/net-print/xprint/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/xprint
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/xprint/ChangeLog,v 1.6 2003/12/13 13:31:54 lanius Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/xprint/ChangeLog,v 1.7 2004/02/04 12:36:52 lanius Exp $
+
+  04 Feb 2004; Heinrich Wendel <lanius@gentoo.org> xprint-008-r1.ebuild,
+  xprint-008-r2.ebuild:
+  remove -r1
+
+  04 Feb 2004; Heinrich Wendel <lanius@gentoo.org> xprint-008-r2.ebuild:
+  fixed einfo in pkg_postinst, bug #40195
 
   13 Dec 2003; Heinrich Wendel <lanius@gentoo.org> xprint-008-r2.ebuild,
   files/xprint.rc6:
diff --git a/net-print/xprint/Manifest b/net-print/xprint/Manifest
index c5da503331c8..af60121725a9 100644
--- a/net-print/xprint/Manifest
+++ b/net-print/xprint/Manifest
@@ -1,7 +1,5 @@
-MD5 ed8d68e18d3e3dec159afafe6dbf22d0 xprint-008-r1.ebuild 1459
-MD5 713658068d67c6aebfd918ffbd7ba27d xprint-008-r2.ebuild 1574
-MD5 fbe861c3439e5d478a0aeff481d6ad95 ChangeLog 1057
+MD5 964ee99648637e8bb971b4740ca5e111 xprint-008-r2.ebuild 1572
+MD5 47ae57e15b5bc89c564c1c8819cd2b95 ChangeLog 1284
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 9a3ff3f41fa310224ed167d60993c191 files/xprint.rc6 593
-MD5 cdead8598c02db049fcacec8db172125 files/digest-xprint-008-r1 100
 MD5 cdead8598c02db049fcacec8db172125 files/digest-xprint-008-r2 100
diff --git a/net-print/xprint/files/digest-xprint-008-r1 b/net-print/xprint/files/digest-xprint-008-r1
deleted file mode 100644
index c520eea69595..000000000000
--- a/net-print/xprint/files/digest-xprint-008-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd8f412bc901055c1fc8ca95397eb0e0 xprint_mozdev_org_source-2003-05-08-release_008.tar.gz 9907926
diff --git a/net-print/xprint/xprint-008-r1.ebuild b/net-print/xprint/xprint-008-r1.ebuild
deleted file mode 100644
index e6970a07b99e..000000000000
--- a/net-print/xprint/xprint-008-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/xprint/xprint-008-r1.ebuild,v 1.3 2003/10/17 12:51:10 lanius Exp $
-
-DESCRIPTION="An advanced printing system which enables X11 applications to use devices like printers in formats like PostScript, PDF, PCL, etc."
-HOMEPAGE="http://xprint.mozdev.org"
-SRC_URI="http://puck.informatik.med.uni-giessen.de/download/xprint_mozdev_org_source-2003-05-08-release_${PV}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="x86"
-DEPEND="x11-base/xfree"
-RDEPEND="virtual/lpr"
-IUSE=""
-
-S=${WORKDIR}/xprint/src/xprint_main/xc/
-
-src_compile() {
-	make World || die
-}
-
-src_install() {
-	make XPRINTDIR=/usr/share/Xprint/xserver XPDESTTARFILE=${S}/xprint.tar.gz make_xprint_tarball -C ${S}/packager
-
-	tar -xzf xprint.tar.gz
-	mv xprint/install/* ${D}
-
-	# this is a really nasty package, so we have to clean up a bit
-	rm -fR ${D}/etc/X11/
-	rm -fR ${D}/etc/profile.d
-	dodir /usr/sbin
-	mv ${D}/etc/init.d/xprint ${D}/usr/sbin/
-	cp ${FILESDIR}/xprint.rc6 ${D}/etc/init.d/xprint
-	dodoc ${D}/usr/X11R6/lib/X11/xserver/README
-	rm -f ${D}/usr/X11R6/lib/X11/xserver/README
-}
-
-pkg_postinst() {
-	einfo
-	einfo '                        You have to add                            '
-	einfo 'export XPSERVERLIST="`/bin/sh /etc/init.d/xprint get_xpserverlist`"'
-	einfo '          to your .xinitrc to get things working correctly         '
-	einfo
-}
diff --git a/net-print/xprint/xprint-008-r2.ebuild b/net-print/xprint/xprint-008-r2.ebuild
index cb23daf48802..f8fc3bdf9667 100644
--- a/net-print/xprint/xprint-008-r2.ebuild
+++ b/net-print/xprint/xprint-008-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/xprint/xprint-008-r2.ebuild,v 1.3 2003/12/13 13:31:54 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/xprint/xprint-008-r2.ebuild,v 1.4 2004/02/04 12:36:52 lanius Exp $
 
 DESCRIPTION="An advanced printing system which enables X11 applications to use devices like printers in formats like PostScript, PDF, PCL, etc."
 HOMEPAGE="http://xprint.mozdev.org"
@@ -41,7 +41,7 @@ src_install() {
 pkg_postinst() {
 	einfo
 	einfo '                        You have to add                            '
-	einfo 'export XPSERVERLIST="`/bin/sh /etc/init.d/xprint get_xpserverlist`"'
+	einfo 'export XPSERVERLIST="`/bin/sh /usr/sbin/xprint get_xpserverlist`"'
 	einfo '          to your .xinitrc to get things working correctly         '
 	einfo
 }