diff options
| -rw-r--r-- | app-arch/pdv/ChangeLog | 8 | ||||
| -rw-r--r-- | app-arch/pdv/Manifest | 3 | ||||
| -rw-r--r-- | app-arch/pdv/files/pdv-1.5.1-x-config.patch | 18 | ||||
| -rw-r--r-- | app-arch/pdv/pdv-1.5.1-r1.ebuild | 22 |
4 files changed, 44 insertions, 7 deletions
diff --git a/app-arch/pdv/ChangeLog b/app-arch/pdv/ChangeLog index 884f0fd8c742..5768e3207d8b 100644 --- a/app-arch/pdv/ChangeLog +++ b/app-arch/pdv/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-arch/pdv # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/pdv/ChangeLog,v 1.7 2005/04/27 00:55:35 wormo Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/pdv/ChangeLog,v 1.8 2005/05/17 20:09:16 wormo Exp $ + +*pdv-1.5.1-r1 (17 May 2005) + + 17 May 2005; Stephanie Lockwood-Childs <wormo@gentoo.org> + +files/pdv-1.5.1-x-config.patch, pdv-1.5.1-r1.ebuild: + fix configure script for X front-end, closes bug #90955 26 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org> +files/pdv-1.5.1-early-free.patch, +files/pdv-1.5.1-opt.patch: diff --git a/app-arch/pdv/Manifest b/app-arch/pdv/Manifest index f1422246a0df..7577b681771f 100644 --- a/app-arch/pdv/Manifest +++ b/app-arch/pdv/Manifest @@ -1,7 +1,8 @@ MD5 999dcc86de11bae99193cfaafcf0f8a7 ChangeLog 811 -MD5 84de25b482be71e943642fdf468d69cb pdv-1.5.1-r1.ebuild 1003 +MD5 5a1838d823f1777909be62af2ecf07a5 pdv-1.5.1-r1.ebuild 1328 MD5 f7f51579b36c961562c86d1b34eedf03 pdv-1.5.1.ebuild 806 MD5 090b9bbcdafe60f821e963d2884f13ee files/digest-pdv-1.5.1 60 MD5 34c1a74136e9d702d3645eff4ad1cf1d files/pdv-1.5.1-opt.patch 696 MD5 eafc2d8347b9e03e7a27bbbbbeee750f files/pdv-1.5.1-early-free.patch 512 MD5 090b9bbcdafe60f821e963d2884f13ee files/digest-pdv-1.5.1-r1 60 +MD5 7b95bbb283b41f502719e1655fa5f41b files/pdv-1.5.1-x-config.patch 529 diff --git a/app-arch/pdv/files/pdv-1.5.1-x-config.patch b/app-arch/pdv/files/pdv-1.5.1-x-config.patch new file mode 100644 index 000000000000..8bab9bee1bfe --- /dev/null +++ b/app-arch/pdv/files/pdv-1.5.1-x-config.patch @@ -0,0 +1,18 @@ +diff -ur pdv-1.5.1-orig/X11/configure.in pdv-1.5.1/X11/configure.in +--- pdv-1.5.1-orig/X11/configure.in 2005-05-13 13:43:27.577544136 -0700 ++++ pdv-1.5.1/X11/configure.in 2005-05-13 13:36:14.218424736 -0700 +@@ -17,8 +17,12 @@ + AC_PATH_X + + dnl Checks for libraries. +-CFLAGS=-I$x_includes +-LDFLAGS=-L$x_libraries ++if test "x$x_includes" != x ; then ++ CFLAGS="$CFLAGS -I$x_includes" ++fi ++if test "x$x_libraries" != x ; then ++ LDFLAGS="$LDFLAGS -L$x_libraries" ++fi + + AC_CHECK_LIB(Xt, XtManageChild) + AC_CHECK_LIB(X11, XLoadFont) diff --git a/app-arch/pdv/pdv-1.5.1-r1.ebuild b/app-arch/pdv/pdv-1.5.1-r1.ebuild index 8b847ae355db..6216a7ce31da 100644 --- a/app-arch/pdv/pdv-1.5.1-r1.ebuild +++ b/app-arch/pdv/pdv-1.5.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/pdv/pdv-1.5.1-r1.ebuild,v 1.3 2005/04/27 00:55:35 wormo Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/pdv/pdv-1.5.1-r1.ebuild,v 1.4 2005/05/17 20:09:16 wormo Exp $ inherit eutils @@ -11,9 +11,11 @@ SRC_URI="mirror://sourceforge/pdv/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~x86 ~ppc" -IUSE="X" +IUSE="nomotif" -DEPEND="X? ( virtual/x11 )" +DEPEND=">=sys-devel/autoconf-2.58 + sys-devel/automake + !nomotif? ( virtual/x11 x11-libs/openmotif )" src_unpack() { unpack ${A} @@ -23,11 +25,21 @@ src_unpack() { epatch ${FILESDIR}/${P}-opt.patch # fix a free-before-use bug epatch ${FILESDIR}/${P}-early-free.patch + # fix a configure script bug + epatch ${FILESDIR}/${P}-x-config.patch } src_compile() { + # re-build configure script since patch was applied to configure.in + cd ${S}/X11 + export WANT_AUTOCONF=2.5 + aclocal + automake -a -c + autoconf + + cd ${S} local myconf="" - use X || myconf="--without-x" # configure script is broken, cant use use_with + use nomotif && myconf="--without-x" # configure script is broken, cant use use_with econf ${myconf} || die emake || die } @@ -35,7 +47,7 @@ src_compile() { src_install() { dobin pdv pdvmkpkg || die doman pdv.1 pdvmkpkg.1 - if use X; then + if ! use nomotif ; then dobin X11/xmpdvmkpkg || die doman xmpdvmkpkg.1 || die fi |