removed dso-configure patch and set DSO=auto to address bug 72895

diff --git a/net-misc/hylafax/ChangeLog b/net-misc/hylafax/ChangeLog
index a4c555d40a1bb43dd8809c7bd6a643078cb9f5b3..e29e42c529e3b53c3950a0f94d27c029b4ba0d35 100644 (file)
--- a/net-misc/hylafax/ChangeLog
+++ b/net-misc/hylafax/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/hylafax
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.44 2004/11/16 13:12:07 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.45 2004/12/04 08:46:37 nerdboy Exp $
+
+  04 Dec 2004; Steve Arnold <nerdboy@gentoo.org> hylafax-4.2.0-r1.ebuild:
+  removed dso-configure patch and set DSO=auto to address bug 72895
 
   16 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> hylafax-4.2.0-r1.ebuild:
   Stable on sparc

diff --git a/net-misc/hylafax/Manifest b/net-misc/hylafax/Manifest
index bb5f5a6633f5e7721d920c1cf0e9486675870c59..c00bcc8e3087ecd195daeb65bd96df5b9d7014bc 100644 (file)
--- a/net-misc/hylafax/Manifest
+++ b/net-misc/hylafax/Manifest
@@ -1,16 +1,15 @@
-MD5 8cc5a99a35a5eaf16de0fa5dbded849a ChangeLog 9000
-MD5 c225c2ed112337ecff1815b5f92cdfd9 hylafax-4.2.0-r1.ebuild 3327
+MD5 dff7311229d50521160d361861e74ff0 ChangeLog 9142
 MD5 d82acf1bcf0f7f9e181d6a2821292f2e metadata.xml 435
 MD5 93b89855f1349b94b334cbe94ceafd0f hylafax-4.1.8-r4.ebuild 3187
-MD5 61b6d16148a84723c2996b519a57d498 files/digest-hylafax-4.2.0-r1 66
-MD5 6fd09a3cd0a1657591fc6c5c076cd462 files/hylafax-4.2.0-tiff_version.patch 1011
+MD5 744a5cca4465202afb4583b3ac1e95b2 hylafax-4.2.0-r1.ebuild 3309
+MD5 46bbae3c77d5651a20e606eb6228c159 files/99hylafax 62
+MD5 eab749cee07de1984c9756e6eb886df0 files/configure-gcc-3.4.patch 696
 MD5 bc084d075b601d42fbd417b97a45f1b2 files/hylafax 3757
 MD5 5f2f2e3fe04414f953d4010d32261318 files/hylafax-4.1.8-fPIC.patch 2086
 MD5 ad3b0e7082e6e71ee6ba940ce1b6b071 files/hylafax-4.1.8-gcc-version.patch 520
-MD5 46bbae3c77d5651a20e606eb6228c159 files/99hylafax 62
 MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8-r4 66
 MD5 fa83948864d83f34f54ce35f26b38ed6 files/99hylafax-4.2 75
 MD5 491e78765b433d7c11146120cf7e40f8 files/hylafax-4.2 3759
-MD5 6b124a5aade1c4eabe5fdde7a21e0689 files/hylafax-4.2.0-dso.patch 884
 MD5 cfcafeadd916b8a9103b9b9110887916 files/hylafax-4.2.0-faxcron_uid.patch 527
-MD5 eab749cee07de1984c9756e6eb886df0 files/configure-gcc-3.4.patch 696
+MD5 6fd09a3cd0a1657591fc6c5c076cd462 files/hylafax-4.2.0-tiff_version.patch 1011
+MD5 61b6d16148a84723c2996b519a57d498 files/digest-hylafax-4.2.0-r1 66

diff --git a/net-misc/hylafax/files/hylafax-4.2.0-dso.patch b/net-misc/hylafax/files/hylafax-4.2.0-dso.patch
deleted file mode 100644 (file)
index ba81b75..0000000
--- a/net-misc/hylafax/files/hylafax-4.2.0-dso.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- configure~ 2004-08-24 08:09:46.158571000 -0700
-+++ configure  2004-08-24 08:17:31.973611105 -0700
-@@ -907,11 +907,6 @@
- }
- 
- if [ -z "$GCOPTS" ]; then
--    case $CC-$TARGET in
--    gcc-x86_64-*-linux-gnu)
--      GCOPTS='-fPIC'
--      ;;
--    esac
-     capture $CCOMPILER $ENVOPTS -g -c dummy.c && {
-       Note "Looks like $CCOMPILER supports the -g option."
-       # NB: cannot use captureX here 'cuz we lose stderr
-@@ -1069,9 +1064,6 @@
-     CC-*-sco3.2v5.*)          # cfront-based or cfront-compatible
-       GCXXOPTS='+a1 +p'
-       ;;
--    g++-x86_64-*-linux-gnu)
--      GCXXOPTS='-fPIC'
--      ;;
-     *)
-       GCXXOPTS=
-       ;;
-@@ -3389,6 +3381,16 @@
-     DSOSUF=a DSOOPTS= DSODELAY= LLDOPTS=
- else
-     MAKEDSOINCLUDE="$MAKEINCLUDE"
-+    case $CC-$TARGET in
-+    gcc-*-linux-gnu)
-+      GCOPTS="$GCOPTS -fpic"
-+      ;;
-+    esac
-+    case $CXX-$TARGET in
-+    g++-*-linux-gnu)
-+      GCXXOPTS="$GCXXOPTS -fpic"
-+      ;;
-+    esac
- fi
- 
- Note ""

diff --git a/net-misc/hylafax/hylafax-4.2.0-r1.ebuild b/net-misc/hylafax/hylafax-4.2.0-r1.ebuild
index 3bc86b43126597b3e6380ff193e80cc11509e6bf..8319464b31038c24112e164e6212e7fc41a0bcac 100644 (file)
--- a/net-misc/hylafax/hylafax-4.2.0-r1.ebuild
+++ b/net-misc/hylafax/hylafax-4.2.0-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/net-misc/hylafax/hylafax-4.2.0-r1.ebuild,v 1.3 2004/11/16 13:12:07 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.2.0-r1.ebuild,v 1.4 2004/12/04 08:46:37 nerdboy Exp $
 
 inherit eutils
 
@@ -30,7 +30,6 @@ export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc"
 src_unpack() {
        unpack ${A}
        cd ${S}
-       epatch ${FILESDIR}/${P}-dso.patch
        epatch ${FILESDIR}/${P}-faxcron_uid.patch
        epatch ${FILESDIR}/${P}-tiff_version.patch
        epatch ${FILESDIR}/configure-gcc-3.4.patch
@@ -54,7 +53,8 @@ src_compile() {
                --with-PATH_IMPRIP=\"\"
                --with-SYSVINIT=no
                --with-LIBTIFF=\"-ltiff -ljpeg -lz\"
-               --with-OPTIMIZER=\"${CFLAGS}\""
+               --with-OPTIMIZER=\"${CFLAGS}\"
+               --with-DSO=auto"
 
        if [ -h /etc/localtime ]; then
                local continent=$(readlink /etc/localtime | cut -d / -f 5)