aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Aldridge <maldridge@VoidLinux.eu>2017-07-19 03:11:10 +0000
committerMichael Aldridge <maldridge@VoidLinux.eu>2017-07-19 03:12:11 +0000
commit2cfef589079f0152d6e552b9da8f1e2efbc87886 (patch)
tree8e18a0114263569fca041cd1356b758c36133242
parent5bc4ea7b504a358405ceb8250e59c185908d2563 (diff)
downloadvoid-packages-2cfef589079f0152d6e552b9da8f1e2efbc87886.tar
void-packages-2cfef589079f0152d6e552b9da8f1e2efbc87886.tar.gz
void-packages-2cfef589079f0152d6e552b9da8f1e2efbc87886.tar.bz2
void-packages-2cfef589079f0152d6e552b9da8f1e2efbc87886.tar.lz
void-packages-2cfef589079f0152d6e552b9da8f1e2efbc87886.tar.xz
void-packages-2cfef589079f0152d6e552b9da8f1e2efbc87886.tar.zst
void-packages-2cfef589079f0152d6e552b9da8f1e2efbc87886.zip
align maintainer email for Michael Aldridge <maldridge@VoidLinux.eu>
-rw-r--r--.mailmap1
-rw-r--r--srcpkgs/CellWriter/template2
-rw-r--r--srcpkgs/FreeRADIUS/template2
-rw-r--r--srcpkgs/apache-maven/template2
-rw-r--r--srcpkgs/apache-tomcat/template2
-rw-r--r--srcpkgs/asciiquarium/template2
-rw-r--r--srcpkgs/audiofile/template2
-rw-r--r--srcpkgs/autojump/template2
-rw-r--r--srcpkgs/cbp2make/template2
-rw-r--r--srcpkgs/cowsay-temoc/template2
-rw-r--r--srcpkgs/dynamips/template2
-rw-r--r--srcpkgs/gns3-gui/template2
-rw-r--r--srcpkgs/gns3-net-converter/template2
-rw-r--r--srcpkgs/gns3-server/template2
-rw-r--r--srcpkgs/google-chrome/template2
-rw-r--r--srcpkgs/heyu/template2
-rw-r--r--srcpkgs/ifupdown/template2
-rw-r--r--srcpkgs/iouyap/template2
-rw-r--r--srcpkgs/libax25/template2
-rw-r--r--srcpkgs/libu2f-server/template2
-rw-r--r--srcpkgs/lightdm-webkit-greeter/template2
-rw-r--r--srcpkgs/msttcorefonts/template2
-rw-r--r--srcpkgs/netdata/template2
-rw-r--r--srcpkgs/nss-pam-ldapd/template2
-rw-r--r--srcpkgs/perl-Term-Animation/template2
-rw-r--r--srcpkgs/python-ldap/template2
-rw-r--r--srcpkgs/python3-aiohttp-cors/template2
-rw-r--r--srcpkgs/python3-aiohttp/template2
-rw-r--r--srcpkgs/python3-async-timeout/template2
-rw-r--r--srcpkgs/python3-multidict/template2
-rw-r--r--srcpkgs/python3-yarl/template2
-rw-r--r--srcpkgs/python3-zipstream/template2
-rw-r--r--srcpkgs/raven-python/template2
-rw-r--r--srcpkgs/sauerbraten/template2
-rw-r--r--srcpkgs/soundmodem/template2
-rw-r--r--srcpkgs/stepmania/template2
-rw-r--r--srcpkgs/vpcs/template2
-rw-r--r--srcpkgs/wego/template2
-rw-r--r--srcpkgs/wps-office/template2
-rw-r--r--srcpkgs/xapps/template2
-rw-r--r--srcpkgs/xastir/template2
-rw-r--r--srcpkgs/xinput_calibrator/template2
-rw-r--r--srcpkgs/xlunch/template2
-rw-r--r--srcpkgs/xrick/template2
-rw-r--r--srcpkgs/zerotier-one/template2
45 files changed, 45 insertions, 44 deletions
diff --git a/.mailmap b/.mailmap
index f5e6c1f9ec7..a53d9e68e69 100644
--- a/.mailmap
+++ b/.mailmap
@@ -17,6 +17,7 @@ Juan RP <xtraeme@voidlinux.eu> Juan RP <xtraeme@gmail.com>
Jürgen Buchmüller <pullmoll@t-online.de> Juergen Buchmueller <pullmoll@t-online.de>
Leah Neukirchen <leah@vuxu.org> Christian Neukirchen <chneukirchen@gmail.com>
Logen Kain <logen@sudotask.com> Logen Kain <walach.of.harkon@gmail.com>
+Michael Aldridge <maldridge@VoidLinux.eu> Michael Aldridge <aldridge.mac@gmail.com>
Philipp Hirsch <itself@hanspolo.net> hanspolo <ph.hanspolo@googlemail.com>
Stefan Mühlinghaus <jazzman@alphabreed.com> Stefan Mühlinghaus <muehlinghaus@mmh.ag>
bougyman <bougyman@voidlinux.eu> bougyman <bougyman@rubyists.com>
diff --git a/srcpkgs/CellWriter/template b/srcpkgs/CellWriter/template
index bccc8e811a3..c93ff12eb7d 100644
--- a/srcpkgs/CellWriter/template
+++ b/srcpkgs/CellWriter/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="gtk+-devel libXtst-devel"
short_desc="Grid-entry natural handwriting input panel"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-2"
homepage="https://github.com/risujin/cellwriter"
distfiles="https://github.com/risujin/cellwriter/archive/${version}.tar.gz"
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index d0b837a9288..9651a479e21 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -11,7 +11,7 @@ makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
system_accounts="_freeradius"
make_dirs="/etc/raddb 0750 _freeradius _freeradius"
short_desc="The world's most popular RADIUS Server"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-2"
homepage="http://freeradius.org"
distfiles="ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.bz2"
diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template
index a2f3f1ed6e0..d3cd5aafad7 100644
--- a/srcpkgs/apache-maven/template
+++ b/srcpkgs/apache-maven/template
@@ -6,7 +6,7 @@ hostmakedepends="openjdk"
depends="virtual?java-environment"
noarch=yes
short_desc="Software project management and comprehension tool"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="Apache-2.0"
homepage="https://maven.apache.org/"
distfiles="https://www-us.apache.org/dist/maven/maven-3/${version}/source/${pkgname}-${version}-src.tar.gz
diff --git a/srcpkgs/apache-tomcat/template b/srcpkgs/apache-tomcat/template
index 17b245906d4..75b18211a98 100644
--- a/srcpkgs/apache-tomcat/template
+++ b/srcpkgs/apache-tomcat/template
@@ -11,7 +11,7 @@ make_dirs="/usr/share/${pkgname}/webapps 0755 tomcat tomcat \
/usr/share/${pkgname}/temp 0755 tomcat tomcat"
system_accounts="tomcat"
short_desc="An open source implementation of the Java Servlet"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="Apache-2.0"
homepage="https://tomcat.apache.org"
distfiles="http://mirrors.advancedhosters.com/apache/tomcat/tomcat-8/v${version}/src/apache-tomcat-${version}-src.tar.gz"
diff --git a/srcpkgs/asciiquarium/template b/srcpkgs/asciiquarium/template
index 64f8828c2ec..adb2e9a7fa0 100644
--- a/srcpkgs/asciiquarium/template
+++ b/srcpkgs/asciiquarium/template
@@ -6,7 +6,7 @@ wrksrc=${pkgname}_${version}
depends="perl perl-Term-Animation"
noarch=yes
short_desc="Enjoy the mysteries of the sea from the safety of your own terminal"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-2"
homepage="http://www.robobunny.com/projects/asciiquarium/html/"
distfiles="http://www.robobunny.com/projects/asciiquarium/asciiquarium_${version}.tar.gz"
diff --git a/srcpkgs/audiofile/template b/srcpkgs/audiofile/template
index ff49ba9aa15..8aa19e43bd2 100644
--- a/srcpkgs/audiofile/template
+++ b/srcpkgs/audiofile/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
hostmakedepends="automake libtool asciidoc pkg-config"
makedepends="gtk+-devel alsa-lib-devel"
short_desc="C library for reading and writing audio files"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="LGPL-2.1"
homepage="http://audiofile.68k.org"
disable_parallel_build=1
diff --git a/srcpkgs/autojump/template b/srcpkgs/autojump/template
index 1961be13b2c..8edd91dc7ae 100644
--- a/srcpkgs/autojump/template
+++ b/srcpkgs/autojump/template
@@ -7,7 +7,7 @@ hostmakedepends="python"
depends="python"
noarch=yes
short_desc="A cd command that learns"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-3"
homepage="https://github.com/wting/autojump"
distfiles="https://github.com/wting/autojump/archive/release-v${version}.tar.gz"
diff --git a/srcpkgs/cbp2make/template b/srcpkgs/cbp2make/template
index 32d24a2ff2e..4ce0739ec7d 100644
--- a/srcpkgs/cbp2make/template
+++ b/srcpkgs/cbp2make/template
@@ -5,7 +5,7 @@ revision=1
wrksrc="$pkgname-stl-rev${version}-all"
hostmakedepends="doxygen p7zip"
short_desc="Makefile generation tool for Code::Blocks IDE"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-3"
homepage="http://sourceforge.net/projects/cbp2make/"
distfiles="${SOURCEFORGE_SITE}/$pkgname/cbp2make-stl-rev${version}-all.tar.7z"
diff --git a/srcpkgs/cowsay-temoc/template b/srcpkgs/cowsay-temoc/template
index 9c3d761be9e..080c85b79ad 100644
--- a/srcpkgs/cowsay-temoc/template
+++ b/srcpkgs/cowsay-temoc/template
@@ -4,7 +4,7 @@ version=1.0
revision=2
depends="cowsay"
short_desc="Temoc cow for Cowsay"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-3"
homepage="https://github.com/kulinacs/cowsay-temoc"
distfiles="${homepage}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/dynamips/template b/srcpkgs/dynamips/template
index 884666ea2bc..a50b7e83af7 100644
--- a/srcpkgs/dynamips/template
+++ b/srcpkgs/dynamips/template
@@ -6,7 +6,7 @@ build_style=cmake
makedepends="elfutils-devel"
depends="iouyap"
short_desc="Hardware emulation for Cisco IOS capable devices"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-2"
homepage="https://github.com/GNS3/dynamips"
distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 859d00e0005..f4aadbfa8cb 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -6,7 +6,7 @@ build_style=python3-module
hostmakedepends="python3 python3-setuptools"
depends="python3 python3-setuptools python3-psutil python3-jsonschema python3-configobj python3-sip python3-PyQt5 python3-PyQt5-svg xterm inetutils-telnet gns3-net-converter"
short_desc="Graphical Network Simulator 3 - GUI"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-3"
homepage="https://gns3.com"
distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/gns3-net-converter/template b/srcpkgs/gns3-net-converter/template
index 522732a7a5c..f8ce6acd72c 100644
--- a/srcpkgs/gns3-net-converter/template
+++ b/srcpkgs/gns3-net-converter/template
@@ -6,7 +6,7 @@ build_style=python3-module
hostmakedepends="python3 python3-setuptools"
depends="python3"
short_desc="Convert old ini-style GNS3 topologies to the newer version"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-3"
homepage="http://gns3-converter.readthedocs.io/en/latest/"
distfiles="${PYPI_SITE}/g/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index 8e581c52137..8b837129e38 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -6,7 +6,7 @@ build_style=python3-module
hostmakedepends="python3 python3-setuptools"
depends="python3 python3-zipstream python3-Jinja2 python3-yarl python3-aiohttp-cors raven-python dynamips"
short_desc="Graphical Network Simulator 3 - Server"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-3"
homepage="https://gns3.com"
distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index b427c9e641c..03dad0a07df 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -6,7 +6,7 @@ _channel=stable
pkgname=google-chrome
version=${_chromeVersion}.${_chromeRevision}
revision=1
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
homepage="http://www.google.com/chrome/"
license="chrome"
short_desc="An attempt at creating a safer, faster, and more stable browser"
diff --git a/srcpkgs/heyu/template b/srcpkgs/heyu/template
index 31c89d73a0f..c71772f7208 100644
--- a/srcpkgs/heyu/template
+++ b/srcpkgs/heyu/template
@@ -6,7 +6,7 @@ build_style=configure
configure_script="./Configure"
configure_args="linux"
short_desc="X10 automation for Linux"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-3"
homepage="http://www.heyu.org"
distfiles="https://github.com/HeyuX10Automation/heyu/archive/v${version}.tar.gz"
diff --git a/srcpkgs/ifupdown/template b/srcpkgs/ifupdown/template
index cc527f078f4..bd16aa8d60d 100644
--- a/srcpkgs/ifupdown/template
+++ b/srcpkgs/ifupdown/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
make_use_env=1
hostmakedepends="dpkg perl"
short_desc="High level tools to configure network interfaces"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-2"
homepage="https://tracker.debian.org/pkg/ifupdown"
distfiles="http://http.debian.net/debian/pool/main/i/ifupdown/ifupdown_${version}.tar.xz"
diff --git a/srcpkgs/iouyap/template b/srcpkgs/iouyap/template
index 47f9f8360a4..4624ae1a48e 100644
--- a/srcpkgs/iouyap/template
+++ b/srcpkgs/iouyap/template
@@ -5,7 +5,7 @@ revision=1
build_style=gnu-makefile
hostmakedepends="bison flex"
short_desc="Bridge IOU to UDP, TAP and Ethernet"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-3"
homepage="https://github.com/GNS3/iouyap"
distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/libax25/template b/srcpkgs/libax25/template
index 292cd2efe7c..3b1046f3e1f 100644
--- a/srcpkgs/libax25/template
+++ b/srcpkgs/libax25/template
@@ -8,7 +8,7 @@ wrksrc="${pkgname}-${_distver}-${_patchver}"
build_style=gnu-configure
makedepends="zlib-devel"
short_desc="A set of functions making it easier to write hamradio programs"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="LGPL-2"
homepage="http://www.linux-ax25.org/wiki/Libax25"
distfiles="http://www.linux-ax25.org/pub/libax25/${wrksrc}.tar.gz"
diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 50a745b6740..4904d722a5a 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -8,7 +8,7 @@ configure_args="--enable-gtk-doc-html=no"
hostmakedepends="automake libtool pkg-config gengetopt check"
makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="BSD"
homepage="https://developers.yubico.com/libu2f-server/"
distfiles="https://github.com/Yubico/libu2f-server/archive/libu2f-server-${version}.tar.gz"
diff --git a/srcpkgs/lightdm-webkit-greeter/template b/srcpkgs/lightdm-webkit-greeter/template
index aa614366e6b..b101d8c2fb9 100644
--- a/srcpkgs/lightdm-webkit-greeter/template
+++ b/srcpkgs/lightdm-webkit-greeter/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config intltool"
makedepends="lightdm-devel libxklavier-devel dbus-glib-devel webkitgtk-devel"
depends="lightdm"
short_desc="Light Display Manager Webkit Greeter"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-3"
homepage="https://launchpad.net/lightdm-webkit-greeter"
distfiles="https://launchpad.net/${pkgname}/trunk/${version}/+download/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/msttcorefonts/template b/srcpkgs/msttcorefonts/template
index 70629bc1b3d..53bbd21087a 100644
--- a/srcpkgs/msttcorefonts/template
+++ b/srcpkgs/msttcorefonts/template
@@ -4,7 +4,7 @@ version=1.3.4
revision=1
hostmakedepends="cabextract"
short_desc="Microsoft Typography Project - corefonts"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
# Referenced to the *.spec file, the template and mechanism are GPLv2
# the fonts are licensed in accordance with the Microsoft Font License
# Agreement which has since been removed from the MS website. A very
diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index 323ef7e3c59..353a600d4f5 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -10,7 +10,7 @@ conf_files="/etc/${pkgname}/*.conf"
configure_args="--with-user=_netdata"
makedepends="libuuid-devel zlib-devel"
short_desc="Real-time performance monitoring, done right"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-3"
homepage="http://netdata.firehol.org/"
distfiles="https://github.com/firehol/netdata/releases/download/v${version}/netdata-${version}.tar.bz2"
diff --git a/srcpkgs/nss-pam-ldapd/template b/srcpkgs/nss-pam-ldapd/template
index c00c7aaa52d..8badb5ac860 100644
--- a/srcpkgs/nss-pam-ldapd/template
+++ b/srcpkgs/nss-pam-ldapd/template
@@ -9,7 +9,7 @@ conf_files="/etc/nslcd.conf"
makedepends="pam-devel libldap-devel libsasl-devel mit-krb5-devel"
system_accounts="nslcd"
short_desc="LDAP identity management via nsswitch"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="LGPL-2.1"
homepage="https://arthurdejong.org/nss-pam-ldapd/"
distfiles="https://arthurdejong.org/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Term-Animation/template b/srcpkgs/perl-Term-Animation/template
index 9460f6f0f90..a4d726bef21 100644
--- a/srcpkgs/perl-Term-Animation/template
+++ b/srcpkgs/perl-Term-Animation/template
@@ -8,7 +8,7 @@ hostmakedepends="perl"
depends="perl"
noarch=yes
short_desc="Terminal Animation module for perl"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="Perl"
homepage="http://robobunny.com/projects/animation/html/"
distfiles="http://robobunny.com/projects/animation/Term-Animation.tar.gz"
diff --git a/srcpkgs/python-ldap/template b/srcpkgs/python-ldap/template
index 72f803911fd..e377486446a 100644
--- a/srcpkgs/python-ldap/template
+++ b/srcpkgs/python-ldap/template
@@ -8,7 +8,7 @@ hostmakedepends="python-devel"
makedepends="python-devel libldap-devel libsasl-devel libressl-devel"
depends="python-pyasn1-modules"
short_desc="Python modules for implementing LDAP clients"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="PSF"
homepage="https://www.python-ldap.org"
distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/python3-aiohttp-cors/template b/srcpkgs/python3-aiohttp-cors/template
index 235a51f5eaf..7a7c84867f4 100644
--- a/srcpkgs/python3-aiohttp-cors/template
+++ b/srcpkgs/python3-aiohttp-cors/template
@@ -7,7 +7,7 @@ build_style=python3-module
hostmakedepends="python3 python3-setuptools"
depends="python3-aiohttp"
short_desc="CORS support for aiohttp"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="Apache-2"
homepage="https://github.com/aio-libs/aiohttp-cors"
distfiles="https://github.com/aio-libs/aiohttp-cors/archive/v${version}.tar.gz"
diff --git a/srcpkgs/python3-aiohttp/template b/srcpkgs/python3-aiohttp/template
index 30090aa913c..55cf9f35fb7 100644
--- a/srcpkgs/python3-aiohttp/template
+++ b/srcpkgs/python3-aiohttp/template
@@ -7,7 +7,7 @@ build_style=python3-module
hostmakedepends="python3 python3-setuptools"
depends="python3-async-timeout python3-chardet"
short_desc="HTTP client/server for asyncio (PEP-3156)"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="Apache-2"
homepage="http://aiohttp.readthedocs.io/"
distfiles="https://github.com/aio-libs/aiohttp/archive/v${version}.tar.gz"
diff --git a/srcpkgs/python3-async-timeout/template b/srcpkgs/python3-async-timeout/template
index 0c043a2d3c3..807bda5804c 100644
--- a/srcpkgs/python3-async-timeout/template
+++ b/srcpkgs/python3-async-timeout/template
@@ -6,7 +6,7 @@ wrksrc=async-timeout-${version}
build_style=python3-module
hostmakedepends="python3 python3-setuptools"
short_desc="Timeout class compatible with asyncio"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="Apache-2"
homepage="https://github.com/aio-libs/async-timeout"
distfiles="https://github.com/aio-libs/async-timeout/archive/v${version}.tar.gz"
diff --git a/srcpkgs/python3-multidict/template b/srcpkgs/python3-multidict/template
index 2f706886330..83154dff298 100644
--- a/srcpkgs/python3-multidict/template
+++ b/srcpkgs/python3-multidict/template
@@ -6,7 +6,7 @@ wrksrc=multidict-${version}
build_style=python3-module
hostmakedepends="python3 python3-setuptools"
short_desc="Multidict implementation from aiohttp"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="Apache-2"
homepage="https://github.com/aio-libs/multidict"
distfiles="https://github.com/aio-libs/multidict/archive/v${version}.tar.gz"
diff --git a/srcpkgs/python3-yarl/template b/srcpkgs/python3-yarl/template
index a662b58f52c..70d107b2626 100644
--- a/srcpkgs/python3-yarl/template
+++ b/srcpkgs/python3-yarl/template
@@ -9,7 +9,7 @@ build_style=python3-module
hostmakedepends="python3 python3-setuptools"
depends="python3-multidict"
short_desc="Yet another URL library"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="Apache-2.0"
homepage="http://yarl.readthedocs.io/"
distfiles="https://github.com/aio-libs/yarl/archive/v${version}.tar.gz"
diff --git a/srcpkgs/python3-zipstream/template b/srcpkgs/python3-zipstream/template
index fdda1a65088..218c6bf6d71 100644
--- a/srcpkgs/python3-zipstream/template
+++ b/srcpkgs/python3-zipstream/template
@@ -6,7 +6,7 @@ wrksrc=python-zipstream-${version}
build_style=python3-module
hostmakedepends="python python3 python-setuptools python3-setuptools"
short_desc="Python's ZipFile module, except it works as a generator"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-3"
homepage="https://github.com/allanlei/python-zipstream"
distfiles="https://github.com/allanlei/python-zipstream/archive/v${version}.tar.gz"
diff --git a/srcpkgs/raven-python/template b/srcpkgs/raven-python/template
index 284b6dcfb37..0bb3cd78333 100644
--- a/srcpkgs/raven-python/template
+++ b/srcpkgs/raven-python/template
@@ -6,7 +6,7 @@ build_style=python3-module
hostmakedepends="python3 python3-setuptools"
depends="python3"
short_desc="Raven is a Python client for Sentry (getsentry.com)"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-3"
homepage="https://github.com/getsentry/raven-python"
distfiles="https://github.com/getsentry/${pkgname}/archive/${version}.tar.gz"
diff --git a/srcpkgs/sauerbraten/template b/srcpkgs/sauerbraten/template
index dace101094a..308b275c36c 100644
--- a/srcpkgs/sauerbraten/template
+++ b/srcpkgs/sauerbraten/template
@@ -8,7 +8,7 @@ build_style=gnu-makefile
makedepends="SDL_image-devel SDL_mixer-devel zlib-devel"
depends="${pkgname}-data-${version}_${revision}"
short_desc="3D game engine (more powerful redesign of the Cube engine) and FPS game"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="zlib"
homepage="http://sauerbraten.org"
distfiles="${SOURCEFORGE_SITE}/sauerbraten/sauerbraten_${version//./_}_collect_edition_linux.tar.bz2"
diff --git a/srcpkgs/soundmodem/template b/srcpkgs/soundmodem/template
index 955b9c902ec..96894aa6f9b 100644
--- a/srcpkgs/soundmodem/template
+++ b/srcpkgs/soundmodem/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
hostmakedepends="automake libtool pkg-config gettext-devel alsa-lib-devel"
makedepends="alsa-lib-devel audiofile-devel gtk+-devel libxml2-devel"
short_desc="Multiplatform Soundcard Packet Radio Modem"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-2"
homepage="http://soundmodem.vk4msl.yi.org/"
distfiles="http://soundmodem.vk4msl.yi.org/soundmodem-${version}.tar.gz"
diff --git a/srcpkgs/stepmania/template b/srcpkgs/stepmania/template
index 7c7918dde2f..1dcfcf8a0b3 100644
--- a/srcpkgs/stepmania/template
+++ b/srcpkgs/stepmania/template
@@ -8,7 +8,7 @@ hostmakedepends="nasm yasm pkg-config git"
makedepends="libmad-devel libvorbis-devel pcre-devel libjpeg-turbo-devel
alsa-lib-devel libXrandr-devel libva-devel glew-devel"
short_desc="Advanced rhythm game"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="MIT"
homepage="http://www.stepmania.com/"
distfiles="https://github.com/stepmania/stepmania/archive/v${version}.tar.gz"
diff --git a/srcpkgs/vpcs/template b/srcpkgs/vpcs/template
index a090690326e..875583da351 100644
--- a/srcpkgs/vpcs/template
+++ b/srcpkgs/vpcs/template
@@ -6,7 +6,7 @@ build_wrksrc="src"
build_style=gnu-makefile
makedepends="glibc-devel"
short_desc="Virtual PC Simulator"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="BSD 2-Clause"
homepage="https://sourceforge.net/projects/vpcs"
distfiles="${SOURCEFORGE_SITE}/project/vpcs/${version}/${pkgname}-${version}-src.tbz"
diff --git a/srcpkgs/wego/template b/srcpkgs/wego/template
index 23b5056f4ad..67bda10e7d0 100644
--- a/srcpkgs/wego/template
+++ b/srcpkgs/wego/template
@@ -6,7 +6,7 @@ hostmakedepends="git-perl"
build_style=go
go_import_path=github.com/schachmat/wego
short_desc="Weather client for the terminal"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="ISC"
homepage="https://github.com/schachmat/wego"
distfiles=${homepage}/archive/${version}.tar.gz
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 00c1546332b..2ed5a300e63 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -6,7 +6,7 @@ _patchLevel=
pkgname=wps-office
version=${_numericVersion}${_releaseIncrement}
revision=1
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
homepage="http://wps-community.org"
license="Kingsoft WPS Community License"
#Full license is at: http://wps-community.org/license.md (Not downloadable)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 66e2c9d47b3..c17ff2c5b33 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -7,7 +7,7 @@ hostmakedepends="gnome-common glib-devel intltool pkg-config libtool intltool gt
makedepends="gettext-devel gobject-introspection gtk+3-devel gdk-pixbuf-devel libgnomekbd-devel"
depends="inxi gist xfconf"
short_desc="Cross-desktop libraries and common resources from Linux Mint"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-2"
homepage="https://github.com/linuxmint/xapps"
distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
diff --git a/srcpkgs/xastir/template b/srcpkgs/xastir/template
index 10b25b5ff8a..00d23267b6b 100644
--- a/srcpkgs/xastir/template
+++ b/srcpkgs/xastir/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
only_for_archs="i686 x86_64"
makedepends="libXrender-devel libXt-devel libXp-devel libcurl-devel pcre-devel lesstif-devel libax25-devel"
short_desc="X Amateur Station Tracking and Information Reporting"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-2"
homepage="http://xastir.org"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/xinput_calibrator/template b/srcpkgs/xinput_calibrator/template
index 179eebe9b94..a03694ad701 100644
--- a/srcpkgs/xinput_calibrator/template
+++ b/srcpkgs/xinput_calibrator/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libXrandr-devel libXi-devel"
short_desc="Utility to calibrate X input devices"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="MIT/X11"
homepage="http://www.freedesktop.org/wiki/Software/xinput_calibrator"
distfiles="http://github.com/downloads/tias/xinput_calibrator/$pkgname-$version.tar.gz"
diff --git a/srcpkgs/xlunch/template b/srcpkgs/xlunch/template
index 4ac14eba74b..3f6b3dc323f 100644
--- a/srcpkgs/xlunch/template
+++ b/srcpkgs/xlunch/template
@@ -5,7 +5,7 @@ revision=1
build_style=gnu-makefile
makedepends="libX11-devel imlib2-devel"
short_desc="Graphical app launcher for X with little dependencies"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-3"
homepage="http://xlunch.org/"
distfiles="https://github.com/Tomas-M/xlunch/archive/v${version}.tar.gz"
diff --git a/srcpkgs/xrick/template b/srcpkgs/xrick/template
index 3876a9632c2..2323fa9428a 100644
--- a/srcpkgs/xrick/template
+++ b/srcpkgs/xrick/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
make_use_env=1
makedepends="SDL-devel zlib-devel"
short_desc="Clone of Rick Dangerous"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-ish"
restricted=yes
homepage="http://www.bigorno.net/xrick/"
diff --git a/srcpkgs/zerotier-one/template b/srcpkgs/zerotier-one/template
index f30e3a6333d..fdaa31bfd0b 100644
--- a/srcpkgs/zerotier-one/template
+++ b/srcpkgs/zerotier-one/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
hostmakedepends="nodejs"
makedepends="sqlite-devel"
short_desc="Network Virtualization Everywhere"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
license="GPL-3"
homepage="https://www.zerotier.com/"
distfiles="https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz"