diff --git a/srcpkgs/void-repo-multilib/template b/srcpkgs/void-repo-multilib/template index 3f6e3a123bc..7b8f7c6f5ef 100644 --- a/srcpkgs/void-repo-multilib/template +++ b/srcpkgs/void-repo-multilib/template @@ -1,6 +1,6 @@ # Template file for 'void-repo-multilib' pkgname=void-repo-multilib -version=4 +version=5 revision=1 build_style=meta only_for_archs="x86_64" @@ -11,10 +11,7 @@ homepage="http://www.voidlinux.eu" do_install() { vmkdir usr/share/xbps.d - vmkdir usr/share/xbps/repo.d for f in multilib multilib-nonfree; do - echo "repository=http://repo.voidlinux.eu/current/${f/-/\/}" > \ - ${DESTDIR}/usr/share/xbps/repo.d/10-${f}.conf echo "repository=http://repo.voidlinux.eu/current/${f/-/\/}" > \ ${DESTDIR}/usr/share/xbps.d/10-repository-${f}.conf done @@ -23,7 +20,6 @@ do_install() { void-repo-multilib-nonfree_package() { short_desc="${short_desc/multilib/multilib\/nonfree}" pkg_install() { - vmove usr/share/xbps/repo.d/10-multilib-nonfree.conf vmove usr/share/xbps.d/10-repository-multilib-nonfree.conf } } diff --git a/srcpkgs/void-repo-nonfree/template b/srcpkgs/void-repo-nonfree/template index 90b25220d3d..d71f6b609f9 100644 --- a/srcpkgs/void-repo-nonfree/template +++ b/srcpkgs/void-repo-nonfree/template @@ -1,6 +1,6 @@ # Template file for 'void-repo-nonfree' pkgname=void-repo-nonfree -version=4 +version=5 revision=1 noarch=yes build_style=meta @@ -11,13 +11,8 @@ homepage="http://www.voidlinux.eu" do_install() { vmkdir usr/share/xbps.d - vmkdir usr/share/xbps/repo.d - echo "repository=http://repo.voidlinux.eu/current/nonfree" > \ - ${DESTDIR}/usr/share/xbps/repo.d/10-nonfree.conf echo "repository=http://repo.voidlinux.eu/current/nonfree" > \ ${DESTDIR}/usr/share/xbps.d/10-repository-nonfree.conf - echo "repository=http://repo.voidlinux.eu/current/debug" > \ - ${DESTDIR}/usr/share/xbps/repo.d/20-debug.conf echo "repository=http://repo.voidlinux.eu/current/debug" > \ ${DESTDIR}/usr/share/xbps.d/20-repository-debug.conf } @@ -26,7 +21,6 @@ void-repo-debug_package() { noarch=yes short_desc="${short_desc/nonfree/debug}" pkg_install() { - vmove usr/share/xbps/repo.d/20-debug.conf vmove usr/share/xbps.d/20-repository-debug.conf } }