version bump; remove obsolete unstable version

diff --git a/net-dialup/mgetty/ChangeLog b/net-dialup/mgetty/ChangeLog
index 2b1b07151b5a9509772e5127e645c0ee44fd06f7..9d8f1f1419bdd1cee29de076a6210c27f7a5846c 100644 (file)
--- a/net-dialup/mgetty/ChangeLog
+++ b/net-dialup/mgetty/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/mgetty
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/ChangeLog,v 1.40 2004/11/13 22:11:27 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/ChangeLog,v 1.41 2004/11/19 23:09:17 mrness Exp $
+
+*mgetty-1.1.31 (20 Nov 2004)
+
+  20 Nov 2004; Alin Nastac <mrness@gentoo.org>
+  +files/mgetty-1.1.31-gentoo.diff, -mgetty-1.1.30-r1.ebuild,
+  +mgetty-1.1.31.ebuild:
+  Version bump.
 
 *mgetty-1.1.30-r3 (14 Nov 2004)
 

diff --git a/net-dialup/mgetty/Manifest b/net-dialup/mgetty/Manifest
index 533ccf1c627e770231e3a9a7a65b6cd03def69b9..107666769ebade377fd49440ba21a7edcb110067 100644 (file)
--- a/net-dialup/mgetty/Manifest
+++ b/net-dialup/mgetty/Manifest
@@ -1,21 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 bb3b302f711e8603d285ab38b371d954 ChangeLog 5536
+MD5 e6ac0afd05eaf93d1dd3828bb89319b8 ChangeLog 5717
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 b1a86bb00a4173f7df12c188993c3239 mgetty-1.1.30-r1.ebuild 3408
 MD5 111042583a0f3f1f9b41e3713e064220 mgetty-1.1.30-r2.ebuild 3551
 MD5 527ac0e55d3ecd1344f95522ab7a4448 mgetty-1.1.30.ebuild 3350
 MD5 30792dd1f8db4dd7f5b65f64babb5151 mgetty-1.1.30-r3.ebuild 3816
+MD5 09d7c2b765ed4d647464031f8bfdd531 mgetty-1.1.31.ebuild 3778
 MD5 c9b070dfabf7bd139d53d263f869b4f0 files/digest-mgetty-1.1.30 70
-MD5 c9b070dfabf7bd139d53d263f869b4f0 files/digest-mgetty-1.1.30-r1 70
 MD5 c9b070dfabf7bd139d53d263f869b4f0 files/digest-mgetty-1.1.30-r2 70
 MD5 bc47f96a12b21b779d57c0c2ad4b6837 files/mgetty-1.1.30-gentoo.diff 2771
 MD5 c9b070dfabf7bd139d53d263f869b4f0 files/digest-mgetty-1.1.30-r3 70
+MD5 892ea03975cbf5145ed6ab5f42424461 files/digest-mgetty-1.1.31 70
+MD5 9b39643283b470533c7e4832364aa168 files/mgetty-1.1.31-gentoo.diff 2782
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBlocNjtv59x0+BrURAvahAKDbimk9KrAn++LNNTKcdWCBu9tszACgvNeV
-Rr/ECIMTitCvxL5y/pRWKEo=
-=TyEj
+iD8DBQFBnn0njtv59x0+BrURAjtQAKDBTEbMpZDWX9AfCjm2ktAJ1Lnu7QCfRLu1
+yzdNlLm7SQtjxwjcoatlBME=
+=zd7r
 -----END PGP SIGNATURE-----

diff --git a/net-dialup/mgetty/files/digest-mgetty-1.1.30-r1 b/net-dialup/mgetty/files/digest-mgetty-1.1.30-r1
deleted file mode 100644 (file)
index de8ce3a..0000000
--- a/net-dialup/mgetty/files/digest-mgetty-1.1.30-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4b80c418bc58add3e40de3be0ac6c02a mgetty1.1.30-Dec16.tar.gz 969967

diff --git a/net-dialup/mgetty/files/digest-mgetty-1.1.31 b/net-dialup/mgetty/files/digest-mgetty-1.1.31
new file mode 100644 (file)
index 0000000..64a0dfb
--- /dev/null
+++ b/net-dialup/mgetty/files/digest-mgetty-1.1.31
@@ -0,0 +1 @@
+MD5 3462a0acbdb2e7165540ef95097d49fb mgetty1.1.31-Jul24.tar.gz 998462

diff --git a/net-dialup/mgetty/files/mgetty-1.1.31-gentoo.diff b/net-dialup/mgetty/files/mgetty-1.1.31-gentoo.diff
new file mode 100644 (file)
index 0000000..df4ed78
--- /dev/null
+++ b/net-dialup/mgetty/files/mgetty-1.1.31-gentoo.diff
@@ -0,0 +1,75 @@
+diff -Nru mgetty-1.1.31.orig/Makefile mgetty-1.1.31/Makefile
+--- mgetty-1.1.31.orig/Makefile        2004-07-24 21:53:47.000000000 +0300
++++ mgetty-1.1.31/Makefile     2004-11-20 00:54:13.998653696 +0200
+@@ -102,7 +102,7 @@
+ #         USTAT         - ustat(), no statfs etc.
+ #
+ #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL
+-CFLAGS=-O2 -Wall -pipe
++#CFLAGS=-O2 -Wall -pipe
+ #CFLAGS=-O -DSVR4
+ #CFLAGS=-O -DSVR4 -DSVR42
+ #CFLAGS=-O -DUSE_POLL
+diff -Nru mgetty-1.1.31.orig/doc/mgetty.texi-in mgetty-1.1.31/doc/mgetty.texi-in
+--- mgetty-1.1.31.orig/doc/mgetty.texi-in      2004-07-24 17:54:40.000000000 +0300
++++ mgetty-1.1.31/doc/mgetty.texi-in   2004-11-20 00:54:14.001653240 +0200
+@@ -13,6 +13,11 @@
+ Copyright @copyright{} 1993-2000 Gert Doering
+ @end ifinfo
+ 
++@dircategory User
++@direntry
++* MGETTY: (mgetty).    Modem+Voice+Fax utilities
++@end direntry
++
+ @titlepage
+ @sp 6
+ @center @titlefont{mgetty+sendfax}
+diff -Nru mgetty-1.1.31.orig/voice/Makefile mgetty-1.1.31/voice/Makefile
+--- mgetty-1.1.31.orig/voice/Makefile  2001-12-23 17:08:13.000000000 +0200
++++ mgetty-1.1.31/voice/Makefile       2004-11-20 00:54:14.002653088 +0200
+@@ -85,6 +85,7 @@
+       @echo ""
+       $(INSTALL) -m 700 vgetty/vgetty $(SBINDIR)
+       $(INSTALL) -m 755 vm/vm $(BINDIR)
++      $(INSTALL) -m 755 voice.conf-dist $(CONFDIR)/voice.conf
+       for i in $(PVFTOOLS); \
+       do \
+            $(INSTALL) -m 755 pvftools/$$i $(BINDIR); \
+@@ -97,21 +98,21 @@
+       do \
+            $(RM) -f $$i.1; $(LN) -s pvf.1 $$i.1; \
+       done
+-#     [ -d $(VOICE_DIR) ] || mkdir $(VOICE_DIR)
+-#     [ -d $(VOICE_DIR)/incoming ] || mkdir $(VOICE_DIR)/incoming
+-#     chown 0 $(VOICE_DIR)/incoming
+-#     chgrp $(PHONE_GROUP) $(VOICE_DIR)/incoming
+-#     chmod $(PHONE_PERMS) $(VOICE_DIR)/incoming
+-#     [ -d $(VOICE_DIR)/messages ] || mkdir $(VOICE_DIR)/messages
+-#     for i in $(SHELLSCRIPTS); do \
+-#             $(INSTALL) -m 755 $$i $(VOICE_DIR) ;\
+-#     done
+-#     [ -f $(VOICE_DIR)/.code ] || echo '12345' >$(VOICE_DIR)/.code
+-#     chgrp $(PHONE_GROUP) $(VOICE_DIR)/.code
+-#     chmod $(PHONE_PERMS) $(VOICE_DIR)/.code
+-#     chmod 660 $(VOICE_DIR)/.code
+-#     [ -f $(VOICE_DIR)/messages/Index ] || \
+-#      echo 'put_filename_here' >$(VOICE_DIR)/messages/Index
++      [ -d $(VOICE_DIR) ] || mkdir $(VOICE_DIR)
++      [ -d $(VOICE_DIR)/incoming ] || mkdir $(VOICE_DIR)/incoming
++      chown 0 $(VOICE_DIR)/incoming
++      chgrp $(PHONE_GROUP) $(VOICE_DIR)/incoming
++      chmod $(PHONE_PERMS) $(VOICE_DIR)/incoming
++      [ -d $(VOICE_DIR)/messages ] || mkdir $(VOICE_DIR)/messages
++      for i in $(SHELLSCRIPTS); do \
++              $(INSTALL) -m 755 $$i $(VOICE_DIR) ;\
++      done
++      [ -f $(VOICE_DIR)/.code ] || echo '12345' >$(VOICE_DIR)/.code
++      chgrp $(PHONE_GROUP) $(VOICE_DIR)/.code
++      chmod $(PHONE_PERMS) $(VOICE_DIR)/.code
++      chmod 660 $(VOICE_DIR)/.code
++      [ -f $(VOICE_DIR)/messages/Index ] || \
++       echo 'put_filename_here' >$(VOICE_DIR)/messages/Index
+ 
+ clean:
+       @echo "Cleaning..."

