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
commit8f707fe6ddcf096d2ba82ee680d0e62a099a11e8 (patch)
treeed8ee52bebd62b1754fec5648f879563315e4719 /x11-base
parentAddress dependency issues caused by depend.apache. Refer to bug 107127. (diff)
downloadhistorical-8f707fe6ddcf096d2ba82ee680d0e62a099a11e8.tar.gz
historical-8f707fe6ddcf096d2ba82ee680d0e62a099a11e8.tar.bz2
historical-8f707fe6ddcf096d2ba82ee680d0e62a099a11e8.zip
Ensure eautoreconf gets run when building xprint and kdrive. (Walter Meinl,
bug #135263) Package-Manager: portage-2.1_rc4-r1
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog7
-rw-r--r--x11-base/xorg-server/Manifest16
-rw-r--r--x11-base/xorg-server/xorg-server-1.1.0.ebuild15
3 files changed, 24 insertions, 14 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/Manifest b/x11-base/xorg-server/Manifest
index dcddb0fd8d14..e7a3ec54690c 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -59,14 +59,14 @@ EBUILD xorg-server-1.0.2-r4.ebuild 6052 RMD160 ad2bedfb69a93c5c652b3916c4c0b38fd
MD5 27e2b115cca585af5c363bcbfed14e61 xorg-server-1.0.2-r4.ebuild 6052
RMD160 ad2bedfb69a93c5c652b3916c4c0b38fdbdb8bfa xorg-server-1.0.2-r4.ebuild 6052
SHA256 c54b611a79139f18a3263adc9a525ad3c063c4e769a32f8043b2932020c2c9be xorg-server-1.0.2-r4.ebuild 6052
-EBUILD xorg-server-1.1.0.ebuild 22851 RMD160 1b221ee7cdbebf94a4891d37baff57b40dc1ffd3 SHA1 1497c6473f032ac9b3ff618f516648ff003693d9 SHA256 caa00b6f6b4af66c71b754d5ed0b20bec0b590075dfb2b936a8f0e2e977e762c
-MD5 458ffb9ccb23741f16a2b4a23c5959dc xorg-server-1.1.0.ebuild 22851
-RMD160 1b221ee7cdbebf94a4891d37baff57b40dc1ffd3 xorg-server-1.1.0.ebuild 22851
-SHA256 caa00b6f6b4af66c71b754d5ed0b20bec0b590075dfb2b936a8f0e2e977e762c xorg-server-1.1.0.ebuild 22851
-MISC ChangeLog 26333 RMD160 dbaf85331b46ce30b4676a9c647475843f49a482 SHA1 8bbd1944f399f76809e2477dad228c7775a4d3c4 SHA256 676f4b83555098103e84c7e7f2d451e0b05e41a476dd4ea9bee2a79f10807732
-MD5 59137d49e00ea5ac604521be9bdc750f ChangeLog 26333
-RMD160 dbaf85331b46ce30b4676a9c647475843f49a482 ChangeLog 26333
-SHA256 676f4b83555098103e84c7e7f2d451e0b05e41a476dd4ea9bee2a79f10807732 ChangeLog 26333
+EBUILD xorg-server-1.1.0.ebuild 22919 RMD160 5db1adb5651dcb13ed81140be11996565a6ae248 SHA1 3daa71393f914219f50c0fc24f1a2f376567792d SHA256 3d9fb8af81deeb20fce0465b43a046159c02938c75f572ec42d725935c0e003c
+MD5 008e008ed19b4a395fdedabc70fc6083 xorg-server-1.1.0.ebuild 22919
+RMD160 5db1adb5651dcb13ed81140be11996565a6ae248 xorg-server-1.1.0.ebuild 22919
+SHA256 3d9fb8af81deeb20fce0465b43a046159c02938c75f572ec42d725935c0e003c xorg-server-1.1.0.ebuild 22919
+MISC ChangeLog 26513 RMD160 831fcc0c2aec31edb72caeb88b447c39dd10e4fc SHA1 99e207cd6b1fa4a3ce37ab3c5de42cfbe1c83c01 SHA256 d2cc5eae6ed73a9560402e28616034f677919ad7cb85c86e039a3c72d46539c6
+MD5 656c5f163ad8cd07060b1f3ba82c4e4c ChangeLog 26513
+RMD160 831fcc0c2aec31edb72caeb88b447c39dd10e4fc ChangeLog 26513
+SHA256 d2cc5eae6ed73a9560402e28616034f677919ad7cb85c86e039a3c72d46539c6 ChangeLog 26513
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
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() {