Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre

4 files changed, 13 insertions, 29 deletions

diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 19f59ec25..bbccfc541 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -26,7 +26,7 @@ replaces=('clementine')
 conflicts=('clementine')
 provides=("clementine=$pkgver")
 install=clementine.install
-source=("https://repo.parabolagnulinux.org/sources/${_pkgname}-${pkgver}.tar.gz")
+source=("https://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}.tar.gz")
 sha256sums=('c376dd2cc346ad1f9828d3731e2bfb03cd0b4d06ea2b23d4b2caaf9351812ec2')
 mksource=("http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz"
           'remove-nonfree-artwork-and-spotify.patch'
diff --git a/libre/midori-libre/PKGBUILD b/libre/midori-libre/PKGBUILD
index 0871de5d4..42d597740 100644
--- a/libre/midori-libre/PKGBUILD
+++ b/libre/midori-libre/PKGBUILD
@@ -26,12 +26,10 @@ optdepends=('gstreamer0.10-base-plugins: HTML5 OGG videos support'
             'gstreamer0.10-ffmpeg: HTML5 H264 videos support'
             'aria2: download utility')
 options=('!emptydirs')
-mksource=("http://www.midori-browser.org/downloads/${_pkgname}_${pkgver}_all_.tar.bz2")
-source=("https://repo.parabolagnulinux.org/sources/${pkgname}_${pkgver}_all_.tar.bz2")
-mksha256sums=('c5be1b5d9933776f09c5cab7945a073a820d65555e51fda9ff55fd063843f24a')
-sha256sums=('463200bb67c35fc4fa7447689174676aba02aa6ec1cec476ca0e83b0d50f65d6')
+source=("http://www.midori-browser.org/downloads/${_pkgname}_${pkgver}_all_.tar.bz2")
+sha256sums=('c5be1b5d9933776f09c5cab7945a073a820d65555e51fda9ff55fd063843f24a')
 
-mksource() {
+prepare() {
   cd "$_pkgname-$pkgver"
 
   # remove non-privacy search providers
diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla-libre/PKGBUILD
index ecd972d6b..15446d91b 100644
--- a/libre/qupzilla-libre/PKGBUILD
+++ b/libre/qupzilla-libre/PKGBUILD
@@ -12,20 +12,18 @@ url="http://www.qupzilla.com/"
 license=('GPL3')
 makedepends=('qtwebkit' 'qt5-webkit' 'qt5-script' 'hunspell')
 optdepends=('bash-completion: bash completion support')
-source=("http://repo.parabolagnulinux.org/sources/$_pkgbase-$pkgver.tar.gz")
-md5sums=('57f51852d14c66a030bb75febcf1eabb')
-mksource=("$_pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/qupzilla/archive/v$pkgver.tar.gz"
+source=("$_pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/qupzilla/archive/v$pkgver.tar.gz"
          'searchenginesmanager.cpp.sed'
          'speeddial.cpp.sed'
          'start.html.sed')
 noextract=("$_pkgbase-$pkgver.tar.gz")
 install="$_pkgbase.install"
-mkmd5sums=('2988c3afbef2612fd4acdb78ebb1fc35'
-           '1d926e97a5b287d40fb695f6516f2a06'
-           '0f166fa102af975b3b8ac030d477e9b8'
-           '77120a0c39ba8254e5b2c273910f029a')
+md5sums=('2988c3afbef2612fd4acdb78ebb1fc35'
+         '1d926e97a5b287d40fb695f6516f2a06'
+         '0f166fa102af975b3b8ac030d477e9b8'
+         '77120a0c39ba8254e5b2c273910f029a')
 
-mksource() {
+prepare() {
   # extract
   mkdir -p qt{4,5}
   bsdtar --strip-components 1 -zxf $_pkgbase-$pkgver.tar.gz -C qt4
diff --git a/libre/reflector/PKGBUILD b/libre/reflector/PKGBUILD
index 5726ae835..dda93c171 100644
--- a/libre/reflector/PKGBUILD
+++ b/libre/reflector/PKGBUILD
@@ -10,34 +10,22 @@ url="http://xyne.archlinux.ca/projects/reflector"
 depends=(python3)
 optdepends=('rsync: rate rsync mirrors')
 source=(
-  https://repo.parabolagnulinux.org/sources/reflector-2014.tar.xz
-  https://repo.parabolagnulinux.org/sources/reflector-2014.tar.xz.sig
-)
-sha512sums=(
-  2783c578c4a29b1e7db1320a7f2e259e104dacab2bcc9cfddcea91335cbb89b282e1d3f03919f9760a3c431ba0d358b4f54fd5bab72488cf74e0e2cd73fc6ba2
-  SKIP
-)
-md5sums=(
-  9b6ec85b8be7f9c4f8b68d00274b0cde
-  SKIP
-)
-mksource=(
   http://xyne.archlinux.ca/projects/reflector/src/reflector-2014.tar.xz
   http://xyne.archlinux.ca/projects/reflector/src/reflector-2014.tar.xz.sig
   rebranding.patch
 )
-mksha512sums=(
+sha512sums=(
   ac9e0026019048c96be5dd4d156bf79b7d7616f764b5d8fb169cb09cbf629a3e2b1efb1ee7cb53b4e0cd109b985f598d9f80941714e47ed0f21c6417df9b073b
   SKIP
   83609177f88c0412f1a543f0431ecfb8be229bfef76d7087c35e9273988faedaf24a98ca45d98248eb5dfaa9a27e321dea99a256c68c5bc86a8a0ba53ed56d02
 )
-mkmd5sums=(
+md5sums=(
   69ab92b948ffe842189229d09bfbf1c0
   SKIP
   24c2a21bc1ac0d3758d8043f36d95add
 )
 
-mksource ()
+prepare ()
 {
   cd "$srcdir/$pkgname-$pkgver"
   # Rebranding for Parabola