packages: chromium-browser/chromium-browser.spec, chromium-browser/clean-so...

[glen]

Author: glen                         Date: Thu Jan  5 23:03:18 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- invert clean logic foo=0 means do not remove it, undefined foo means do remove it

---- Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.166 -> 1.167) , clean-source.sh (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.166 packages/chromium-browser/chromium-browser.spec:1.167
--- packages/chromium-browser/chromium-browser.spec:1.166	Wed Dec 28 00:04:49 2011
+++ packages/chromium-browser/chromium-browser.spec	Fri Jan  6 00:03:13 2012
@@ -210,7 +210,7 @@
 cd ..
 
 cd src
-sh -x clean-source.sh %{?with_system_v8:v8=1} %{?with_nacl:nacl=1}
+sh -x clean-source.sh %{!?with_system_v8:v8=0} %{!?with_nacl:nacl=0}
 
 %build
 cd src
@@ -369,6 +369,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.167  2012/01/05 23:03:13  glen
+- invert clean logic foo=0 means do not remove it, undefined foo means do remove it
+
 Revision 1.166  2011/12/27 23:04:49  glen
 - use repackaged official tarball
 

================================================================
Index: packages/chromium-browser/clean-source.sh
diff -u packages/chromium-browser/clean-source.sh:1.5 packages/chromium-browser/clean-source.sh:1.6
--- packages/chromium-browser/clean-source.sh:1.5	Tue Dec 27 22:40:10 2011
+++ packages/chromium-browser/clean-source.sh	Fri Jan  6 00:03:13 2012
@@ -3,6 +3,8 @@
 set -x
 
 # import options
+# remove everything unless it's remove has been disabled with "0"
+# "v8=0" means "do not remove v8"
 eval "$@"
 
 # drop bundled libs, from gentoo
@@ -126,7 +128,7 @@
 	for dir in "$@"; do
 		lib=${dir##*/}
 		bcond=$(eval echo \$$lib)
-		[ "$bcond" = 0 ] && continue
+		[ "${bcond:-1}" = 0 ] && continue
 
 		# skip already removed dirs
 		test -d $dir || continue
@@ -175,7 +177,7 @@
 
 rm -vf third_party/expat/files/lib/expat.h
 
-if [ "$v8" = 1 ]; then
+if [ "${v8:-1}" != "0" ]; then
 	# The implementation files include v8 headers with full path,
 	# like #include "v8/include/v8.h". Make sure the system headers
 	# will be used.
@@ -183,7 +185,7 @@
 	ln -s /usr/include v8/include
 fi
 
-if [ "$nacl" = 1 ]; then
+if [ "${nacl:-1}" != "0" ]; then
 	# NOTE: here is always x86_64
 	rm -rf native_client/toolchain/linux_x86_newlib
 	ln -s /usr/x86_64-nacl-newlib native_client/toolchain/linux_x86_newlib
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.166&r2=1.167&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/clean-source.sh?r1=1.5&r2=1.6&f=u