Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre

Conflicts:
	libre/your-freedom/PKGBUILD

1 files changed, 16 insertions, 66 deletions

diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 7bf7c47bd..692fcc8ac 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -1,79 +1,29 @@
 # Maintainer: Parabola Project <dev@list.parabolagnulinux.org>
 pkgname=your-freedom
-pkgver=$(LC_ALL=C date +%Y%m%d)
-pkgrel=1
+pkgver=$(LC_ALL=C date -u +%Y%m%d)
+pkgrel=2
 pkgdesc="This package conflicts with every unfree package known to date."
 arch=('any')
 url="https://parabolagnulinux.org"
 license=('GPL')
 groups=('base')
 install=${pkgname}.install
-source=(http://repo.parabolagnulinux.org/docs/blacklist.txt
-        http://repo.parabolagnulinux.org/docs/whitelist.txt)
+source=()
+md5sums=()
 noextract=()
-md5sums=() #generate with 'makepkg -g'
-
-# Get packages without replacement
-get_blacklist() {
-    unfree=($(wget -q -O - ${source[0]} | \
-        cut -d':' -f1,2 | \
-        sed "s/:$//" | \
-        grep -v ":" | \
-        sort -u))
-    echo "conflicts=(${unfree[@]})"
-}
 
 build() {
-    install -d $pkgdir/usr/share/doc/${pkgname}
-    install -m644 $srcdir/{black,white}list.txt
+    cd ${srcdir}
+    wget http://repo.parabolagnulinux.org/docs/blacklist.txt
+    wget http://repo.parabolagnulinux.org/docs/whitelist.txt
+    install -d ${pkgdir}/usr/share/doc/${pkgname}
+    install -m644 {black,white}list.txt ${pkgdir}/usr/share/doc/${pkgname}/
 }
 
-conflicts=(abyssws alienarena alienarena-data alsa-firmware
-aqua-data-studio arch-artwork arch-firefox-search archlinux-artwork
-archlinux-menus archlinux-themes-kde archlinux-themes-kdm
-archlinux-themes-slim archlinux-wallpaper arch-wiki-docs assaultcube
-b43-fwcutter bass blobwars bluez-firmware boinc boinc-nox chromium
-chromium-bsu crafty d4x dina-font dosemu faac fcpci fcpcmcia
-firefox-adblock-plus firefox-i18n firefox-i18n-af firefox-i18n-ak
-firefox-i18n-ar firefox-i18n-ast firefox-i18n-be firefox-i18n-bg
-firefox-i18n-bn-bd firefox-i18n-bn-in firefox-i18n-br firefox-i18n-bs
-firefox-i18n-ca firefox-i18n-cs firefox-i18n-cy firefox-i18n-da
-firefox-i18n-de firefox-i18n-el firefox-i18n-en-gb firefox-i18n-eo
-firefox-i18n-es-ar firefox-i18n-es-cl firefox-i18n-es-es
-firefox-i18n-es-mx firefox-i18n-et firefox-i18n-eu firefox-i18n-fa
-firefox-i18n-fi firefox-i18n-fr firefox-i18n-fy-nl firefox-i18n-ga-ie
-firefox-i18n-gl firefox-i18n-gu-in firefox-i18n-he firefox-i18n-hi-in
-firefox-i18n-hr firefox-i18n-hu firefox-i18n-hy-am firefox-i18n-id
-firefox-i18n-is firefox-i18n-it firefox-i18n-ja firefox-i18n-kk
-firefox-i18n-kn firefox-i18n-ko firefox-i18n-ku firefox-i18n-lg
-firefox-i18n-lt firefox-i18n-lv firefox-i18n-mai firefox-i18n-mk
-firefox-i18n-ml firefox-i18n-mr firefox-i18n-nb-no firefox-i18n-nl
-firefox-i18n-nn-no firefox-i18n-or firefox-i18n-pa-in firefox-i18n-pl
-firefox-i18n-pt-br firefox-i18n-pt-pt firefox-i18n-rm firefox-i18n-ro
-firefox-i18n-ru firefox-i18n-si firefox-i18n-sk firefox-i18n-sl
-firefox-i18n-son firefox-i18n-sq firefox-i18n-sr firefox-i18n-sv-se
-firefox-i18n-ta firefox-i18n-ta-lk firefox-i18n-te firefox-i18n-th
-firefox-i18n-tr firefox-i18n-uk firefox-i18n-vi firefox-i18n-zh-cn
-firefox-i18n-zh-tw firefox-i18n-zu firefox-noscript firefox-spell-pt-br
-firefox-spell-ru flashplugin fmodex font-mathematica foomatic-db-nonfree
-gstreamer0.10-bad ipw2100-fw ipw2200-fw iwlwifi-1000-ucode
-iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode
-iwlwifi-5150-ucode iwlwifi-6000-ucode java-sun jdk jre kdebase-konqueror
-kernel26-firmware lha lib32-libflashsupport lib32-mesa-demos
-lib32-nvidia-utils libflashsupport linux-firmware mac madwifi
-madwifi-utils martian martian-utils mesa-demos microcode_ctl mod_fastcgi
-monaco-linux-font mp32ogg ndiswrapper ndiswrapper-lts ndiswrapper-utils
-netperf nouveau-firmware nvidia nvidia-173xx nvidia-173xx-utils
-nvidia-96xx nvidia-96xx-utils nvidia-cg-toolkit nvidia-lts nvidia-utils
-nxclient openttd-opensfx opera paintown povray profont pypy
-qingy-theme-arch qstat rt2870usb-fw rt2x00-rt61-fw rt2x00-rt71w-fw
-sane-gt68xx-firmware screenlets sdlmame sfarkxtc skype skype-call-recorder
-skype-oss skype-staticqt slim-themes slmodem snes9x sopcast sqlite3-doc
-tarsnap tiacx tiacx-firmware tiacx-lts ttf-hannom ttf-ms-fonts ufoai
-ufoai-data urbanterror urbanterror-data vbaexpress virtualbox-additions
-virtualbox-additions-modules visualboyadvance warsow-data winetricks
-xdm-archlinux xf86-input-vmmouse xf86-video-vmware xorg-xlsfonts
-xpdf-chinese-simplified xpdf-chinese-traditional xpdf-japanese xpdf-korean
-xsnow xv zd1211-firmware)
-md5sums=('2637ca96bd9e39dacd452bec01307345'
-         '98d40d324ed474a9b2a222432fb97f02')
+package() {
+    conflicts=($(cut -d: -f1,2 ${pkgdir}/usr/share/doc/${pkgname}/blacklist.txt \
+        sed "s/:$//" | \
+        grep -v ":" | \
+        sort -u
+        ))
+}