Merge branch 'master' of git://git.alpinelinux.org/aports

5 files changed, 103 insertions, 5 deletions

diff --git a/testing/calibre/APKBUILD b/testing/calibre/APKBUILD
index 2282ad64d5..f996d6ac85 100644
--- a/testing/calibre/APKBUILD
+++ b/testing/calibre/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=calibre
 pkgver=0.8.7
-pkgrel=1
+pkgrel=4
 pkgdesc="Ebook management application"
 url="http://calibre-ebook.com/"
 arch="all"
@@ -11,11 +11,14 @@ depends=
 depends_dev="python-dev imagemagick-dev py-qt py-sip py-imaging libusb-dev
 	poppler-dev poppler-qt4-dev py-dbus py-pycountry py-lxml icu-dev
 	desktop-file-utils py-sqlite sqlite-dev chmlib-dev podofo-dev
-	py-sip-dev py-dateutil py-cherrypy py-beautifulsoup py-mechanize"
+	py-sip-dev py-dateutil py-cherrypy py-beautifulsoup py-mechanize
+	py-dnspython shared-mime-info unrar xdg-utils"
 makedepends="$depends_dev"
 install=""
 subpackages=""
-source="http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+source="http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+	calibre.confd
+	calibre.initd"
 _builddir="$srcdir"/$pkgname
 build() {
 	cd "$_builddir"
@@ -27,15 +30,29 @@ build() {
 	python setup.py resources
 	python setup.py translations
 }
-
 package() {
 	cd "$_builddir"
+	 # More on desktop integration (e.g. enforce arch defaults)
+	sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \
+		-e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \
+		-e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \
+		-e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \
+		-e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py
+	# Create a dir for ebook repository
+	mkdir -p "${pkgdir}/var/lib/calibre"
 	# Fix the environment module location
 	sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py
 	install -d "${pkgdir}/usr/lib/python2.7/site-packages"
 	python setup.py install --root="${pkgdir}" --prefix=/usr \
+		--no-postinstall \
 		--staging-bindir="${pkgdir}/usr/bin" \
 		--staging-libdir="${pkgdir}/usr/lib" \
 		--staging-sharedir="${pkgdir}/usr/share"
+	install -m755 -D ../$pkgname.initd \
+		"$pkgdir"/etc/init.d/$pkgname || return 1
+        install -m644 -D ../$pkgname.confd \
+                "$pkgdir"/etc/conf.d/$pkgname || return 1
 }
-md5sums="d7132ec75f5e742e04e196fc8e2c0884  calibre-0.8.7.tar.gz"
+md5sums="d7132ec75f5e742e04e196fc8e2c0884  calibre-0.8.7.tar.gz
+a53086675b33859da1d18cc21daa090b  calibre.confd
+96a7744a8b5d63ed8fbe3c4919b0e40f  calibre.initd"
diff --git a/testing/calibre/calibre.confd b/testing/calibre/calibre.confd
new file mode 100644
index 0000000000..c20e676990
--- /dev/null
+++ b/testing/calibre/calibre.confd
@@ -0,0 +1,6 @@
+DAEMON=/usr/bin/$NAME
+PIDFILE=/var/run/$NAME.pid
+CONTENT=/var/lib/calibre
+PORT=8080
+MAX_COVER=600x800
+DAEMON_ARGS="--auto-reload --with-library=$CONTENT --pidfile=$PIDFILE --port=$PORT --max-cover=$MAX_COVER --daemonize"
diff --git a/testing/calibre/calibre.initd b/testing/calibre/calibre.initd
new file mode 100644
index 0000000000..25117ed375
--- /dev/null
+++ b/testing/calibre/calibre.initd
@@ -0,0 +1,17 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+	after firewall
+}
+start()  {
+	ebegin "Starting Calibre Server"
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS
+	eend $?
+}  
+ 
+stop() {  
+	ebegin "Stopping Calibre Server"
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE  
+	eend $?
+}  
diff --git a/testing/crosstool-ng/APKBUILD b/testing/crosstool-ng/APKBUILD
new file mode 100644
index 0000000000..f1fd382bb4
--- /dev/null
+++ b/testing/crosstool-ng/APKBUILD
@@ -0,0 +1,36 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=crosstool-ng
+pkgver=1.11.3
+pkgrel=0
+pkgdesc="tool for building toolchains"
+url="http://ymorin.is-a-geek.org/projects/crosstool"
+license="GPL"
+arch="noarch"
+depends="bash gawk bison flex automake autoconf libtool cvs sed texinfo"
+makedepends="ncurses-dev"
+install=
+subpackages="$pkgname-doc"
+source="http://ymorin.is-a-geek.org/download/crosstool-ng/crosstool-ng-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	# apply patches here
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+md5sums="3830cbdcc7e1a60c93caeaf98f718187  crosstool-ng-1.11.3.tar.bz2"
diff --git a/testing/py-dnspython/APKBUILD b/testing/py-dnspython/APKBUILD
new file mode 100644
index 0000000000..0678ef8bfc
--- /dev/null
+++ b/testing/py-dnspython/APKBUILD
@@ -0,0 +1,22 @@
+# Contributor: Francesco Colista <francesco.colista@gmail.com>
+# Maintainer:
+pkgname=py-dnspython
+_pkgname=dnspython
+pkgver=1.9.2
+pkgrel=0
+pkgdesc="A DNS toolkit for Python"
+url="http://www.dnspython.org"
+arch="noarch"
+license="BSD"
+depends=
+depends_dev="python-dev"
+makedepends="$depends_dev"
+install=""
+subpackages=""
+source="http://www.dnspython.org/kits/$pkgver/$_pkgname-$pkgver.tar.gz"
+_builddir="$srcdir"/$_pkgname-$pkgver
+package() {
+	cd "$_builddir"
+	python setup.py install --root=$pkgdir
+}
+md5sums="26426043e619d34b47c7c30dc0a02f1c  dnspython-1.9.2.tar.gz"