app-text/dgs: fix + modifs thanks to Olivier Huber

4 files changed, 37 insertions, 7 deletions

diff --git a/app-text/dgs/ChangeLog b/app-text/dgs/ChangeLog
index 96a0a66df..481372198 100644
--- a/app-text/dgs/ChangeLog
+++ b/app-text/dgs/ChangeLog
@@ -2,6 +2,20 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/app-text/dgs/ChangeLog,v 1.30 2008/03/18 13:24:47 flameeyes Exp $
 
+*dgs-0.5.10-r2 (19 Sep 2009)
+
+  19 Sep 2009; Etienne Lorriaux <etienne.lorriaux@gmail.com>
+  -dgs-0.5.10-r1.ebuild, +dgs-0.5.10-r2.ebuild,
+  +files/dgs-fix-as-needed.patch:
+  Fix --as-needed LDFLAG + modifs thanks to Olivier Huber
+
+  deleted: dgs-0.5.10-r1.ebuild
+
+  new file: dgs-0.5.10-r2.ebuild
+
+  new file: files/dgs-fix-as-needed.patch
+
+
   17 Sep 2009; Etienne Lorriaux <etienne.lorriaux@gmail.com>
   +files/0.5.10-workaround-include-in-comments.patch, +dgs-0.5.10-r1.ebuild,
   +files/dgs-0.5.10-gcc-3.4.diff, +files/dgs-0.5.10-gs-time_.h-gentoo.diff,
diff --git a/app-text/dgs/Manifest b/app-text/dgs/Manifest
index 0da9e8d86..95a0b950a 100644
--- a/app-text/dgs/Manifest
+++ b/app-text/dgs/Manifest
@@ -2,7 +2,8 @@ AUX 0.5.10-workaround-include-in-comments.patch 862 RMD160 de1a0a5a31fd7aaf04771
 AUX dgs-0.5.10-gcc-3.4.diff 870 RMD160 8808f0f2b6df9e9ef9b8472af8df2ecd27abb793 SHA1 398273c14a7fea5d27e40836e302750a4de57d87 SHA256 e6e4fdbc71f8ae542b15333036585cc56b50b605d09532294778b286c6f90e22
 AUX dgs-0.5.10-gs-time_.h-gentoo.diff 415 RMD160 42b4b923d1ddc5bc301d7df0a5c75e02ddedd6f9 SHA1 67493d01b1d9be779822bd5e6851b157384b34ac SHA256 79b3a60acd8a112e9dcf0ceb2318c6f1f30a0ad188c59a19f3ef61d3f446a224
 AUX dgs-0.5.10-tcpd-gentoo.diff 939 RMD160 739b5d1954b5f95c8c38d0be3acf0f24a0d4bbd7 SHA1 4e528983004d09da387b17e607630b18d2868977 SHA256 82ef1fff0d799f398965047ff5556af7cac651317ede40e493fbd382aaf65185
+AUX dgs-fix-as-needed.patch 519 RMD160 6b4d0d2b567b823580317ba582a8a5c7c6438401 SHA1 bdd91fe03f48a5840ea5d0794c6c37cf187b1665 SHA256 db0a15aa1a92e9b8f53072a480f42d7b6a366b73977314344f3f6246eb4b3516
 DIST dgs-0.5.10.tar.gz 3572504 RMD160 4538e098ad4fab1ff4e1f483838fd3dd9515cd5c SHA1 94c35dbbf596dd35d47205cdde628457d95df084 SHA256 b01f21609241414fe92d8838e63150bfd7359d74ce05dfa38d2798e9d0f8a0ff
