4 files changed, 8 insertions, 49 deletions
diff --git a/app-text/libpaper/ChangeLog b/app-text/libpaper/ChangeLog
index 645a0f7b8194..f0c83bd26fec 100644
--- a/app-text/libpaper/ChangeLog
+++ b/app-text/libpaper/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/libpaper
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libpaper/ChangeLog,v 1.28 2007/07/21 11:20:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libpaper/ChangeLog,v 1.29 2007/07/22 07:01:24 drac Exp $
+
+  22 Jul 2007; Samuli Suominen <drac@gentoo.org> -libpaper-1.1.20.ebuild,
+  libpaper-1.1.21.ebuild:
+  Change postinstallation message for bug 186179 and drop old version.
 
   21 Jul 2007; Raúl Porcel <armin76@gentoo.org> libpaper-1.1.21.ebuild:
   alpha stable wrt #182363, thanks to Brian Evans and Tobias Klausmann for
diff --git a/app-text/libpaper/files/digest-libpaper-1.1.20 b/app-text/libpaper/files/digest-libpaper-1.1.20
deleted file mode 100644
index 5021eae16a16..000000000000
--- a/app-text/libpaper/files/digest-libpaper-1.1.20
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7075f580606a84e63b7d6d9fa3124c31 libpaper_1.1.20.tar.gz 329001
-RMD160 72def1bc31cf74cc679070caaf62cad1fa8b8ec6 libpaper_1.1.20.tar.gz 329001
-SHA256 7ff5f355bb254a3d4ed4541377e6304432ee8678e7c9ec29e7d43488903004c9 libpaper_1.1.20.tar.gz 329001
diff --git a/app-text/libpaper/libpaper-1.1.20.ebuild b/app-text/libpaper/libpaper-1.1.20.ebuild
deleted file mode 100644
index 318f4d92de10..000000000000
--- a/app-text/libpaper/libpaper-1.1.20.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libpaper/libpaper-1.1.20.ebuild,v 1.12 2007/03/29 14:28:48 wolf31o2 Exp $
-
-inherit eutils libtool
-
-MY_P=${P/-/_}
-DESCRIPTION="Library for handling paper characteristics"
-HOMEPAGE="http://packages.debian.org/unstable/source/libpaper"
-SRC_URI="mirror://debian/pool/main/libp/libpaper/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# let portage update these for us
-	touch config.sub config.guess
-
-	epatch "${FILESDIR}"/libpaper-1.1.14.8-malloc.patch
-
-	elibtoolize
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc README ChangeLog
-
-	dodir /etc
-	(paperconf 2>/dev/null || echo a4) > ${D}/etc/papersize
-}
-
-pkg_postinst() {
-	elog "run \"paperconfig -p letter\" to use letter-pagesizes"
-}
diff --git a/app-text/libpaper/libpaper-1.1.21.ebuild b/app-text/libpaper/libpaper-1.1.21.ebuild
index 1db6f660e986..be851ca14ffc 100644
--- a/app-text/libpaper/libpaper-1.1.21.ebuild
+++ b/app-text/libpaper/libpaper-1.1.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libpaper/libpaper-1.1.21.ebuild,v 1.13 2007/07/21 11:20:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libpaper/libpaper-1.1.21.ebuild,v 1.14 2007/07/22 07:01:24 drac Exp $
 
 inherit eutils libtool
 
@@ -17,21 +17,18 @@ IUSE=""
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
 	epatch "${FILESDIR}"/libpaper-1.1.14.8-malloc.patch
-
 	elibtoolize
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-
 	dodoc README ChangeLog
-
 	dodir /etc
 	(paperconf 2>/dev/null || echo a4) > "${D}"/etc/papersize
 }
 
 pkg_postinst() {
-	elog "run \"paperconfig -p letter\" to use letter-pagesizes"
+	elog "run \"paperconfig -p letter\" as root to use letter-pagesizes"
+	elog "or paperconf with normal user privileges."
 }