Update all source packages for xbps-src>=90.

doc/manual.txt

@@ -27,7 +27,6 @@ A simple `template` example is as follows:
 --------------------------------------------------------------------------
 # Template file for 'foo'
 
-## source section
 pkgname="foo"
 version="1.0"
 revision="1"
@@ -39,12 +38,6 @@ homepage="http://www.foo.org"
 distfiles="http://www.foo.org/foo-${version}.tar.gz"
 checksum="fea0a94d4b605894f3e2d5572e3f96e4413bcad3a085aae7367c2cf07908b2ff"
 
-## package section
-foo_package() {
-  pkg_install() {
-    vmove all
-  }
-}
 ---------------------------------------------------------------------------
 
 

srcpkgs/2bwm-git/template

@@ -29,9 +29,3 @@ do_install() {
 	install -Dm644 hidden.man ${DESTDIR}/usr/share/man/man1/hidden.1
 	vinstall README.md 644 usr/share/doc/${pkgname}
 }
-
-2bwm-git_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/Ice/template

@@ -65,9 +65,3 @@ Ice-devel_package() {
 		vmove usr/include
 	}
 }
-
-Ice_package() {
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/LuaJIT/template

@@ -32,9 +32,3 @@ LuaJIT-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
-LuaJIT_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/MesaLib/template

@@ -22,6 +22,7 @@ hostmakedepends="automake libtool flex pkg-config llvm>=3.3"
 makedepends="glproto dri2proto>=2.1 libXext-devel libXxf86vm-devel libXdamage-devel
  libudev-devel>=183 libdrm-devel expat-devel talloc-devel libxml2-python
  libvdpau-devel libXvMC-devel>=1.0.6 wayland-devel elfutils-devel"
+conf_files="/etc/drirc"
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
@@ -175,10 +176,3 @@ mesa-vmwgfx-dri_package() {
 		vmove usr/lib/gallium-pipe/pipe_vmwgfx.so
 	}
 }
-
-MesaLib_package() {
-	conf_files="/etc/drirc"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/ModemManager/template

@@ -6,6 +6,8 @@ build_style=gnu-configure
 configure_args="--disable-static --sbindir=/usr/bin --with-udev-base-dir=/usr/lib/udev --with-polkit=permissive"
 hostmakedepends="pkg-config intltool"
 makedepends="glib-devel libgudev-devel polkit-devel libqmi-devel libmbim-devel systemd-devel ppp"
+depends="hicolor-icon-theme ppp"
+systemd_services="${pkgname}.service on"
 short_desc="Mobile broadband modem management service"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/ModemManager/"
@@ -29,11 +31,3 @@ libmm-glib_package() {
 		vmove "usr/lib/libmm-glib.so.*"
 	}
 }