-EBUILD dgs-0.5.10-r1.ebuild 1385 RMD160 97189345b74f8cf51dba9edf95995a329941995c SHA1 1dc676f404712ba8abc3a4a47078554d56954a35 SHA256 0f036b46dafd9ae17b2c03404ee65aa444c7f1ec25937af3eebab8dc74cdc54a
-MISC ChangeLog 2115 RMD160 f123c49c1fdf604c5b1cf0cf24712ff3206fec55 SHA1 fc3e031a129752e084d115368d5fa11972dc0661 SHA256 ea4541559d8c1d0eb0edddf2e85d04c16ef3ce5d5cc3c4ab95e43cd6a96c3672
+EBUILD dgs-0.5.10-r2.ebuild 1437 RMD160 0224a06a31d2b04b7f34ae9031fece5aa826b1df SHA1 a7075634a5abe8fde03e8416cbfbe314599e5c4a SHA256 849c8fdb78097a509b52a0059e4812b91294871aebfbc1421082f78d86eb9b6f
+MISC ChangeLog 2458 RMD160 07db0d8054a38331e9b43cbe749381a5c7ba1fd4 SHA1 da61e978cbd7aac5ee8330f6362865abddb7c258 SHA256 96910fe836b010ee48c23e8281e948ab7f267b8df0af03ce4cbd48813af2701b
 MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
diff --git a/app-text/dgs/dgs-0.5.10-r1.ebuild b/app-text/dgs/dgs-0.5.10-r2.ebuild
index 88b8f2ed1..ee21afd3c 100644
--- a/app-text/dgs/dgs-0.5.10-r1.ebuild
+++ b/app-text/dgs/dgs-0.5.10-r2.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-text/dgs/dgs-0.5.10-r1.ebuild,v 1.38 2008/03/18 13:24:47 flameeyes Exp $
 
+EAPI=2
+
 WANT_AUTOCONF="2.1"
 WANT_AUTOMAKE="latest"
 
@@ -14,25 +16,27 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~hppa ~mips ~ppc64 ~ia64"
 IUSE="tcpd"
-RDEPEND="=dev-libs/glib-1.2*
+RDEPEND="dev-libs/glib:1
 	!<x11-base/xorg-x11-7"
 DEPEND="${RDEPEND}
 	sys-apps/texinfo
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/"${P}"-gs-time_.h-gentoo.diff
 	epatch "${FILESDIR}"/"${P}"-tcpd-gentoo.diff
 	epatch "${FILESDIR}"/"${P}"-gcc-3.4.diff
 	epatch "${FILESDIR}"/"${PV}"-workaround-include-in-comments.patch
+	epatch "${FILESDIR}"/"${PN}"-fix-as-needed.patch
 
 	eautoconf
 }
 
-src_compile() {
+src_configure() {
 	econf --with-x $(use_enable tcpd) || die "econf failed"
+}
+
+src_compile() {
 	emake -j1 || die "emake failed"
 }
 
diff --git a/app-text/dgs/files/dgs-fix-as-needed.patch b/app-text/dgs/files/dgs-fix-as-needed.patch
new file mode 100644
index 000000000..69e432c3f
--- /dev/null
+++ b/app-text/dgs/files/dgs-fix-as-needed.patch
@@ -0,0 +1,11 @@
+--- DPS/lib/dpstk/Makefile.in~	2000-06-16 05:54:36.000000000 +0200
++++ DPS/lib/dpstk/Makefile.in	2009-09-17 22:18:34.417953240 +0200
+@@ -96,7 +96,7 @@
+ libdpstk_la_SOURCES =  	$(dps_sources) 	XDPSshare.c 	XDPSpreview.c 	XDPSuserpath.c 	FontSBI.h 	dpsXcommonI.h
+ 
+ 
+-libdpstk_la_LIBADD = $(X_PRE_LIBS) -lX11 -lXt $(X_LIBS) $(X_EXTRA_LIBS)
++libdpstk_la_LIBADD = $(X_PRE_LIBS) -lX11 -lm -lXt $(X_LIBS) $(X_EXTRA_LIBS)
+ libdpstk_la_LDFLAGS = -version-info $(LT_VERSION)
+ 
+ libdpstkXm_la_SOURCES =  	ColorSB.c 	DPSScrollW.c