summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2009-09-30 16:54:55 +0200
committerTreeve Jelbert2009-09-30 16:54:55 +0200
commit48d8c44a32babf2f0408000c92cee9813db91490 (patch)
tree8779411154ee7542a3fe605d56ed4ab09c2aee6a
parentf8fd821a2efba0e42c04f0d5590bc653e3ee57c3 (diff)
parent3cb2c7a15c80ccce40f8ff174369ec0fba887f54 (diff)
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
-rwxr-xr-xdisk/e2fsprogs/DEPENDS2
-rw-r--r--disk/e2fsprogs/HISTORY3
-rwxr-xr-xgnome2-apps/evolution/DEPENDS2
-rw-r--r--gnome2-apps/evolution/HISTORY4
-rwxr-xr-xgnome2-libs/devicekit-power/DEPENDS5
-rw-r--r--gnome2-libs/devicekit-power/HISTORY3
-rwxr-xr-xgnome2-libs/gnome-session/DEPENDS2
-rw-r--r--gnome2-libs/gnome-session/HISTORY5
-rwxr-xr-xnet/bridge-utils/BUILD5
-rwxr-xr-xnet/bridge-utils/DETAILS6
-rw-r--r--net/bridge-utils/HISTORY4
-rwxr-xr-xnet/farsight2/DEPENDS5
-rw-r--r--net/farsight2/HISTORY3
-rwxr-xr-xnet/net-tools/DEPENDS2
-rw-r--r--net/net-tools/HISTORY3
-rw-r--r--security/shadow/HISTORY3
-rwxr-xr-xsecurity/shadow/INSTALL1
-rwxr-xr-xutils/console-tools/DEPENDS2
-rw-r--r--utils/console-tools/HISTORY3
-rwxr-xr-xutils/eggdbus/BUILD3
-rwxr-xr-xutils/eggdbus/DEPENDS7
-rw-r--r--utils/eggdbus/HISTORY4
-rwxr-xr-xxorg-data/xkeyboard-config/BUILD1
-rw-r--r--xorg-data/xkeyboard-config/HISTORY3
24 files changed, 67 insertions, 14 deletions
diff --git a/disk/e2fsprogs/DEPENDS b/disk/e2fsprogs/DEPENDS
index 54438e2a65..24cd6bea02 100755
--- a/disk/e2fsprogs/DEPENDS
+++ b/disk/e2fsprogs/DEPENDS
@@ -1,5 +1,5 @@
depends gawk &&
depends gnupg &&
-depends init.d &&
+depends INITSCRIPTS &&
depends smgl-fhs &&
depends pkgconfig
diff --git a/disk/e2fsprogs/HISTORY b/disk/e2fsprogs/HISTORY
index 64690f8248..d47c70e53a 100644
--- a/disk/e2fsprogs/HISTORY
+++ b/disk/e2fsprogs/HISTORY
@@ -1,3 +1,6 @@
+2009-09-30 Arjan Bouter <abouter@sourcemage.org>
+ * DEPENDS: depend on INITSCRIPTS instead of init.d
+
2009-08-23 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 1.41.9
diff --git a/gnome2-apps/evolution/DEPENDS b/gnome2-apps/evolution/DEPENDS
index 4849a999e4..1655221d45 100755
--- a/gnome2-apps/evolution/DEPENDS
+++ b/gnome2-apps/evolution/DEPENDS
@@ -1,4 +1,4 @@
-depends hal &&
+#depends hal &&
depends libx11 &&
depends libxml2 &&
depends -sub PYTHON libxml2 &&
diff --git a/gnome2-apps/evolution/HISTORY b/gnome2-apps/evolution/HISTORY
index 693a62cdf2..8e6939dddd 100644
--- a/gnome2-apps/evolution/HISTORY
+++ b/gnome2-apps/evolution/HISTORY
@@ -1,3 +1,7 @@
+2009-09-30 Arjan Bouter <abouter@sourcemage.org>
+ * DEPENDS: commented out the hal dependency, afaikt it's not a
+ direct dep. maybe somewhere up the dependency chain?
+
2009-09-26 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.28.0
* BUILD: added --disable-nm to disable NetworkManager
diff --git a/gnome2-libs/devicekit-power/DEPENDS b/gnome2-libs/devicekit-power/DEPENDS
index ca8735f1d5..b6996db4f2 100755
--- a/gnome2-libs/devicekit-power/DEPENDS
+++ b/gnome2-libs/devicekit-power/DEPENDS
@@ -3,6 +3,11 @@ depends libusb &&
depends policykit &&
depends -sub EXTRAS udev &&
+optional_depends libxslt \
+ "--enable-man-pages" \
+ "--disable-man-pages" \
+ "Build man pages?" &&
+
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
diff --git a/gnome2-libs/devicekit-power/HISTORY b/gnome2-libs/devicekit-power/HISTORY
index 6f82ec5fcf..39421ee17b 100644
--- a/gnome2-libs/devicekit-power/HISTORY
+++ b/gnome2-libs/devicekit-power/HISTORY
@@ -1,3 +1,6 @@
+2009-09-26 Arjan Bouter <abouter@sourcemage.org>
+ * DEPENDS: added missing optional dep on libxslt
+
2009-09-25 Finn Haedicke <finn_haedicke@gmx.net>
* DEPENDS: added udev (with EXTRAS), policykit
diff --git a/gnome2-libs/gnome-session/DEPENDS b/gnome2-libs/gnome-session/DEPENDS
index db6555c39e..a2eee59bd9 100755
--- a/gnome2-libs/gnome-session/DEPENDS
+++ b/gnome2-libs/gnome-session/DEPENDS
@@ -6,7 +6,7 @@ depends xtrans &&
depends glib2 &&
depends dbus-glib &&
depends gtk+2 &&
-depends at-spi &&
+#depends at-spi &&
depends libglade2 &&
depends gnome-keyring &&
depends libgnomeui &&
diff --git a/gnome2-libs/gnome-session/HISTORY b/gnome2-libs/gnome-session/HISTORY
index 9bb0e35882..b0789aea12 100644
--- a/gnome2-libs/gnome-session/HISTORY
+++ b/gnome2-libs/gnome-session/HISTORY
@@ -1,3 +1,8 @@
+2009-09-27 Arjan Bouter <abouter@sourcemage.org>
+ * DEPENDS: commented out the at-spi dependency. it should probably
+ either be optional or moved in the dependency chain as
+ gnome-session doesn't depend on it directly
+
2009-09-25 Ladislav Hagara <hgr@vabo.cz>
* DEPENDS: added devicekit-power #15430
diff --git a/net/bridge-utils/BUILD b/net/bridge-utils/BUILD
new file mode 100755
index 0000000000..6003e3579b
--- /dev/null
+++ b/net/bridge-utils/BUILD
@@ -0,0 +1,5 @@
+OPTS="$OPTS --with-linux-headers=${INSTALL_ROOT}/usr/src/linux" &&
+cd ${SOURCE_DIRECTORY} &&
+aclocal &&
+autoconf &&
+default_build
diff --git a/net/bridge-utils/DETAILS b/net/bridge-utils/DETAILS
index 6cd6694c88..b333ffad4d 100755
--- a/net/bridge-utils/DETAILS
+++ b/net/bridge-utils/DETAILS
@@ -1,10 +1,10 @@
SPELL=bridge-utils
- VERSION=1.0.4
+ VERSION=1.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/bridge/${SOURCE}
- SOURCE_HASH=sha512:f7c112598d6d768fd9ea62772a2d83a34e71ce374139230df5a0b5c83db9956b7ea65778a31f5a711d3b6d6bb388b690b421b08779ed9f00ca7477f1bf98bfbe
- WEB_SITE=http://bridge.sourceforge.net/
+ SOURCE_HASH=sha512:d890e66fd93cac086ee4fd5e3097caf3703656a4bb97936ca4c06defa923dcd006b9958bd9aa04fd051a4598d80aaa0b02f8a4e59d3d6f97e67ab1dc271703ca
+ WEB_SITE="http://www.linuxfoundation.org/en/Net:Bridge"
ENTERED=20030126
LICENSE[0]=GPL
KEYWORDS="net"
diff --git a/net/bridge-utils/HISTORY b/net/bridge-utils/HISTORY
index 49a1f3f596..44137f8183 100644
--- a/net/bridge-utils/HISTORY
+++ b/net/bridge-utils/HISTORY
@@ -1,3 +1,7 @@
+2009-09-24 Arjan Bouter <abouter@sourcemage.org>
+ * DETAILS: version 1.4
+ * BUILD: added
+
2006-10-03 Juuso Alasuutari <iuso@sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/net/farsight2/DEPENDS b/net/farsight2/DEPENDS
index 866f4b3add..6ffef00cba 100755
--- a/net/farsight2/DEPENDS
+++ b/net/farsight2/DEPENDS
@@ -2,5 +2,6 @@ depends libnice &&
optional_depends python "--enable-python" "--disable-python" "To build python bindings" &&
if is_depends_enabled $SPELL python; then
depends gst-python
-fi
-
+fi &&
+optional_depends gst-plugins-good '' '' 'for the RTP plugin' &&
+optional_depends gst-plugins-bad '' '' 'for the MSN plugin'
diff --git a/net/farsight2/HISTORY b/net/farsight2/HISTORY
index aea1ac7928..994ce75897 100644
--- a/net/farsight2/HISTORY
+++ b/net/farsight2/HISTORY
@@ -1,3 +1,6 @@
+2009-09-30 Arjan Bouter <abouter@sourcemage.org>
+ * DEPENDS: added missing deps on gst plugins
+
2009-09-25 David Kowis <dkowis@shlrm.org>
* DEPENDS: if there's a python installed it automatically grabs onto
trying to build python bindings. So made an optional dependency of python
diff --git a/net/net-tools/DEPENDS b/net/net-tools/DEPENDS
index da0dbf3303..b3e50510e8 100755
--- a/net/net-tools/DEPENDS
+++ b/net/net-tools/DEPENDS
@@ -1,6 +1,6 @@
depends coreutils &&
depends gnupg &&
-depends init.d &&
+depends INITSCRIPTS &&
depends smgl-fhs &&
#if [ "$DECNET" == "y" ]; then
diff --git a/net/net-tools/HISTORY b/net/net-tools/HISTORY
index cfc3130fdf..dc4db4b79c 100644
--- a/net/net-tools/HISTORY
+++ b/net/net-tools/HISTORY
@@ -1,3 +1,6 @@
+2009-09-30 Arjan Bouter <abouter@sourcemage.org>
+ * DEPENDS: use INITSCRIPTS provider
+
2009-01-06 George Sherwood <gsherwood@sourcemage.org>
* PRE_BUILD: Added patch build error. Bug #15009
* net-tool-NULL-error.patch: gentoo patch for gcc 4.3.x build error
diff --git a/security/shadow/HISTORY b/security/shadow/HISTORY
index a08269a034..0f4f0495c2 100644
--- a/security/shadow/HISTORY
+++ b/security/shadow/HISTORY
@@ -1,3 +1,6 @@
+2009-09-30 Arjan Bouter <abouter@sourcemage.org>
+ * INSTALL: make sure the SHADOW_HOME dir exists.
+
2009-08-02 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 4.1.4.2
diff --git a/security/shadow/INSTALL b/security/shadow/INSTALL
index 9df6c63fe9..049e6ee88f 100755
--- a/security/shadow/INSTALL
+++ b/security/shadow/INSTALL
@@ -8,6 +8,7 @@ install_config_file etc/login.access $INSTALL_ROOT/etc/login.access &&
install_config_file etc/login.defs $INSTALL_ROOT/etc/login.defs &&
sed -i -e 's,^HOME=.*$,HOME='"$SHADOW_HOME"',' -e 's,GROUP=1000,GROUP=users,' etc/useradd &&
mkdir -p $INSTALL_ROOT/etc/default &&
+mkdir -p ${INSTALL_ROOT}${SHADOW_HOME} &&
install_config_file etc/useradd $INSTALL_ROOT/etc/default/useradd &&
cp -fv $SCRIPT_DIRECTORY/adduser $INSTALL_ROOT/usr/sbin &&
diff --git a/utils/console-tools/DEPENDS b/utils/console-tools/DEPENDS
index 01eb603e54..85dd8fa43b 100755
--- a/utils/console-tools/DEPENDS
+++ b/utils/console-tools/DEPENDS
@@ -6,6 +6,6 @@ depends smgl-fhs &&
# to fix bug #12830, to be removed eventually (during stable-rc 0.7
# should be sufficient)
-depends init.d &&
+depends INITSCRIPTS &&
optional_depends linuxdoc-tools "" "" "for some SGML and HTML documentation"
diff --git a/utils/console-tools/HISTORY b/utils/console-tools/HISTORY
index 926c0c2385..9e72eb28b8 100644
--- a/utils/console-tools/HISTORY
+++ b/utils/console-tools/HISTORY
@@ -1,3 +1,6 @@
+2009-09-30 Arjan Bouter <abouter@sourcemage.org>
+ * DEPENDS: depend on INITSCRIPTS provider
+
2008-06-10 Arwed v. Merkatz <v.merkatz@gmx.net>
* PRE_BUILD: added missing include for gcc 4.2, bug #14434
diff --git a/utils/eggdbus/BUILD b/utils/eggdbus/BUILD
deleted file mode 100755
index 05cd5fd640..0000000000
--- a/utils/eggdbus/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="--disable-man-pages $OPTS" &&
-
-default_build
diff --git a/utils/eggdbus/DEPENDS b/utils/eggdbus/DEPENDS
index db517a3639..4e95395338 100755
--- a/utils/eggdbus/DEPENDS
+++ b/utils/eggdbus/DEPENDS
@@ -5,4 +5,9 @@ depends dbus-glib &&
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
- "to build documentation"
+ "to build documentation" &&
+
+optional_depends libxslt \
+ "--enable-man-pages" \
+ "--disable-man-pages" \
+ "to build man pages (seems broken)"
diff --git a/utils/eggdbus/HISTORY b/utils/eggdbus/HISTORY
index 5474687b9b..58e3eef4ab 100644
--- a/utils/eggdbus/HISTORY
+++ b/utils/eggdbus/HISTORY
@@ -1,3 +1,7 @@
+2009-09-30 Arjan Bouter <abouter@sourcemage.org>
+ * DEPENDS: added missing optional dep on libxslt
+ * BUILD: removed, not needed anymore
+
2009-09-23 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: added gtk-doc as opt dep
* BUILD: don't build man pages via xsltproc
diff --git a/xorg-data/xkeyboard-config/BUILD b/xorg-data/xkeyboard-config/BUILD
index d60d8c828c..01fada7f91 100755
--- a/xorg-data/xkeyboard-config/BUILD
+++ b/xorg-data/xkeyboard-config/BUILD
@@ -3,4 +3,5 @@ OPTS="$OPTS --enable-compat-rules" &&
OPTS="$OPTS --with-xkb-base=/usr/share/X11/xkb" &&
OPTS="$OPTS --with-xkb-rules-symlink=xorg,xfree86" &&
+./autogen.sh &&
default_build
diff --git a/xorg-data/xkeyboard-config/HISTORY b/xorg-data/xkeyboard-config/HISTORY
index 097a871915..80118afffb 100644
--- a/xorg-data/xkeyboard-config/HISTORY
+++ b/xorg-data/xkeyboard-config/HISTORY
@@ -1,3 +1,6 @@
+2009-09-26 Arjan Bouter <abouter@sourcemage.org>
+ * BUILD: run autogen.sh before building
+
2009-02-10 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* DETAILS: updated spell to 1.5