Tue Aug 9 23:14:31 UTC 2011

author: root <root@rshg054.dnsready.net> 2011-08-09 23:14:31 +0000
committer: root <root@rshg054.dnsready.net> 2011-08-09 23:14:31 +0000
commit: a306c2530354c1c02351c4cc02eefa53c8d23eac (patch)
tree: 85f473f0abb92a80a4a400a7c07eed79d83880bd /community
parent: 5135b52f901206bbb365152084e82e92c120e0be (diff)
28 files changed, 582 insertions, 147 deletions
diff --git a/community/cdfs/PKGBUILD b/community/cdfs/PKGBUILD
index 891e3d14f..dc31bc915 100644
--- a/community/cdfs/PKGBUILD
+++ b/community/cdfs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 52427 2011-07-25 09:33:20Z spupykin $
+# $Id: PKGBUILD 53785 2011-08-08 08:18:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
 
 pkgname=cdfs
 pkgver=2.6.27
-pkgrel=15
+pkgrel=16
 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files."
 arch=(i686 x86_64)
 url="http://www.elis.UGent.be/~ronsse/cdfs/"
diff --git a/community/fpc/Makefile-mk382.diff b/community/fpc/Makefile-mk382.diff
new file mode 100644
index 000000000..00909766d
--- /dev/null
+++ b/community/fpc/Makefile-mk382.diff
@@ -0,0 +1,174 @@
+--- Makefile.fpc.orig	2011-04-02 01:15:34.000000000 +0400
++++ Makefile.fpc	2011-08-05 22:29:44.000000000 +0400
+@@ -4,7 +4,7 @@
+ 
+ [package]
+ name=compiler
+-version=2.4.4
++version=2.5.1
+ 
+ [target]
+ programs=pp
+@@ -32,7 +32,7 @@
+ unexport FPC_VERSION FPC_COMPILERINFO
+ 
+ # Which platforms are ready for inclusion in the cycle
+-CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb # mipsel mips
++CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr
+ 
+ # All supported targets used for clean
+ ALLTARGETS=$(CYCLETARGETS)
+@@ -148,6 +148,12 @@
+ ifeq ($(CPC_TARGET),arm)
+ CPUSUF=arm
+ endif
++ifeq ($(CPC_TARGET),mips)
++CPUSUF=mips
++endif
++ifeq ($(CPC_TARGET),mipsel)
++CPUSUF=mipsel
++endif
+ 
+ # Do not define the default -d$(CPU_TARGET) because that
+ # will conflict with our -d$(CPC_TARGET)
+@@ -224,12 +230,39 @@
+ override LOCALOPT+=
+ endif
+ 
++# mipsel specific
++ifeq ($(PPC_TARGET),mipsel)
++override LOCALOPT+=-Fumips
++endif
++
++
++OPTWPOCOLLECT=-OWdevirtcalls,optvmts -FW$(BASEDIR)/pp1.wpo
++OPTWPOPERFORM=-Owdevirtcalls,optvmts -Fw$(BASEDIR)/pp1.wpo
++# symbol liveness WPO requires nm, smart linking and no stripping (the latter
++# is forced by the Makefile when necessary)
++ifneq ($(findstring $(OS_TARGET),darwin linux freebsd solaris),)
++ifdef LINKSMART
++ifdef CREATESMART
++OPTWPOCOLLECT+=-OWsymbolliveness -Xs-
++OPTWPOPERFORM+=-Owsymbolliveness
++endif
++endif
++endif
++
++
+ [rules]
+ #####################################################################
+ # Setup Targets
+ #####################################################################
+ 
+ ifeq ($(OS_TARGET),win32)
++USE_CMP_FOR_DIFF=1
++endif
++ifeq ($(OS_TARGET),win64)
++USE_CMP_FOR_DIFF=1
++endif
++
++ifdef USE_CMP_FOR_DIFF
+ ifdef CMP
+ override DIFF:=$(CMP) -i218
+ endif
+@@ -267,6 +300,8 @@
+ TEMPNAME1=ppc1$(EXEEXT)
+ TEMPNAME2=ppc2$(EXEEXT)
+ TEMPNAME3=ppc3$(EXEEXT)
++TEMPWPONAME1=ppcwpo1$(EXEEXT)
++TEMPWPONAME2=ppcwpo2$(EXEEXT)
+ MAKEDEP=ppdep$(EXEEXT)
+ MSG2INC=./msg2inc$(EXEEXT)
+ ifdef CROSSINSTALL
+@@ -327,15 +362,15 @@
+         -$(DEL) $(addsuffix /*$(PPUEXT),$(COMPILERSOURCEDIR))
+ 
+ tempclean:
+-        -$(DEL) $(PPCROSSNAME) $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3) $(MSG2INC)
++        -$(DEL) $(PPCROSSNAME) $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3) $(MSG2INC) pp1.wpo pp2.wpo
+ 
+ execlean :
+-        -$(DEL) ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) $(EXENAME)
++        -$(DEL) ppc386$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) ppcppc64$(EXEEXT) ppcarm$(EXEEXT) ppcmips$(EXEEXT) ppcmipsel$(EXEEXT) $(EXENAME) $(TEMPWPONAME1) $(TEMPWPONAME2)
+ 
+ $(addsuffix _clean,$(ALLTARGETS)):
+         -$(DELTREE) $(addprefix $(subst _clean,,$@),/units)
+         -$(DEL) $(addprefix $(subst _clean,,$@)/,*$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT))
+-        -$(DEL) $(addprefix $(subst _clean,,$@)/,ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcppc$(EXEEXT) $(EXENAME))
++        -$(DEL) $(addprefix $(subst _clean,,$@)/,ppc386$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) ppcppc64$(EXEEXT) ppcarm$(EXEEXT) ppcmips$(EXEEXT) ppcmipsel$(EXEEXT) $(EXENAME))
+ 
+ cycleclean: cleanall $(addsuffix _clean,$(CPC_TARGET))
+         -$(DEL) $(EXENAME)
+@@ -444,6 +479,28 @@
+ # Normal cycle
+ #
+ 
++ifndef NOWPOCYCLE
++ifdef RELEASE
++DOWPOCYCLE=1
++# Two WPO cycles in case of RELEASE=1
++wpocycle:
++# don't use cycle_clean, it will delete the compiler utilities again
++        $(RM) $(EXENAME)
++        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(LOCALOPT) $(OPTWPOCOLLECT)' compiler
++        $(RM) $(EXENAME)
++        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(RTLOPT) $(OPTWPOPERFORM)' rtlclean rtl
++        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(LOCALOPT) $(OPTWPOPERFORM) $(subst pp1.wpo,pp2.wpo,$(OPTWPOCOLLECT))' $(addsuffix _clean,$(ALLTARGETS)) compiler
++        $(MOVE) $(EXENAME) $(TEMPWPONAME1)
++        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(RTLOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' rtlclean rtl
++        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(LOCALOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' $(addsuffix _clean,$(ALLTARGETS)) compiler
++        $(COPY) $(EXENAME) $(TEMPWPONAME2)
++endif
++endif
++
++ifndef DOWPOCYCLE
++wpocycle:
++endif
++
+ # Used to avoid unnecessary steps
+ ifdef DIFF
+ ifdef OLDFPC
+@@ -490,6 +547,7 @@
+         $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OLDFPC=$(BASEDIR)/$(TEMPNAME2)' next
+         $(DIFF) $(TEMPNAME3) $(EXENAME)
+         $(MAKE) $(addsuffix _all,$(TARGET_DIRS)) 'FPC=$(BASEDIR)/$(EXENAME)'
++        $(MAKE) wpocycle
+         $(MAKE) echotime
+ 
+ else
+@@ -508,8 +566,11 @@
+ # ppc<ARCH> (target native)
+ ifndef CROSSINSTALL
+         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' rtlclean rtl
++# building a native compiler for embedded targets is not possible
++ifneq ($(OS_TARGET),embedded)
+         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' cycleclean compiler
+ endif
++endif
+ 
+ endif
+ 
+@@ -523,10 +584,10 @@
+ # ppc3/ppcXXX = native (skipped for cross installation)
+ #
+ 
++cycle: override FPC=
+ cycle:
+ # ppc (source native)
+ # Clear detected compiler binary, because it can be existing crosscompiler binary, but we need native compiler here
+-override FPC=
+         $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) CROSSBINDIR= BINUTILSPREFIX= CROSSCYCLEBOOTSTRAP=1 rtlclean rtl
+         $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) EXENAME=$(TEMPNAME) CROSSBINDIR= BINUTILSPREFIX= CROSSCYCLEBOOTSTRAP=1 cycleclean compiler
+ # ppcross<ARCH> (source native)
+@@ -535,8 +596,11 @@
+ # ppc<ARCH> (target native)
+ ifndef CROSSINSTALL
+         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' 'OPT=$(OPT) $(CROSSOPT)' rtlclean rtl
++# building a native compiler for embedded targets is not possible
++ifneq ($(OS_TARGET),embedded)
+         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' 'OPT=$(OPT) $(CROSSOPT)' cycleclean compiler
+ endif
++endif
+ 
+ endif
+ 
diff --git a/community/fpc/PKGBUILD b/community/fpc/PKGBUILD
index 16dd11444..6402d9213 100644
--- a/community/fpc/PKGBUILD
+++ b/community/fpc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 48312 2011-05-31 09:49:30Z spupykin $
+# $Id: PKGBUILD 53775 2011-08-08 08:05:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Valeriy Lyasotskiy <onestep@ukr.net>
 # Contributor: Jan Willemson <janwil@hot.ee>
@@ -8,7 +8,7 @@
 
 pkgname=fpc
 pkgver=2.4.4
-pkgrel=1
+pkgrel=3
 pkgdesc="The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit Pascal Compiler. It comes with fully TP 7.0 compatible run-time library."
 arch=('i686' 'x86_64')
 url="http://www.freepascal.org/"
@@ -17,18 +17,31 @@ backup=("etc/fpc.cfg")
 depends=(ncurses)
 makedepends=(fpc)
 options=(zipman)
-source=(ftp://ftp.freepascal.org/pub/fpc/dist/$pkgver/source/fpcbuild-$pkgver.tar.gz)
-md5sums=('d069dfd3412bd0d26dcd1b81ac998305')
+source=(ftp://ftp.freepascal.org/pub/fpc/dist/$pkgver/source/fpcbuild-$pkgver.tar.gz
+	Makefile-mk382.diff)
+md5sums=('d069dfd3412bd0d26dcd1b81ac998305'
+         'a2242d261b055d08fa4d70e88ca1d1a7')
 
 build() {
   cd ${srcdir}/fpcbuild-$pkgver
+  pushd fpcsrc/compiler
+  patch -uN Makefile.fpc $srcdir/Makefile-mk382.diff
+  fpcmake -Tall
+  popd
   make NOGDB=1 build
+#  make NOGDB=1 build OS_TARGET=win32 CPU_TARGET=i386
 }
 
 package() {
   cd ${srcdir}/fpcbuild-$pkgver
+
+  export HOME=$srcdir
+
   make -j1 NOGDB=1 PREFIX=${pkgdir}/usr install
 
+#  make NOGDB=1 PREFIX=${pkgdir}/usr crossinstall OS_TARGET=win32 CPU_TARGET=i386
+#  ln -s /usr/lib/fpc/$pkgver/ppcross386 $pkgdir/usr/bin/ppcross386
+
   # install package license
   install -m 755 -d ${pkgdir}/usr/share/licenses/${pkgname}
   install -m 644 fpcsrc/rtl/COPYING.FPC ${pkgdir}/usr/share/licenses/${pkgname}/
diff --git a/community/gnome-system-tools/PKGBUILD b/community/gnome-system-tools/PKGBUILD
index aef106546..fc8daf9aa 100644
--- a/community/gnome-system-tools/PKGBUILD
+++ b/community/gnome-system-tools/PKGBUILD
@@ -1,27 +1,34 @@
-# $Id: PKGBUILD 44473 2011-04-07 19:13:54Z ibiru $
+# $Id: PKGBUILD 53804 2011-08-08 09:59:18Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugodoria@archlinux-br.org>
 
 pkgname=gnome-system-tools
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Gnome System Configuration Utilities"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/projects/gst/"
 license=('GPL')
 options=('!libtool')
 depends=('wireless_tools' 'liboobs' 'nautilus' 'polkit-gnome' 'dconf')
-makedepends=('gnome-doc-utils' 'intltool')
+makedepends=('gnome-doc-utils' 'intltool' 'gnome-common')
 install=gnome-system-tools.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('905df26c02f00a6c2c18706ba3db7eab764e3df6576289e103504aa39a47ae0b')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2
+        po.patch)
+sha256sums=('905df26c02f00a6c2c18706ba3db7eab764e3df6576289e103504aa39a47ae0b'
+            '827c3169ae5060403b3f833b0f9c1d5cefe1d80aa5ade22e2ff7908b1ce1b5ef')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
-
+    patch -Np1 -i "${srcdir}/po.patch"
+    gnome-autogen.sh
     ./configure --prefix=/usr  --sysconfdir=/etc \
-	--localstatedir=/var --disable-scrollkeeper --disable-static \
-	--disable-services --disable-schemas-compile
+        --localstatedir=/var --disable-scrollkeeper --disable-static \
+        --disable-services --disable-schemas-compile
     make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
     make DESTDIR="${pkgdir}" install
 }
diff --git a/community/gnome-system-tools/po.patch b/community/gnome-system-tools/po.patch
new file mode 100644
index 000000000..0f89f2605
--- /dev/null
+++ b/community/gnome-system-tools/po.patch
@@ -0,0 +1,14 @@
+diff -Nur gnome-system-tools-3.0.0.orig//configure.in gnome-system-tools-3.0.0/configure.in
+--- gnome-system-tools-3.0.0.orig//configure.in	2011-08-08 09:49:33.514034262 +0000
++++ gnome-system-tools-3.0.0/configure.in	2011-08-08 09:50:06.967688099 +0000
+@@ -161,8 +161,8 @@
+ AM_GNU_GETTEXT([external])
+ AM_GNU_GETTEXT_VERSION([0.17])
+ GETTEXT_PACKAGE=gnome-system-tools
+-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package name])
+-AC_SUBST([GETTEXT_PACKAGE], GETTEXT_PACKAGE)
++AC_SUBST(GETTEXT_PACKAGE) # needed by gettext in po directory
++AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",[fix])
+ 
+ dnl ========================================================
+ dnl END : Translations
diff --git a/community/java-oracle/PKGBUILD b/community/java-oracle/PKGBUILD
index 61cce1d2a..ac8e89a76 100644
--- a/community/java-oracle/PKGBUILD
+++ b/community/java-oracle/PKGBUILD
@@ -10,18 +10,16 @@
 pkgbase=java-oracle
 pkgname=('jre' 'jdk')
 pkgver=7
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
   [ "${CARCH}" = 'i686' ]   && _arch='i586'
   [ "${CARCH}" = 'x86_64' ] && _arch='x64'
 url='http://jdk7.java.net/'
 license=('custom')
 source=("http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-${_arch}.tar.gz"
-        'java-control-panel.desktop'
         'java-monitoring-and-management-console.desktop'
         'java-policy-settings.desktop'
         'java-visualvm.desktop'
-        'java-web-start.desktop'
         'jre.profile'
         'jre.profile.csh'
         'jdk.profile'
@@ -31,22 +29,20 @@ source=("http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-${_arch}.tar.
         'javaws-launcher')
 [ "${CARCH}" = 'i686' ] && md5sums=('f97244a104f03731e5ff69f0dd5a9927')
 [ "${CARCH}" = 'x86_64' ] && md5sums=('b3c1ef5faea7b180469c129a49762b64')
-md5sums+=('e4d814c0f310d77ed6990c731bccd0fb'
-          '4bc2b0be93f76ed07b471e3c89eb5a8a'
-          '8e3cec7ab641ec449cabd068be583f5c'
-          '9ba148ebabce8ed3351b813a9a66b6e5'
-          '619ec32235dcfe454234ef4316f8a7cc'
-          '7cd3dc10e7a37468cad4053a067dcd01'
-          'cc90df2df6fe80fab885a80036d420a1'
-          'b83ab5742651b4234b7d2e20785c6693'
-          '6f4cbf332816d2c4e9578ecd1d0dce7f'
-          'a279e195e249000646895d93e199860d'
-          '4bdff6982c66d24a879c424aaac3d04d'
-          '45c15a6b4767288f2f745598455ea2bf')
+md5sums+=('81cf9b716263ba85f0528d3357dccb75'
+         '6614b04176b9b7dfe26f22e9ce846801'
+         'ef27c6d4062f2f97c532a9e893b6adbe'
+         '7cd3dc10e7a37468cad4053a067dcd01'
+         'cc90df2df6fe80fab885a80036d420a1'
+         'b83ab5742651b4234b7d2e20785c6693'
+         '6f4cbf332816d2c4e9578ecd1d0dce7f'
+         'a279e195e249000646895d93e199860d'
+         '4bdff6982c66d24a879c424aaac3d04d'
+         '45c15a6b4767288f2f745598455ea2bf')
 
 package_jre() {
   pkgdesc="Oracle's Java Runtime Environment"
-  depends=('libxtst')
+  depends=('libxtst' 'desktop-file-utils' 'xdg-utils' 'shared-mime-info')
   provides=('java-runtime=7')
   conflicts=('java-runtime')
   install='jre.install'
@@ -55,6 +51,27 @@ package_jre() {
   mkdir -p ${pkgdir}/opt/java
   cp -r jdk1.7.0/jre ${pkgdir}/opt/java
 
+  # move icons to appropriate location
+  install -d ${pkgdir}/usr/share
+  mv ${pkgdir}/opt/java/jre/lib/desktop/icons ${pkgdir}/usr/share
+
+  # install .desktop entries
+  mv ${pkgdir}/opt/java/jre/lib/desktop/applications ${pkgdir}/usr/share
+  # desktop entries
+  install -d ${pkgdir}/usr/share/applications
+  install -m644 \
+    ${srcdir}/java-policy-settings.desktop \
+    ${pkgdir}/usr/share/applications
+
+  # move mime files
+  mv ${pkgdir}/opt/java/jre/lib/desktop/mime ${pkgdir}/usr/share
+
+  # get rid of already installed files
+  rm -r ${pkgdir}/opt/java/jre/plugin/desktop
+  rm -r ${pkgdir}/opt/java/jre/lib/desktop
+
+  # TODO: find out the purpose of ./jre/lib/images/icons
+
   # profiles
   install -D ${srcdir}/jre.profile \
     ${pkgdir}/etc/profile.d/jre.sh
@@ -73,19 +90,20 @@ package_jre() {
 
   # licenses
   install -d ${pkgdir}/usr/share/licenses/jre
-  install -m644 ${pkgdir}/opt/java/jre/COPYRIGHT \
-    ${pkgdir}/usr/share/licenses/jre
-  install -m644 ${pkgdir}/opt/java/jre/LICENSE \
-    ${pkgdir}/usr/share/licenses/jre
-  install -m644 ${pkgdir}/opt/java/jre/THIRDPARTYLICENSEREADME.txt \
+  install -m644 \
+    ${pkgdir}/opt/java/jre/{COPYRIGHT,LICENSE,THIRDPARTYLICENSEREADME.txt} \
     ${pkgdir}/usr/share/licenses/jre
 
-  # Fix system prefs folder FS#18872
-  install -d ${pkgdir}/etc/.java/.systemPrefs
-
   # Clicking a .jnlp file does not launch that file but launch javaws -viewer instead FS#22509
   install ${srcdir}/javaws-launcher \
     ${pkgdir}/opt/java/jre/bin
+  sed \
+    -e 's/Exec=javaws/&-launcher %f/' \
+    -e '/NoDisplay=true/d' \
+    -i ${pkgdir}/usr/share/applications/sun-javaws.desktop
+
+  # Fix system prefs folder FS#18872
+  install -d ${pkgdir}/etc/.java/.systemPrefs
 }
 
 package_jdk() {
@@ -101,14 +119,16 @@ package_jdk() {
 
   # main files
   install -d ${pkgdir}/opt
-  mv jdk1.7.0 ${pkgdir}/opt/java
+  cp -r jdk1.7.0 ${pkgdir}/opt/java
 
-  # cleanup jre folder
-  rm -rf ${pkgdir}/opt/java/jre
+  # remove jre folder provided by the jre package
+  rm -r ${pkgdir}/opt/java/jre
   # can not package src.zip due to international use restrictions for certain countries
   rm ${pkgdir}/opt/java/src.zip
   # remove windows specific batch files
   find ${pkgdir}/opt/java -name '*\.bat' -delete
+  # remove already installed icons, mime and .desktop files provided by jre
+  rm -r ${pkgdir}/opt/java/lib/desktop
 
   # profiles
   install -D ${srcdir}/jdk.profile \
@@ -118,24 +138,15 @@ package_jdk() {
 
   # licenses
   install -d ${pkgdir}/usr/share/licenses/jdk
-  install -m644 ${pkgdir}/opt/java/COPYRIGHT \
-    ${pkgdir}/usr/share/licenses/jdk
-  install -m644 ${pkgdir}/opt/java/LICENSE \
-    ${pkgdir}/usr/share/licenses/jdk
-  install -m644 ${pkgdir}/opt/java/THIRDPARTYLICENSEREADME.txt \
+  install -m644 \
+    ${pkgdir}/opt/java/{COPYRIGHT,LICENSE,THIRDPARTYLICENSEREADME.txt} \
     ${pkgdir}/usr/share/licenses/jdk
 
   # desktop entries
-  install -Dm644 ${srcdir}/java-control-panel.desktop \
-    ${pkgdir}/usr/share/applications/java-control-panel.desktop
-  install -Dm644 ${srcdir}/java-monitoring-and-management-console.desktop \
-    ${pkgdir}/usr/share/applications/java-monitoring-and-management-console.desktop
-  install -Dm644 ${srcdir}/java-policy-settings.desktop \
-    ${pkgdir}/usr/share/applications/java-policy-settings.desktop
-  install -Dm644 ${srcdir}/java-visualvm.desktop \
-    ${pkgdir}/usr/share/applications/java-visualvm.desktop
-  install -Dm644 ${srcdir}/java-web-start.desktop \
-    ${pkgdir}/usr/share/applications/java-web-start.desktop
+  install -d ${pkgdir}/usr/share/applications
+  install -m644 \
+    ${srcdir}/java-{monitoring-and-management-console,visualvm}.desktop \
+    ${pkgdir}/usr/share/applications
 
   # javadb (apache derby) daemon files FS#21186
   install -D ${srcdir}/derby-network-server \
diff --git a/community/java-oracle/java-monitoring-and-management-console.desktop b/community/java-oracle/java-monitoring-and-management-console.desktop
index c0e1e59f6..4de3bd293 100644
--- a/community/java-oracle/java-monitoring-and-management-console.desktop
+++ b/community/java-oracle/java-monitoring-and-management-console.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=/opt/java/bin/jconsole
+Exec=jconsole
 Icon=java
 Name[cs]=Konzole monitorování a správy prostředí Java
 Name=Java Monitoring and Management Console
diff --git a/community/java-oracle/java-policy-settings.desktop b/community/java-oracle/java-policy-settings.desktop
index 1009301b1..0e032258d 100644
--- a/community/java-oracle/java-policy-settings.desktop
+++ b/community/java-oracle/java-policy-settings.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Exec=/opt/java/bin/policytool
-Icon=java
+Exec=policytool
+Icon=sun-java.png
 Name[cs]=Nastavení politiky Java aplikací
 Name=Java Policy Settings
 Path=
diff --git a/community/java-oracle/java-visualvm.desktop b/community/java-oracle/java-visualvm.desktop
index 8aa9527c8..f7ad3e324 100644
--- a/community/java-oracle/java-visualvm.desktop
+++ b/community/java-oracle/java-visualvm.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=/opt/java/bin/jvisualvm
+Exec=jvisualvm
 GenericName[cs]=Nástroj pro monitorování a sledování výkonu Java aplikací
 GenericName=Java Monitoring and Performance Monitoring Tool
 Icon=java
diff --git a/community/java-oracle/jdk.install b/community/java-oracle/jdk.install
index abe08b6a0..0d96b6572 100644
--- a/community/java-oracle/jdk.install
+++ b/community/java-oracle/jdk.install
@@ -1,7 +1,16 @@
 post_install() {
+  update-desktop-database -q
   echo "The jdk package is licensed software."
   echo "You MUST read and agree to the license stored in"
-  echo "/opt/java/LICENSE before using it."
+  echo "/usr/share/licenses/jdk/LICENSE before using it."
 
   echo 'Please relogin to include jdk in your PATH'
 }
+
+post_upgrade() {
+  update-desktop-database -q
+}
+
+post_remove() {
+  update-desktop-database -q
+}
diff --git a/community/java-oracle/jre.install b/community/java-oracle/jre.install
index 111da3c2a..573f5f836 100644
--- a/community/java-oracle/jre.install
+++ b/community/java-oracle/jre.install
@@ -1,20 +1,35 @@
 post_install() {
-   echo "The jre package is licensed software."
-	echo "You MUST read and agree to the license stored in"
-	echo "/opt/java/jre/LICENSE before using it."
-	if [ -f /etc/mailcap ] ; then
-		sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap
-	fi
-	echo 'application/x-java-jnlp-file;/opt/java/jre/bin/javaws %s' >>/etc/mailcap
+  update-desktop-database -q
+  xdg-icon-resource forceupdate
+  update-mime-database usr/share/mime &> /dev/null
+
+  echo "The jre package is licensed software."
+  echo "You MUST read and agree to the license stored in"
+  echo "/usr/share/licenses/jre/LICENSE before using it."
+
+  if [ -f /etc/mailcap ] ; then
+    sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap
+  fi
+  echo 'application/x-java-jnlp-file;/opt/java/jre/bin/javaws %s' >>/etc/mailcap
 
   echo 'Please relogin to include jre in your PATH.'
 }
 
+post_upgrade() {
+  update-desktop-database -q
+  xdg-icon-resource forceupdate
+  update-mime-database usr/share/mime &> /dev/null
+}
+
 post_remove() {
-	mailcap=$(grep -v 'application/x-java-jnlp-file' /etc/mailcap)
-	if [ "$mailcap" != "" ] ; then
-		sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap
-	else
-		rm /etc/mailcap
-	fi
+  update-desktop-database -q
+  xdg-icon-resource forceupdate
+  update-mime-database usr/share/mime &> /dev/null
+
+  mailcap=$(grep -v 'application/x-java-jnlp-file' /etc/mailcap)
+  if [ "$mailcap" != "" ] ; then
+    sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap
+  else
+    rm /etc/mailcap
+  fi
 }
diff --git a/community/metapixel/PKGBUILD b/community/metapixel/PKGBUILD
new file mode 100644
index 000000000..056f40d52
--- /dev/null
+++ b/community/metapixel/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 53817 2011-08-08 13:44:50Z lfleischer $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Daniel Isenmann <daniel.isenmann [at] gmx [dot] de>
+
+pkgname=metapixel
+pkgver=1.0.2
+pkgrel=2
+pkgdesc='A program for generating photomosaics.'
+arch=('i686' 'x86_64')
+url='http://www.complang.tuwien.ac.at/schani/metapixel/'
+license=('GPL')
+depends=('libungif' 'libjpeg' 'libpng' 'perl')
+source=("http://www.complang.tuwien.ac.at/schani/metapixel/files/${pkgname}-${pkgver}.tar.gz"
+        'metapixel-1.0.2-libpng-1.5.patch')
+md5sums=('af5d77d38826756af213a08e3ada9941'
+         '1832a79790b07402735bfeb9f71f36e9')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  sed -i 's/lgif/lungif/g' Makefile
+  sed -ie '58,58d' Makefile
+
+  patch -p1 -i ../metapixel-1.0.2-libpng-1.5.patch
+
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make PREFIX="${pkgdir}/usr" install
+}
diff --git a/community/metapixel/metapixel-1.0.2-libpng-1.5.patch b/community/metapixel/metapixel-1.0.2-libpng-1.5.patch
new file mode 100644
index 000000000..ed787452f
--- /dev/null
+++ b/community/metapixel/metapixel-1.0.2-libpng-1.5.patch
@@ -0,0 +1,174 @@
+--- metapixel-1.0.2.orig/rwimg/rwpng.c
++++ metapixel-1.0.2/rwimg/rwpng.c
+@@ -57,19 +57,39 @@
+     data->end_info = png_create_info_struct(data->png_ptr);
+     assert(data->end_info != 0);
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	if (setjmp(png_jmpbuf((data->png_ptr))))
++#else
+     if (setjmp(data->png_ptr->jmpbuf))
++#endif
+ 	assert(0);
+ 
+-    png_init_io(data->png_ptr, data->file);
+-
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	png_init_io(data->png_ptr, data->file);
++    png_read_info(data->png_ptr, data->info_ptr);
++#else
++	png_init_io(data->png_ptr, data->file);
+     png_read_info(data->png_ptr, data->info_ptr);
++#endif
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	*width = png_get_image_width(data->png_ptr, data->info_ptr);
++	*height = png_get_image_height(data->png_ptr, data->info_ptr);
++	{
++		png_byte value = png_get_bit_depth(data->png_ptr, data->info_ptr);
++    	assert(value == 8 || value == 16);
++		value = png_get_color_type(data->png_ptr, data->info_ptr);
++    	assert(value == PNG_COLOR_TYPE_RGB || value == PNG_COLOR_TYPE_RGB_ALPHA);
++    	value = png_get_interlace_type(data->png_ptr, data->info_ptr);
++    	assert(value == PNG_INTERLACE_NONE);
++	}
++#else
+     *width = data->info_ptr->width;
+     *height = data->info_ptr->height;
+-
+     assert(data->info_ptr->bit_depth == 8 || data->info_ptr->bit_depth == 16);
+     assert(data->info_ptr->color_type == PNG_COLOR_TYPE_RGB || data->info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA);
+     assert(data->info_ptr->interlace_type == PNG_INTERLACE_NONE);
++#endif
+ 
+     data->have_read = 0;
+ 
+@@ -81,32 +101,51 @@
+ {
+     png_data_t *data = (png_data_t*)_data;
+     int i;
+-    int bps, spp;
++    int bps, spp, width;
+     unsigned char *row;
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++
++	if (setjmp(png_jmpbuf((data->png_ptr))))
++#else
+     if (setjmp(data->png_ptr->jmpbuf))
++#endif
+ 	assert(0);
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	if(png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_RGB)
++#else
+     if (data->info_ptr->color_type == PNG_COLOR_TYPE_RGB)
++#endif
+ 	spp = 3;
+     else
+ 	spp = 4;
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	if(png_get_bit_depth(data->png_ptr, data->info_ptr) == 16)
++#else
+     if (data->info_ptr->bit_depth == 16)
++#endif
+ 	bps = 2;
+     else
+ 	bps = 1;
+ 
+-    row = (unsigned char*)malloc(data->info_ptr->width * spp * bps);
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	width = png_get_image_width(data->png_ptr, data->info_ptr);
++#else
++    width = data->info_ptr->width:
++#endif
++
++    row = (unsigned char*)malloc(width * spp * bps);
+ 
+     for (i = 0; i < num_lines; ++i)
+     {
+ 	int j, channel;
+ 
+ 	png_read_row(data->png_ptr, (png_bytep)row, 0);
+-	for (j = 0; j < data->info_ptr->width; ++j)
++	for (j = 0; j < width; ++j)
+ 	    for (channel = 0; channel < 3; ++channel)
+-		lines[i * data->info_ptr->width * 3 + j * 3 + channel] = row[j * spp * bps + channel * bps];
++		lines[i * width * 3 + j * 3 + channel] = row[j * spp * bps + channel * bps];
+     }
+ 
+     free(row);
+@@ -119,7 +158,11 @@
+ {
+     png_data_t *data = (png_data_t*)_data;
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	if (setjmp(png_jmpbuf((data->png_ptr))))
++#else
+     if (setjmp(data->png_ptr->jmpbuf))
++#endif
+ 	assert(0);
+ 
+     if (data->have_read)
+@@ -148,7 +191,11 @@
+     data->info_ptr = png_create_info_struct(data->png_ptr);
+     assert(data->info_ptr != 0);
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	if (setjmp(png_jmpbuf((data->png_ptr))))
++#else
+     if (setjmp(data->png_ptr->jmpbuf))
++#endif
+ 	assert(0);
+ 
+     if (pixel_stride == 4)
+@@ -156,6 +203,16 @@
+ 
+     png_init_io(data->png_ptr, data->file);
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	png_set_IHDR(data->png_ptr, data->info_ptr,
++		width, height, 8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
++		PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
++
++	/* Maybe does not need following. */
++	png_set_tRNS(data->png_ptr, data->info_ptr, NULL, 0, NULL);
++	png_set_PLTE(data->png_ptr, data->info_ptr, NULL, 0);
++	png_set_invalid(data->png_ptr, data->info_ptr, 0);
++#else
+     data->info_ptr->width = width;
+     data->info_ptr->height = height;
+     data->info_ptr->valid = 0;
+@@ -168,6 +225,7 @@
+     data->info_ptr->compression_type = PNG_COMPRESSION_TYPE_DEFAULT;
+     data->info_ptr->filter_type = PNG_FILTER_TYPE_DEFAULT;
+     data->info_ptr->interlace_type = PNG_INTERLACE_NONE;
++#endif
+ 
+     png_write_info(data->png_ptr, data->info_ptr);
+ 
+@@ -182,7 +240,11 @@
+     png_data_t *data = (png_data_t*)_data;
+     int i;
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	if (setjmp(png_jmpbuf((data->png_ptr))))
++#else
+     if (setjmp(data->png_ptr->jmpbuf))
++#endif
+ 	assert(0);
+ 
+     for (i = 0; i < num_lines; ++i)
+@@ -194,7 +256,11 @@
+ {
+     png_data_t *data = (png_data_t*)_data;
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	if (setjmp(png_jmpbuf((data->png_ptr))))
++#else
+     if (setjmp(data->png_ptr->jmpbuf))
++#endif
+ 	assert(0);
+ 
+     png_write_end(data->png_ptr, data->info_ptr);
diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD
index 449f8d6cf..7240ccc97 100644
--- a/community/open-vm-tools-modules/PKGBUILD
+++ b/community/open-vm-tools-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 52418 2011-07-24 20:40:05Z spupykin $
+# $Id: PKGBUILD 53790 2011-08-08 08:19:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools-modules
 pkgver=2011.07.19
 _pkgsubver=450511
-pkgrel=1
+pkgrel=2
 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools"
 arch=('i686' 'x86_64')
 url="http://open-vm-tools.sourceforge.net/"
diff --git a/community/quvi/PKGBUILD b/community/quvi/PKGBUILD
index e6a4f6c98..4194f970b 100644
--- a/community/quvi/PKGBUILD
+++ b/community/quvi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 52105 2011-07-20 08:21:04Z lfleischer $
+# $Id: PKGBUILD 53820 2011-08-08 14:10:47Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: joyfulgirl@archlinux.us
 
 pkgname=quvi
-pkgver=0.2.18
+pkgver=0.2.19
 pkgrel=1
 pkgdesc='Command-line tool for parsing video download links.'
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('LGPL')
 depends=('curl' 'pcre' 'lua')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('496bb7aad2f449c2a692aa48721b8a4a')
+md5sums=('c96627374377b049ac60e7642eb7f838')
 
 build() {
   cd "${pkgname}-${pkgver}"
diff --git a/community/ruby-atk/PKGBUILD b/community/ruby-atk/PKGBUILD
index d39683e6a..2787f8556 100644
--- a/community/ruby-atk/PKGBUILD
+++ b/community/ruby-atk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 44814 2011-04-12 01:26:00Z bfanella $
+# $Id: PKGBUILD 53612 2011-08-07 01:11:19Z bfanella $
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
 # Contributor: kritoke <kritoke@nospam.gmail.com>
 
 pkgname=ruby-atk
-pkgver=0.90.8
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="Ruby bindings for atk."
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('LGPL')
 depends=('ruby-glib2')
 makedepends=('ruby-glib2' 'atk' 'ruby-pkgconfig')
 source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz)
-md5sums=('74966bde5366bc9d09701e9f464d60c9')
+md5sums=('e9711eb5bd88debda90a920deb96d7d0')
 
 build() {
 	cd "$srcdir/ruby-gtk2-$pkgver"
diff --git a/community/ruby-gdkpixbuf2/PKGBUILD b/community/ruby-gdkpixbuf2/PKGBUILD
index 58cc56824..7298e2339 100644
--- a/community/ruby-gdkpixbuf2/PKGBUILD
+++ b/community/ruby-gdkpixbuf2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 44824 2011-04-12 01:33:28Z bfanella $
+# $Id: PKGBUILD 53620 2011-08-07 02:18:34Z bfanella $
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
 # Contributor: kritoke <kritoke@nospam.gmail.com>
 
 pkgname=ruby-gdkpixbuf2
-pkgver=0.90.8
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="Ruby bindings for gdkpixbuf2."
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('LGPL')
 depends=('ruby-glib2' 'gtk2')
 makedepends=('ruby-glib2' 'ruby-pkgconfig')
 source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz)
-md5sums=('74966bde5366bc9d09701e9f464d60c9')
+md5sums=('e9711eb5bd88debda90a920deb96d7d0')
 
 build() {
 	cd "$srcdir/ruby-gtk2-$pkgver"
diff --git a/community/ruby-gio2/PKGBUILD b/community/ruby-gio2/PKGBUILD
index e4eb57305..297f60085 100644
--- a/community/ruby-gio2/PKGBUILD
+++ b/community/ruby-gio2/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=ruby-gio2
-pkgver=0.90.8
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="Ruby bindings for gio2."
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 depends=('ruby-glib2')
 makedepends=('ruby-pkgconfig')
 source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz)
-md5sums=('74966bde5366bc9d09701e9f464d60c9')
+md5sums=('e9711eb5bd88debda90a920deb96d7d0')
 
 build() {
 	cd "$srcdir/ruby-gtk2-$pkgver"
diff --git a/community/ruby-glib2/PKGBUILD b/community/ruby-glib2/PKGBUILD
index 8c885ead8..fb2a1fac3 100644
--- a/community/ruby-glib2/PKGBUILD
+++ b/community/ruby-glib2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 44809 2011-04-12 00:27:03Z bfanella $
+# $Id: PKGBUILD 53576 2011-08-05 22:47:58Z bfanella $
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
 # Contributor: kritoke <kritoke@nospam.gmail.com>
 
 pkgname=ruby-glib2
-pkgver=0.90.8
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="Ruby bindings for glib2."
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('LGPL')
 depends=('ruby')
 makedepends=('ruby-pkgconfig')
 source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz)
-md5sums=('74966bde5366bc9d09701e9f464d60c9')
+md5sums=('e9711eb5bd88debda90a920deb96d7d0')
 
 build() {
 	cd "$srcdir/ruby-gtk2-$pkgver"
diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD
index b796f8416..cf6a05af1 100644
--- a/community/ruby-gtk2/PKGBUILD
+++ b/community/ruby-gtk2/PKGBUILD
@@ -1,28 +1,23 @@
-# $Id: PKGBUILD 44925 2011-04-13 00:53:43Z bfanella $
+# $Id: PKGBUILD 53871 2011-08-09 01:21:52Z bfanella $
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
 # Contributor: kritoke <kritoke@nospam.gmail.com>
 
 pkgname=ruby-gtk2
-pkgver=0.90.8
-pkgrel=2
+pkgver=1.0.0
+pkgrel=1
 pkgdesc="Ruby bindings for gtk2."
 arch=('i686' 'x86_64')
 url="http://ruby-gnome2.sourceforge.jp"
 license=('LGPL')
 depends=('ruby-glib2' 'ruby-pango' 'ruby-atk' 'ruby-gdkpixbuf2')
 makedepends=('ruby-pkgconfig' 'ruby-cairo')
-source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz
-	'mkmf-gnome2.patch')
-md5sums=('74966bde5366bc9d09701e9f464d60c9'
-	'5674ec349bec878c36f70102ca7acb0b')
+source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz)
+md5sums=('e9711eb5bd88debda90a920deb96d7d0')
 
 build() {
 	cd "$srcdir/ruby-gtk2-$pkgver"
 
-	# Apply mkmf-gnome2.patch
-	patch -Np1 glib2/lib/mkmf-gnome2.rb < ${srcdir}/mkmf-gnome2.patch
-
 	export LANG="en_US.UTF-8"
 	ruby extconf.rb gtk2 --topdir=$pkgdir
 	make
diff --git a/community/ruby-pango/PKGBUILD b/community/ruby-pango/PKGBUILD
index fd5e51805..1f20c7a3d 100644
--- a/community/ruby-pango/PKGBUILD
+++ b/community/ruby-pango/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 44819 2011-04-12 01:30:34Z bfanella $
+# $Id: PKGBUILD 53626 2011-08-07 02:29:56Z bfanella $
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
 # Contributor: kritoke <kritoke@nospam.gmail.com>
 
 pkgname=ruby-pango
-pkgver=0.90.8
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="Ruby bindings for pango."
 arch=('i686' 'x86_64')
@@ -13,10 +13,10 @@ license=('LGPL')
 depends=('ruby-glib2' 'ruby-cairo')
 makedepends=('ruby-glib2' 'pango' 'ruby-pkgconfig' 'ruby-cairo')
 source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz)
-md5sums=('74966bde5366bc9d09701e9f464d60c9')
+md5sums=('e9711eb5bd88debda90a920deb96d7d0')
+
 build() {
 	cd "$srcdir/ruby-gtk2-$pkgver"
-
 	ruby extconf.rb pango --topdir=$pkgdir
 	make
 }
diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD
index 03f85a55d..aafaf1b5f 100644
--- a/community/systemd/PKGBUILD
+++ b/community/systemd/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 53341 2011-08-03 04:06:06Z dreisner $
+# $Id: PKGBUILD 53877 2011-08-09 02:05:40Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=systemd
 pkgver=33
-pkgrel=1
+pkgrel=2
 pkgdesc="Session and Startup manager"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2')
-depends=('dbus-core' 'libcap' 'util-linux>=2.19' 'udev>=172')
+depends=('dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172')
 makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'intltool' 'libnotify' 'gperf')
 optdepends=('cryptsetup: required for encrypted block devices'
             'dbus-python: systemd-analyze'
diff --git a/community/systemd/systemd.install b/community/systemd/systemd.install
index 34f902276..04b29688a 100644
--- a/community/systemd/systemd.install
+++ b/community/systemd/systemd.install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 checkgroups() {
-  if usr/bin/getent group lock >/dev/null; then
+  if ! usr/bin/getent group lock >/dev/null; then
     usr/sbin/groupadd -g 54 lock
   fi
 }
@@ -13,7 +13,7 @@ sd_booted() {
 post_install() {
   checkgroups
 
-  if [ -f etc/machine-id ]; then
+  if [ ! -f etc/machine-id ]; then
     bin/systemd-machine-id-setup
   fi
 
@@ -24,7 +24,7 @@ post_install() {
 post_upgrade() {
   checkgroups
 
-  if [ -f etc/machine-id ]; then
+  if [ ! -f etc/machine-id ]; then
     bin/systemd-machine-id-setup
   fi
 
@@ -45,7 +45,9 @@ post_upgrade() {
 }
 
 post_remove() {
-  usr/bin/getent group lock >/dev/null && usr/sbin/groupdel lock
+  if usr/bin/getent group lock >/dev/null; then
+    usr/sbin/groupdel lock
+  fi
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD
index 3aacd232f..bc3845166 100644
--- a/community/tea/PKGBUILD
+++ b/community/tea/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 50314 2011-06-28 09:33:06Z spupykin $
+# $Id: PKGBUILD 53780 2011-08-08 08:12:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu>
 
 pkgname=tea
-pkgver=30.0.0
+pkgver=30.1.0
 pkgrel=1
 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions."
 arch=('i686' 'x86_64')
@@ -14,9 +14,9 @@ url="http://tea-editor.sourceforge.net/"
 license=('GPL')
 depends=('qt' 'aspell' 'hunspell')
 install=tea.install
-source=(http://downloads.sourceforge.net/tea-editor/${pkgname}-${pkgver}.tar.bz2
+source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2
         tea.desktop)
-md5sums=('07508b4972403fc7c3a72169700e6157'
+md5sums=('1b6bdadf7cd323f059b0b7b4420e186b'
          '377ace3363124f4c086de0babb820761')
 
 build() {
diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD
index 137897a28..5904f5ef7 100644
--- a/community/vhba-module/PKGBUILD
+++ b/community/vhba-module/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 51733 2011-07-13 18:23:43Z schiv $
+# $Id: PKGBUILD 53809 2011-08-08 10:37:58Z jelle $
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
 
 pkgname=vhba-module
 pkgver=20110416
-_kernver='2.6.39-ARCH'
-pkgrel=1
+_kernver='3.0-ARCH'
+pkgrel=2
 pkgdesc="Kernel module that emulates SCSI devices"
 arch=('i686' 'x86_64')
 url="http://cdemu.sourceforge.net/"
 license=('GPL2')
-depends=('kernel26>=2.6.39' 'kernel26<2.6.40')
-makedepends=('kernel26-headers>=2.6.39')
+depends=('linux>=3.0' 'linux<3.1')
+makedepends=('linux-headers>=3.0')
 install=vhba-module.install
 source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz)
 md5sums=('2f91dd4ee8648da92d625221d4275b60')
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index 9df5a53bf..bfb657eb9 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 53173 2011-07-31 12:12:47Z ibiru $
+# $Id: PKGBUILD 53837 2011-08-08 20:19:32Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
 pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk')
 pkgver=4.1.0
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -26,7 +26,7 @@ build() {
     patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch"
     patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
     patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
-    patch -Np0 -i "$srcdir/fix-kernel-panic.patch"
+    patch -Np2 -i "$srcdir/fix-kernel-panic.patch"
 
     cp "$srcdir/LocalConfig.kmk" .
 
@@ -203,6 +203,6 @@ md5sums=('02556a6b4877cfdfbaa3ce0a0c0dcf31'
          'ed1341881437455d9735875ddf455fbe'
          '4cf75d9c091199a47a7a1bc2f4e347d9'
          '78ffa67ff131680f1d2b6f06d4325c5b'
-         'b3de603560b2fb2c33e704e4e8ab3de8'
+         '790a1456345fe74b6b714d71f90a1c6d'
          '97e193f050574dd272a38e5ee5ebe62b'
-         '19b05b85a8a46af5a429b2ab618638cd')
+         '863107a852607b758b356cd53850679d')
diff --git a/community/virtualbox/fix-kernel-panic.patch b/community/virtualbox/fix-kernel-panic.patch
index 237715db2..1f1ea993d 100644
--- a/community/virtualbox/fix-kernel-panic.patch
+++ b/community/virtualbox/fix-kernel-panic.patch
@@ -1,22 +1,11 @@
-Index: src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c
+Index: /trunk/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c
 ===================================================================
---- src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c	(revision 73165)
-+++ src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c	(revision 73166)
-@@ -32,6 +32,7 @@
- #include "internal/iprt.h"
- 
- #include <iprt/mp.h>
-+#include <iprt/asm-amd64-x86.h>
- #include <iprt/err.h>
- #include <iprt/cpuset.h>
- #include <iprt/thread.h>
-@@ -82,7 +83,8 @@
-     NOREF(pvUser1);
- 
-     AssertRelease(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
--    AssertRelease(idCpu == RTMpCpuId());   /* ASSUMES iCpu == RTCPUID */
-+    AssertReleaseMsg(idCpu == RTMpCpuId(),  /* ASSUMES iCpu == RTCPUID */
-+                     ("idCpu=%u RTMpCpuId=%d ApicId=%d\n", idCpu, RTMpCpuId(), ASMGetApicId() ));
- 
-     switch (ulNativeEvent)
-     {
-\ No newline at end of file
+--- /trunk/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 38199)
++++ /trunk/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 38232)
+@@ -78,5 +78,5 @@
+  * @remarks This can be invoked in interrupt context.
+  */
+-static void rtMpNotificationLinuxOnCurrentCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2)
++static DECLCALLBACK(void) rtMpNotificationLinuxOnCurrentCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2)
+ {
+     unsigned long ulNativeEvent = *(unsigned long *)pvUser2;
diff --git a/community/virtualbox/vboxdrv.sh b/community/virtualbox/vboxdrv.sh
index 845f6c769..aace25edf 100755
--- a/community/virtualbox/vboxdrv.sh
+++ b/community/virtualbox/vboxdrv.sh
@@ -21,7 +21,7 @@ fi
 case "$1" in
   setup)
     stat_busy "Unloading VirtualBox kernel modules"
-    for module in vbox{netflt,netadp,drv,pci}; do
+    for module in vbox{pci,netflt,netadp,drv}; do
       if grep -q "^${module}" /proc/modules; then
         MODLIST+=($module)
         modprobe -r $module
author	root <root@rshg054.dnsready.net>	2011-08-09 23:14:31 +0000
committer	root <root@rshg054.dnsready.net>	2011-08-09 23:14:31 +0000
commit	a306c2530354c1c02351c4cc02eefa53c8d23eac (patch)
tree	85f473f0abb92a80a4a400a7c07eed79d83880bd /community
parent	5135b52f901206bbb365152084e82e92c120e0be (diff)