diff --git a/net-dialup/mgetty/mgetty-1.1.30-r1.ebuild b/net-dialup/mgetty/mgetty-1.1.31.ebuild
similarity index 78%
rename from net-dialup/mgetty/mgetty-1.1.30-r1.ebuild
rename to net-dialup/mgetty/mgetty-1.1.31.ebuild
index 9b0bcfe8e44f6c2e0f128dccd573b7231030316f..73cf3646dce03ecda7d7b7381c0bdb6748459301 100644 (file)
--- a/net-dialup/mgetty/mgetty-1.1.30-r1.ebuild
+++ b/net-dialup/mgetty/mgetty-1.1.31.ebuild
@@ -1,26 +1,26 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/mgetty-1.1.30-r1.ebuild,v 1.5 2004/08/03 07:38:13 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/mgetty-1.1.31.ebuild,v 1.1 2004/11/19 23:09:17 mrness Exp $
 
 inherit flag-o-matic eutils
 
 DESCRIPTION="Fax and Voice modem programs."
-SRC_URI="ftp://alpha.greenie.net/pub/mgetty/source/1.1/${PN}${PV}-Dec16.tar.gz"
+SRC_URI="ftp://alpha.greenie.net/pub/mgetty/source/1.1/${PN}${PV}-Jul24.tar.gz"
 HOMEPAGE="http://alpha.greenie.net/mgetty/"
 
-DEPEND=">=sys-apps/portage-2.0.47-r10
-       >=sys-apps/sed-4.0.5
+DEPEND="sys-apps/sed
        doc? ( virtual/tetex )
        sys-apps/gawk
        dev-lang/perl"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha ~ia64 ~hppa ~ppc ~amd64"
+KEYWORDS="~x86 ~sparc ~alpha ~ia64 ~hppa ~ppc ~amd64 ~mips"
 IUSE="doc"
 
-pkg_preinst() {
+pkg_setup() {
        enewgroup fax
+       enewgroup modem
        enewuser fax -1 /bin/false /dev/null fax
 }
 
@@ -43,6 +43,11 @@ src_unpack() {
 src_compile() {
        append-flags "-DAUTO_PPP"
 
+       #Avoid "is setXid, dynamically linked and using lazy bindings" QA notices 
+       append-ldflags "-Wl,-z,now"
+       sed -i "s:^LDFLAGS=.*:#&:" Makefile
+       sed -i 's: \$(CFLAGS) -o faxq-helper faxq-helper.o: $(LDLAGS) -Wl,-z,now -o faxq-helper faxq-helper.o:' fax/Makefile
+
        emake prefix=/usr \
                CONFDIR=/etc/mgetty+sendfax \
                CFLAGS="${CFLAGS}" \
@@ -70,6 +75,7 @@ src_compile() {
 
 src_install () {
        dodir /var/spool
+       dodir /var/log/mgetty
        dodir /usr/share/info
        make prefix=${D}/usr \
                INFODIR=${D}/usr/share/info \
@@ -111,11 +117,18 @@ src_install () {
        dodoc BUGS ChangeLog FTP README.1st Recommend THANKS TODO
        cd doc
        dodoc *.txt modems.db
-       use doc && dodoc mgetty.ps
+       cd ${S}/samples/
+       docinto samples
+       dodoc *
+       if use doc; then
+               dodoc mgetty.ps
+               cd ${S}/voice/doc/
+               docinto voice
+               dodoc *
+       fi
 
        #generate missing fonts if any.
-       if [ -f ${S}/doc/missfont.log ]
-       then
+       if [ -f ${S}/doc/missfont.log ] ; then
                echo '#!/bin/bash' >genfonts.sh
                cat missfont.log >>genfonts.sh
                chmod +x genfonts.sh
@@ -125,17 +138,14 @@ src_install () {
 
 pkg_postinst() {
        #generate missing fonts if any.
-       if [ -x {$ROOT}/usr/share/doc/${PF}/genfonts.sh ]
-       then
+       if [ -x {$ROOT}/usr/share/doc/${PF}/genfonts.sh ] ; then
                {$ROOT}/usr/share/doc/${PF}/genfonts.sh
        fi
 
-       if [ ! -d ${ROOT}/var/spool/fax/incoming ]
-       then
+       if [ ! -d ${ROOT}/var/spool/fax/incoming ] ;    then
                mkdir -p ${ROOT}/var/spool/fax/incoming
        fi
-       if [ ! -d ${ROOT}/var/spool/fax/outgoing/locks ]
-       then
+       if [ ! -d ${ROOT}/var/spool/fax/outgoing/locks ] ;      then
                mkdir -p ${ROOT}/var/spool/fax/outgoing/locks
        fi
 }