From 971bb621ce87d2bb73403e877c7279cd55239f5b Mon Sep 17 00:00:00 2001 From: Joshua Baergen Date: Fri, 6 Apr 2007 19:00:48 +0000 Subject: [PATCH] If building with xprint enabled, make sure libXaw is also built with xprint enabled. (Bug #150954, Scott Alfter) Package-Manager: portage-2.1.2.3 --- x11-apps/xman/ChangeLog | 8 ++++++-- x11-apps/xman/Manifest | 16 ++++++++-------- x11-apps/xman/xman-1.0.2.ebuild | 14 ++++++++++++-- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/x11-apps/xman/ChangeLog b/x11-apps/xman/ChangeLog index 9305afba6e20..99d28cc0d404 100644 --- a/x11-apps/xman/ChangeLog +++ b/x11-apps/xman/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-apps/xman -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xman/ChangeLog,v 1.17 2006/10/10 23:55:18 dberkholz Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xman/ChangeLog,v 1.18 2007/04/06 19:00:48 joshuabaergen Exp $ + + 06 Apr 2007; Joshua Baergen xman-1.0.2.ebuild: + If building with xprint enabled, make sure libXaw is also built with xprint + enabled. (Bug #150954, Scott Alfter) 10 Oct 2006; Donnie Berkholz ; xman-1.0.2.ebuild: Update description to be less generic. diff --git a/x11-apps/xman/Manifest b/x11-apps/xman/Manifest index 1f7ffbdd2d63..d451f8b92dee 100644 --- a/x11-apps/xman/Manifest +++ b/x11-apps/xman/Manifest @@ -1,12 +1,12 @@ DIST xman-1.0.2.tar.bz2 138214 RMD160 5a84755d1415341b528c8d2cd8cd9db4c2e39b5e SHA1 b3d53eedce31071dfc3bc981b04e960d4f830527 SHA256 00bc616892388c94505b09564daffbad2df2e7c684686dea2d78dbcd210212f2 -EBUILD xman-1.0.2.ebuild 544 RMD160 9e9a954223acaf1c40d7c52d9b4124c051484e36 SHA1 00659553a5b30851de150006460faefc277073e9 SHA256 53224df1f3ff9142fece1c957d339c89772a490f6c2a653b7479ac35b6d4d0d4 -MD5 8d9c8653250773a5c353e54655d2bed3 xman-1.0.2.ebuild 544 -RMD160 9e9a954223acaf1c40d7c52d9b4124c051484e36 xman-1.0.2.ebuild 544 -SHA256 53224df1f3ff9142fece1c957d339c89772a490f6c2a653b7479ac35b6d4d0d4 xman-1.0.2.ebuild 544 -MISC ChangeLog 2121 RMD160 8d2873f9b71b08711f26f163296e55761ae497cf SHA1 91ab853c474f70bd23186a01038e71f21c01fc46 SHA256 0b4da1443b36c6337a142164f9e106fccff8e4faa406d32662d1a8e87156838c -MD5 e81c8a40a18cbf91dea270995e253a9e ChangeLog 2121 -RMD160 8d2873f9b71b08711f26f163296e55761ae497cf ChangeLog 2121 -SHA256 0b4da1443b36c6337a142164f9e106fccff8e4faa406d32662d1a8e87156838c ChangeLog 2121 +EBUILD xman-1.0.2.ebuild 729 RMD160 0cce884f1283b2c38fbbaea273dff6aba3bceb05 SHA1 1f5dc2a3637edf4db67842ee4b615116a8e7a7bb SHA256 94e5ce6bd25d0ef8912ec19a802f7e2e3e98a5239a8520c4d0e56b3f107e9bde +MD5 5e43cd47500c4ee06724c9395e8d56a8 xman-1.0.2.ebuild 729 +RMD160 0cce884f1283b2c38fbbaea273dff6aba3bceb05 xman-1.0.2.ebuild 729 +SHA256 94e5ce6bd25d0ef8912ec19a802f7e2e3e98a5239a8520c4d0e56b3f107e9bde xman-1.0.2.ebuild 729 +MISC ChangeLog 2319 RMD160 fce317a5230378a998767a73791c60925b6b7acc SHA1 3cf354196f43ede33373bde3cfbea436a546f047 SHA256 9c830c952cf623d66ba24419051c0b336f4600f6a3f98d9de06de6f9be521319 +MD5 8148f3126f76dc37d7a7c6846c5e6466 ChangeLog 2319 +RMD160 fce317a5230378a998767a73791c60925b6b7acc ChangeLog 2319 +SHA256 9c830c952cf623d66ba24419051c0b336f4600f6a3f98d9de06de6f9be521319 ChangeLog 2319 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 diff --git a/x11-apps/xman/xman-1.0.2.ebuild b/x11-apps/xman/xman-1.0.2.ebuild index 5bf85c9be2f3..00f59131a714 100644 --- a/x11-apps/xman/xman-1.0.2.ebuild +++ b/x11-apps/xman/xman-1.0.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xman/xman-1.0.2.ebuild,v 1.7 2006/10/10 23:55:18 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xman/xman-1.0.2.ebuild,v 1.8 2007/04/06 19:00:48 joshuabaergen Exp $ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" @@ -16,3 +16,13 @@ RDEPEND="xprint? ( x11-libs/libXprintUtil )" DEPEND="${RDEPEND}" CONFIGURE_OPTIONS="$(use_enable xprint)" + +pkg_setup() { + if use xprint; then + if ! built_with_use x11-libs/libXaw xprint; then + msg="You must build libXaw with xprint enabled." + eerror ${msg} + die ${msg} + fi + fi +} -- 2.26.2