Add a better package for etoys

5 files changed, 40 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 261a566112f7..9e06d21aafd0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,16 @@
-# Generated by mksrcinfo v8
-# Sun Jan 31 21:03:59 UTC 2016
 pkgbase = etoys
-	pkgdesc = Educational tool for teaching children powerful ideas in compelling ways. For Sugar
+	pkgdesc = Educational tool and media-rich authoring environment for teaching children
 	pkgver = 5.0.2408
-	pkgrel = 2
-	url = http://www.sugarlabs.org/
-	install = etoys.install
-	arch = i686
-	arch = x86_64
-	groups = sucrose
-	groups = glucose
-	license = GPL
-	depends = sugar
+	pkgrel = 1
+	url = http://squeakland.org/
+	arch = any
+	license = Apache
+	license = MIT
 	depends = squeak-vm
-	depends = shared-mime-info
 	source = http://download.sugarlabs.org/sources/sucrose/glucose/etoys/etoys-5.0.2408.tar.gz
 	source = etoys.desktop
-	source = etoys.png
-	md5sums = c79ee59d8e100cfc2934af8da90519b5
-	md5sums = 14de8b52fee032ad3065cf52a1eddb8c
-	md5sums = 78db4db90ebf3bee26d66758096dcaa5
+	sha256sums = 65e89d6367fd9ac6a7ef9b017922510dcfcbd13c6f1417c7e6672877559c4f4f
+	sha256sums = cf9a73302eb9c69177e190a90714477f5fed8a478a5513256ac92f1b0b397774
 
 pkgname = etoys
 
diff --git a/PKGBUILD b/PKGBUILD
index d3ea59cd4518..13a0c5c52da7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,34 @@
-# Maintainer: zoe <chp321 AT gmail DOT com>
-# Contributor: Cilyan Olowen <gaknar@gmail.com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=etoys
 pkgver=5.0.2408
-_realver=5.0.2408
-pkgrel=2
-pkgdesc="Educational tool for teaching children powerful ideas in compelling ways. For Sugar"
-arch=('i686' 'x86_64')
-url="http://www.sugarlabs.org/"
-license=('GPL')
-groups=('sucrose' 'glucose')
-depends=('sugar' 'squeak-vm' 'shared-mime-info')
-install=etoys.install
-source=("http://download.sugarlabs.org/sources/sucrose/glucose/${pkgname}/${pkgname}-${_realver}.tar.gz"
-        "${pkgname}.desktop" "${pkgname}.png")
-md5sums=('c79ee59d8e100cfc2934af8da90519b5'
-         '14de8b52fee032ad3065cf52a1eddb8c'
-         '78db4db90ebf3bee26d66758096dcaa5')
+pkgrel=1
+pkgdesc="Educational tool and media-rich authoring environment for teaching children"
+arch=('any')
+url="http://squeakland.org/"
+license=('Apache' 'MIT')
+depends=('squeak-vm')
+source=(http://download.sugarlabs.org/sources/sucrose/glucose/$pkgname/$pkgname-$pkgver.tar.gz
+        etoys.desktop)
+sha256sums=('65e89d6367fd9ac6a7ef9b017922510dcfcbd13c6f1417c7e6672877559c4f4f'
+            'cf9a73302eb9c69177e190a90714477f5fed8a478a5513256ac92f1b0b397774')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd $pkgname-$pkgver
+  sed -i 's@^#!.*python$@#!/usr/bin/python2@' setup.py
+}
 
-  PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc || return 1
-  make || return 1
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
 }
 
 package() {
-  install -DTm644 ${srcdir}/${pkgname}.png     "${pkgdir}/usr/share/icons/hicolor/80x80/apps/${pkgname}.png"
-  install -DTm644 ${srcdir}/${pkgname}.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make ROOT="$pkgdir" install-etoys install-activity || return 1
-}
\ No newline at end of file
+  cd $pkgname-$pkgver
+  make ROOT="$pkgdir" install-etoys
+
+  install -Dm644 ../etoys.desktop "$pkgdir/usr/share/applications/etoys.desktop"
+  install -Dm644 activity-etoys.svg "$pkgdir/usr/share/pixmaps/etoys.svg"
+  install -dm755 "$pkgdir"/usr/share/licenses/$pkgname
+  ln -s ../../doc/etoys/NOTICE "$pkgdir/usr/share/licenses/$pkgname/NOTICE"
+}
diff --git a/etoys.desktop b/etoys.desktop
index 87d2119642b6..e909aeae463a 100644
--- a/etoys.desktop
+++ b/etoys.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
+Name=Etoys
+Comment=Media-rich authoring environment
 Exec=etoys
-Name=eToys
-GenericName=Educational tool for teaching children
-Comment=Educational tool for teaching children powerful ideas in compelling ways. For Sugar
-Icon=/usr/share/icons/hicolor/80x80/apps/etoys.png
 Terminal=false
-Type=Application
-Categories=Education
\ No newline at end of file
+Icon=etoys
+StartupWMClass=squeak
+Categories=Development;
diff --git a/etoys.install b/etoys.install
deleted file mode 100644
index a795fd7deb14..000000000000
--- a/etoys.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  echo "Updating mime info..."
-  update-mime-database usr/share/mime
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
\ No newline at end of file
diff --git a/etoys.png b/etoys.png
deleted file mode 100644
index f1608a4e398b..000000000000
--- a/etoys.png
+++ /dev/null