summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2008-02-04 17:30:36 +0100
committerTreeve Jelbert2008-02-04 17:30:36 +0100
commit511025f2202977e5d7ce4866e721037449e7eb92 (patch)
tree8c8abfa418d9ad26cbaa2c659b18fcf0dc6084fb
parente28e126b3969fad592216bf95decb6e7794a60a9 (diff)
parentaa1330d5ac5d168fd3bb4dbd46474bc160e362b1 (diff)
Merge branch 'master' of ssh://treeve@scm.sourcemage.org/smgl/grimoire
-rw-r--r--ChangeLog3
-rwxr-xr-xaudio-soft/asunder/DETAILS2
-rw-r--r--audio-soft/asunder/HISTORY3
-rw-r--r--audio-soft/asunder/asunder-1.0.2.tar.bz2.sigbin0 -> 287 bytes
-rw-r--r--audio-soft/asunder/asunder-1.0.tar.bz2.sigbin280 -> 0 bytes
-rwxr-xr-xgnome2-libs/libart_lgpl/DETAILS5
-rw-r--r--gnome2-libs/libart_lgpl/HISTORY4
-rwxr-xr-xgnome2-libs/libart_lgpl/PRE_BUILD3
-rw-r--r--gnome2-libs/libart_lgpl/art_misc-2.19.patch18
-rw-r--r--gnome2-libs/libart_lgpl/libart_lgpl-2.3.19.tar.bz2.sigbin536 -> 0 bytes
-rwxr-xr-xshell-term-fm/bash-completion/DETAILS2
-rw-r--r--shell-term-fm/bash-completion/HISTORY4
-rwxr-xr-xshell-term-fm/bash-completion/PRE_BUILD5
-rwxr-xr-xtelephony/libtelepathy/DEPENDS9
-rw-r--r--telephony/libtelepathy/HISTORY3
-rwxr-xr-xutils/coreutils/CONFLICTS1
-rwxr-xr-xutils/coreutils/DEPENDS12
-rwxr-xr-xutils/coreutils/DETAILS1
-rw-r--r--utils/coreutils/HISTORY7
-rwxr-xr-xutils/coreutils/TRIGGERS5
-rwxr-xr-xutils/mktemp/BUILD15
-rwxr-xr-xutils/mktemp/DEPENDS2
-rwxr-xr-xutils/mktemp/DETAILS10
-rw-r--r--utils/mktemp/HISTORY3
-rwxr-xr-xutils/mktemp/INSTALL2
-rwxr-xr-xutils/mktemp/PRE_BUILD1
-rwxr-xr-xutils/mktemp/TRIGGERS1
-rwxr-xr-xx11-libs/wine/BUILD3
-rw-r--r--x11-libs/wine/HISTORY5
29 files changed, 58 insertions, 71 deletions
diff --git a/ChangeLog b/ChangeLog
index 5fe86bd925..ff090bf7d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-02-03 Ladislav Hagara <hgr@vabo.cz>
+ * utils/mktemp: deprecated in favour of coreutils [Bug 14271]
+
2008-02-03 Treeve Jelbert <treeve@sourcemage.org>
* devel/falcon: new spell, general purpose untyped scripting language
diff --git a/audio-soft/asunder/DETAILS b/audio-soft/asunder/DETAILS
index b0ca9ff66c..9d50e535a1 100755
--- a/audio-soft/asunder/DETAILS
+++ b/audio-soft/asunder/DETAILS
@@ -1,5 +1,5 @@
SPELL=asunder
- VERSION=1.0
+ VERSION=1.0.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://littlesvr.ca/$SPELL/releases/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig
diff --git a/audio-soft/asunder/HISTORY b/audio-soft/asunder/HISTORY
index abbd5495ec..bbfc7543ad 100644
--- a/audio-soft/asunder/HISTORY
+++ b/audio-soft/asunder/HISTORY
@@ -1,3 +1,6 @@
+2008-02-04 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.0.2
+
2007-12-19 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: Changed SOURCE_URL[0] extension,
updated spell to 1.0, hash => gpg
diff --git a/audio-soft/asunder/asunder-1.0.2.tar.bz2.sig b/audio-soft/asunder/asunder-1.0.2.tar.bz2.sig
new file mode 100644
index 0000000000..810e6a9c04
--- /dev/null
+++ b/audio-soft/asunder/asunder-1.0.2.tar.bz2.sig
Binary files differ
diff --git a/audio-soft/asunder/asunder-1.0.tar.bz2.sig b/audio-soft/asunder/asunder-1.0.tar.bz2.sig
deleted file mode 100644
index ca06b101db..0000000000
--- a/audio-soft/asunder/asunder-1.0.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/libart_lgpl/DETAILS b/gnome2-libs/libart_lgpl/DETAILS
index 976d00b845..d5c86be991 100755
--- a/gnome2-libs/libart_lgpl/DETAILS
+++ b/gnome2-libs/libart_lgpl/DETAILS
@@ -1,11 +1,10 @@
SPELL=libart_lgpl
- VERSION=2.3.19
- PATCHLEVEL=1
+ VERSION=2.3.20
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig
LICENSE[0]=LGPL
WEB_SITE=http://www.levien.com/libart
ENTERED=20020509
diff --git a/gnome2-libs/libart_lgpl/HISTORY b/gnome2-libs/libart_lgpl/HISTORY
index b4c678e903..43893f58d5 100644
--- a/gnome2-libs/libart_lgpl/HISTORY
+++ b/gnome2-libs/libart_lgpl/HISTORY
@@ -1,3 +1,7 @@
+2008-02-04 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 2.3.20
+ * PRE_BUILD: removed a patch applied in .20
+
2007-03-11 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* art_misc-2.19.patch, PRE_BUILD: added for #13605
* DETAILS: PATCHLEVEL++
diff --git a/gnome2-libs/libart_lgpl/PRE_BUILD b/gnome2-libs/libart_lgpl/PRE_BUILD
deleted file mode 100755
index 8f660e1cee..0000000000
--- a/gnome2-libs/libart_lgpl/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/art_misc-2.19.patch
diff --git a/gnome2-libs/libart_lgpl/art_misc-2.19.patch b/gnome2-libs/libart_lgpl/art_misc-2.19.patch
deleted file mode 100644
index 2dfbc998e0..0000000000
--- a/gnome2-libs/libart_lgpl/art_misc-2.19.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- trunk/art_misc.h 2005/10/06 02:19:12 267
-+++ trunk/art_misc.h 2007/03/01 16:18:41 278
-@@ -34,9 +34,15 @@
- #include <libart_lgpl/art_config.h>
- #endif
-
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- void *art_alloc(size_t size);
- void art_free(void *ptr);
- void *art_realloc(void *ptr, size_t size);
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
-
- /* These aren't, strictly speaking, configuration macros, but they're
- damn handy to have around, and may be worth playing with for
diff --git a/gnome2-libs/libart_lgpl/libart_lgpl-2.3.19.tar.bz2.sig b/gnome2-libs/libart_lgpl/libart_lgpl-2.3.19.tar.bz2.sig
deleted file mode 100644
index f309559dea..0000000000
--- a/gnome2-libs/libart_lgpl/libart_lgpl-2.3.19.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/shell-term-fm/bash-completion/DETAILS b/shell-term-fm/bash-completion/DETAILS
index ff264bd719..5ded14312a 100755
--- a/shell-term-fm/bash-completion/DETAILS
+++ b/shell-term-fm/bash-completion/DETAILS
@@ -6,7 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/bash_completion
SOURCE_URL[0]=http://www.caliban.org/files/bash/$SOURCE
WEB_SITE=http://www.caliban.org/bash/index.shtml#completion
ENTERED=20020215
- UPDATED=20040127
+ PATCHLEVEL=1
LICENSE[0]=GPL
KEYWORDS="bash console"
SHORT="bash programmable completion"
diff --git a/shell-term-fm/bash-completion/HISTORY b/shell-term-fm/bash-completion/HISTORY
index 7c17c60cfb..43f21bab8e 100644
--- a/shell-term-fm/bash-completion/HISTORY
+++ b/shell-term-fm/bash-completion/HISTORY
@@ -1,3 +1,7 @@
+2008-02-03 Pol Vinogradov <vin.public@gmail.com>
+ * DETAILS: UPDATED -> PATCHLEVEL
+ * PRE_BUILD: added to avoid bash non-reading its config files
+
2006-07-02 Pol Vinogradov <vin.public@gmail.com>
* INSTALL: docs now go to ${INSTALL_ROOT}/usr/share/doc/$SPELL
diff --git a/shell-term-fm/bash-completion/PRE_BUILD b/shell-term-fm/bash-completion/PRE_BUILD
new file mode 100755
index 0000000000..9d0bcb0546
--- /dev/null
+++ b/shell-term-fm/bash-completion/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+sedit 's:readonly BASH_COMPLETION BASH_COMPLETION_DIR:#readonly BASH_COMPLETION BASH_COMPLETION_DIR:' \
+bash_completion
diff --git a/telephony/libtelepathy/DEPENDS b/telephony/libtelepathy/DEPENDS
index cd0f431488..9b4f4597e5 100755
--- a/telephony/libtelepathy/DEPENDS
+++ b/telephony/libtelepathy/DEPENDS
@@ -1,4 +1,5 @@
-depends dbus &&
-depends dbus-glib &&
-depends glib2 &&
-depends pkgconfig
+depends dbus &&
+depends dbus-glib &&
+depends glib2 &&
+depends pkgconfig &&
+depends telepathy-glib
diff --git a/telephony/libtelepathy/HISTORY b/telephony/libtelepathy/HISTORY
index fbf9faf48b..6dfb77a3cc 100644
--- a/telephony/libtelepathy/HISTORY
+++ b/telephony/libtelepathy/HISTORY
@@ -1,3 +1,6 @@
+2008-02-03 Robin Cook <rcook@wyrms.net>
+ * DEPENDS: added telepathy-glib
+
2008-01-13 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 0.3.1
diff --git a/utils/coreutils/CONFLICTS b/utils/coreutils/CONFLICTS
new file mode 100755
index 0000000000..26e7dbb54b
--- /dev/null
+++ b/utils/coreutils/CONFLICTS
@@ -0,0 +1 @@
+conflicts mktemp y
diff --git a/utils/coreutils/DEPENDS b/utils/coreutils/DEPENDS
index 70a6a1a687..18594eb242 100755
--- a/utils/coreutils/DEPENDS
+++ b/utils/coreutils/DEPENDS
@@ -1,12 +1,2 @@
depends gnupg &&
-depends smgl-fhs &&
-
-optional_depends linux-pam \
- '--enable-pam' \
- '' \
- "for pam enabled su command" &&
-
-# we need to recreate configure after PAM patch with autoreconf
-if is_depends_enabled $SPELL linux-pam; then
- depends autoconf
-fi
+depends smgl-fhs
diff --git a/utils/coreutils/DETAILS b/utils/coreutils/DETAILS
index 8ed6b0e49b..0dd376ba31 100755
--- a/utils/coreutils/DETAILS
+++ b/utils/coreutils/DETAILS
@@ -1,5 +1,6 @@
SPELL=coreutils
VERSION=6.10
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/coreutils/HISTORY b/utils/coreutils/HISTORY
index 23494a8614..4323ff6a40 100644
--- a/utils/coreutils/HISTORY
+++ b/utils/coreutils/HISTORY
@@ -1,3 +1,10 @@
+2008-02-03 Ladislav Hagara <hgr@vabo.cz>
+ * DEPENDS: removed linux-pam [Bug 14270]
+ * TRIGGERS: removed
+ * DETAILS: mktemp is provided by coreutils not by mktemp [Bug 14271]
+ PATCHLEVEL=1
+ * CONFLICTS: conflicts mktemp y
+
2008-01-30 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* DEPENDS: no longer needs util-linux for kill
diff --git a/utils/coreutils/TRIGGERS b/utils/coreutils/TRIGGERS
deleted file mode 100755
index c8d3360deb..0000000000
--- a/utils/coreutils/TRIGGERS
+++ /dev/null
@@ -1,5 +0,0 @@
-for i in $(grep $SPELL $DEPENDS_STATUS);
-do if [ $(echo $i | cut -d: -f1) = "$SPELL" ] && [ $(echo $i | cut -d: -f2) == "linux-pam" ] && [ $(echo $i | cut -d: -f3 ) = "on" ] ;
- then on_cast linux-pam cast_self
- fi
-done
diff --git a/utils/mktemp/BUILD b/utils/mktemp/BUILD
index 9cb78cea87..27ba77ddaf 100755
--- a/utils/mktemp/BUILD
+++ b/utils/mktemp/BUILD
@@ -1,14 +1 @@
-export CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE" &&
-
- OPTS="$OPTS --build=${BUILD}"
- [[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"
-
- ./configure --prefix=${TRACK_ROOT}/usr \
- --sysconfdir=${TRACK_ROOT}/etc \
- --localstatedir=${TRACK_ROOT}/var \
- --mandir=${TRACK_ROOT}/usr/share/man \
- --infodir=${TRACK_ROOT}/usr/share/info \
- $OPTS &&
- sedit "s:^mandir = .*:mandir = \${prefix}/usr/share/man:" Makefile
- make
-
+true
diff --git a/utils/mktemp/DEPENDS b/utils/mktemp/DEPENDS
deleted file mode 100755
index 18594eb242..0000000000
--- a/utils/mktemp/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends gnupg &&
-depends smgl-fhs
diff --git a/utils/mktemp/DETAILS b/utils/mktemp/DETAILS
index f66d8cbae3..35912dae1a 100755
--- a/utils/mktemp/DETAILS
+++ b/utils/mktemp/DETAILS
@@ -1,11 +1,11 @@
SPELL=mktemp
VERSION=1.5
- SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_HASH=sha512:f013adc685efddc343f6e63aee153f10b4c9a7dc78251e801930a5e8b670d4a4c87d6a06ef9f62678e0a7d1c19fe3e7b2514f64fc4abfd74767a2453d3c69082
+# SOURCE=$SPELL-$VERSION.tar.gz
+# SOURCE_HASH=sha512:f013adc685efddc343f6e63aee153f10b4c9a7dc78251e801930a5e8b670d4a4c87d6a06ef9f62678e0a7d1c19fe3e7b2514f64fc4abfd74767a2453d3c69082
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://ftp.mktemp.org/pub/mktemp/$SOURCE
- SOURCE_URL[0]=ftp://ftp.courtesan.com/pub/mktemp/$SOURCE
- SOURCE_URL[0]=http://www.courtesan.com/mktemp/dist/$SOURCE
+# SOURCE_URL[0]=ftp://ftp.mktemp.org/pub/mktemp/$SOURCE
+# SOURCE_URL[0]=ftp://ftp.courtesan.com/pub/mktemp/$SOURCE
+# SOURCE_URL[0]=http://www.courtesan.com/mktemp/dist/$SOURCE
WEB_SITE=http://www.mktemp.org/
ENTERED=20020214
LICENSE=BSD
diff --git a/utils/mktemp/HISTORY b/utils/mktemp/HISTORY
index be5295760c..1bea64d09d 100644
--- a/utils/mktemp/HISTORY
+++ b/utils/mktemp/HISTORY
@@ -1,3 +1,6 @@
+2008-02-03 Ladislav Hagara <hgr@vabo.cz>
+ * *: Deprecated in favour of coreutils [Bug 14271]
+
2006-10-03 Juuso Alasuutari <iuso@sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/utils/mktemp/INSTALL b/utils/mktemp/INSTALL
index 6db2ac4f5f..27ba77ddaf 100755
--- a/utils/mktemp/INSTALL
+++ b/utils/mktemp/INSTALL
@@ -1 +1 @@
-make install prefix=$INSTALL_ROOT
+true
diff --git a/utils/mktemp/PRE_BUILD b/utils/mktemp/PRE_BUILD
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/utils/mktemp/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/utils/mktemp/TRIGGERS b/utils/mktemp/TRIGGERS
new file mode 100755
index 0000000000..043c89cb66
--- /dev/null
+++ b/utils/mktemp/TRIGGERS
@@ -0,0 +1 @@
+on_cast mktemp dispel_self
diff --git a/x11-libs/wine/BUILD b/x11-libs/wine/BUILD
index c84faa8507..7fb853390c 100755
--- a/x11-libs/wine/BUILD
+++ b/x11-libs/wine/BUILD
@@ -1,9 +1,6 @@
# fix wine build problem
LDFLAGS=${LDFLAGS//-z combreloc/} &&
-# avoid the memory leak on vartest.c
-CFLAGS="$CFLAGS -fno-inline-functions"
-
OPTS="--disable-debug \
--disable-trace \
$OPTS" &&
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 678d8266f2..a23acdde07 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,8 @@
+2008-02-03 Thomas Orgis <sobukus@sourcemage.org>
+ * BUILD: Remove the -fno-inline-functions which was added becuase of vartest.c
+ memory hogging; seems to be more or less fixed in wine and/or gcc (though
+ you shouldn't try to build wine on a 64MB RAM box)
+
2008-01-31 Eric Sandall <sandalle@sourcemage.org>
* DEPENDS: Optionally depend on wine-gecko (z-rejected) for a
pre-downloaded GECKO engine