summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Baergen <joshuabaergen@gentoo.org>2006-06-04 18:51:49 +0000
committerJoshua Baergen <joshuabaergen@gentoo.org>2006-06-04 18:51:49 +0000
commite519c57a147c080aadc717dc61290cc6a4a6f5bd (patch)
treeacaed70ca89c7396e0b7b74648039b0d5cda0f20 /x11-base
parentAddress dependency issues caused by depend.apache. Refer to bug 107127. (diff)
downloadgentoo-2-e519c57a147c080aadc717dc61290cc6a4a6f5bd.tar.gz
gentoo-2-e519c57a147c080aadc717dc61290cc6a4a6f5bd.tar.bz2
gentoo-2-e519c57a147c080aadc717dc61290cc6a4a6f5bd.zip
Ensure eautoreconf gets run when building xprint and kdrive. (Walter Meinl,
bug #135263) (Portage version: 2.1_rc4-r1)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog7
-rw-r--r--x11-base/xorg-server/xorg-server-1.1.0.ebuild15
2 files changed, 16 insertions, 6 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index c45f0cd98f1c..81ca889f386d 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.122 2006/06/04 18:28:25 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.123 2006/06/04 18:51:49 joshuabaergen Exp $
+
+ 04 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+ xorg-server-1.1.0.ebuild:
+ Ensure eautoreconf gets run when building xprint and kdrive. (Walter Meinl,
+ bug #135263)
04 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
xorg-server-1.1.0.ebuild:
diff --git a/x11-base/xorg-server/xorg-server-1.1.0.ebuild b/x11-base/xorg-server/xorg-server-1.1.0.ebuild
index 48c583c8aa4b..027844bf8229 100644
--- a/x11-base/xorg-server/xorg-server-1.1.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.0.ebuild
@@ -1,10 +1,9 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.0.ebuild,v 1.2 2006/06/04 18:28:25 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.0.ebuild,v 1.3 2006/06/04 18:51:49 joshuabaergen Exp $
# Must be before x-modular eclass is inherited
-# Hack to make sure autoreconf gets run
-SNAPSHOT="yes"
+#SNAPSHOT="yes"
inherit x-modular multilib
@@ -567,10 +566,16 @@ src_unpack() {
-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
${S}/hw/kdrive/Makefile.am
fi
+ fi
- # Only need to reconf if we're modifying kdrive's Makefile.am
- x-modular_reconf_source
+ # Make sure eautoreconf gets run if we need the autoconf/make
+ # changes.
+ if [[ ${SNAPSHOT} != "yes" ]]; then
+ if use kdrive || use xprint; then
+ eautoreconf
+ fi
fi
+ x-modular_reconf_source
}
src_install() {