sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (f1d7efa931e99a87edcf3fa67662dd6988579b55)

From: Vlad Glagolev <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (f1d7efa931e99a87edcf3fa67662dd6988579b55)
Date: Sun, 31 Jul 2011 14:22:31 -0500

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

devel/distcc/BUILD | 5 +++++
devel/distcc/DEPENDS | 22 +++++++++++++++++++---
devel/distcc/DETAILS | 9 ++++-----
devel/distcc/HISTORY | 7 +++++++
devel/distcc/INSTALL | 8 ++++++++
devel/distcc/PRE_BUILD | 2 --
devel/distcc/init.d/distcc | 3 ++-
devel/distcc/init.d/distcc.conf | 9 +++------
gnu/gcc/CONFIGURE | 3 +--
gnu/gcc/HISTORY | 3 +++
10 files changed, 52 insertions(+), 19 deletions(-)

New commits:
commit 729c913e391951819100ba728b756d18667f025b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

distcc: => 3.1

commit 8a8566ce9e03e0fbbf04b8a95f712b061834aee7
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

gcc: fix multi -> list

diff --git a/devel/distcc/BUILD b/devel/distcc/BUILD
new file mode 100755
index 0000000..f7aa896
--- /dev/null
+++ b/devel/distcc/BUILD
@@ -0,0 +1,5 @@
+create_account distcc &&
+
+OPTS="--disable-Werror $OPTS" &&
+
+default_build
diff --git a/devel/distcc/DEPENDS b/devel/distcc/DEPENDS
index cbc1a54..eef9301 100755
--- a/devel/distcc/DEPENDS
+++ b/devel/distcc/DEPENDS
@@ -1,3 +1,19 @@
-depends popt &&
-optional_depends "gtk+2" "--with-gtk" "" "for a GUI interface" &&
-optional_depends "libgnomeui" "--with-gnome" "" "for a gnome-based GUI"
+optional_depends popt \
+ "--without-included-popt" \
+ "--with-included-popt" \
+ "to use system popt library instead of bundled" &&
+
+optional_depends gtk+2 \
+ "--with-gtk" \
+ "--without-gtk" \
+ "for GTK+-based montior" &&
+
+optional_depends libgnomeui \
+ "--with-gnome" \
+ "--without-gnome" \
+ "for GNOME-based monitor" &&
+
+optional_depends avahi \
+ "--with-avahi" \
+ "--without-avahi" \
+ "for getting hosts via avahi"
diff --git a/devel/distcc/DETAILS b/devel/distcc/DETAILS
index 81c3272..b3e4d05 100755
--- a/devel/distcc/DETAILS
+++ b/devel/distcc/DETAILS
@@ -1,13 +1,12 @@
SPELL=distcc
- VERSION=2.18.3
+ VERSION=3.1
SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://distcc.samba.org/ftp/distcc/$SOURCE
-
SOURCE_HASH=sha512:2cd1cbd40ae34580f1cf45502e13f683a420d0f954418307942091cb4b34e3e437439ec3f5c971639af89441dccdd0bf40efa503907e435379aac5246ab686e3
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=http://distcc.googlecode.com/files/$SOURCE
+
SOURCE_HASH=sha512:0ca7167309badf5d36d2783bab398295b52c43fde0355cf1902032c70b27fc40c21729c98af0ee4c0aeea0c48755e4626308e9385d938b7822de27cdb048e7bd
WEB_SITE=http://distcc.org/
LICENSE[0]=GPL
ENTERED=20020717
- UPDATED=20040515
KEYWORDS="devel"
SHORT="spread compilation among several different computers"

diff --git a/devel/distcc/HISTORY b/devel/distcc/HISTORY
index f4111a0..1c19eab 100644
--- a/devel/distcc/HISTORY
+++ b/devel/distcc/HISTORY
@@ -1,3 +1,10 @@
+2011-07-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.1
+ * PRE_BUILD: moved to BUILD
+ * DEPENDS: renewed dependencies
+ * INSTALL: added, to install init config and pid dir
+ * init.d/distcc{,.conf}: fixed several options for proper
functionality
+
2008-06-19 Ethan Grammatikidis <eekee57 AT fastmail.fm>
* DETAILS: updated WEB_SITE

diff --git a/devel/distcc/INSTALL b/devel/distcc/INSTALL
new file mode 100755
index 0000000..d4cf2f5
--- /dev/null
+++ b/devel/distcc/INSTALL
@@ -0,0 +1,8 @@
+default_install &&
+
+if [[ $INIT_INSTALLED ]]; then
+ install_config_file "$SPELL_DIRECTORY/init.d/distcc.conf" \
+ "$INSTALL_ROOT/etc/sysconfig/distcc"
+fi &&
+
+install -d -o distcc -g distcc -vm 755 "$INSTALL_ROOT/var/run/distccd"
diff --git a/devel/distcc/PRE_BUILD b/devel/distcc/PRE_BUILD
deleted file mode 100755
index a22bf12..0000000
--- a/devel/distcc/PRE_BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-create_account distcc &&
-default_pre_build
diff --git a/devel/distcc/init.d/distcc b/devel/distcc/init.d/distcc
index 0e071b0..d924fd1 100755
--- a/devel/distcc/init.d/distcc
+++ b/devel/distcc/init.d/distcc
@@ -3,7 +3,8 @@
. /etc/sysconfig/distcc

PROGRAM=/usr/bin/distccd
-ARGS="--user $USER --allow $ALLOWED --daemon --log-file $LOGFILE --log-level
$LOGLEVEL --listen $LISTEN --jobs $JOBS"
+PIDFILE=/var/run/distccd/distccd.pid
+ARGS="--daemon --user distcc --pid-file $PIDFILE $DISTCCD_ARGS"
RUNLEVEL=3
NEEDS="+remote_fs"

diff --git a/devel/distcc/init.d/distcc.conf b/devel/distcc/init.d/distcc.conf
index 30756fc..c8b373f 100644
--- a/devel/distcc/init.d/distcc.conf
+++ b/devel/distcc/init.d/distcc.conf
@@ -1,6 +1,3 @@
-USER="distcc"
-ALLOWED="0.0.0.0/24"
-LOGFILE="/var/log/distcc"
-LOGLEVEL="info"
-LISTEN="0.0.0.0"
-JOBS="3"
+# For the arguments and description see distccd(1)
+
+DISTCCD_ARGS="--listen 0.0.0.0 --allow 0.0.0.0/24 --jobs 3"
diff --git a/gnu/gcc/CONFIGURE b/gnu/gcc/CONFIGURE
index 3099458..81b4a8d 100755
--- a/gnu/gcc/CONFIGURE
+++ b/gnu/gcc/CONFIGURE
@@ -1,8 +1,7 @@
. $SECTION_DIRECTORY/FUNCTIONS &&
default_configure_gcc &&

-. $GRIMOIRE/config_query_multi.function
-config_query_multi GCC_TARGET "Select what build to use" \
+config_query_list GCC_TARGET "Select what build to use" \
all \
bootstrap \
bootstrap-lean \
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 525a3c2..4e20a2e 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,6 @@
+2011-07-31 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * CONFIGURE: should be _list not _multi
+
2011-07-31 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: TMPFS=off for all (1GB is not enough space)

[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (f1d7efa931e99a87edcf3fa67662dd6988579b55), Vlad Glagolev, 07/31/2011