-
-ModemManager_package() {
-	depends="hicolor-icon-theme ppp"
-	systemd_services="${pkgname}.service on"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/MoinMoin/template

@@ -3,8 +3,11 @@ pkgname=MoinMoin
 version=1.9.4
 revision=1
 wrksrc=moin-${version}
+noarch="yes"
 build_style=python-module
 makedepends="python"
+depends="python"
+pycompile_module="MoinMoin jabberbot"
 short_desc="MoinMoin, a Python clone of WikiWiki"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://moinmo.in"
@@ -16,12 +19,3 @@ long_desc="
  emphasis on easy access to and modification of information. MoinMoin
  is a Python WikiClone that allows you to easily set up your own wiki,
  only requiring a Python installation."
-
-MoinMoin_package() {
-	noarch="yes"
-	pycompile_module="MoinMoin jabberbot"
-	depends="python"
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/ORBit2/template

@@ -42,9 +42,3 @@ ORBit2-devel_package() {
 		vmove usr/share/aclocal
 	}
 }
-
-ORBit2_package() {
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/Pyrex/template

@@ -4,6 +4,8 @@ version=0.9.9
 revision=2
 build_style=python-module
 makedepends="python"
+noarch="yes"
+pycompile_module="Pyrex"
 short_desc="Language for writing Python extension modules"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex"
@@ -13,11 +15,3 @@ checksum=5f87df06831d0b3412eb4bc9d3fc2ee7bfae1b913d7da8c23ab2bf5699fb6b50
 long_desc="
  Pyrex lets you write code that mixes Python and C data types any way you
  want, and compiles it into a C extension for Python."
-
-Pyrex_package() {
-	noarch="yes"
-	pycompile_module="Pyrex"
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/SDL/template

@@ -67,6 +67,11 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
+if [ "$build_option_opengl" ]; then
+	# libGL.so.1 is dynamically loaded with dlopen.
+	depends="libGL"
+fi
+
 SDL-devel_package() {
 	short_desc="${short_desc} -- development files"
 	depends="alsa-lib-devel SDL>=${version}"
@@ -88,13 +93,3 @@ SDL-devel_package() {
 		vmove usr/share
 	}
 }
-
-SDL_package() {
-	if [ "$build_option_opengl" ]; then
-		# libGL.so.1 is dynamically loaded with dlopen.
-		depends="libGL"
-	fi
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/SDL2/template

@@ -65,6 +65,15 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
+if [ "$build_option_opengl" ]; then
+	# libGL.so.1 is dynamically loaded with dlopen.
+	depends+=" libGL"
+fi
+if [ "$build_option_gles" ]; then
+	# libGLESv2.so.1 is dynamically loaded with dlopen.
+	depends+=" libGLES"
+fi
+
 SDL2-devel_package() {
 	short_desc+=" - development files"
 	depends="alsa-lib-devel ${sourcepkg}>=${version}_${revision}"
@@ -90,17 +99,3 @@ SDL2-devel_package() {
 		vmove usr/share
 	}
 }
-
-SDL2_package() {
-	if [ "$build_option_opengl" ]; then
-		# libGL.so.1 is dynamically loaded with dlopen.
-		depends+=" libGL"
-	fi
-	if [ "$build_option_gles" ]; then
-		# libGLESv2.so.1 is dynamically loaded with dlopen.
-		depends+=" libGLES"
-	fi
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/SDL_image/template

@@ -5,6 +5,8 @@ revision=9
 build_style=gnu-configure
 configure_args="--disable-static"
 makedepends="libpng-devel>=1.6 tiff-devel SDL-devel libwebp-devel>=0.2.0"
+# The following are dlopen(3)ed at runtime.
+depends="libpng>=1.6 tiff libjpeg-turbo libwebp>=0.2.0"
 short_desc="Load images as SDL surfaces"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -24,11 +26,3 @@ SDL_image-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
-
-SDL_image_package() {
-	# The following are dlopen(3)ed at runtime.
-	depends="libpng>=1.6 tiff libjpeg-turbo libwebp>=0.2.0"
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/SDL_mixer/template

@@ -6,6 +6,8 @@ build_style=gnu-configure
 configure_args="--disable-static"
 makedepends="SDL-devel libvorbis-devel libmikmod-devel>=3.2.0
  libflac-devel smpeg-devel fluidsynth-devel"
+# The following deps are dlopen(3)ed at runtime.
+depends="libvorbis libmikmod smpeg libflac"
 short_desc="Multi-channel audio mixer library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -31,17 +33,9 @@ post_install() {
 
 SDL_mixer-devel_package() {
 	depends="${sourcepkg}>=${version}"
-	short_desc="${short_desc} (development files)"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 	}
 }
-
-SDL_mixer_package() {
-	# The following deps are dlopen(3)ed at runtime.
-	depends="libvorbis libmikmod smpeg libflac"
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/SDL_net/template

@@ -27,9 +27,3 @@ SDL_net-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
-
-SDL_net_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/SDL_sound/template

@@ -26,14 +26,8 @@ long_desc="
 
 SDL_sound-devel_package() {
 	depends="SDL_sound>=${version}"
-	short_desc="${short_desc} -- development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 	}
 }
-
-SDL_sound_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/SDL_ttf/template

@@ -28,9 +28,3 @@ SDL_ttf-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
-
-SDL_ttf_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/Thunar/template

@@ -18,6 +18,7 @@ makedepends="pcre-devel>=8.30 libglib-devel>=2.32.3_2
  gtk+-devel dbus-glib-devel libexif-devel exo-devel>=0.10.2 xfce4-panel-devel
  startup-notification-devel systemd-devel gvfs-devel hicolor-icon-theme
  desktop-file-utils"
+depends="gvfs hicolor-icon-theme desktop-file-utils"
 
 Thunar-devel_package() {
 	depends="libglib-devel gtk+-devel Thunar>=${version}"
@@ -28,10 +29,3 @@ Thunar-devel_package() {
 		vmove usr/share/gtk-doc
 	}
 }
-
-Thunar_package() {
-	depends="gvfs hicolor-icon-theme desktop-file-utils"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/Twisted/template

@@ -4,6 +4,8 @@ version=13.2.0
 revision=1
 build_style=python-module
 makedepends="python-devel zope.interface>=4.0.1 pycrypto pyopenssl"
+depends="zope.interface>=4.0.1 pycrypto pyopenssl"
+pycompile_module="twisted"
 short_desc="Event-driven networking engine written in Python"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://twistedmatrix.com/"
@@ -14,11 +16,3 @@ checksum=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="${makedepends}"
 fi
-
-Twisted_package() {
-	depends="zope.interface>=4.0.1 pycrypto pyopenssl"
-	pycompile_module="twisted"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/VirtualGL/template

@@ -28,9 +28,3 @@ VirtualGL-devel_package() {
 		vmove usr/include
 	}
 }
-
-VirtualGL_package() {
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/WindowMaker/template

@@ -9,6 +9,13 @@ configure_args="--enable-xinerama --with-nlsdir=/usr/share/locale
 makedepends="pkg-config libXinerama-devel libXrandr-devel
  libXmu-devel libpng-devel>=1.6 libXpm-devel libXft-devel tiff-devel
  giflib-devel fontconfig-devel"
+conf_files="
+	/etc/WindowMaker
+	/etc/WindowMaker/WindowMaker
+	/etc/WindowMaker/WMRootMenu
+	/etc/WindowMaker/WMWindowAttributes
+	/etc/WindowMaker/WMState
+	/etc/WindowMaker/WMGLOBA"
 short_desc="An X11 window manager with a NEXTSTEP look and feel"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -29,16 +36,3 @@ WindowMaker-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
-
-WindowMaker_package() {
-	conf_files="
-		/etc/WindowMaker
-		/etc/WindowMaker/WindowMaker
-		/etc/WindowMaker/WMRootMenu
-		/etc/WindowMaker/WMWindowAttributes
-		/etc/WindowMaker/WMState
-		/etc/WindowMaker/WMGLOBA"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/a2jmidid/template

@@ -13,9 +13,3 @@ checksum=2a9635f62aabc59edb54ada07048dd47e896b90caff94bcee710d3582606f55f
 long_desc="
  a2jmidid is daemon for exposing legacy ALSA sequencer applications in JACK
  MIDI system."
-
-a2jmidid_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/aalib/template

@@ -30,9 +30,3 @@ aalib-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-aalib_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/abGate/template

@@ -5,16 +5,10 @@ build_style=gnu-makefile
 revision=2
 hostmakedepends="pkg-config"
 makedepends="qt-devel gtkmm2-devel lv2"
+depends="lv2"
 short_desc="LV2 Noise Gate plugin"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-3"
 homepage="http://abgate.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/abgate/${pkgname}-${version}.tar.gz"
 checksum=df1e0457757ba3c01ba55eba975fd04f8b96c10157ae1955738c0a77106dafa4
-
-abGate_package() {
-	depends="lv2"
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/abcde/template

@@ -2,20 +2,14 @@
 pkgname=abcde
 version=2.5.4
 revision=2
+noarch="yes"
+conf_files="/etc/${pkgname}.conf"
 makedepends="cd-discid vorbis-tools perl"
+depends="${makedepends}"
 build_style="gnu-makefile"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"
+short_desc="A Better CD Encoder"
 license="GPL-2"
 homepage="http://code.google.com/p/abcde/"
 distfiles="http://abcde.googlecode.com/files/${pkgname}-${version}.tar.gz"
 checksum=85b679b970e728a986487adcbff7c51eb0e72f9fa10c4450521f8e029fa6e591
-short_desc="A Better CD Encoder"
-
-abcde_package() {
-  noarch="yes"
-  depends="${makedepends}"
-  conf_files="/etc/${pkgname}.conf"
-  pkg_install() {
-    vmove all
-  }
-}

srcpkgs/abiword/template

@@ -9,6 +9,8 @@ makedepends="libjpeg-turbo-devel libpng-devel>=1.6
  fribidi-devel libgsf-devel enchant-devel gtk+3-devel librsvg-devel
  wv-devel>=1.2.9 boost-devel libxslt-devel libwmf-devel libchamplain-devel
  redland-devel libical-devel"
+replaces="abiword-plugins>=0"
+depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Free word processing program similar to Microsoft(R) Word"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-3"
@@ -32,11 +34,3 @@ abiword-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
-
-abiword_package() {
-	replaces="abiword-plugins>=0"
-	depends="hicolor-icon-theme desktop-file-utils"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/abook/template

@@ -2,18 +2,11 @@
 pkgname=abook
 version=0.5.6
 revision=1
+build_style=gnu-configure
+makedepends="ncurses-devel readline-devel"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2"
 homepage="http://abook.sourceforge.net/"
+short_desc="text-based addressbook designed to use with mutt mail client"
 distfiles="http://prdownloads.sourceforge.net/abook/${pkgname}-${version}.tar.gz"
 checksum=0646f6311a94ad3341812a4de12a5a940a7a44d5cb6e9da5b0930aae9f44756e
-short_desc="text-based addressbook designed to use with mutt mail client"
-makedepends="ncurses-devel readline-devel"
-build_style=gnu-configure
-
-
-abook_package() {
-  pkg_install() {
-    vmove all
-  }
-}

srcpkgs/accountsservice/template

@@ -7,6 +7,9 @@ configure_args="--disable-static
  --with-systemdsystemunitdir=/usr/lib/systemd/system"
 hostmakedepends="pkg-config intltool gobject-introspection"
 makedepends="polkit-devel systemd-devel"
+make_dirs="
+	/var/lib/AccountsService/users 755 root root
+	/var/lib/AccountsService/icons 755 root root"
 short_desc="D-Bus interfaces for querying and manipulating user account information"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://cgit.freedesktop.org/accountsservice/"
@@ -29,12 +32,3 @@ accountsservice-devel_package() {
 		vmove usr/share/gtk-doc
 	}
 }
-
-accountsservice_package() {
-	make_dirs="
-		/var/lib/AccountsService/users 755 root root
-		/var/lib/AccountsService/icons 755 root root"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/acct/template

@@ -18,9 +18,3 @@ post_install() {
 	rm ${DESTDIR}/usr/bin/last
 	rm ${DESTDIR}/usr/share/man/man1/last.1
 }
-
-acct_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/acl/template

@@ -2,6 +2,7 @@
 pkgname=acl
 version=2.2.52
 revision=2
+bootstrap=yes
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --libexecdir=/usr/lib"
 makedepends="attr-devel"
@@ -12,8 +13,6 @@ license="LGPL-2.1"
 distfiles="${NONGNU_SITE}/acl/acl-${version}.src.tar.gz"
 checksum=179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23
 
-bootstrap=yes
-
 if [ -z "$CHROOT_READY" ]; then
 	CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"
 	LDFLAGS+=" -L${XBPS_MASTERDIR}/usr/lib"
@@ -42,9 +41,3 @@ acl-progs_package() {
 		vmove usr/share
 	}
 }
-
-acl_package() {
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/acpi/template

@@ -9,9 +9,3 @@ license="GPL-2"
 homepage="http://sourceforge.net/projects/acpiclient/"
 distfiles="http://downloads.sourceforge.net/acpiclient/$pkgname-$version.tar.gz"
 checksum=d7a504b61c716ae5b7e81a0c67a50a51f06c7326f197b66a4b823de076a35005
-
-acpi_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/acpica-utils/template

@@ -41,9 +41,3 @@ do_build() {
 do_install() {
 	make DESTDIR=${DESTDIR} install
 }
-
-acpica-utils_package() {
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/acpid/template

@@ -3,6 +3,8 @@ pkgname=acpid
 version=2.0.19
 revision=1
 build_style=gnu-configure
+conf_files="/etc/acpi/events/anything /etc/acpi/handler.sh"
+systemd_services="acpid.socket on"
 short_desc="The ACPI Daemon (acpid) With Netlink Support"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -22,11 +24,3 @@ post_install() {
 	vinstall ${FILESDIR}/handler.sh 755 etc/acpi
 	vinstall ${FILESDIR}/anything 644 etc/acpi/events
 }
-
-acpid_package() {
-	conf_files="/etc/acpi/events/anything /etc/acpi/handler.sh"
-	systemd_services="acpid.socket on"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/acr/template

@@ -2,6 +2,7 @@
 pkgname=acr
 version=0.9.6
 revision=1
+noarch="yes"
 build_style=gnu-configure
 short_desc="AutoConf Replacement"
 maintainer="pancake <pancake@nopcode.org>"
@@ -13,10 +14,3 @@ long_desc="
  ACR tries to replace autoconf functionality generating a full-compatible
  'configure' script (runtime flags). But using shell-script instead of m4.
  This means that ACR is faster, smaller and easy to use."
-
-acr_package() {
-	noarch="yes"
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/adobe-flash-plugin/template

@@ -20,6 +20,9 @@ short_desc="Adobe Flash Player plugin for Netscape compatible browsers"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.adobe.com"
 license="Adobe License (non free)"
+nonfree="yes"
+makedepends="curl hicolor-icon-theme desktop-file-utils"
+depends="${makedepends}"
 
 create_srcdir=yes
 create_wrksrc=yes
@@ -40,11 +43,3 @@ do_install() {
 	vinstall "${XBPS_SRCDISTDIR}/${pkgname}-${version}/$(basename ${_eula})" 644 \
 		usr/share/licenses/${pkgname} LICENSE.pdf
 }
-
-adobe-flash-plugin_package() {
-	nonfree="yes"
-	depends="curl hicolor-icon-theme desktop-file-utils"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/adobe-flash-plugin11.1/template

@@ -20,6 +20,11 @@ short_desc="Adobe Flash Player plugin (11.1 series)"
 homepage="http://www.adobe.com"
 license="Propietary license - adobe"
 maintainer="Juan RP <xtraeme@gmail.com>"
+nonfree="yes"
+replaces="adobe-flash-plugin>=0"
+provides="adobe-flash-plugin-11.1.102.63"
+makedepends="curl hicolor-icon-theme desktop-file-utils"
+depends="${makedepends}"
 
 create_srcdir=yes
 create_wrksrc=yes
@@ -39,13 +44,3 @@ do_install() {
 	vinstall "${XBPS_SRCDISTDIR}/${pkgname}-${version}/$(basename ${_eula})" 644 \
 		usr/share/licenses/${pkgname} LICENSE.pdf
 }
-
-adobe-flash-plugin11.1_package() {
-	nonfree="yes"
-	replaces="adobe-flash-plugin>=0"
-	provides="adobe-flash-plugin-11.1.102.63"
-	depends="curl hicolor-icon-theme desktop-file-utils"
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/agar/template

@@ -46,9 +46,3 @@ agar-devel_package() {
 		vmove usr/share/man
 	}
 }
-
-agar_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/agg/template

@@ -32,9 +32,3 @@ agg-devel_package() {
 		vmove usr/share
 	}
 }
-
-agg_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/akonadi/template

@@ -17,6 +17,7 @@ configure_args="-DAKONADI_BUILD_TESTS=OFF -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
 hostmakedepends="cmake automoc4 pkg-config"
 makedepends="shared-mime-info sqlite-devel boost-devel>=1.54 qt-devel
  phonon-devel soprano-devel>=2.9.2_4"
+depends="shared-mime-info"
 
 akonadi-devel_package() {
 	short_desc+=" - development files"
@@ -28,10 +29,3 @@ akonadi-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
-akonadi_package() {
-	depends="shared-mime-info"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/allegro4/template

@@ -8,6 +8,8 @@ configure_args="-DWANT_DOCS=OFF"
 hostmakedepends="pkg-config cmake"
 makedepends="zlib-devel alsa-lib-devel jack-devel libXpm-devel libXxf86vm-devel
  libXxf86dga-devel libXcursor-devel libvorbis-devel libpng-devel glu-devel"
+# libGL.so is dlopen()ed.
+depends="libGL"
 short_desc="Portable library mainly aimed at video game and multimedia programming"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Allegro License (MIT alike)"
@@ -24,11 +26,3 @@ allegro4-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
-allegro4_package() {
-	# libGL.so is dlopen()ed.
-	depends="libGL"
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/alsa-lib/template

@@ -40,12 +40,6 @@ alsa-lib-devel_package() {
 	}
 }
 
-alsa-lib_package() {
-	pkg_install() {
-		vmove all
-	}
-}
-
 if [ -z "$CROSS_BUILD" ]; then
 	alsa-lib-python_package() {
 		short_desc+=" - python smixer plugin"

srcpkgs/alsa-plugins/template

@@ -58,9 +58,3 @@ alsa-plugins-ffmpeg_package() {
 		vmove "usr/lib/alsa-lib/*a52*"
 	}
 }
-
-alsa-plugins_package() {
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/alsa-utils/template

@@ -7,6 +7,9 @@ configure_args="--with-systemdsystemunitdir=/usr/lib/systemd/system
  --with-udev-rules-dir=/usr/lib/udev/rules.d -disable-alsaconf"
 hostmakedepends="pkg-config xmlto"
 makedepends="ncurses-devel alsa-lib-devel>=1.0.27 libsamplerate-devel"
+# Needs snd_pcm_abort() from >= 1.0.27.
+depends="alsa-lib>=1.0.27"
+make_dirs="/var/lib/alsa 0750 root root"
 short_desc="The Advanced Linux Sound Architecture (ALSA) utils"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.alsa-project.org"
@@ -24,12 +27,3 @@ post_install() {
 	make -C alsactl 90-alsa-restore.rules
 	vinstall alsactl/90-alsa-restore.rules 644 usr/lib/udev/rules.d
 }
-
-alsa-utils_package() {
-	# Needs snd_pcm_abort() from >= 1.0.27.
-	depends="alsa-lib>=1.0.27"
-	make_dirs="/var/lib/alsa 0750 root root"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/anjuta/template

@@ -21,6 +21,7 @@ makedepends="gtksourceview-devel>=3.10 libxml2-devel vte3-devel gjs-devel>=1.38
  libxslt-devel glade3-devel>=3.16 graphviz-devel vala-devel>=0.22 gdl-devel>=3.10
  libgda-devel devhelp-devel>=3.10 sqlite-devel apr-util-devel
  neon-devel subversion-devel python-devel"
+depends="autogen"
 
 anjuta-devel_package() {
 	short_desc+=" - Development files"
@@ -41,10 +42,3 @@ anjuta-docs_package() {
 		vmove usr/share/gtk-doc
 	}
 }
-
-anjuta_package() {
-	depends="autogen"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/ansible/template

@@ -2,21 +2,15 @@
 pkgname=ansible
 version=1.4.3
 revision=1
+noarch="yes"
 build_style=python-module
 hostmakedepends="python"
 makedepends="python-devel python-jinja python-paramiko pyyaml"
+depends="python python-jinja python-paramiko pyyaml"
+pycompile_module="${pkgname}"
 short_desc="A radically simple deployment, model-driven configuration management, and command execution framework"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://www.ansibleworks.com"
 distfiles="http://www.ansibleworks.com/releases/$pkgname-$version.tar.gz"
 checksum=0741788cdd86d2e3bbfb4474c26bb13d57690ed2e2c8ff8dd1c271a7de590ee3
-
-ansible_package() {
-	noarch="yes"
-	pycompile_module="${pkgname}"
-	depends="python python-jinja python-paramiko pyyaml"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/apache-mpm-event/template

@@ -28,6 +28,10 @@ long_desc="
 
  This MPM is experimental and less tested than the worker and prefork MPMs."
 
+# dlopen(3) run-time dependencies.
+depends="apache>=$version"
+systemd_services="apache-mpm-event.service on"
+
 pre_configure() {
 	cat ${XBPS_SRCPKGDIR}/apache/files/xbps.layout >> config.layout
 }
@@ -39,12 +43,3 @@ post_install() {
 	vinstall httpd 755 usr/sbin httpd.event
 	vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
 }
-
-apache-mpm-event_package() {
-	# dlopen(3) run-time dependencies.
-	depends="apache>=$version"
-	systemd_services="apache-mpm-event.service on"
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/apache-mpm-worker/template

@@ -25,6 +25,10 @@ long_desc="
  recommended especially for high-traffic sites because it is faster and has
  a smaller memory footprint than the traditional prefork MPM."
 
+# dlopen(3) run-time dependencies.
+depends="apache>=$version"
+systemd_services="apache-mpm-worker.service on"
+
 pre_configure() {
 	cat ${XBPS_SRCPKGDIR}/apache/files/xbps.layout >> config.layout
 }
@@ -36,12 +40,3 @@ post_install() {
 	vinstall httpd 755 usr/sbin httpd.worker
 	vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
 }
-
-apache-mpm-worker_package() {
-	# dlopen(3) run-time dependencies.
-	depends="apache>=$version"
-	systemd_services="apache-mpm-worker.service on"
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/apache/template

@@ -22,6 +22,25 @@ configure_args="--prefix= --enable-pie --enable-modules=all
 hostmakedepends="pkg-config perl"
 makedepends="zlib-devel libuuid-devel pcre-devel>=8.30
  openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+conf_files="
+	/etc/httpd/extra/httpd-autoindex.conf
+	/etc/httpd/extra/httpd-dav.conf
+	/etc/httpd/extra/httpd-manual.conf
+	/etc/httpd/extra/httpd-vhosts.conf
+	/etc/httpd/extra/httpd-info.conf
+	/etc/httpd/extra/httpd-languages.conf
+	/etc/httpd/extra/httpd-userdir.conf
+	/etc/httpd/extra/httpd-ssl.conf
+	/etc/httpd/extra/httpd-mpm.conf
+	/etc/httpd/extra/httpd-default.conf
+	/etc/httpd/extra/httpd-multilang-errordoc.conf
+	/etc/httpd/httpd.conf
+	/etc/httpd/magic
+	/etc/httpd/mime.types"
+systemd_services="apache.service on"
+system_accounts="httpd"
+httpd_descr="Apache HTTP server"
+httpd_homedir="/srv/httpd"
 short_desc="The Number One HTTP Server On The Internet"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://httpd.apache.org/"
@@ -87,28 +106,3 @@ apache-devel_package() {
 		vmove "usr/share/man/man1/apxs*"
 	}
 }
-
-apache_package() {
-	conf_files="
-		/etc/httpd/extra/httpd-autoindex.conf
-		/etc/httpd/extra/httpd-dav.conf
-		/etc/httpd/extra/httpd-manual.conf
-		/etc/httpd/extra/httpd-vhosts.conf
-		/etc/httpd/extra/httpd-info.conf
-		/etc/httpd/extra/httpd-languages.conf
-		/etc/httpd/extra/httpd-userdir.conf
-		/etc/httpd/extra/httpd-ssl.conf
-		/etc/httpd/extra/httpd-mpm.conf
-		/etc/httpd/extra/httpd-default.conf
-		/etc/httpd/extra/httpd-multilang-errordoc.conf
-		/etc/httpd/httpd.conf
-		/etc/httpd/magic
-		/etc/httpd/mime.types"
-	systemd_services="apache.service on"
-	system_accounts="httpd"
-	httpd_descr="Apache HTTP server"
-	httpd_homedir="/srv/httpd"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/apg/template

@@ -23,9 +23,3 @@ do_install() {
 		install -D -m644 doc/man/$i.1 ${DESTDIR}/usr/share/man/man1/$i.1
 	done
 }
-
-apg_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/apr-util/template

@@ -86,9 +86,3 @@ apr-util-sqlite_package() {
 		vmove "usr/lib/apr-util-1/apr_dbd_sqlite*"
 	}
 }
-
-apr-util_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/apr/template

@@ -36,9 +36,3 @@ apr-devel_package() {
 		vmove usr/lib/pkgconfig 
 	}
 }
-
-apr_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/aqemu/template

@@ -6,6 +6,7 @@ build_style=cmake
 configure_args="-DWITHOUT_EMBEDDED_DISPLAY=1"
 hostmakedepends="cmake"
 makedepends="qt-devel qemu desktop-file-utils"
+depends="qemu desktop-file-utils"
 short_desc="GUI to QEMU and KVM emulators, written in Qt4"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://aqemu.sourceforge.net"
@@ -16,10 +17,3 @@ long_desc="
  AQEMU is GUI to QEMU and KVM emulators, written in Qt4. The program has
  user-friendly interface and allows to set up the majority of QEMU and KVM
  options."
-
-aqemu_package() {
-	depends="qemu desktop-file-utils"
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/aria2/template

@@ -12,16 +12,10 @@ configure_args="--with-openssl --with-libexpat --without-gnutls
 hostmakedepends="pkg-config"
 makedepends="zlib-devel gmp-devel expat-devel openssl-devel sqlite-devel
  c-ares-devel ca-certificates"
+depends="ca-certificates"
 short_desc="Lightweight multi-protocol/multi-source command-line download utility"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://aria2.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.xz"
 checksum=b4c99eea9e11d265ed90ab685571f7328a20f5c5a438da93ecdba0959170f460
-
-aria2_package() {
-	depends="ca-certificates"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/arm-mem-git/template

@@ -19,9 +19,3 @@ do_fetch() {
 do_install() {
 	vinstall libarmmem.so 755 usr/lib
 }
-
-arm-mem-git_package() {
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/artwiz-fonts/template

@@ -2,6 +2,8 @@
 pkgname=artwiz-fonts
 version=1.3
 revision=1
+noarch="yes"
+wrksrc="artwiz-aleczapka-en-${version}"
 short_desc="Small futuristic ASCII fonts for X"
 maintainer="Ypnose <linuxienATlegtuxDOTorg>"
 homepage="http://artwizaleczapka.sourceforge.net/"
@@ -9,7 +11,8 @@ license="GPL-2"
 distfiles="http://downloads.sourceforge.net/sourceforge/artwizaleczapka/artwiz-aleczapka-en-${version}.tar.bz2"
 checksum=19f163de81548db9b9dd7d3a415fba379f1d17989020236aa4eb88c25929afe1
 makedepends="font-util mkfontdir"
-wrksrc="artwiz-aleczapka-en-${version}"
+depends="${makedepends}"
+font_dirs="/usr/share/fonts/artwiz-fonts"
 
 do_install() {
 	vmkdir usr/share/fonts/artwiz-fonts
@@ -18,12 +21,3 @@ do_install() {
 	vinstall fonts.alias 644 usr/share/fonts/artwiz-fonts
 	vinstall README 644 usr/share/doc/artwiz-fonts
 }
-
-artwiz-fonts_package() {
-	depends="${makedepends}"
-	noarch="yes"
-	font_dirs="/usr/share/fonts/artwiz-fonts"
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/asciidoc/template

@@ -2,24 +2,9 @@
 pkgname=asciidoc
 version=8.6.9
 revision=1
+noarch="yes"
 build_style=gnu-configure
 makedepends="python libxslt docbook-xsl"
-short_desc="Text based document generation"
-maintainer="Juan RP <xtraeme@gmail.com>"
-homepage="http://www.methods.co.nz/asciidoc/"
-license="GPL-2"
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0
-long_desc="
- asciidoc is a text document format for writing short documents,
- articles, books and UNIX man pages. asciidoc files can be translated
- to HTML and DocBook markups using the asciidoc(1) command.
-
- AsciiDoc is highly configurable: both the AsciiDoc source file syntax
- and the backend output markups (which can be almost any type of SGML/XML
- markup) can be customized and extended by the user."
-
-asciidoc_package() {
 depends="${makedepends}"
 conf_files="
 	/etc/asciidoc/asciidoc.conf
@@ -46,8 +31,17 @@ asciidoc_package() {
 	/etc/asciidoc/wordpress.conf
 	/etc/asciidoc/xhtml11.conf
 	/etc/asciidoc/xhtml11-quirks.conf"
-	noarch="yes"
+short_desc="Text based document generation"
-	pkg_install() {
+maintainer="Juan RP <xtraeme@gmail.com>"
-		vmove all
+homepage="http://www.methods.co.nz/asciidoc/"
-	}
+license="GPL-2"
-}
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
+checksum=78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0
+long_desc="
+ asciidoc is a text document format for writing short documents,
+ articles, books and UNIX man pages. asciidoc files can be translated
+ to HTML and DocBook markups using the asciidoc(1) command.
+
+ AsciiDoc is highly configurable: both the AsciiDoc source file syntax
+ and the backend output markups (which can be almost any type of SGML/XML
+ markup) can be customized and extended by the user."

srcpkgs/aspell-en/template

@@ -2,6 +2,7 @@
 pkgname=aspell-en
 version=7.1
 revision=1
+noarch=yes
 wrksrc="aspell6-en-${version}-0"
 build_style=configure
 hostmakedepends="which"
@@ -12,10 +13,3 @@ license="LGPL-2.1"
 maintainer="Juan RP <xtraeme@gmail.com>"
 distfiles="${GNU_SITE}/aspell/dict/en/aspell6-en-${version}-0.tar.bz2"
 checksum=ff9df3c2e8c5bb19c6a66078b36a0ef4c4dfb0fcb969e29f7b5345e26d748d0a
-
-aspell-en_package() {
-	noarch=yes
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/aspell/template

@@ -22,6 +22,7 @@ build_style=gnu-configure
 configure_args="--enable-compile-in-filters"
 hostmakedepends="perl"
 makedepends="ncurses-devel"
+depends="perl"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gettext-devel"
@@ -41,10 +42,3 @@ aspell-devel_package() {
 		vmove usr/share/man/man1/pspell-config.1
 	}
 }
-
-aspell_package() {
-	depends="perl"
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/astyle/template

@@ -17,9 +17,3 @@ do_install() {
 	vmkdir usr/share/doc/html/astyle
 	install -m644 ../../doc/*.html ${DESTDIR}/usr/share/doc/html/astyle
 }
-
-astyle_package() {
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/at-spi2-atk/template

@@ -5,6 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel>=2.38 atk-devel>=2.10 at-spi2-core-devel>=2.10"
+depends="at-spi2-core>=2.10"
 short_desc="A GTK+ module that bridges ATK to D-Bus at-spi"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -28,10 +29,3 @@ at-spi2-atk-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
-at-spi2-atk_package() {
-	depends="at-spi2-core>=2.10"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/at-spi2-core/template

@@ -5,6 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool dbus gobject-introspection"
 makedepends="libXext-devel libSM-devel libXtst-devel libXevie-devel dbus-devel"
+conf_files="/etc/at-spi2/accessibility.conf"
 short_desc="Assistive Technology Service Provider Interface"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -23,10 +24,3 @@ at-spi2-core-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
-at-spi2-core_package() {
-	conf_files="/etc/at-spi2/accessibility.conf"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/atf/template

@@ -5,6 +5,8 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="libtool gdb"
 makedepends="gdb xmlcatmgr"
+depends="${makedepends}"
+xml_entries="system http://www.NetBSD.org/XML/atf/tests-results.dtd /usr/share/xml/atf/tests-results.dtd"
 short_desc="Automated Testing Framework"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/kyua/wiki/ATF"
@@ -40,11 +42,3 @@ atf-libs_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
-
-atf_package() {
-	depends="gdb xmlcatmgr"
-	xml_entries="system http://www.NetBSD.org/XML/atf/tests-results.dtd /usr/share/xml/atf/tests-results.dtd"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/atk/template

@@ -51,9 +51,3 @@ atk-devel_package() {
 		vmove usr/share/gtk-doc
 	}
 }
-
-atk_package() {
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/atkmm/template

@@ -6,6 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-documentation"
 hostmakedepends="pkg-config"
 makedepends="libsigc++-devel atk-devel glibmm-devel"
+replaces="gtkmm<2.22"
 short_desc="Set of interfaces for accessibility (C++ bindings)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gtkmm.sourceforge.net/"
@@ -28,7 +29,7 @@ long_desc="
 
 atkmm-devel_package() {
 	depends="glibmm-devel atk-devel atkmm>=${version}"
-	short_desc="Set of interfaces for accessibility (C++ bindings) - development files"
+	short_desc+=" - development files"
 	replaces="gtkmm-devel<2.22"
 	pkg_install() {
 		vmove usr/include
@@ -36,10 +37,3 @@ atkmm-devel_package() {
 		vmove usr/lib/atkmm-1.6
 	}
 }
-
-atkmm_package() {
-	replaces="gtkmm<2.22"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/atop/template

@@ -7,6 +7,7 @@ wrksrc=atop-${_distver}-${_patchver}
 revision=1
 build_style=gnu-makefile
 makedepends="ncurses-devel zlib-devel"
+systemd_services="atop.service true"
 short_desc="A system and process level monitor"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -21,11 +22,3 @@ post_install() {
 	# systemd service
 	vinstall atop.service 644 usr/lib/systemd/system
 }
-
-atop_package() {
-	systemd_services="atop.service true"
-	pkg_install() {
-		vmove etc
-		vmove usr
-	}
-}

srcpkgs/attica/template

@@ -19,9 +19,3 @@ attica-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
-	
-attica_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/attr/template

@@ -2,6 +2,7 @@
 pkgname=attr
 version=2.4.47
 revision=2
+bootstrap=yes
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --libexecdir=/usr/lib"
 short_desc="Extended attribute support library for ACL support"
@@ -11,8 +12,6 @@ license="LGPL-2.1"
 distfiles="${NONGNU_SITE}/attr/attr-${version}.src.tar.gz"
 checksum=25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859
 
-bootstrap=yes
-
 do_install() {
 	make DIST_ROOT=${DESTDIR} install install-lib install-dev
 }
@@ -39,9 +38,3 @@ attr-progs_package() {
 		vmove usr/share/locale
 	}
 }
-
-attr_package() {
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/aubio/template

@@ -34,9 +34,3 @@ aubio-devel_package() {
         	vmove usr/lib/pkgconfig
 	}
 }
-
-aubio_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/audacious-plugins/template

@@ -15,9 +15,3 @@ license="GPL-3"
 homepage="http://audacious-media-player.org/"
 distfiles="http://distfiles.audacious-media-player.org/${pkgname}-${version}.tar.bz2"
 checksum=8b10c61481d7ee9972f329d79f56001aa7b092aab44a0084bdd1472fe529b874
-
-audacious-plugins_package() {
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/audacious/template

@@ -5,7 +5,8 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-thunar"
 hostmakedepends="pkg-config"
-makedepends="libSM-devel gtk+3-devel dbus-glib-devel libguess-devel"
+makedepends="libSM-devel gtk+3-devel dbus-glib-devel libguess-devel desktop-file-utils hicolor-icon-theme"
+depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Lightweight, advanced audio player focused on audio quality"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-3"
@@ -32,10 +33,3 @@ audacious-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
-audacious_package() {
-	depends="desktop-file-utils hicolor-icon-theme"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/autoconf/template

@@ -2,8 +2,10 @@
 pkgname=autoconf
 version=2.69
 revision=1
+noarch=yes
 build_style=gnu-configure
 hostmakedepends="perl>=0"
+depends="gawk diffutils m4"
 short_desc="Generates automatic source code configuration scripts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, GPL-3"
@@ -18,11 +20,3 @@ long_desc="
  configuration script for a package from a template file that lists the
  operating system features that the package can use, in the form of m4
  macro calls."
-
-autoconf_package() {
-	depends="gawk diffutils m4"
-	noarch=yes
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/autoconf213/template

@@ -2,8 +2,10 @@
 pkgname=autoconf213
 version=2.13
 revision=1
+noarch=yes
 wrksrc="autoconf-${version}"
 hostmakedepends="perl>=0"
+depends="gawk diffutils m4"
 short_desc="Generates automatic source code configuration scripts (2.13 version)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, GPL-3"
@@ -33,11 +35,3 @@ do_install() {
 	mv ${DESTDIR}/usr/share/autoconf ${DESTDIR}/usr/share/autoconf213
 	sed -e 's,/usr/share/autoconf,/usr/share/autoconf213,g' -i ${DESTDIR}/usr/bin/*
 }
-
-autoconf213_package() {
-	depends="gawk diffutils m4"
-	noarch=yes
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/autogen/template

@@ -46,9 +46,3 @@ autogen-docs_package() {
 		vmove usr/share/man
 	}
 }
-
-autogen_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/automake/template

@@ -2,19 +2,13 @@
 pkgname=automake
 version=1.14
 revision=1
+noarch=yes
 build_style=gnu-configure
 hostmakedepends="perl autoconf>=2.60"
+depends="perl autoconf>=2.60"
 short_desc="GNU Standards-compliant Makefile generator"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://www.gnu.org/software/automake"
 distfiles="http://ftp.gnu.org/gnu/automake/${pkgname}-${version}.tar.xz"
 checksum=e1188f5d074374cf06946cabb2b9e70bee141637a8fd1fab9a660c8930fe8059
-
-automake_package() {
-	depends="perl autoconf>=2.60"
-	noarch=yes
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/automoc4/template

@@ -11,11 +11,3 @@ license="BSD"
 maintainer="Juan RP <xtraeme@gmail.com>"
 distfiles="ftp://ftp.kde.org/pub/kde/stable/$pkgname/$version/$pkgname-$version.tar.bz2"
 checksum=234116f4c05ae21d828594d652b4c4a052ef75727e2d8a4f3a4fb605de9e4c49
-long_desc="
- automoc4 tool, used to build KDE4 and related packages."
-
-automoc4_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/avahi-discover/template

@@ -7,6 +7,7 @@ pkgname=avahi-discover
 version=0.6.31
 wrksrc="avahi-${version}"
 revision=13
+noarch=yes
 build_style=gnu-configure
 configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
  --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
@@ -17,7 +18,7 @@ configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
  --disable-static ssp_cv_lib=no --enable-python --enable-pygtk
  --enable-glib --enable-gobject --enable-gtk --enable-gtk3
  --enable-introspection"
-short_desc="Multicast DNS Service Discovery"
+short_desc="Service discover user interface for avahi"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
 homepage="http://www.avahi.org"
@@ -27,6 +28,8 @@ checksum=8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48
 hostmakedepends="pkg-config intltool"
 makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel
  pygtk-devel dbus-python gtk+3-devel gobject-introspection"
+depends="avahi>=$version python avahi-python>=$version dbus-python pygtk desktop-file-utils"
+pycompile_module="avahi_discover"
 
 if [ "$CROSS_BUILD" ]; then
 	msg_error "$pkgver: this package is not cross buildable currently.\n"
@@ -123,17 +126,3 @@ avahi-ui-utils_package() {
 		vmove usr/bin/bshell
 	}
 }
-
-avahi-discover_package() {
-	depends="avahi>=$version python avahi-python>=$version dbus-python pygtk desktop-file-utils"
-	short_desc="Service discover user interface for avahi"
-	noarch=yes
-	pycompile_module="avahi_discover"
-	pkg_install() {
-		vmove usr/lib/python2.7/site-packages/avahi_discover
-		vmove usr/share/applications/avahi-discover.desktop
-		vmove usr/share/man/man1/avahi-discover.1
-		vmove usr/share/avahi/interfaces/avahi-discover.ui
-		vmove usr/bin/avahi-discover
-	}
-}

srcpkgs/avahi/template

@@ -21,6 +21,14 @@ checksum=8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48
 
 hostmakedepends="pkg-config intltool"
 makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel"
+depends="dbus"
+systemd_services="avahi-daemon.service on"
+conf_files="
+	/etc/avahi/services/ssh.service
+	/etc/avahi/services/sftp-ssh.service
+	/etc/avahi/avahi-daemon.conf
+	/etc/avahi/hosts
+	/etc/avahi/avahi-dnsconfd.action"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" libtool glib-devel"
@@ -99,17 +107,3 @@ avahi-utils_package() {
 		vmove usr/share/man/man1
 	}
 }
-
-avahi_package() {
-	systemd_services="avahi-daemon.service on"
-	conf_files="
-		/etc/avahi/services/ssh.service
-		/etc/avahi/services/sftp-ssh.service
-		/etc/avahi/avahi-daemon.conf
-		/etc/avahi/hosts
-		/etc/avahi/avahi-dnsconfd.action"
-	depends="dbus"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/awesome/template

@@ -10,6 +10,8 @@ makedepends="
  xcb-util-keysyms-devel>=0.3.9 xcb-util-wm-devel>=0.3.9 xcb-util-cursor-devel>=0.1.0_2
  startup-notification-devel>=0.12_3 imlib2-devel ImageMagick>=6.7.9.6_2 lgi>=0.7.2
  libxdg-basedir-devel>=1.1.1_1 gdk-pixbuf-devel lua-devel>=5.2 dbus-devel"
+depends="dbus-x11 lgi>=0.7.2"
+conf_files="/etc/xdg/awesome/rc.lua"
 short_desc="Highly configurable, next gen framework window manager for X"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
@@ -22,11 +24,6 @@ pre_configure() {
 	sed -i -e "s|es fr de ru|es fr de|g" CMakeLists.txt
 }
 
-awesome_package() {
+post_install() {
-	conf_files="/etc/xdg/awesome/rc.lua"
+	vinstall awesome.desktop 644 usr/share/xsessions
-	depends="dbus-x11 lgi>=0.7.2"
-	pkg_install() {
-		vmove all
-		vinstall ${wrksrc}/awesome.desktop 644 usr/share/xsessions
-	}
 }

srcpkgs/awoken-icons/template

@@ -2,14 +2,16 @@
 pkgname=awoken-icons
 version=2.5.2
 revision=1
+noarch="yes"
 distfiles="https://dl.dropbox.com/u/8029324/AwOken-2.5.zip"
 checksum="d122ee0457079aaa30a664ae582fbc6208414e8728f497dce399ed9f33f9b36e"
 makedepends="unzip"
+depends="zenity xdg-utils ImageMagick"
 wrksrc="AwOken-2.5"
 maintainer="Steven R <strob AT styez DOT com>"
 homepage="http://alecive.deviantart.com/art/AwOken-163570862"
 license="CCPL:by-sa"
-short_desc="Simple and quite complete icon set, Token-style."
+short_desc="Simple and quite complete icon set, Token-style"
 
 do_install() {
   vmkdir "usr/bin"
@@ -44,12 +46,3 @@ awoken-icons-white_package() {
     vmove usr/bin/awoken-icon-theme-customization-white
   }
 }
-
-awoken-icons_package() {
-  noarch="yes"
-  depends="zenity xdg-utils ImageMagick"
-  pkg_install() {
-    vmove usr/share/icons/AwOken
-    vmove usr/bin/awoken-icon-theme-customization
-  }
-}

srcpkgs/b43-fwcutter/template

@@ -14,9 +14,3 @@ do_install() {
 	vinstall b43-fwcutter 755 usr/bin
 	vinstall b43-fwcutter.1 644 usr/share/man/man1
 }
-
-b43-fwcutter_package() {
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/babl/template

@@ -23,15 +23,9 @@ long_desc="
 
 babl-devel_package() {
 	depends="babl>=${version}"
-	short_desc="${short_desc} -- development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 	}
 }
-
-babl_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/backintime/template

@@ -2,21 +2,16 @@
 pkgname=backintime
 version=1.0.8
 revision=2
+noarch="yes"
 wrksrc=$pkgname-$version/common
 build_style=gnu-configure
 hostmakedepends="which"
+makedepends="python rsync cron-daemon"
+depends="${makedepends}"
+pycompile_dirs="/usr/share/backintime"
 short_desc="A simple backup tool for Linux"
 maintainer="tripledes <tripledes@gmail.com>"
 license="GPL-2"
 homepage="http://$pkgname.le-web.org"
 distfiles="http://$pkgname.le-web.org/download/$pkgname/$pkgname-${version}_src.tar.gz"
 checksum=fb83736ae0671b0d63468a9d39a29334320d93df004911cc192b1989df97d931
-
-backintime_package() {
-	noarch="yes"
-	pycompile_dirs="/usr/share/backintime"
-	depends="python rsync cron-daemon"
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/balsa/template

@@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool automake gettext-devel"
 makedepends="iso-codes enchant-devel libnotify-devel libesmtp-devel gtk+3-devel
  gmime-devel webkitgtk-devel openssl-devel gpgme-devel libsecret-devel pcre-devel
  hicolor-icon-theme desktop-file-utils"
+depends="hicolor-icon-theme desktop-file-utils"
 short_desc="An email client for GNOME"
 maintainer="pancake <pancake@nopcode.org>"
 homepage="http://pawsa.fedorapeople.org/balsa/"
@@ -24,10 +25,3 @@ pre_configure() {
 	mkdir m4
 	autoreconf -fi
 }
-
-balsa_package() {
-	depends="hicolor-icon-theme desktop-file-utils"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/baobab/template

@@ -6,17 +6,11 @@ build_style=gnu-configure
 configure_args="--disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool gnome-doc-utils gobject-introspection"
 makedepends="gtk+3-devel vala-devel>=0.22 gsettings-desktop-schemas-devel>=3.10"
+depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.10"
+replaces="gnome-utils>=3.0"
 short_desc="A graphical directory tree analyzer for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=23ce8e4847ce5f1c8230e757532d94c84e6e273d6ec8fca20eecaed5f96563f9
-
-baobab_package() {
-	replaces="gnome-utils>=3.0"
-	depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.10"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/bar-git/template

@@ -24,9 +24,3 @@ post_install() {
 	vinstall LICENSE 644 usr/share/licenses/${pkgname}
 	vinstall README.md 644 usr/share/doc/${pkgname}
 }
-
-bar-git_package() {
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/base-chroot/template

@@ -2,6 +2,7 @@
 pkgname=base-chroot
 version=0.40
 revision=1
+noarch=yes
 bootstrap=yes
 build_style=meta
 homepage="http://www.voidlinux.eu"
@@ -18,8 +19,4 @@ makedepends="
  chroot-gettext chroot-texinfo chroot-sed chroot-gawk chroot-findutils
  chroot-make chroot-gzip chroot-file chroot-tar chroot-m4 chroot-fakeroot
  chroot-distcc chroot-git ccache xbps-src>=20130317_4 xbps xz"
-
-base-chroot_package() {
-	noarch="yes"
 depends="${makedepends}"
-}

srcpkgs/base-directories/template

@@ -2,6 +2,7 @@
 pkgname=base-directories
 version=0.22
 revision=1
+noarch=yes
 bootstrap=yes
 build_style=meta
 short_desc="Void Linux base system directories"
@@ -11,7 +12,3 @@ license="Public domain"
 long_desc="
  This package installs the base system directories as specifed by FHS that aren't
  installed by any other package and are required on any GNU/Linux system."
-
-base-directories_package() {
-	noarch=yes
-}

srcpkgs/base-files/template

@@ -9,6 +9,24 @@ short_desc="Void Linux base system files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.voidlinux.eu"
 license="Public domain"
+conf_files="
+	/etc/inputrc
+	/etc/profile
+	/etc/hosts
+	/etc/host.conf
+	/etc/securetty
+	/etc/skel/.bash_profile
+	/etc/skel/.bash_logout
+	/etc/skel/.bashrc
+	/etc/skel/.inputrc
+	/etc/issue
+	/etc/passwd
+	/etc/group
+	/etc/fstab
+	/etc/crypttab
+	/etc/nsswitch.conf"
+noarch="yes"
+depends="base-directories xbps-triggers"
 
 do_install() {
 	# Install misc config files.
@@ -43,27 +61,3 @@ do_install() {
 	# Create /proc/self/mounts -> /etc/mtab symlink.
 	ln -sf /proc/self/mounts ${DESTDIR}/etc/mtab
 }
-
-base-files_package() {
-	conf_files="
-		/etc/inputrc
-		/etc/profile
-		/etc/hosts
-		/etc/host.conf
-		/etc/securetty
-		/etc/skel/.bash_profile
-		/etc/skel/.bash_logout
-		/etc/skel/.bashrc
-		/etc/skel/.inputrc
-		/etc/issue
-		/etc/passwd
-		/etc/group
-		/etc/fstab
-		/etc/crypttab
-		/etc/nsswitch.conf"
-	noarch="yes"
-	depends="base-directories xbps-triggers"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/base-system-busybox/template

@@ -11,6 +11,19 @@ license="GPL-2"
 distfiles="${homepage}/downloads/busybox-$version.tar.bz2"
 checksum=cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303
 
+# Applets provided by this busybox version.
+# Keep this list updated with ${FILESDIR}/dotconfig.
+#
+# XXX bzip2 provides libbz2, split it into libbz2 pkg.
+_FEATURES="acpid coreutils cpio dash diffutils dosfstools findutils gawk
+	grep gzip hdparm ifenslave iproute2 iputils less lsof netcat nvi
+	patch powertop procps-ng psmisc rfkill run-parts sed tar
+	traceroute util-linux wget which whois xz"
+for f in ${_FEATURES}; do
+	provides+="${f}-${version}_${revision} "
+	replaces+="${f}>=0 "
+done
+
 do_build() {
 	cp -f ${FILESDIR}/dotconfig .config
 	if [ "$CROSS_BUILD" ]; then
@@ -30,21 +43,3 @@ do_install() {
 		755 usr/share/udhcpc default.script
 	rm -f ${DESTDIR}/{bin,sbin,usr/sbin}
 }
-
-base-system-busybox_package() {
-	# Applets provided by this busybox version.
-	# Keep this list updated with ${FILESDIR}/dotconfig.
-	#
-	# XXX bzip2 provides libbz2, split it into libbz2 pkg.
-	FEATURES="acpid coreutils cpio dash diffutils dosfstools findutils gawk
-		grep gzip hdparm ifenslave iproute2 iputils less lsof netcat nvi
-		patch powertop procps-ng psmisc rfkill run-parts sed tar
-		traceroute util-linux wget which whois xz"
-	for f in ${FEATURES}; do
-		provides+="${f}-${version}_${revision} "
-		replaces+="${f}>=0 "
-	done
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/base-system/template

@@ -25,11 +25,9 @@ elif [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
 	makedepends+=" rpi-base-files rpi-firmware"
 fi
 
-base-system_package() {
 # gcc and glibc shouldn't be direct dependencies.
 for f in ${makedepends}; do
 	if [ "$f" != "gcc" -a "$f" != "glibc" ]; then
 		depends+=" $f"
 	fi
 done
-}

srcpkgs/base-voidstrap/template

@@ -2,18 +2,15 @@
 pkgname=base-voidstrap
 version=0.2
 revision=1
+noarch="yes"
 build_style=meta
+makedepends="
+ base-files>=0.77 ncurses coreutils findutils diffutils dash bash grep
+ texinfo file sed gawk less util-linux which tar man-pages man-db shadow
+ e2fsprogs btrfs-progs xfsprogs kbd psmisc procps-ng sudo tzdata
+ iana-etc systemd cron-daemon openssh>=6.1p1 xbps netbsd-wtf nvi"
+depends="${makedepends}"
 homepage="http://www.voidlinux.eu"
 short_desc="Void Linux base system for the voidstrap script"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Public domain"
-
-makedepends="base-files>=0.77 ncurses coreutils findutils diffutils dash bash grep
- texinfo file sed gawk less util-linux which tar man-pages man-db shadow
- e2fsprogs btrfs-progs xfsprogs kbd psmisc procps-ng sudo tzdata
- iana-etc systemd cron-daemon openssh>=6.1p1 xbps netbsd-wtf nvi"
-
-base-voidstrap_package() {
-	noarch="yes"
-	depends="${makedepends}"
-}

srcpkgs/bash-completion/template

@@ -2,8 +2,10 @@
 pkgname=bash-completion
 version=2.1
 revision=2
+noarch="yes"
 build_style=gnu-configure
 makedepends="bash"
+depends="${makedepends}"
 short_desc="Programmable completion for the GNU Bash shell"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -24,11 +26,3 @@ post_install() {
 		rm -f ${DESTDIR}/usr/share/bash-completion/completions/${f}
 	done
 }
-
-bash-completion_package() {
-	depends="bash"
-	noarch="yes"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/bash/template

@@ -21,6 +21,8 @@ configure_args="--without-bash-malloc --with-curses --with-installed-readline
  bash_cv_func_strcoll_broken=no bash_cv_func_vsnprintf=yes"
 hostmakedepends="bison"
 makedepends="readline-devel"
+conflicts="chroot-bash>=0"
+register_shell="/bin/bash"
 short_desc="The GNU Bourne Again Shell"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/bash/bash.html"
@@ -46,11 +48,3 @@ pre_configure() {
 			msg_normal " Applying patch bash${ver}-$p.\n"
 	done
 }
-
-bash_package() {
-	conflicts="chroot-bash>=0"
-	register_shell="/bin/bash"
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/bbswitch/template

@@ -3,6 +3,9 @@ pkgname=bbswitch
 version=0.7
 revision=1
 makedepends="dkms"
+depends="dkms"
+dkms_modules="${pkgname} ${version}"
+triggers="dkms"
 short_desc="kernel module allowing to switch dedicated graphics card on Optimus laptops"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -20,12 +23,3 @@ do_install() {
 	sed "s,#MODULE_VERSION#,${version}," dkms/dkms.conf > \
 		${DESTDIR}/usr/src/${pkgname}-${version}/dkms.conf
 }
-
-bbswitch_package() {
-	dkms_modules="${pkgname} ${version}"
-	triggers="dkms"
-	depends="dkms"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/bc/template

@@ -27,9 +27,3 @@ long_desc="
 do_build() {
 	make ${makejobs} LEX="flex -I"
 }
-
-bc_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/bdftopcf/template

@@ -20,9 +20,3 @@ long_desc="
  architecture to read them directly without reformatting. This
  allows fast reading on the appropriate machine, but the files
  are still portable (but read more slowly) on other machines."
-
-bdftopcf_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/beets/template

@@ -2,21 +2,15 @@
 pkgname=beets
 version=1.3.2
 revision=1
+noarch="yes"
 distfiles="https://github.com/sampsyo/beets/archive/v${version}.tar.gz"
 checksum="1946b5e981a2858112b7f3aadb2d5f22c1d1438f2753cfda9996091c5e30520a"
 build_style=python-module
 hostmakedepends="python-devel"
 makedepends="python-distribute"
+depends="python>=2.7 pyyaml python-Unidecode python-musicbrainzngs mutagen>=1.22 python-munkres python-distribute"
+pycompile_module="beets beetsplug"
 maintainer="Steven R <strob AT styez DOT com>"
 homepage="https://github.com/sampsyo/beets"
 license="GPL"
 short_desc="Media library management system for obsessive-compulsive music geeks"
-
-beets_package() {
-	noarch="yes"
-	depends="python>=2.7 pyyaml python-Unidecode python-musicbrainzngs mutagen>=1.22 python-munkres python-distribute"
-	pycompile_module="beets beetsplug"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/bigreqsproto/template

@@ -1,20 +1,12 @@
 # Template build for 'bigreqsproto'.
 pkgname=bigreqsproto
 version=1.1.0
-build_style=gnu-configure
 revision=2
+noarch="yes"
+build_style=gnu-configure
 short_desc="BigReqs extension headers from modular Xorg X11"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
 distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 checksum=4864e12d3c5a99b0a9ee4704822455299345e6c65b23c688a4e4bf11481107bd
-long_desc="
- BigReqs extension headers from modular Xorg X11."
-
-bigreqsproto_package() {
-	noarch="yes"
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/bijiben/template

@@ -8,16 +8,10 @@ hostmakedepends="pkg-config intltool itstool gobject-introspection"
 makedepends="libuuid-devel webkitgtk-devel>=2.1.90 gnome-desktop-devel>=3.10
  gnome-online-accounts-devel>=3.10 tracker-devel>=0.16.2_2
  clutter-gtk-devel>=1.4.4_2 zeitgeist-devel>=0.9.14"
+depends="zeitgeist>=0.9.14 desktop-file-utils"
 short_desc="Intuitive note editor with strong GNOME desktop integration"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/Apps/Bijiben"
 license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=81257f85218968b0ad386da6e1143586de478870ca74bb5387646a479999a7d4
-
-bijiben_package() {
-	depends="zeitgeist>=0.9.14 desktop-file-utils"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/bin86/template

@@ -8,8 +8,6 @@ homepage="http://www.debath.co.uk/"
 license="GPL-2"
 distfiles="http://www.debath.co.uk/dev86/bin86-$version.tar.gz"
 checksum=35b99e05395264d0692f8b327f9b4f18de9e483484faa5ccbaa7c9f353d9c30c
-long_desc="
- This package provides a complete 8086 assembler and loader."
 
 do_build() {
 	make ${makejobs} PREFIX=/usr
@@ -20,9 +18,3 @@ do_install() {
 	vmkdir usr/share/man/man1
 	make PREFIX=${DESTDIR}/usr MANDIR=${DESTDIR}/usr/share/man/man1 install
 }
-
-bin86_package() {
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/bind/template

@@ -17,6 +17,14 @@ long_desc="
 hostmakedepends="automake libtool perl"
 makedepends="openssl-devel mit-krb5-devel libxml2-devel
  libcap-devel readline-devel"
+depends="shadow"
+systemd_services="named.service true"
+conf_files="/etc/named/named.conf"
+system_accounts="named"
+named_desc="BIND DNS server"
+named_homedir="/var/named"
+named_shell="/bin/false"
+make_dirs="/var/named 0770 root named"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" libxml2-devel"
@@ -87,17 +95,3 @@ bind-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
-bind_package() {
-	systemd_services="named.service true"
-	conf_files="/etc/named/named.conf"
-	system_accounts="named"
-	named_desc="BIND DNS server"
-	named_homedir="/var/named"
-	named_shell="/bin/false"
-	make_dirs="/var/named 0770 root named"
-	depends="shadow"
-	pkg_install() {
-		vmove all
-	}
-}