Revision bump. Don't use utempter even if it is found on the system. Closes bug ...

diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index 1cff0bc8b5ff26753bef508843e50ea7d6032c31..aaa535e9c8dc6e5b1937f9fc52939cfb85d942aa 100644 (file)
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/screen
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.79 2004/12/10 00:38:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.80 2004/12/17 19:04:52 swegener Exp $
+
+*screen-4.0.2-r1 (17 Dec 2004)
+
+  17 Dec 2004; Sven Wegener <swegener@gentoo.org>
+  +files/4.0.2-no-utempter.patch, +screen-4.0.2-r1.ebuild,
+  -screen-4.0.2.ebuild:
+  Revision bump. Don't use utempter even if it is found on the system. Closes
+  bug #74717.
 
   09 Dec 2004; Mike Frysinger <vapier@gentoo.org> files/screenrc:
   Change default to vbell=off and msg=Wuff Wuff :).

diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 28c526b80f6637d6e3a0f7a1aff7025571c402ee..93b225974b2a8ea43e56f69ba78cf40b78c0bbfc 100644 (file)
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 caf22279b73d5e6758fc4a542baf0317 ChangeLog 11419
-MD5 3e339dd858477685cb6b1b3622f85883 screen-4.0.2.ebuild 3432
+MD5 c90034fb121598cc5a1b5f9b15d42fb3 screen-4.0.2-r1.ebuild 3535
+MD5 12e2d1d0254d220ddf0e65cd488eb895 ChangeLog 11679
 MD5 537c3754e8f6422e4f7025358173ef2b metadata.xml 1525
-MD5 35961ab00c29256e3f6d7a374387e327 files/digest-screen-4.0.2 64
-MD5 bebe7dbe3fee13c1251a9bd30535b245 files/4.0.2-no-pty.patch 392
-MD5 23cfd7dd1968780724e7b9a3cb406cc8 files/screen-4.0.1-int-overflow-fix.patch 930
+MD5 7f5ab1c54d87ad24f0a8bafbbcf24844 files/4.0.2-no-utempter.patch 440
+MD5 35961ab00c29256e3f6d7a374387e327 files/digest-screen-4.0.2-r1 64
 MD5 839ac3a5c896513a3e3c6353a6242f53 files/screen.pam.system-auth 113
 MD5 900e914315ec08e447d1b56fe916eea5 files/screenrc 10303
 MD5 304be93a4c3b72f2f761f45194059287 files/screen-4.0.1-vsprintf.patch 480
+MD5 23cfd7dd1968780724e7b9a3cb406cc8 files/screen-4.0.1-int-overflow-fix.patch 930
+MD5 bebe7dbe3fee13c1251a9bd30535b245 files/4.0.2-no-pty.patch 392
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBuPAOroRuSHgZdywRAqe2AJsFz0GOHSaWAZC+Ev39ZZjIzqqrNQCggp52
-QyYyLQoJG8BFF1eqBkQj6lo=
-=eKhv
+iD8DBQFBwy3cI1lqEGTUzyQRAlsjAJ95seRvl19qzLE0vWCn4jS8gwbCNQCdG4P/
+JHra1aEyd0a3EgJJ6/VTGjU=
+=OcUE
 -----END PGP SIGNATURE-----

diff --git a/app-misc/screen/files/4.0.2-no-utempter.patch b/app-misc/screen/files/4.0.2-no-utempter.patch
new file mode 100644 (file)
index 0000000..2a06119
--- /dev/null
+++ b/app-misc/screen/files/4.0.2-no-utempter.patch
@@ -0,0 +1,14 @@
+--- screen-4.0.2/configure.in.orig     2004-12-17 19:55:45.314670411 +0100
++++ screen-4.0.2/configure.in  2004-12-17 19:55:50.575941541 +0100
+@@ -855,11 +855,6 @@
+ #include <utmp.h>
+ #endif
+ ],[struct utmp u; u.ut_host[0] = 0;], AC_DEFINE(UTHOST))
+-AC_CHECK_HEADER(utempter.h, have_utempter=yes, have_utempter=no)
+-if test "$have_utempter" = yes; then
+-  AC_DEFINE(HAVE_UTEMPTER)
+-  LIBS="$LIBS -lutempter"
+-fi
+ 
+ dnl
+ dnl    ****  loadav  ****

diff --git a/app-misc/screen/files/digest-screen-4.0.2 b/app-misc/screen/files/digest-screen-4.0.2-r1
similarity index 100%
rename from app-misc/screen/files/digest-screen-4.0.2
rename to app-misc/screen/files/digest-screen-4.0.2-r1

diff --git a/app-misc/screen/screen-4.0.2.ebuild b/app-misc/screen/screen-4.0.2-r1.ebuild
similarity index 93%
rename from app-misc/screen/screen-4.0.2.ebuild
rename to app-misc/screen/screen-4.0.2-r1.ebuild
index 11110e464790818d4806171f18381b4deaf76166..7e61be166d6168c5fff3872f9b159290539aeebf 100644 (file)
--- a/app-misc/screen/screen-4.0.2.ebuild
+++ b/app-misc/screen/screen-4.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.2.ebuild,v 1.22 2004/12/05 00:55:24 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.2-r1.ebuild,v 1.1 2004/12/17 19:04:52 swegener Exp $
 
 inherit eutils flag-o-matic
 
@@ -33,6 +33,9 @@ src_unpack() {
        # uclibc doesnt have sys/stropts.h
        use uclibc && epatch ${FILESDIR}/${PV}-no-pty.patch
 
+       # Don't use utempter even if it is found on the system
+       epatch ${FILESDIR}/${PV}-no-utempter.patch
+
        # Fix manpage.
        sed -i \
                -e "s:/usr/local/etc/screenrc:/etc/screenrc:g" \