[arch-commits] Commit in enlightenment/repos (4 files)

[Eric Belanger]

    Date: Thursday, May 1, 2008 @ 22:26:06
  Author: eric
Revision: 1214

Merged revisions 2-1213 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/enlightenment/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r1213 | eric | 2008-05-01 22:25:53 -0400 (Thu, 01 May 2008) | 2 lines
  
  upgpkg: enlightenment 0.16.8.13-1
      upstream update
........

Modified:
  enlightenment/repos/extra-x86_64/	(properties)
  enlightenment/repos/extra-x86_64/ChangeLog
  enlightenment/repos/extra-x86_64/PKGBUILD
Deleted:
  enlightenment/repos/extra-x86_64/e_gen_menu.patch

------------------+
 ChangeLog        |   12 +++++++++---
 PKGBUILD         |   33 ++++++++++++++-------------------
 e_gen_menu.patch |   11 -----------
 3 files changed, 23 insertions(+), 33 deletions(-)


Property changes on: enlightenment/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /enlightenment/trunk:1
   + /enlightenment/trunk:1-1213

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2008-05-02 02:25:53 UTC (rev 1213)
+++ extra-x86_64/ChangeLog	2008-05-02 02:26:06 UTC (rev 1214)
@@ -1,5 +1,11 @@
+2008-05-01  Eric Belanger  <eric at archlinux.org>
+
+	* enlightenment 0.16.8.13-1
+	* Upstream update
+
 2008-02-18  Eric Belanger  <eric at archlinux.org>
 
-	* upstream update
-	* moved X sessions to /etc/X11/sessions
-	* added scripts for e16-kde and e16-gnome in /usr/bin
+	* enlightenment 0.16.8.12-1
+	* Upstream update
+	* Moved X sessions to /etc/X11/sessions
+	* Added scripts for e16-kde and e16-gnome in /usr/bin

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-05-02 02:25:53 UTC (rev 1213)
+++ extra-x86_64/PKGBUILD	2008-05-02 02:26:06 UTC (rev 1214)
@@ -3,7 +3,7 @@
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=enlightenment
-pkgver=0.16.8.12
+pkgver=0.16.8.13
 _themever=0.16.8.0.2
 pkgrel=1
 pkgdesc="A fast, flexible, and very extensible Window Manager"
@@ -13,30 +13,25 @@
 depends=('freetype2' 'libxinerama' 'libxft' 'libsm' 'libxxf86vm' 'esd' 'imlib2' 'perl' 'libxcomposite' 'libxdamage' 'libxrandr')
 makedepends=('xbitmaps')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/e16-$pkgver.tar.gz \
-        http://downloads.sourceforge.net/enlightenment/e16-themes-${_themever}.tar.gz \
-        e_gen_menu.patch)
-md5sums=('86e2e83bb77f3879b2bad4ff23d5d11d' '20fbaff803c3decdf3ac7c363b37c42e'\
-         '56c2d0c53803a659c3846fc4aa359f14')
-sha1sums=('f2792b60a254405b1352ce965dc2dc233a1d619f'
-          '44dd62c5a476561c7ab4382ddd0250a5a0902065'
-          '4ae92721c2e3e30698f06537e8da6b3f402b82a1')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/e16-${pkgver}.tar.gz \
+        http://downloads.sourceforge.net/enlightenment/e16-themes-${_themever}.tar.gz)
+md5sums=('50e3e0d128b0f1046c95e2820a1bc841' '20fbaff803c3decdf3ac7c363b37c42e')
+sha1sums=('9bcbb42add4447624db3179a79476f0f858974bb' '44dd62c5a476561c7ab4382ddd0250a5a0902065')
 
 build() {
-  cd $startdir/src/e16-$pkgver
-  patch -Np0 -i $startdir/src/e_gen_menu.patch || return 1
+  cd ${startdir}/src/e16-${pkgver}
   sed -i 's|xsessiondir = $(datadir)/xsessions|xsessiondir = /etc/X11/sessions|' misc/Makefile.in
   ./configure --prefix=/usr --enable-fsstd --enable-sound --sysconfdir=/etc
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  install -D -m755 $startdir/pkg/usr/share/e16/misc/Xclients.e16-gnome.sh $startdir/pkg/usr/bin/e16-gnome
-  install -D -m755 $startdir/pkg/usr/share/e16/misc/Xclients.e16-kde.sh $startdir/pkg/usr/bin/e16-kde
-  install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING
-  install -D -m644 man/e16.1 $startdir/pkg/usr/share/man/man1/e16.1
+  make DESTDIR=${startdir}/pkg install
+  install -D -m755 ${startdir}/pkg/usr/share/e16/misc/Xclients.e16-gnome.sh ${startdir}/pkg/usr/bin/e16-gnome
+  install -D -m755 ${startdir}/pkg/usr/share/e16/misc/Xclients.e16-kde.sh ${startdir}/pkg/usr/bin/e16-kde
+  install -D -m644 COPYING ${startdir}/pkg/usr/share/licenses/${pkgname}/COPYING
+  install -D -m644 man/e16.1 ${startdir}/pkg/usr/share/man/man1/e16.1
 
-  cd $startdir/src/e16-themes-${_themever}
+  cd ${startdir}/src/e16-themes-${_themever}
   ./configure --prefix=/usr --enable-fsstd
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=${startdir}/pkg install
  
-  chown -R root:root $startdir/pkg/usr/share/*
+  chown -R root:root ${startdir}/pkg/usr/share/*
 }

Deleted: extra-x86_64/e_gen_menu.patch
===================================================================
--- extra-x86_64/e_gen_menu.patch	2008-05-02 02:25:53 UTC (rev 1213)
+++ extra-x86_64/e_gen_menu.patch	2008-05-02 02:26:06 UTC (rev 1214)
@@ -1,11 +0,0 @@
---- scripts/e_gen_menu~	2006-03-29 22:09:17.000000000 +0200
-+++ scripts/e_gen_menu	2006-08-15 15:11:18.000000000 +0200
-@@ -25,7 +25,7 @@
- ##############################################################################
- 
- # Likely  prefixes
--$Prefixes = "/usr/local:/usr:/opt:/opt/kde:$ENV{'KDEDIR'}";
-+$Prefixes = "/usr/local:/usr:/opt:/opt/kde:/opt/gnome";
- $Prefixes = "$Prefixes:/opt/kde3:/opt/gnome";	# SUSE
- $Prefixes = RemoveDuplcates($Prefixes);
-