diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-10 15:10:58 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-10 15:10:58 +0100 |
commit | 9f050463d1b34e3f36a54aeb9ef65217530f2cd0 (patch) | |
tree | 0a4fca87cb224834876e3c5cf79375619bca75a4 /libre | |
parent | bf8d5e47ebdb788735d74c8232db8ec4a724a0bb (diff) |
Remove packages missing from abs.
Diffstat (limited to 'libre')
47 files changed, 0 insertions, 2324 deletions
diff --git a/libre/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD deleted file mode 100644 index 77e0dfe94..000000000 --- a/libre/apache-ant/PKGBUILD +++ /dev/null @@ -1,110 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Maintainer (Arch): Paul Mattal <paul@archlinux.org> -# Contributor: Andrew Wright <andreww@photism.org> - -pkgname=apache-ant -pkgver=1.8.4 - -provides=("apache-ant-libre=$pkgver") -replaces=("apache-ant-libre") -conflicts=("apache-ant-libre") - -pkgrel=1.1 -pkgdesc="A Java-based build tool" -arch=('any') -license=('Apache') -url="http://ant.apache.org/" -_mirror=http://archive.apache.org/dist -source=($_mirror/ant/source/${pkgname}-${pkgver}-src.tar.bz2 - ${pkgname}.sh ${pkgname}.csh) -depends=('java-environment') - -# This list is adapted from https://ant.apache.org/manual/install.html#librarydependencies -declare -A _opts -_opts[junit]='to have JUnit on the classpath in javac tasks;/usr/share/java/junit.jar' -_opts[xalan-java]='<junitreport> task;/usr/share/java/xalan.jar' -_opts[antlr2]='<antlr> task;/usr/share/java/antlr2.jar::antlr.jar' -#_opts[java-bsf]='<script> task;/usr/share/java/bsf.jar' -#_opts[groovy]='Groovy with <script> and <scriptdef> tasks;/usr/share/java/groovy.jar' -_opts[java-asm2]='Groovy with <script> and <scriptdef> tasks;/usr/share/java/asm-2.jar::asm.jar /usr/share/java/asm-util-2.jar::asm-util.jar' -#_opts[netrexx]='<netrexx> task, Rexx with <script> task;/usr/share/java/netrexx.jar' -_opts[rhino]='Javascript with <script> task;/usr/share/java/js.jar' -_opts[jython]='Python with <script> task;/opt/jython/jython.jar' -#_opts[jacl]='TCL with <script> task;/usr/share/java/jacl.jar' -#_opts[tcljava]='TCL with <script> task;/usr/share/java/tcljava.jar' -_opts[beanshell>=1.3]='BeanShell with <script> task;/usr/share/java/bsh.jar::beanshell.jar' -#_opts[jruby]='Ruby with <script> task;/usr/share/java/jruby.jar' -#_opts[judo]='Judoscript with <script> task;/usr/share/java/judo.jar' -_opts[java-commons-logging]='CommonsLoggingListener;/usr/share/java/commons-logging/commons-logging.jar' -#_opts[java-log4j]='Log4jListener;/usr/share/java/log4j.jar' -#_opts[java-commons-net>=1.4.0]='<ftp>, <rexec> and <telnet> tasks;/usr/share/java/commons-net.jar' -#_opts[java-bcel]="'classfileset' data type, JavaClassHelper for ClassConstants filter reader;/usr/share/java/bcel.jar" -#_opts[java-mail]='<mimemail> task, mime encoding with <mail>;/usr/share/java/mail.jar' -#_opts[java-activation]='<mimemail> task, mime encoding with <mail>;/usr/share/java/activation.jar' -#_opts[jdepend]='<jdepend> task;/usr/share/java/jdepend.jar' -#_opts[java-xmlcommons-resolver>=1.1beta]="external files for 'xmlcatalog' datatype;/usr/share/java/resolver.jar" -#_opts[java-jsch>=0.1.42]='<sshexec> and <scp> tasks;/usr/share/java/jsch.jar' -#_opts[java-advanced-imaging]='<image> task/usr/share/java/jai/*.jar' - -for pkg in "${!_opts[@]}"; do - optdepends+=("$pkg: ${_opts[$pkg]%;*}") - makedepends+=("$pkg") -done - -build() { - # This directory is what becomes - # http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2 - # which is what Arch uses - rm -rf "${srcdir}"/${pkgname}-${pkgver}-bin - mkdir -p "${srcdir}"/${pkgname}-${pkgver}-bin - - cd "${srcdir}"/${pkgname}-${pkgver} - # Symlink to external optional libraries - for jar in ${_opts[@]#*;}; do - ln -sf ${jar%::*} lib/optional/`basename ${jar/*::}` - done - # Build - source "/etc/profile.d/jdk.sh" # Get the JAVA_HOME env var - sh build.sh -Ddist.dir="${srcdir}"/${pkgname}-${pkgver}-bin dist -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver}-bin - source "${srcdir}"/${pkgname}.sh # Get the ANT_HOME env var - source "/etc/profile.d/jdk.sh" # Get the JAVA_HOME env var - - ## Install profile.d script - install -d "${pkgdir}"/etc/profile.d - install -m755 "${srcdir}"/${pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/ - - ## Install the main distribution - install -d "${pkgdir}"/${ANT_HOME} - cp -Rp * "${pkgdir}"/${ANT_HOME} - - ## Fix the distribution - # Remove Windows .bat/.cmd files - rm -f "${pkgdir}"/${ANT_HOME}/bin/*.{bat,cmd} - # Fix python2 path - sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/${ANT_HOME}/bin/runant.py - # Symlink to external optional libraries - for jar in ${_opts[@]#*;}; do - ln -sf ${jar%::*} "${pkgdir}"/${ANT_HOME}/lib/`basename ${jar/*::}` - done - - ## Symlink the /opt distribution to the normal places - install -d "${pkgdir}"/usr/bin - install -d "${pkgdir}"/usr/share/doc/${pkgname} - install -d "${pkgdir}"/usr/share/licenses/${pkgname} - - cd "${pkgdir}"/${ANT_HOME} - for prog in bin/*; do - ln -sf ${ANT_HOME}/$prog "${pkgdir}"/usr/bin - done - ln -sf ${ANT_HOME}/{README,WHATSNEW} "${pkgdir}"/usr/share/doc/${pkgname} - ln -sf ${ANT_HOME}/docs "${pkgdir}"/usr/share/doc/${pkgname}/html - ln -sf ${ANT_HOME}/{LICENSE,NOTICE} "${pkgdir}"/usr/share/licenses/${pkgname} -} - -md5sums=('c474fa9d0c35a24037c23b6e476862c1' - 'bd63c881be406f515fc4d22635e8326a' - 'aaa615512cbe1ed7f3b62c1ff46802f8') diff --git a/libre/apache-ant/apache-ant.csh b/libre/apache-ant/apache-ant.csh deleted file mode 100644 index fdc04b2f8..000000000 --- a/libre/apache-ant/apache-ant.csh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/csh -setenv ANT_HOME /opt/apache-ant diff --git a/libre/apache-ant/apache-ant.sh b/libre/apache-ant/apache-ant.sh deleted file mode 100644 index 6e4809da5..000000000 --- a/libre/apache-ant/apache-ant.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -export ANT_HOME=/opt/apache-ant diff --git a/libre/grub2/05_archtheme b/libre/grub2/05_archtheme deleted file mode 100644 index 4d1b6fb20..000000000 --- a/libre/grub2/05_archtheme +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -e - -cat << EOF -set menu_color_normal=light-blue/black -set menu_color_highlight=light-cyan/blue -EOF diff --git a/libre/grub2/20_memtest86+ b/libre/grub2/20_memtest86+ deleted file mode 100644 index 1d3096f6b..000000000 --- a/libre/grub2/20_memtest86+ +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh -e -######################################################## -# This script generates a memtest86+ entry on grub.cfg # -# if memtest is installed on the system. # -######################################################## - -prefix="/usr" -exec_prefix="${prefix}" - -datarootdir="/usr/share" -datadir="${datarootdir}" - -. "${datadir}/grub/grub-mkconfig_lib" - -MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin" -CLASS="--class memtest86 --class gnu --class tool" - -if [ -e $MEMTEST86_IMAGE ] && is_path_readable_by_grub $MEMTEST86_IMAGE; then - # image exists, create menu entry - echo "Found memtest86+ image: $MEMTEST86_IMAGE" >&2 - cat << EOF -menuentry "Memory test (memtest86+)" $CLASS { -EOF - prepare_grub_to_access_device `${grub_probe} --target=device $MEMTEST86_IMAGE` | sed -e "s/^/ /" - cat << EOF - linux16 (\$root)`make_system_path_relative_to_its_root $MEMTEST86_IMAGE` -} -EOF -fi diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD deleted file mode 100644 index a326fc8eb..000000000 --- a/libre/grub2/PKGBUILD +++ /dev/null @@ -1,259 +0,0 @@ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> -# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> - -_pkgver="2.00~rc1" - -_grub_lua_ver=24 -_grub_ntldr_ver=21 -_grub_915_ver=9 - -pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386') -[ "$CARCH" = "mips64el" ] && pkgname=('grub2-common' 'grub2-loongson') -pkgbase=grub2 -pkgver=2.00rc1 -pkgrel=1.1 -url="http://www.gnu.org/software/grub/" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL3') -epoch="1" -makedepends=('rsync' 'xz' 'bdf-unifont' 'python' 'autogen' 'texinfo' - 'help2man' 'gettext' 'device-mapper' 'fuse' 'dosfstools' 'efibootmgr') - -# source=("ftp://ftp.archlinux.org/other/grub2/grub_r${_grub_bzr_rev}.tar.xz" -source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz - "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" - "ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" - "ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz" - 'parabola_grub_mkconfig_fixes.patch' - 'grub.default' - 'grub.cfg' - '20_memtest86+') - -noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz" - "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" - "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz") - -sha1sums=('2f5ca951c3cb9ca364d38e4b4a2ca2a232fc4c13' - '89290031b974780c6df76893836d2477d4add895' - 'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a' - 'd5ae2efec25616028a9d89e98b6e454f1c4c415f' - '31aa740fc225b3f3ed4917843038f9e8658a71be' - '9a81f8bebcbee3d300315a29266ce7a5c9e5881c' - '9735043d518e16f147f64ef283eceb2549fed860' - 'ce35d7ae75cd1b5b677e894e528f96add40e77b9') - -_build_grub2-common_and_bios() { - - ## copy the source for building the common/bios package - cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub_bios-${_pkgver}" - cd "${srcdir}/grub_bios-${_pkgver}" - - ## Apply Parabola specific fixes to enable grub-mkconfig detect Libre kernels and initramfs - patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch" - echo - - ## add the grub-extra sources - export GRUB_CONTRIB="${srcdir}/grub_bios-${_pkgver}/grub-extras/" - install -d "${srcdir}/grub_bios-${_pkgver}/grub-extras" - - bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \ - -C "${srcdir}/grub_bios-${_pkgver}/grub-extras" - - bsdtar xf "${srcdir}/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" \ - -C "${srcdir}/grub_bios-${_pkgver}/grub-extras" - - bsdtar xf "${srcdir}/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz" \ - -C "${srcdir}/grub_bios-${_pkgver}/grub-extras" - - ## Requires python2 - # sed 's|python |python2 |g' -i "${srcdir}/grub_bios-${_pkgver}/autogen.sh" - - ## start the actual build process - cd "${srcdir}/grub_bios-${_pkgver}" - ./autogen.sh - - ## fix unifont.bdf location so grub-mkfont can create *.pf2 files - sed 's|/usr/share/fonts/unifont|/usr/share/fonts/misc|g' -i "${srcdir}/grub_bios-${_pkgver}/configure" - - # install -d "${srcdir}/grub_bios-${_pkgver}/BUILD_BIOS" - # cd "${srcdir}/grub_bios-${_pkgver}/BUILD_BIOS" - - CFLAGS="" ./configure \ - --with-platform="pc" \ - --target="i386" \ - --host="${CARCH}-unknown-linux-gnu" \ - "${_EFIEMU}" \ - --enable-mm-debug \ - --enable-nls \ - --enable-device-mapper \ - --enable-cache-stats \ - --enable-grub-mkfont \ - --enable-grub-mount \ - --prefix="/usr" \ - --bindir="/usr/bin" \ - --sbindir="/usr/sbin" \ - --mandir="/usr/share/man" \ - --infodir="/usr/share/info" \ - --datarootdir="/usr/share" \ - --sysconfdir="/etc" \ - --program-prefix="" \ - --with-bootdir="/boot" \ - --with-grubdir="grub" \ - --disable-werror - - CFLAGS="" make - -} - -_build_grub2-efi-i386() { - - ## copy the source for building the efi package - cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub_efi-${_pkgver}" - cd "${srcdir}/grub_efi-${_pkgver}" - - export GRUB_CONTRIB="${srcdir}/grub_efi-${_pkgver}/grub-extras/" - install -d "${srcdir}/grub_efi-${_pkgver}/grub-extras" - - bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \ - -C "${srcdir}/grub_efi-${_pkgver}/grub-extras" - - ## Requires python2 - # sed 's|python |python2 |g' -i "${srcdir}/grub_efi-${_pkgver}/autogen.sh" - - cd "${srcdir}/grub_efi-${_pkgver}" - ./autogen.sh - - CFLAGS="" ./configure \ - --with-platform="efi" \ - --target="i386" \ - --host="${CARCH}-unknown-linux-gnu" \ - --disable-efiemu \ - --enable-mm-debug \ - --enable-nls \ - --enable-device-mapper \ - --enable-cache-stats \ - --enable-grub-mkfont \ - --enable-grub-mount \ - --prefix="/usr" \ - --bindir="/usr/bin" \ - --sbindir="/usr/sbin" \ - --mandir="/usr/share/man" \ - --infodir="/usr/share/info" \ - --datarootdir="/usr/share" \ - --sysconfdir="/etc" \ - --program-prefix="" \ - --with-bootdir="/boot" \ - --with-grubdir="grub" \ - --disable-werror - - CFLAGS="" make -} - -#_get_locale_files() { -# -# cd "${srcdir}/grub-${_pkgver}" -# rsync -Lrtvz translationproject.org::tp/latest/grub/ "${srcdir}/grub-${_pkgver}/po" || true -# (cd "${srcdir}/grub-${_pkgver}/po" && ls *.po | cut -d. -f1 | xargs) > "${srcdir}/grub-${_pkgver}/po/LINGUAS" -#} - -build() { - - ## set architecture dependent variables - if [[ "${CARCH}" == 'x86_64' ]]; then - _EFIEMU="--enable-efiemu" - else - _EFIEMU="--disable-efiemu" - fi - - _HOST="${CARCH}" - - cd "${srcdir}/grub-${_pkgver}" - # _get_locale_files - - _build_grub2-common_and_bios - _build_grub2-efi-i386 - -} - -package_grub2-common() { - - pkgdesc="The GNU GRand Unified Bootloader version 2 - Files common for all platforms (Parabola rebranded)" - depends=('xz' 'freetype2' 'gettext' 'device-mapper' 'fuse' 'sh') - conflicts=('grub') - backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom') - optdepends=('libisoburn: provides xorriso for generating grub rescue iso using grub-mkrescue' - 'os-prober: to detect other OSes when generating grub.cfg in BIOS systems' - 'mtools: for grub-mkrescue FAT FS support') - install="grub2.install" - options=('strip' 'purge' 'docs' 'zipman' '!emptydirs') - - cd "${srcdir}/grub_bios-${_pkgver}" - make bashcompletiondir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}/" install - - ## install extra /etc/grub.d/ files - install -D -m0755 "${srcdir}/20_memtest86+" "${pkgdir}/etc/grub.d/20_memtest86+" - - ## install /etc/default/grub (used by grub-mkconfig) - install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" - - ## install grub.cfg (needed so it doesn't get removed on upgrading because it was previously here) - install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg" - - # remove platform specific files - rm -rf "${pkgdir}/usr/lib/grub/i386-pc/" - -} - -package_grub2-bios() { - - pkgdesc="The GNU GRand Unified Bootloader version 2 - Built for i386 PC BIOS" - depends=("grub2-common=${epoch}:${pkgver}") - options=('!strip' '!emptydirs') - - cd "${srcdir}/grub_bios-${_pkgver}" - make DESTDIR="${pkgdir}/" install - - ## remove non platform-specific files - rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}} - - ## remove gdb debugging related files - rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true - -} - -package_grub2-efi-i386() { - - pkgdesc="The GNU GRand Unified Bootloader version 2 - i386 UEFI version" - depends=("grub2-common=${epoch}:${pkgver}" 'dosfstools' 'efibootmgr') - options=('!strip' '!emptydirs') - - cd "${srcdir}/grub_efi-${_pkgver}" - make DESTDIR="${pkgdir}/" install - - ## remove non platform-specific files - rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}} - - ## remove gdb debugging related files - rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/i386-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true - -} - -# Same as -bios but different pkgdesc -package_grub2-loongson() { - pkgdesc="The GNU GRand Unified Bootloader version 2 - Built for Loogson" - depends=(grub2-common=${epoch}:${pkgver}) - replaces=('grub2' 'grub2-libre') - provides=('grub2' 'grub2-libre') - - cd ${srcdir}/grub2_bios-${pkgver} - make DESTDIR=${pkgdir} install - - ## remove non platform-specific files - rm -rf ${pkgdir}/{boot,bin,sbin,etc,usr/share} - rm ${pkgdir}/usr/lib/grub/{grub-mkconfig_lib,update-grub_lib} -} diff --git a/libre/grub2/fix_stack_pointer_handling_16_relocator.patch b/libre/grub2/fix_stack_pointer_handling_16_relocator.patch deleted file mode 100644 index edc0ef502..000000000 --- a/libre/grub2/fix_stack_pointer_handling_16_relocator.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/grub-core/lib/i386/relocator16.S b/grub-core/lib/i386/relocator16.S -index c3768f4..982415d 100644 ---- a/grub-core/lib/i386/relocator16.S -+++ b/grub-core/lib/i386/relocator16.S -@@ -130,7 +130,7 @@ VARIABLE(grub_relocator16_ss) - .byte 0xb8 - VARIABLE(grub_relocator16_sp) - .word 0 -- movw %ax, %ss -+ movzwl %ax, %esp - - /* movw imm32, %edx. */ - .byte 0x66, 0xba diff --git a/libre/grub2/grub-install.fix b/libre/grub2/grub-install.fix deleted file mode 100644 index 29e74bd44..000000000 --- a/libre/grub2/grub-install.fix +++ /dev/null @@ -1,11 +0,0 @@ -=== modified file 'grub-core/kern/emu/hostdisk.c' ---- grub-core/kern/emu/hostdisk.c 2012-04-18 21:48:52 +0000 -+++ grub-core/kern/emu/hostdisk.c 2012-04-19 18:35:06 +0000 -@@ -1081,7 +1081,7 @@ - { - int fd; - grub_disk_addr_t max = ~0ULL; -- fd = open_device (disk, sector, O_RDONLY, &max); -+ fd = open_device (disk, sector, O_WRONLY, &max); - if (fd < 0) - return grub_errno; diff --git a/libre/grub2/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch b/libre/grub2/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch deleted file mode 100644 index e1de26859..000000000 --- a/libre/grub2/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 859c2e8..c4391dc 100644 ---- a/util/grub-mkconfig.in -+++ b/util/grub-mkconfig.in -@@ -40,7 +40,9 @@ self=`basename $0` - grub_probe="${sbindir}/`echo grub-probe | sed "${transform}"`" - grub_script_check="${bindir}/`echo grub-script-check | sed "${transform}"`" - --GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"` -+if test -z "${GRUB_PREFIX}"; then -+ GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"` -+fi - - . "${datadir}/@PACKAGE@/grub-mkconfig_lib" - diff --git a/libre/grub2/grub.cfg b/libre/grub2/grub.cfg deleted file mode 100644 index 6e60c70c4..000000000 --- a/libre/grub2/grub.cfg +++ /dev/null @@ -1,127 +0,0 @@ -# -# DO NOT EDIT THIS FILE -# -# It is automatically generated by grub-mkconfig using templates -# from /etc/grub.d and settings from /etc/default/grub -# - -### BEGIN /etc/grub.d/00_header ### -insmod part_gpt -insmod part_msdos -if [ -s $prefix/grubenv ]; then - load_env -fi -set default="0" -if [ "${prev_saved_entry}" ]; then - set saved_entry="${prev_saved_entry}" - save_env saved_entry - set prev_saved_entry= - save_env prev_saved_entry - set boot_once=true -fi - -function savedefault { - if [ -z "${boot_once}" ]; then - saved_entry="${chosen}" - save_env saved_entry - fi -} - -function load_video { - if [ x$feature_all_video_module = xy ]; then - insmod all_video - else - insmod efi_gop - insmod efi_uga - insmod ieee1275_fb - insmod vbe - insmod vga - insmod video_bochs - insmod video_cirrus - fi -} - -if [ x$feature_default_font_path = xy ] ; then - font=unicode -else -insmod part_gpt -insmod ext2 -set root='hd0,gpt9' -if [ x$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root --hint-bios=hd0,gpt9 --hint-efi=hd0,gpt9 --hint-baremetal=ahci0,gpt9 0cc6e472-7f98-42ff-b7f3-309b641377ad -else - search --no-floppy --fs-uuid --set=root 0cc6e472-7f98-42ff-b7f3-309b641377ad -fi - font="/usr/share/grub/unicode.pf2" -fi - -if loadfont $font ; then - set gfxmode=auto - load_video - insmod gfxterm - set locale_dir=$prefix/locale - set lang=en_US - insmod gettext -fi -terminal_input console -terminal_output gfxterm -set timeout=5 -### END /etc/grub.d/00_header ### - -### BEGIN /etc/grub.d/10_linux ### -menuentry 'Parabola GNU/Linux-libre, with Linux libre' --class parabola --class gnu-linux --class gnu --class os { - load_video - set gfxpayload=keep - insmod gzio - insmod part_gpt - insmod ext2 - set root='hd0,gpt3' - if [ x$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root --hint-bios=hd0,gpt3 --hint-efi=hd0,gpt3 --hint-baremetal=ahci0,gpt3 2ccd62fe-2204-44e8-bcfd-ce33996f9852 - else - search --no-floppy --fs-uuid --set=root 2ccd62fe-2204-44e8-bcfd-ce33996f9852 - fi - echo 'Loading Linux libre ...' - linux /vmlinuz-linux-libre root=/dev/disk/by-uuid/0cc6e472-7f98-42ff-b7f3-309b641377ad ro quiet - echo 'Loading initial ramdisk ...' - initrd /initramfs-linux-libre.img -} -menuentry 'Parabola GNU/Linux-libre, with Linux libre Fallback' --class parabola --class gnu-linux --class gnu --class os { - load_video - set gfxpayload=keep - insmod gzio - insmod part_gpt - insmod ext2 - set root='hd0,gpt3' - if [ x$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root --hint-bios=hd0,gpt3 --hint-efi=hd0,gpt3 --hint-baremetal=ahci0,gpt3 2ccd62fe-2204-44e8-bcfd-ce33996f9852 - else - search --no-floppy --fs-uuid --set=root 2ccd62fe-2204-44e8-bcfd-ce33996f9852 - fi - echo 'Loading Linux libre ...' - linux /vmlinuz-linux-libre root=/dev/disk/by-uuid/0cc6e472-7f98-42ff-b7f3-309b641377ad ro quiet - echo 'Loading initial ramdisk ...' - initrd /initramfs-linux-libre-fallback.img -} -### END /etc/grub.d/10_linux ### - -### BEGIN /etc/grub.d/20_linux_xen ### -### END /etc/grub.d/20_linux_xen ### - -### BEGIN /etc/grub.d/20_memtest86+ ### -### END /etc/grub.d/20_memtest86+ ### - -### BEGIN /etc/grub.d/30_os-prober ### -### END /etc/grub.d/30_os-prober ### - -### BEGIN /etc/grub.d/40_custom ### -# This file provides an easy way to add custom menu entries. Simply type the -# menu entries you want to add after this comment. Be careful not to change -# the 'exec tail' line above. -### END /etc/grub.d/40_custom ### - -### BEGIN /etc/grub.d/41_custom ### -if [ -f $prefix/custom.cfg ]; then - source $prefix/custom.cfg; -fi -### END /etc/grub.d/41_custom ### diff --git a/libre/grub2/grub.default b/libre/grub2/grub.default deleted file mode 100644 index d0c959059..000000000 --- a/libre/grub2/grub.default +++ /dev/null @@ -1,45 +0,0 @@ -GRUB_DEFAULT=0 -GRUB_TIMEOUT=5 -GRUB_DISTRIBUTOR="Parabola GNU/Linux-libre" -GRUB_CMDLINE_LINUX_DEFAULT="quiet add_efi_memmap" -GRUB_CMDLINE_LINUX="" - -# Preload both GPT and MBR modules so that they are not missed -GRUB_PRELOAD_MODULES="part_gpt part_msdos" - -# Uncomment to enable Hidden Menu, and optionally hide the timeout count -#GRUB_HIDDEN_TIMEOUT=5 -#GRUB_HIDDEN_TIMEOUT_QUIET=true - -# Uncomment to use basic console -GRUB_TERMINAL_INPUT=console - -# Uncomment to disable graphical terminal -#GRUB_TERMINAL_OUTPUT=console - -# The resolution used on graphical terminal -# note that you can use only modes which your graphic card supports via VBE -# you can see them in real GRUB with the command `vbeinfo' -GRUB_GFXMODE=auto - -# Uncomment to allow the kernel use the same resolution used by grub -GRUB_GFXPAYLOAD_LINUX=keep - -# Uncomment if you want GRUB to pass to the Linux kernel the old parameter -# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" -#GRUB_DISABLE_LINUX_UUID=true - -# Uncomment to disable generation of recovery mode menu entries -GRUB_DISABLE_RECOVERY=true - -# Uncomment and set to the desired menu colors. Used by normal and wallpaper -# modes only. Entries specified as foreground/background. -GRUB_COLOR_NORMAL="magenta/black" -GRUB_COLOR_HIGHLIGHT="white/magenta" - -# Uncomment one of them for the gfx desired, a image background or a gfxtheme -#GRUB_BACKGROUND="/path/to/wallpaper" -#GRUB_THEME="/path/to/gfxtheme" - -# Uncomment to get a beep at GRUB start -#GRUB_INIT_TUNE="480 440 1" diff --git a/libre/grub2/grub2.install b/libre/grub2/grub2.install deleted file mode 100644 index 000533553..000000000 --- a/libre/grub2/grub2.install +++ /dev/null @@ -1,33 +0,0 @@ -infodir=usr/share/info -filelist=(grub.info grub-dev.info) - -post_install() { - if [ -f /boot/grub/grub.cfg.pacsave ]; then - echo "Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg" - install -Dm644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg - fi - - cat << 'EOM' -Generating grub.cfg.example config file... -This may fail on some machines running a custom kernel. -EOM - - grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null - echo "done." - - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/libre/grub2/grub2_automake_1.11.2_pkglib_to_pkgdata.patch b/libre/grub2/grub2_automake_1.11.2_pkglib_to_pkgdata.patch deleted file mode 100644 index 0e396b210..000000000 --- a/libre/grub2/grub2_automake_1.11.2_pkglib_to_pkgdata.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff --git a/ChangeLog_Keshav b/ChangeLog_Keshav -new file mode 100644 -index 0000000..0eafd65 ---- /dev/null -+++ b/ChangeLog_Keshav -@@ -0,0 +1,12 @@ -+2012-01-04 Keshav P R <the.ridikulus.rat@gmail.com> -+ -+ Fixes for automake 1.11.2 -+ -+ * conf/Makefile.common: Change pkglib_SCRIPTS to pkgdata_SCRIPTS. -+ * conf/Makefile.common: Change pkglib_DATA to pkgdata_DATA. -+ * Makefile.am: Likewise. -+ * gentpl.py: Likewise. -+ * util/grub-mkstandalone.in: Likewise. -+ * util/grub-mknetdir.in: Likewise. -+ * util/grub-mkrescue.in: Likewise. -+ * util/grub-mkstandalone.in: Likewise. -diff --git a/Makefile.am b/Makefile.am -index c5f486e..395b0dd 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -101,8 +101,8 @@ CLEANFILES += widthspec.h - # Install config.h into platformdir - platform_HEADERS = config.h - --pkglib_DATA += grub-mkconfig_lib --pkglib_DATA += update-grub_lib -+pkgdata_DATA += grub-mkconfig_lib -+pkgdata_DATA += update-grub_lib - - - if COND_i386_coreboot -diff --git a/conf/Makefile.common b/conf/Makefile.common -index 751188b..bbd59cc 100644 ---- a/conf/Makefile.common -+++ b/conf/Makefile.common -@@ -137,7 +137,7 @@ KERNEL_HEADER_FILES = - - man_MANS = - noinst_DATA = --pkglib_DATA = -+pkgdata_DATA = - bin_SCRIPTS = - sbin_SCRIPTS = - bin_PROGRAMS = -@@ -147,7 +147,7 @@ check_SCRIPTS = - grubconf_DATA = - check_PROGRAMS = - noinst_SCRIPTS = --pkglib_SCRIPTS = -+pkgdata_SCRIPTS = - noinst_PROGRAMS = - grubconf_SCRIPTS = - noinst_LIBRARIES = -diff --git a/gentpl.py b/gentpl.py -index 3008b80..a935f4d 100644 ---- a/gentpl.py -+++ b/gentpl.py -@@ -512,7 +512,7 @@ def script(platform): - r += "[+ ENDIF +]" - - r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """ --$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ -+$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@ - chmod a+x [+ name +] - """) - -diff --git a/util/grub-mknetdir.in b/util/grub-mknetdir.in -index e5a2172..7f6a36d 100644 ---- a/util/grub-mknetdir.in -+++ b/util/grub-mknetdir.in -@@ -30,7 +30,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@ - host_os=@host_os@ - localedir=@datadir@/locale - datarootdir=@datarootdir@ --pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" -+pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" - - self=`basename $0` - -@@ -183,7 +183,7 @@ process_input_dir () - cp -f "$file" "$grubdir/" - fi - done -- for file in ${pkglib_DATA}; do -+ for file in ${pkgdata_DATA}; do - if test -f "${input_dir}/${file}"; then - cp -f "${input_dir}/${file}" "$grubdir/" - fi -diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in -index eff7708..f6b96d4 100644 ---- a/util/grub-mkrescue.in -+++ b/util/grub-mkrescue.in -@@ -27,7 +27,7 @@ libdir=@libdir@ - PACKAGE_NAME=@PACKAGE_NAME@ - PACKAGE_TARNAME=@PACKAGE_TARNAME@ - PACKAGE_VERSION=@PACKAGE_VERSION@ --pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" -+pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" - - self=`basename $0` - -@@ -163,7 +163,7 @@ process_input_dir () - cp -f "$file" ${iso9660_dir}/boot/grub/${platform}/ - fi - done -- for file in ${pkglib_DATA}; do -+ for file in ${pkgdata_DATA}; do - if test -f "${input_dir}/${file}"; then - cp -f "${input_dir}/${file}" ${iso9660_dir}/boot/grub/${platform}/ - fi -diff --git a/util/grub-mkstandalone.in b/util/grub-mkstandalone.in -index b0dbf9b..92b7306 100644 ---- a/util/grub-mkstandalone.in -+++ b/util/grub-mkstandalone.in -@@ -27,7 +27,7 @@ libdir=@libdir@ - PACKAGE_NAME=@PACKAGE_NAME@ - PACKAGE_TARNAME=@PACKAGE_TARNAME@ - PACKAGE_VERSION=@PACKAGE_VERSION@ --pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" -+pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" - - self=`basename $0` - -@@ -163,7 +163,7 @@ for file in "${source_directory}/"*.mod "${source_directory}/"efiemu32.o "${sour - fi - done - --for file in ${pkglib_DATA}; do -+for file in ${pkgdata_DATA}; do - if test -f "${source_directory}/${file}"; then - cp -f "${source_directory}/${file}" "${memdisk_dir}"/boot/grub/ - fi diff --git a/libre/grub2/grub2_bzr_export.sh b/libre/grub2/grub2_bzr_export.sh deleted file mode 100644 index f40588f82..000000000 --- a/libre/grub2/grub2_bzr_export.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash - -## For actual repos - -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/lua lua -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/gpxe gpxe -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/ntldr-img ntldr-img -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/915resolution 915resolution - -## For launchpad mirror - -# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-lua lua -# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-gpxe gpxe -# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-ntldr-img ntldr-img -# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-915resolution 915resolution - -## grub-extras zfs is integrated into grub2 bzr main repo and is no longer needed separately. - -_WD="${PWD}/" -_OUTPUT_DIR="${_WD}/" - -_ACTUAL_PKGVER="1.99" - -_GRUB2_BZR_REPO_DIR="${_WD}/grub2_BZR/" -_GRUB2_BZR_EXP_REPO_DIR="${_WD}/grub2_experimental_BZR/" -_GRUB2_EXTRAS_REPOS_DIR="${_WD}/grub2_extras_BZR/" - -_MAIN_SNAPSHOT() { - - cd "${_GRUB2_BZR_REPO_DIR}/" - echo - - _REVNUM="$(bzr revno ${_GRUB2_BZR_REPO_DIR})" - bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub2_r${_REVNUM}.tar" - echo - - cd "${_OUTPUT_DIR}/" - - xz -9 "${_OUTPUT_DIR}/grub2_r${_REVNUM}.tar" - echo - -} - -_EXP_SNAPSHOT() { - - cd "${_GRUB2_BZR_EXP_REPO_DIR}/" - echo - - _REVNUM="$(bzr revno ${_GRUB2_BZR_EXP_REPO_DIR})" - bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub2_exp_r${_REVNUM}.tar" - echo - - cd "${_OUTPUT_DIR}/" - - xz -9 "${_OUTPUT_DIR}/grub2_exp_r${_REVNUM}.tar" - echo - -} - -_EXTRAS_SNAPSHOT() { - - cd "${_GRUB2_EXTRAS_REPOS_DIR}/${_GRUB2_EXTRAS_NAME}/" - echo - - _REVNUM="$(bzr revno ${_GRUB2_EXTRAS_REPOS_DIR}/${_GRUB2_EXTRAS_NAME})" - bzr export --root="${_GRUB2_EXTRAS_NAME}" --format=tar "${_OUTPUT_DIR}/grub2_extras_${_GRUB2_EXTRAS_NAME}_r${_REVNUM}.tar" - echo - - cd "${_OUTPUT_DIR}/" - echo - - xz -9 "${_OUTPUT_DIR}/grub2_extras_${_GRUB2_EXTRAS_NAME}_r${_REVNUM}.tar" - echo - -} - -echo - -set -x -e - -echo - -_MAIN_SNAPSHOT - -echo - -# _EXP_SNAPSHOT - -echo - -_GRUB2_EXTRAS_NAME="lua" -_EXTRAS_SNAPSHOT - -_GRUB2_EXTRAS_NAME="gpxe" -_EXTRAS_SNAPSHOT - -_GRUB2_EXTRAS_NAME="ntldr-img" -_EXTRAS_SNAPSHOT - -_GRUB2_EXTRAS_NAME="915resolution" -_EXTRAS_SNAPSHOT - -echo - -set +x +e - -echo - -unset _WD -unset _OUTPUT_DIR -unset _GRUB2_BZR_REPO_DIR -unset _GRUB2_EXTRAS_REPOS_DIR -unset _GRUB2_EXTRAS_NAME diff --git a/libre/grub2/grub_extras_lua_args_fix.patch b/libre/grub2/grub_extras_lua_args_fix.patch deleted file mode 100644 index 5cb317ce3..000000000 --- a/libre/grub2/grub_extras_lua_args_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/grub-extras/lua/grub_lib.c b/grub-extras/lua/grub_lib.c -index 9014320..055d620 100644 ---- a/grub-extras/lua/grub_lib.c -+++ b/grub-extras/lua/grub_lib.c -@@ -466,7 +466,7 @@ grub_lua_add_menu (lua_State *state) - if (! p) - return push_result (state); - -- grub_normal_add_menu_entry (n, args, NULL, NULL, NULL, NULL, p, 0); -+ grub_normal_add_menu_entry (n, args, NULL, NULL, NULL, NULL, NULL, p, 0); - } - else - { diff --git a/libre/grub2/parabola-mkconfig.patch b/libre/grub2/parabola-mkconfig.patch deleted file mode 100644 index 7c18a4cc2..000000000 --- a/libre/grub2/parabola-mkconfig.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ru grub-1.99.orig/util/grub.d/10_linux.in grub-1.99/util/grub.d/10_linux.in ---- grub-1.99.orig/util/grub.d/10_linux.in 2011-08-11 15:54:52.051246328 +0200 -+++ grub-1.99/util/grub.d/10_linux.in 2011-08-11 15:55:41.297910793 +0200 -@@ -134,7 +134,7 @@ - - case x`uname -m` in - xi?86 | xx86_64) -- list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* /boot/vmlinuz26-* ; do -+ list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* /boot/vmlinuz26-* /boot/vmlinuz26 ; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi - done` ;; - *) -@@ -163,7 +163,8 @@ - "initrd-${alt_version}" "initramfs-${alt_version}.img" \ - "initramfs-genkernel-${version}" \ - "initramfs-genkernel-${alt_version}" \ -- "${basename/vmlinuz/kernel}.img"; do -+ "${basename/vmlinuz/kernel}.img" \ -+ "${basename/vmlinuz/initramfs}.img"; do - if test -e "${dirname}/${i}" ; then - initrd="$i" - break -@@ -194,7 +195,8 @@ - linux_entry "${OS}" "${version}" false \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" - for i in "initramfs-${version}-fallback.img" \ -- "${basename/vmlinuz/kernel}-fallback.img"; do -+ "${basename/vmlinuz/kernel}-fallback.img" \ -+ "${basename/vmlinuz/initramfs}-fallback.img"; do - if test -e "${dirname}/${i}"; then - initrd="$i" - linux_entry "${OS}" "${version}" true \ diff --git a/libre/grub2/parabola_grub_mkconfig_fixes.patch b/libre/grub2/parabola_grub_mkconfig_fixes.patch deleted file mode 100644 index 19022aec6..000000000 --- a/libre/grub2/parabola_grub_mkconfig_fixes.patch +++ /dev/null @@ -1,152 +0,0 @@ -diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 516be86..5f37db2 100644 ---- a/util/grub-mkconfig.in -+++ b/util/grub-mkconfig.in -@@ -213,6 +213,8 @@ export GRUB_DEFAULT \ - GRUB_THEME \ - GRUB_GFXPAYLOAD_LINUX \ - GRUB_DISABLE_OS_PROBER \ -+ GRUB_COLOR_NORMAL \ -+ GRUB_COLOR_HIGHLIGHT \ - GRUB_INIT_TUNE \ - GRUB_SAVEDEFAULT \ - GRUB_ENABLE_CRYPTODISK \ -diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index 765bfdc..b148558 100644 ---- a/util/grub.d/00_header.in -+++ b/util/grub.d/00_header.in -@@ -115,6 +115,14 @@ cat <<EOF - - EOF - -+if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then -+ cat << EOF -+set menu_color_normal=$GRUB_COLOR_NORMAL -+set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT -+ -+EOF -+fi -+ - serial=0; - gfxterm=0; - for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do -diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 14402e8..64c9bb5 100644 ---- a/util/grub.d/10_linux.in -+++ b/util/grub.d/10_linux.in -@@ -31,7 +31,7 @@ - if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then - OS=GNU/Linux - else -- OS="${GRUB_DISTRIBUTOR} GNU/Linux" -+ OS="${GRUB_DISTRIBUTOR}" - CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}" - fi - -@@ -87,6 +87,8 @@ linux_entry () - case $type in - recovery) - title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; -+ fallback) -+ title="$(gettext_printf "%s, with Linux %s (Fallback initramfs)" "${os}" "${version}")" ;; - *) - title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; - esac -@@ -100,7 +102,7 @@ linux_entry () - else - echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" - fi -- if [ x$type != xrecovery ] ; then -+ if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then - save_default_entry | sed -e "s/^/\t/" - fi - -@@ -132,7 +134,8 @@ linux_entry () - fi - printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" - fi -- message="$(gettext_printf "Loading Linux %s ..." ${version})" -+ -+ message="$(gettext_printf "Loading Linux %s ..." "${version}")" - sed "s/^/$submenu_indentation/" << EOF - echo '$message' - linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} -@@ -190,7 +193,22 @@ while [ "x$list" != "x" ] ; do - alt_version=`echo $version | sed -e "s,\.old$,,g"` - linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" - -+ if test -e "/etc/arch-release" ; then -+ if echo "${basename}" | grep -q 'vmlinuz-linux' ; then -+ version="`echo "${basename}" | sed -e 's,vmlinuz-linux,,g'`" -+ -+ if [ "x${version}" = "x" ] ; then -+ version="core repo kernel" -+ else -+ version="`echo "${version}" | sed -e 's,-,,g'`" -+ version="${version} kernel" -+ fi -+ fi -+ fi -+ - initrd= -+ initrd_arch="`echo "${basename}" | sed -e 's,vmlinuz,initramfs,g'`" -+ - for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ - "initrd-${version}" "initramfs-${version}.img" \ - "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ -@@ -198,7 +216,8 @@ while [ "x$list" != "x" ] ; do - "initramfs-genkernel-${version}" \ - "initramfs-genkernel-${alt_version}" \ - "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ -- "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do -+ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" \ -+ "${initrd_arch}.img" ; do - if test -e "${dirname}/${i}" ; then - initrd="$i" - break -@@ -226,6 +245,22 @@ while [ "x$list" != "x" ] ; do - linux_root_device_thisversion=${GRUB_DEVICE} - fi - -+ if test -e "/etc/arch-release" ; then -+ is_first_entry="false" -+ -+ linux_entry "${OS}" "${version}" true \ -+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ -+ for i in "${initrd_arch}-fallback.img" "initramfs-${version}-fallback.img" ; do -+ if test -e "${dirname}/${i}" ; then -+ initrd="${i}" -+ linux_entry "${OS}" "${version}" fallback \ -+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ break -+ fi -+ done -+ fi -+ - if [ "x$is_first_entry" = xtrue ]; then - linux_entry "${OS}" "${version}" simple \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -@@ -239,8 +274,11 @@ while [ "x$list" != "x" ] ; do - echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {" - fi - -+ if ! test -e "/etc/arch-release" ; then - linux_entry "${OS}" "${version}" advanced \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ fi -+ - if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then - linux_entry "${OS}" "${version}" recovery \ - "single ${GRUB_CMDLINE_LINUX}" -@@ -252,8 +290,10 @@ done - - # If at least one kernel was found, then we need to - # add a closing '}' for the submenu command. -+if ! test -e "/etc/arch-release" ; then - if [ x"$is_first_entry" != xtrue ]; then - echo '}' - fi -+fi - - echo "$title_correction_code" diff --git a/libre/java-asm2/PKGBUILD b/libre/java-asm2/PKGBUILD deleted file mode 100644 index 4853d79c0..000000000 --- a/libre/java-asm2/PKGBUILD +++ /dev/null @@ -1,76 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> - -_pkgname=asm -pkgname=java-asm2 -_pkgver=2 -pkgver=2.2.3 -pkgrel=4 -pkgdesc="An all purpose Java bytecode manipulation and analysis framework." -arch=('any') -url="http://asm.ow2.org/" -license=('custom:BSD3') -depends=('java-runtime') -makedepends=( - apache-ant - java-ow-util-ant-tasks -) -source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz") - -_M2_LOCALREPO='/usr/share/maven/repository' -_ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar' -_m2_packages=( - asm - asm-analysis - asm-attrs - asm-commons - asm-tree - asm-util - asm-xml - asm-all) - -build() { - cd "$srcdir/$_pkgname-$pkgver" - - mkdir -p test/lib - - echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties - ant dist - - # This will make package() easier: - cd output/dist/lib - ln -s all/* . -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - - # Install license file - install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - # Install documentation - cd output/dist - install -d "$pkgdir/usr/share/doc/$pkgname" - cp -r doc/javadoc/user "$pkgdir/usr/share/doc/$pkgname/javadoc" - cp -r examples "$pkgdir/usr/share/doc/$pkgname/examples" - - # Install Apache Maven modules - cd lib - install -d "$pkgdir"/usr/share/java/asm - for pkg in "${_m2_packages[@]}"; do - dir="$_M2_LOCALREPO"/asm/$pkg/$pkgver - # Create the Maven directory - install -d "$pkgdir$dir" - # Install the files - cp $pkg-$pkgver.* "$pkgdir$dir" - # Symlink them to /usr/share/java - ln -s "$dir"/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/asm/ - ln -s asm/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/$pkg-$_pkgver.jar - done - - # Install a README file about the -all files - cd "$srcdir/$_pkgname-$pkgver" - install -m644 output/dist/lib/all/README.txt \ - "$pkgdir"/usr/share/java/asm/README-$pkgver.txt -} - -md5sums=('7a92c87bf067925685cf68dcc0dd8998') diff --git a/libre/java-asm3/PKGBUILD b/libre/java-asm3/PKGBUILD deleted file mode 100644 index 7e66a5b5a..000000000 --- a/libre/java-asm3/PKGBUILD +++ /dev/null @@ -1,78 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> - -_pkgname=asm -pkgname=java-asm3 -_pkgver=3 -pkgver=3.3.1 -pkgrel=4.1 -pkgdesc="An all purpose Java bytecode manipulation and analysis framework." -arch=('any') -url="http://asm.ow2.org/" -license=('custom:BSD3') -depends=('java-runtime') -makedepends=( - apache-ant - java-ow-util-ant-tasks -) -source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz") - -_M2_LOCALREPO='/usr/share/maven/repository' -_ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar' -_m2_packages=( - asm - asm-analysis - asm-commons - asm-parent - asm-tree - asm-util - asm-xml - asm-all - asm-debug-all) - -build() { - cd "$srcdir/$_pkgname-$pkgver" - - rm cobertura.ser # We regenerate this - rm examples/jasmin/test/jasmin.jar - - echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties - ant dist - - # This will make package() easier: - cd output/dist/lib - ln -s all/* . -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - - # Install license file - install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - # Install documentation - cd output/dist - install -d "$pkgdir/usr/share/doc/$pkgname" - cp -r doc/javadoc/user "$pkgdir/usr/share/doc/$pkgname/javadoc" - cp -r examples "$pkgdir/usr/share/doc/$pkgname/examples" - - # Install Apache Maven modules - cd lib - install -d "$pkgdir"/usr/share/java/asm - for pkg in "${_m2_packages[@]}"; do - dir="$_M2_LOCALREPO"/asm/$pkg/$pkgver - # Create the Maven directory - install -d "$pkgdir$dir" - # Install the files - cp $pkg-$pkgver.* "$pkgdir$dir" - # Symlink them to /usr/share/java - ln -s "$dir"/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/asm/ - ln -s asm/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/$pkg-$_pkgver.jar - done - - # Install a README file about the -all files - cd "$srcdir/$_pkgname-$pkgver" - install -m644 output/dist/lib/all/README.txt \ - "$pkgdir"/usr/share/java/asm/README-$pkgver.txt -} - -md5sums=('433024df8176f09922646316e415631c') diff --git a/libre/java-ow-util-ant-tasks/PKGBUILD b/libre/java-ow-util-ant-tasks/PKGBUILD deleted file mode 100644 index 023048188..000000000 --- a/libre/java-ow-util-ant-tasks/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> - -pkgname=java-ow-util-ant-tasks -pkgver=1.3.2 -pkgrel=1 -pkgdesc="ObjectWeb utility Ant tasks library" -arch=('any') -url="http://forge.ow2.org/projects/monolog" -license=('LGPL') -depends=('java-environment') -makedepends=('apache-ant' 'xalan-java' 'java-asm2') -source=("http://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}-1-any.src.tar.xz") - -build() { - cd "$srcdir/$pkgname-$pkgver" - ln -s /usr/share/java/asm-2.jar externals - ln -s /usr/share/java/xalan.jar externals - ant jar -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - install -d "$pkgdir"/usr/share/java - install -m644 "output/lib/ow_util_ant_tasks.jar" "$pkgdir"/usr/share/java -} - -md5sums=('339b3eb4b2960473a42f5f781afbeca6') diff --git a/libre/java-ow-util-ant-tasks/SRCBUILD b/libre/java-ow-util-ant-tasks/SRCBUILD deleted file mode 100644 index 01241907d..000000000 --- a/libre/java-ow-util-ant-tasks/SRCBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> - -pkgname=java-ow-util-ant-tasks -pkgver=1.3.2 -pkgrel=1 -pkgdesc="ObjectWeb utility Ant tasks library" -arch=('any') -url="http://forge.ow2.org/projects/monolog" -license=('LGPL') -source=("http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_$pkgver.zip") -noextract=("ow_util_ant_tasks_$pkgver.zip") - -build() { - cd "$srcdir" - mkdir $pkgname-$pkgver - cd $pkgname-$pkgver - bsdtar xf "$srcdir"/ow_util_ant_tasks_$pkgver.zip - rm -rf output - rm externals/* -} - - -package() { - PKGEXT=${SRCEXT} - PKGDEST=${SRCDEST} - cp -a "$srcdir/$pkgname-$pkgver" "$pkgdir/" -} - -md5sums=('cd602bf75a0feab480fa97739955b84e') diff --git a/libre/luxrays-libre/PKGBUILD b/libre/luxrays-libre/PKGBUILD deleted file mode 100644 index 279e6622e..000000000 --- a/libre/luxrays-libre/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id$ -# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> -_pkgname=luxrays -pkgname=luxrays-libre -pkgver=1.0rc3 -_pkgver=eb749c000ffc -pkgrel=1 -epoch=0 -pkgdesc="Accelerate the ray intersection process by using CPUs (without OpenCL)" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.luxrender.net/" -license=('GPL') -depends=('freeimage' 'freeglut' 'glew') -makedepends=('cmake' 'boost') -replaces=('luxrays') -conflicts=('luxrays') -provides=("luxrays=$pkgver") -source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2) -md5sums=('f5f4b53df22a1c7ad301c78d046edd7d') - -build() { - cd "$srcdir/luxrender-$_pkgname-$_pkgver" - - export CXXFLAGS="$CXXFLAGS -lpthread" - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=ON \ - -DLUXRAYS_DISABLE_OPENCL=ON \ - . - make -} - -package() { - cd "$srcdir/luxrender-$_pkgname-$_pkgver" - - install -d -m755 "$pkgdir"/usr/{bin,include,lib} - install -m755 bin/* "$pkgdir"/usr/bin - install -m644 lib/* "$pkgdir"/usr/lib - cp -a include/luxrays "$pkgdir"/usr/include -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD deleted file mode 100644 index be6fd88e8..000000000 --- a/libre/luxrender-libre/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id$ -# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Initial contributor: flixie <69one@gmx.net> -# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> -pkgname=luxrender-libre -pkgver=1.0rc3 -_pkgver=9ed6b94cef05 -pkgrel=1 -pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenCL)" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.luxrender.net/" -license=('GPL') -depends=('boost-libs' 'freeimage' 'openexr') -optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \ - 'python: Python interface (pylux)') -makedepends=('cmake' 'boost' 'qt' 'luxrays-libre' 'python') -replaces=('luxrender') -conflicts=('luxrender') -provides=("luxrender=$pkgver") -source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \ - boost_1.50_fix.diff) -md5sums=('54ff625a7833541c3cff5f0a77a93863' - '8c7774bb0c97aadd77d9e665d8fa4aab') - -build() { - cd "$srcdir"/luxrender-lux-$_pkgver - - # fix for boost 1.50 - # the boost::TIME_UTC has been renamed due to the conflict with C++11 - patch -Np1 < "$srcdir"/boost_1.50_fix.diff || true - - export CXXFLAGS="$CXXFLAGS -lpthread" - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DLUXRAYS_DISABLE_OPENCL=ON \ - -DPYTHON_CUSTOM=ON \ - -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \ - -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \ - . - make -} - -package() { - cd "$srcdir"/luxrender-lux-$_pkgver - make DESTDIR="$pkgdir" install - - # fix library path on x86_64 - [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib - - #install pylux - install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.2/pylux.so -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/luxrender-libre/boost_1.50_fix.diff b/libre/luxrender-libre/boost_1.50_fix.diff deleted file mode 100644 index c1aa0a8e2..000000000 --- a/libre/luxrender-libre/boost_1.50_fix.diff +++ /dev/null @@ -1,131 +0,0 @@ -diff -rup luxrender-lux-008805644181/core/film.cpp luxrender-lux-008805644181.new/core/film.cpp ---- luxrender-lux-008805644181/core/film.cpp 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/core/film.cpp 2012-07-07 15:44:59.867492295 +0200 -@@ -618,7 +618,7 @@ Film::Film(u_int xres, u_int yres, Filte - int yRealHeight = Floor2Int(yPixelStart + .5f + yPixelCount + filter->yWidth) - Floor2Int(yPixelStart + .5f - filter->yWidth); - samplePerPass = xRealWidth * yRealHeight; - -- boost::xtime_get(&creationTime, boost::TIME_UTC); -+ boost::xtime_get(&creationTime, boost::TIME_UTC_); - - //Queryable parameters - AddIntAttribute(*this, "xResolution", "Horizontal resolution (pixels)", &Film::GetXResolution); -@@ -855,7 +855,7 @@ void Film::AddSampleCount(float count) { - if (haltTime > 0) { - // Check if we have met the enough rendering time condition - boost::xtime t; -- boost::xtime_get(&t, boost::TIME_UTC); -+ boost::xtime_get(&t, boost::TIME_UTC_); - if (t.sec - creationTime.sec > haltTime) - enoughSamplesPerPixel = true; - } -diff -rup luxrender-lux-008805644181/core/photonmap.cpp luxrender-lux-008805644181.new/core/photonmap.cpp ---- luxrender-lux-008805644181/core/photonmap.cpp 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/core/photonmap.cpp 2012-07-07 15:44:59.870825579 +0200 -@@ -474,13 +474,13 @@ void PhotonMapPreprocess(const RandomGen - - boost::xtime photonShootingStartTime; - boost::xtime lastUpdateTime; -- boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC); -- boost::xtime_get(&lastUpdateTime, boost::TIME_UTC); -+ boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC_); -+ boost::xtime_get(&lastUpdateTime, boost::TIME_UTC_); - u_int nshot = 0; - while ((!radianceDone || !directDone || !causticDone || !indirectDone) && !scene.terminated) { - // Dade - print some progress information - boost::xtime currentTime; -- boost::xtime_get(¤tTime, boost::TIME_UTC); -+ boost::xtime_get(¤tTime, boost::TIME_UTC_); - if (currentTime.sec - lastUpdateTime.sec > 5) { - ss.str(""); - ss << "Photon shooting progress: Direct[" << directPhotons.size(); -@@ -686,7 +686,7 @@ void PhotonMapPreprocess(const RandomGen - return; - - boost::xtime photonShootingEndTime; -- boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC); -+ boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC_); - LOG(LUX_INFO,LUX_NOERROR) << "Photon shooting done (" << ( photonShootingEndTime.sec - photonShootingStartTime.sec ) << "s)"; - - if (computeRadianceMap) { -@@ -700,7 +700,7 @@ void PhotonMapPreprocess(const RandomGen - for (u_int i = 0; i < radiancePhotons.size(); ++i) { - // Dade - print some progress info - boost::xtime currentTime; -- boost::xtime_get(¤tTime, boost::TIME_UTC); -+ boost::xtime_get(¤tTime, boost::TIME_UTC_); - if (currentTime.sec - lastUpdateTime.sec > 5) { - LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computation progress: " << i << " (" << (100 * i / radiancePhotons.size()) << "%)"; - -@@ -740,7 +740,7 @@ void PhotonMapPreprocess(const RandomGen - - - boost::xtime radianceComputeEndTime; -- boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC); -+ boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC_); - LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computed (" << ( radianceComputeEndTime.sec - photonShootingEndTime.sec ) << "s)"; - } - -diff -rup luxrender-lux-008805644181/core/renderfarm.cpp luxrender-lux-008805644181.new/core/renderfarm.cpp ---- luxrender-lux-008805644181/core/renderfarm.cpp 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/core/renderfarm.cpp 2012-07-07 15:44:59.870825579 +0200 -@@ -100,7 +100,7 @@ void FilmUpdaterThread::updateFilm(FilmU - // Dade - thread to update the film with data from servers - - boost::xtime reft; -- boost::xtime_get(&reft, boost::TIME_UTC); -+ boost::xtime_get(&reft, boost::TIME_UTC_); - - while (filmUpdaterThread->signal == SIG_NONE) { - // Dade - check signal every 1 sec -@@ -108,7 +108,7 @@ void FilmUpdaterThread::updateFilm(FilmU - for(;;) { - // Dade - sleep for 1 sec - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 1; - boost::thread::sleep(xt); - -diff -rup luxrender-lux-008805644181/film/fleximage.cpp luxrender-lux-008805644181.new/film/fleximage.cpp ---- luxrender-lux-008805644181/film/fleximage.cpp 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/film/fleximage.cpp 2012-07-07 15:44:59.877492150 +0200 -@@ -191,7 +191,7 @@ FlexImageFilm::FlexImageFilm(u_int xres, - m_CameraResponseEnabled = d_CameraResponseEnabled = m_CameraResponseFile != ""; - - // init timer -- boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC); -+ boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC_); - lastWriteFLMTime = lastWriteImageTime; - } - -@@ -812,7 +812,7 @@ void FlexImageFilm::CheckWriteOuputInter - { - // Check write output interval - boost::xtime currentTime; -- boost::xtime_get(¤tTime, boost::TIME_UTC); -+ boost::xtime_get(¤tTime, boost::TIME_UTC_); - bool timeToWriteImage = (currentTime.sec - lastWriteImageTime.sec > writeInterval); - bool timeToWriteFLM = (currentTime.sec - lastWriteFLMTime.sec > flmWriteInterval); - -@@ -834,7 +834,7 @@ void FlexImageFilm::CheckWriteOuputInter - // WriteImage can take a very long time to be executed (i.e. by saving - // the film. It is better to refresh timestamps after the - // execution of WriteImage instead than before. -- boost::xtime_get(¤tTime, boost::TIME_UTC); -+ boost::xtime_get(¤tTime, boost::TIME_UTC_); - - if (timeToWriteImage) - lastWriteImageTime = currentTime; -diff -rup luxrender-lux-008805644181/renderers/sppmrenderer.h luxrender-lux-008805644181.new/renderers/sppmrenderer.h ---- luxrender-lux-008805644181/renderers/sppmrenderer.h 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/renderers/sppmrenderer.h 2012-07-07 15:44:59.874158864 +0200 -@@ -126,7 +126,7 @@ public: - { - while (state == PAUSE && !boost::this_thread::interruption_requested()) { - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 1; - boost::thread::sleep(xt); - } diff --git a/libre/maven-libre/PKGBUILD b/libre/maven-libre/PKGBUILD deleted file mode 100644 index 2bd99940e..000000000 --- a/libre/maven-libre/PKGBUILD +++ /dev/null @@ -1,76 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -_pkgname=maven -pkgname=maven-libre -pkgver=3.0.4 - -provides=("$_pkgname=$pkgver") -replaces=("$_pkgname") -conflicts=("$_pkgname") - -pkgrel=1 -pkgdesc="A Java project management and project comprehension tool" -arch=('any') -url="http://maven.apache.org" -license=('Apache') -depends=('java-environment') -makedepends=('apache-ant') -backup=('etc/maven/settings.xml') - -_mirror=http://archive.apache.org/dist -source=($_mirror/maven/source/apache-maven-$pkgver-src.tar.gz - maven.sh maven.csh) - -_M2_LOCALREPO="/usr/share/maven/repository" - -# FIXME: This also does tasks for package() -build() { - cd $srcdir/apache-maven-$pkgver - - . /etc/profile.d/jre.sh - . /etc/profile.d/jdk.sh - - export MAVEN_OPTS=-Xmx512m - export M2_HOME="$pkgdir"/opt/maven - export PATH="$PATH:$M2_HOME/bin" - - # FIXME: Downloads many deps from Internet. They should be - # packaged separately and added to depends=() - install -d "$pkgdir`dirname $_M2_LOCALREPO`" - cp -r $_M2_LOCALREPO "$pkgdir$_M2_LOCALREPO" - install -d "$pkgdir"/opt - ant -Dmaven.repo.local="$pkgdir$_M2_LOCALREPO" - rm "$pkgdir"/opt/maven/*.txt -} - -package() { - install -d "$pkgdir$_M2_LOCALREPO" - - # Install config file in /etc - # Unlike the other directories, we symlink from the system to /opt/maven - # because that way all conf files stay in /etc - install -d "$pkgdir"/etc/maven - sed "55i<localRepository>$_M2_LOCALREPO</localRepository>" \ - < "$pkgdir"/opt/maven/conf/settings.xml \ - > "$pkgdir"/etc/maven/settings.xml - rm -rf "$pkgdir"/opt/maven/conf - ln -s /etc/maven "$pkgdir"/opt/maven/conf - - # Install profile.d settings - install -d "$pkgdir"/etc/profile.d - install -m 755 "$srcdir"/maven.{csh,sh} "$pkgdir"/etc/profile.d - - # Link executables to /usr/bin - install -d "$pkgdir"/usr/bin - ln -s /opt/maven/bin/{mvn,mvnDebug,mvnyjp} "$pkgdir"/usr/bin - - # Link jar files to appropriate place in /usr/share - install -d "$pkgdir"/usr/share/java - ln -s /opt/maven/lib "$pkgdir"/usr/share/java/maven -} - -md5sums=('17ca94d5be05a78c6ab12425b7a0ee10' - '58820067a4d7384477daa134023d9b57' - 'e2bbdeffed100cd51d05b2ba8ebd6321') diff --git a/libre/maven-libre/maven.csh b/libre/maven-libre/maven.csh deleted file mode 100644 index f5750cfc8..000000000 --- a/libre/maven-libre/maven.csh +++ /dev/null @@ -1,2 +0,0 @@ -setenv MAVEN_OPTS -Xmx512m -setenv M2_HOME=/opt/maven diff --git a/libre/maven-libre/maven.sh b/libre/maven-libre/maven.sh deleted file mode 100644 index b6655cc22..000000000 --- a/libre/maven-libre/maven.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -export MAVEN_OPTS=-Xmx512m -export M2_HOME=/opt/maven diff --git a/libre/parabolaweb-git/Makefile b/libre/parabolaweb-git/Makefile deleted file mode 100644 index 55115aba3..000000000 --- a/libre/parabolaweb-git/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -all: - makepkg - -python_packages=south -python2_packages=markdown|psycopg2|pyinotify|pytz -requirements= https://projects.parabolagnulinux.org/parabolaweb.git/plain/requirements_prod.txt - -requirements_prod.txt: WEB - rm -f $@ - wget --no-check-certificate $(requirements) - -deps-ver.txt: requirements_prod.txt - sed -r -e 's/.*/\L&/' -e 's/==/=/' \ - -e 's/^(${python_packages})/python-&/' \ - -e 's/^(${python2_packages})/python2-&/' $< >$@ - -deps-nover.txt: deps-ver.txt - sed 's/[<>=].*//' $< >$@ - -clean: - rm requirements_prod.txt deps-ver.txt deps-nover.txt - -WEB: FORCE -FORCE: PHONY -PHONY: -.PHONY: PHONY diff --git a/libre/parabolaweb-git/PKGBUILD b/libre/parabolaweb-git/PKGBUILD deleted file mode 100644 index 4641ea8d3..000000000 --- a/libre/parabolaweb-git/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> - -pkgname=parabolaweb-git -pkgver=20120506 -pkgrel=3 -pkgdesc="The Parabola website, fork of archweb" -arch=('any') -url="https://projects.parabolagnulinux.org/parabolaweb.git/" -license=('GPL2') - -_deps_file=deps-ver.txt -#_deps_file=deps-nover.txt -make "$_deps_file" 1>&2 -depends=('python2' 'git' 'libretools' `cat $_deps_file`) - -source=('parabolaweb.init.sh' 'parabolaweb.update.sh.in') - -# These will make it install into /http/srv/web -_install_dir=/srv/http -_gitname=web - -_gitroot=https://projects.parabolagnulinux.org/parabolaweb.git -_gitbranch="master" - -build() { - cd "${srcdir}" - sed \ - -e "s|^_install_dir=.*|_install_dir='$_install_dir'|" \ - -e "s|^_gitname=.*|_gitname='$_gitname'|" \ - -e "s|^_gitroot=.*|_gitroot='$_gitroot'|" \ - -e "s|^_gitbranch=.*|_gitbranch='$_gitbranch'|" \ - < parabolaweb.update.sh.in > parabolaweb.update.sh -} - -package() { - cd "${srcdir}" - install -d "${pkgdir}/${_install_dir}" - install -Dm755 parabolaweb.init.sh "${pkgdir}/etc/rc.d/parabolaweb" - install -Dm755 parabolaweb.update.sh "${pkgdir}/usr/sbin/parabolaweb.update" -} - -md5sums=('72bc7092e4e50a2aaca8b871644520d9' - 'f495b2e4623691925308cb4a1ec7e5a9') diff --git a/libre/parabolaweb-git/deps-ver.txt b/libre/parabolaweb-git/deps-ver.txt deleted file mode 100644 index 67fe6848b..000000000 --- a/libre/parabolaweb-git/deps-ver.txt +++ /dev/null @@ -1,7 +0,0 @@ -django=1.3.1 -python2-markdown>=2.0.3 -python2-psycopg2 -python-south>=0.7.3 -python2-pyinotify>=0.9.2 -python-memcached>=1.47 -python2-pytz>=2011n diff --git a/libre/parabolaweb-git/parabolaweb.init.sh b/libre/parabolaweb-git/parabolaweb.init.sh deleted file mode 100644 index cb9f2441e..000000000 --- a/libre/parabolaweb-git/parabolaweb.init.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -HOST=127.0.0.1 -PORT=8090 # 80 is nginx -PIDFILE=/var/run/web/fcgi.pid - -case $1 in -start) - stat_busy "Starting ParabolaWeb" - if [[ -e /srv/http/web/manage.py ]]; then - sudo -u nobody \ - python2 /srv/http/web/manage.py runfcgi \ - host=${HOST} \ - port=${PORT} \ - pidfile=${PIDFILE} \ - --settings=settings - - add_daemon parabolaweb - stat_done - exit 0 - else - stat_fail - exit 1 - fi - ;; - -stop) - stat_busy "Stopping ParabolaWeb" - if [[ -f ${PIDFILE} ]]; then - pid=$(cat ${PIDFILE}) - kill ${pid} - rm_daemon parabolaweb - stat_done - else - stat_fail - exit 1 - fi - ;; - -restart) - $0 stop - $0 start - ;; - -*) - echo "Usage: $0 {start|stop|restart}" >&2 - exit 1 - -esac diff --git a/libre/parabolaweb-git/parabolaweb.update.sh.in b/libre/parabolaweb-git/parabolaweb.update.sh.in deleted file mode 100644 index 8c3aef0f0..000000000 --- a/libre/parabolaweb-git/parabolaweb.update.sh.in +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -set -e - -_install_dir=@INSTALL_DIR@ -_gitname=@GIT_NAME@ - -_gitroot=@GITROOT@ -_gitbranch=@GITBRANCH@ - -. /usr/bin/libremessages - -if [ ! -d "$_install_dir" ]; then - mkdir "$_install_dir" -fi -cd "$_install_dir" - -msg "Connecting to GIT server...." -if [ -d ${_gitname} ] ; then - msg2 "Updating existing tree" - cd ${_gitname} && git pull ${_gitroot} -else - msg2 "Cloning tree" - git clone ${_gitroot} ${_gitname} - cd ${_gitname} -fi -git checkout ${_gitbranch} -msg "GIT checkout done or server timeout" - -msg "Purging old .pyc files...." -find . -name '*.pyc' -delete - -msg "Checking configuration...." -if [ ! -f local_settings.py ]; then - cp local_settings.py.example local_settings.tmp.$$.py - if ${EDITOR:-xdg-open} local_settings.tmp.$$.py; then - mv local_settings.tmp.$$.py local_settings.py - else - rm local_settings.tmp.$$.py - msg "Failed to configure, exiting" - exit 1 - fi - msg "Creating database...." - ./manage.py syncdb -fi - -msg "Purging old .pyc files...." -find . -name '*.pyc' -delete - -msg "Updating database...." -msg2 "Running migrations...." -./manage.py migrate -msg2 "Loading fixtures...." -./manage.py loaddata */fixtures/*.json - -msg "Checking media/admin_media symlink...." -if [ ! -e media/admin-media ]; then - rm media/admin_media - ln -s /usr/lib/python2.7/site-packages/django/contrib/admin/media media/admin_media -fi diff --git a/libre/parabolaweb-git/requirements_prod.txt b/libre/parabolaweb-git/requirements_prod.txt deleted file mode 100644 index 78eb51250..000000000 --- a/libre/parabolaweb-git/requirements_prod.txt +++ /dev/null @@ -1,7 +0,0 @@ -Django==1.3.1 -Markdown>=2.0.3 -psycopg2 -South>=0.7.3 -pyinotify>=0.9.2 -python-memcached>=1.47 -pytz>=2011n diff --git a/libre/python-reportlab-libre/PKGBUILD b/libre/python-reportlab-libre/PKGBUILD deleted file mode 100644 index 155785fbd..000000000 --- a/libre/python-reportlab-libre/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 67753 2012-03-14 10:35:58Z giovanni $ -# Maintainer: -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: William Rea <sillywilly@gmail.com> -# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> -# Contributor: borgo <nomail> -# Contributor (Parabola): André Silva <emulatorman@lavabit.com> - -pkgname=python-reportlab-libre -_origname=reportlab -pkgver=2.5 -pkgrel=2 -pkgdesc="A proven industry-strength PDF generating solution" -arch=('i686' 'x86_64' 'mips64el') -depends=('python2' 'freetype2' 'ttf-bitstream-vera' 'gsfonts' 'python-imaging') -license=('custom') -source=(http://www.reportlab.com/ftp/${_origname}-$pkgver.tar.gz - free-fonts.patch) -url="http://www.reportlab.org/rl_toolkit.html" -md5sums=('cdf8b87a6cf1501de1b0a8d341a217d3' - '1fc63857754cf3e2987d2400d94e7cd7') -provides=("python-reportlab=$pkgver") -conflicts=('python-reportlab') -replaces=('python-reportlab') -optdepends=('ghostscript') - -build() { - cd $srcdir/${_origname}-$pkgver - - # python2 fix - for file in src/reportlab/graphics/widgets/table.py src/reportlab/lib/normalDate.py \ - src/reportlab/pdfgen/pycanvas.py; do - sed -i 's_#!.*/usr/bin/env python_#!/usr/bin/env python2_' $file - done - - rm -f reportlab/fonts/Vera* reportlab/fonts/bitstream-vera-license.txt - patch -p1 -i $srcdir/free-fonts.patch - - python2 setup.py install --root=$pkgdir --optimize=1 - install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/license.txt -} diff --git a/libre/python-reportlab-libre/free-fonts.patch b/libre/python-reportlab-libre/free-fonts.patch deleted file mode 100644 index 9c79839b6..000000000 --- a/libre/python-reportlab-libre/free-fonts.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff -rupN reportlab-2.5-orig/setup.py reportlab-2.5/setup.py ---- reportlab-2.5-orig/setup.py 2010-06-16 13:56:53.000000000 +0200 -+++ reportlab-2.5/setup.py 2011-01-06 11:01:50.263333455 +0100 -@@ -222,11 +222,11 @@ def get_fonts(PACKAGE_DIR, reportlab_fil - infoline("Standard T1 font curves already downloaded") - return - try: -- infoline("Downloading standard T1 font curves") -+ #infoline("Downloading standard T1 font curves") - -- remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/fonts/pfbfer.zip") -- zipdata = StringIO.StringIO(remotehandle.read()) -- remotehandle.close() -+ #remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/fonts/pfbfer.zip") -+ #zipdata = StringIO.StringIO(remotehandle.read()) -+ #remotehandle.close() - archive = zipfile.ZipFile(zipdata) - dst = pjoin(rl_dir, 'fonts') - -@@ -239,7 +239,7 @@ def get_fonts(PACKAGE_DIR, reportlab_fil - except: - xitmsg = "Failed to download standard T1 font curves" - reportlab_files = [x for x in reportlab_files if os.path.isfile(pjoin(rl_dir,x))] -- infoline(xitmsg) -+ #infoline(xitmsg) - - def main(): - #test to see if we've a special command -diff -rupN reportlab-2.5-orig/src/reportlab/pdfbase/_fontdata.py reportlab-2.5/src/reportlab/pdfbase/_fontdata.py ---- reportlab-2.5-orig/src/reportlab/pdfbase/_fontdata.py 2010-02-10 22:01:22.000000000 +0100 -+++ reportlab-2.5/src/reportlab/pdfbase/_fontdata.py 2011-01-06 11:03:59.459999025 +0100 -@@ -72,20 +72,20 @@ _font2fnrMapWin32 = { - } - if sys.platform in ('linux2',): - _font2fnrMapLinux2 ={ -- 'symbol': 'Symbol', -- 'zapfdingbats': 'ZapfDingbats', -- 'helvetica': 'Arial', -- 'helvetica-bold': 'Arial-Bold', -- 'helvetica-boldoblique': 'Arial-BoldItalic', -- 'helvetica-oblique': 'Arial-Italic', -- 'times-bold': 'TimesNewRoman-Bold', -- 'times-bolditalic':'TimesNewRoman-BoldItalic', -- 'times-italic': 'TimesNewRoman-Italic', -- 'times-roman': 'TimesNewRoman', -- 'courier-bold': 'Courier-Bold', -- 'courier-boldoblique': 'Courier-BoldOblique', -- 'courier': 'Courier', -- 'courier-oblique': 'Courier-Oblique', -+ 'symbol': 's050000l.pfb', -+ 'zapfdingbats': 'd050000l.pfb', -+ 'helvetica': 'n019003l.pfb', -+ 'helvetica-bold': 'n019004l.pfb', -+ 'helvetica-boldoblique': 'n019024l.pfb', -+ 'helvetica-oblique': 'n019023l.pfb', -+ 'times-bold': 'n021004l.pfb', -+ 'times-bolditalic':'n021024l.pfb', -+ 'times-italic': 'n021023l.pfb', -+ 'times-roman': 'n021003l.pfb', -+ 'courier-bold': 'n022004l.pfb', -+ 'courier-boldoblique': 'n022024l.pfb', -+ 'courier': 'n022003l.pfb', -+ 'courier-oblique': 'n022023l.pfb', - } - _font2fnrMap = _font2fnrMapLinux2 - for k, v in _font2fnrMap.items(): -diff -rupN reportlab-2.5-orig/src/reportlab/rl_config.py reportlab-2.5/src/reportlab/rl_config.py ---- reportlab-2.5-orig/src/reportlab/rl_config.py 2010-09-30 13:27:09.000000000 +0200 -+++ reportlab-2.5/src/reportlab/rl_config.py 2011-01-06 11:01:50.266666714 +0100 -@@ -49,25 +49,7 @@ ttfAsciiReadable= 1 - - # places to look for T1Font information - T1SearchPath = ( -- 'c:/Program Files/Adobe/Acrobat 9.0/Resource/Font', -- 'c:/Program Files/Adobe/Acrobat 8.0/Resource/Font', -- 'c:/Program Files/Adobe/Acrobat 7.0/Resource/Font', -- 'c:/Program Files/Adobe/Acrobat 6.0/Resource/Font', #Win32, Acrobat 6 -- 'c:/Program Files/Adobe/Acrobat 5.0/Resource/Font', #Win32, Acrobat 5 -- 'c:/Program Files/Adobe/Acrobat 4.0/Resource/Font', #Win32, Acrobat 4 -- '%(disk)s/Applications/Python %(sys_version)s/reportlab/fonts', #Mac? -- '/usr/lib/Acrobat9/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat8/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat7/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat6/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat5/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat4/Resource/Font', #Linux, Acrobat 4 -- '/usr/local/Acrobat9/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat8/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat7/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat6/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat5/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat4/Resource/Font', #Linux, Acrobat 4 -+ '/usr/share/fonts/Type1', - '%(REPORTLAB_DIR)s/fonts', #special - '%(REPORTLAB_DIR)s/../fonts', #special - '%(REPORTLAB_DIR)s/../../fonts', #special -@@ -76,44 +58,17 @@ T1SearchPath = ( - - # places to look for TT Font information - TTFSearchPath = ( -- 'c:/winnt/fonts', -- 'c:/windows/fonts', -- '/usr/lib/X11/fonts/TrueType/', -- '/usr/share/fonts/truetype', -+ '/usr/share/fonts/TTF', - '%(REPORTLAB_DIR)s/fonts', #special - '%(REPORTLAB_DIR)s/../fonts', #special - '%(REPORTLAB_DIR)s/../../fonts',#special - '%(HOME)s/fonts', #special -- #mac os X - from -- #http://developer.apple.com/technotes/tn/tn2024.html -- '~/Library/Fonts', -- '/Library/Fonts', -- '/Network/Library/Fonts', -- '/System/Library/Fonts', -- - ) - - # places to look for CMap files - should ideally merge with above - CMapSearchPath = ( -- '/usr/lib/Acrobat9/Resource/CMap', -- '/usr/lib/Acrobat8/Resource/CMap', -- '/usr/lib/Acrobat7/Resource/CMap', -- '/usr/lib/Acrobat6/Resource/CMap', -- '/usr/lib/Acrobat5/Resource/CMap', -- '/usr/lib/Acrobat4/Resource/CMap', -- '/usr/local/Acrobat9/Resource/CMap', -- '/usr/local/Acrobat8/Resource/CMap', -- '/usr/local/Acrobat7/Resource/CMap', -- '/usr/local/Acrobat6/Resource/CMap', -- '/usr/local/Acrobat5/Resource/CMap', -- '/usr/local/Acrobat4/Resource/CMap', -- 'C:\\Program Files\\Adobe\\Acrobat\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 9.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 8.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 7.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 6.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 5.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 4.0\\Resource\\CMap', -+ '/usr/share/ghostscript/8.71/Resource/CMap', -+ '/usr/share/ghostscript/9.00/Resource/CMap', - '%(REPORTLAB_DIR)s/fonts/CMap', #special - '%(REPORTLAB_DIR)s/../fonts/CMap', #special - '%(REPORTLAB_DIR)s/../../fonts/CMap', #special diff --git a/libre/virtualbox-modules-lts/60-vboxguest.rules b/libre/virtualbox-modules-lts/60-vboxguest.rules deleted file mode 100644 index 6285f7249..000000000 --- a/libre/virtualbox-modules-lts/60-vboxguest.rules +++ /dev/null @@ -1,2 +0,0 @@ -ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" -ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" diff --git a/libre/virtualbox-modules-lts/LocalConfig.kmk b/libre/virtualbox-modules-lts/LocalConfig.kmk deleted file mode 100644 index af79f90cd..000000000 --- a/libre/virtualbox-modules-lts/LocalConfig.kmk +++ /dev/null @@ -1,19 +0,0 @@ -VBOX_WITH_ADDITION_DRIVERS = -VBOX_WITH_INSTALLER = 1 -VBOX_WITH_LINUX_ADDITIONS = 1 -VBOX_WITH_X11_ADDITIONS = -VBOX_WITH_TESTCASES = -VBOX_WITH_TESTSUITE = -VBOX_WITH_ORIGIN := -VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox -VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) -VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) -VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox -VBOX_PATH_APP_DOCS := /usr/share/virtualbox -VBOX_WITH_REGISTRATION_REQUEST = -VBOX_WITH_UPDATE_REQUEST = -VBOX_WITH_VNC := 1 -VBOX_BLD_PYTHON = python2 -VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk -VBOX_GCC_WERR = -VBOX_GCC_WARN = diff --git a/libre/virtualbox-modules-lts/PKGBUILD b/libre/virtualbox-modules-lts/PKGBUILD deleted file mode 100644 index 2daecb990..000000000 --- a/libre/virtualbox-modules-lts/PKGBUILD +++ /dev/null @@ -1,101 +0,0 @@ -# $Id$ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> -# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -# Maintainer (Parabola): Jorge López <jorginho@lavabit.com> - -pkgbase=virtualbox-modules-lts -pkgname=('virtualbox-modules-lts' 'virtualbox-parabola-modules-lts') -pkgver=4.1.18 -pkgrel=2 -arch=('i686' 'x86_64' 'mips64el') -url='http://virtualbox.org' -license=('GPL') -makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-libre-lts' 'linux-libre-lts-headers') -[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') -source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 - LocalConfig.kmk 60-vboxguest.rules) -md5sums=('38db0a87cba659b484af868b0c2bd3ac' - '4c88bd122677a35f68abd76eb01b378b' - 'ed1341881437455d9735875ddf455fbe') - -_extramodules=extramodules-3.0-LIBRE-LTS -_kernver=$(pacman -Q linux-libre-lts | awk '{ printf "%s-LIBRE-LTS", $2; exit }') - -export KERN_DIR=/usr/lib/modules/${_kernver}/build -export KERN_INCL=/usr/src/linux-${_kernver}/include/ - -build() { - cd "$srcdir/VirtualBox-${pkgver}" - - cp "$srcdir/LocalConfig.kmk" . - - ./configure \ - --with-linux=/usr/src/linux-${_kernver} \ - --disable-java \ - --disable-docs \ - --disable-xpcom \ - --disable-python \ - --disable-sdl-ttf \ - --disable-alsa \ - --disable-pulse \ - --disable-dbus \ - --disable-opengl \ - --build-headless \ - --nofatal - source ./env.sh - kmk all - - make -C "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src" - make -C "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" -} - -package_virtualbox-parabola-modules-lts(){ - pkgdesc="Additions only for Parabola guests (long-term supported kernel modules)" - license=('GPL') - install=virtualbox-parabola-modules-lts.install - depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') - replaces=('virtualbox-archlinux-modules-lts') - conflicts=('virtualbox-archlinux-modules-lts') - provides=("virtualbox-parabola-modules=$pkgver" "virtualbox-archlinux-modules=$pkgver" "virtualbox-archlinux-modules-lts=$pkgver") - - source "$srcdir/VirtualBox-${pkgver}/env.sh" - - cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" - - for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do - install -D -m644 ${module} \ - "$pkgdir/usr/lib/modules/${_extramodules}/${module}" - done - - install -D -m 0644 "$srcdir/60-vboxguest.rules" \ - "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules" - - find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; -} - -package_virtualbox-modules-lts(){ - pkgdesc="Long-term supported kernel modules for VirtualBox" - license=('GPL') - install=virtualbox-modules-lts.install - depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') - provides=("virtualbox-modules=$pkgver") - - source "$srcdir/VirtualBox-${pkgver}/env.sh" - - cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src" - - install -D -m644 vboxdrv.ko \ - "$pkgdir/usr/lib/modules/${_extramodules}/vboxdrv.ko" - - install -D -m644 vboxnetadp.ko \ - "$pkgdir/usr/lib/modules/${_extramodules}/vboxnetadp.ko" - - install -D -m644 vboxnetflt.ko \ - "$pkgdir/usr/lib/modules/${_extramodules}/vboxnetflt.ko" - - install -D -m644 vboxpci.ko \ - "$pkgdir/usr/lib/modules/${_extramodules}/vboxpci.ko" - - find "${pkgdir}" -name '*.ko' -exec gzip -9 {} + -} diff --git a/libre/virtualbox-modules-lts/virtualbox-modules-lts.install b/libre/virtualbox-modules-lts/virtualbox-modules-lts.install deleted file mode 100644 index 5387563a6..000000000 --- a/libre/virtualbox-modules-lts/virtualbox-modules-lts.install +++ /dev/null @@ -1,18 +0,0 @@ -EXTRAMODULES='extramodules-3.0-LIBRE-LTS' - -post_install() { -/bin/cat << EOF -===> You must load vboxdrv module before starting VirtualBox: -===> # modprobe vboxdrv -EOF - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_upgrade() { - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - echo 'In order to use the new version, reload all virtualbox modules manually.' -} - -post_remove() { - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} diff --git a/libre/virtualbox-modules-lts/virtualbox-parabola-modules-lts.install b/libre/virtualbox-modules-lts/virtualbox-parabola-modules-lts.install deleted file mode 100644 index 54a052390..000000000 --- a/libre/virtualbox-modules-lts/virtualbox-parabola-modules-lts.install +++ /dev/null @@ -1,16 +0,0 @@ -EXTRAMODULES='extramodules-3.0-LIBRE-LTS' - -post_install() { -cat << EOF -===> You may want to load vboxguest, vboxsf and vboxvideo -EOF - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_upgrade() { - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_remove() { - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} diff --git a/libre/virtualbox-modules/.directory b/libre/virtualbox-modules/.directory deleted file mode 100644 index 7486c78f1..000000000 --- a/libre/virtualbox-modules/.directory +++ /dev/null @@ -1,2 +0,0 @@ -[Dolphin] -Timestamp=2012,3,20,12,36,27 diff --git a/libre/virtualbox-modules/60-vboxguest.rules b/libre/virtualbox-modules/60-vboxguest.rules deleted file mode 100644 index 6285f7249..000000000 --- a/libre/virtualbox-modules/60-vboxguest.rules +++ /dev/null @@ -1,2 +0,0 @@ -ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" -ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" diff --git a/libre/virtualbox-modules/LocalConfig.kmk b/libre/virtualbox-modules/LocalConfig.kmk deleted file mode 100644 index af79f90cd..000000000 --- a/libre/virtualbox-modules/LocalConfig.kmk +++ /dev/null @@ -1,19 +0,0 @@ -VBOX_WITH_ADDITION_DRIVERS = -VBOX_WITH_INSTALLER = 1 -VBOX_WITH_LINUX_ADDITIONS = 1 -VBOX_WITH_X11_ADDITIONS = -VBOX_WITH_TESTCASES = -VBOX_WITH_TESTSUITE = -VBOX_WITH_ORIGIN := -VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox -VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) -VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) -VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox -VBOX_PATH_APP_DOCS := /usr/share/virtualbox -VBOX_WITH_REGISTRATION_REQUEST = -VBOX_WITH_UPDATE_REQUEST = -VBOX_WITH_VNC := 1 -VBOX_BLD_PYTHON = python2 -VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk -VBOX_GCC_WERR = -VBOX_GCC_WARN = diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD deleted file mode 100644 index 5e0feec6d..000000000 --- a/libre/virtualbox-modules/PKGBUILD +++ /dev/null @@ -1,104 +0,0 @@ -# $Id$ -#Maintainer: Ionut Biru <ibiru@archlinux.org> -#Maintainer (Parabola): Jorge López <jorginho@lavabit.com> -#Contributor (Parabola): André Silva <emulatorman@lavabit.com> - -pkgbase=virtualbox-modules -pkgname=('virtualbox-modules' 'virtualbox-parabola-modules') -pkgver=4.1.18 -pkgrel=5 -arch=('i686' 'x86_64') -url='http://virtualbox.org' -license=('GPL') -makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-libre-headers') -[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') -source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 - LocalConfig.kmk 60-vboxguest.rules) -md5sums=('38db0a87cba659b484af868b0c2bd3ac' - '4c88bd122677a35f68abd76eb01b378b' - 'ed1341881437455d9735875ddf455fbe') - -_extramodules=extramodules-3.5-LIBRE -_kernver="$(cat /usr/lib/modules/${_extramodules}/version || true)" - -export KERN_DIR=/usr/lib/modules/${_kernver}/build -export KERN_INCL=/usr/src/linux-${_kernver}/include/ - -build() { - cd "$srcdir/VirtualBox-${pkgver}" - - cp "$srcdir/LocalConfig.kmk" . - - ./configure \ - --with-linux=/usr/src/linux-${_kernver} \ - --disable-java \ - --disable-docs \ - --disable-xpcom \ - --disable-python \ - --disable-sdl-ttf \ - --disable-alsa \ - --disable-pulse \ - --disable-dbus \ - --disable-opengl \ - --build-headless \ - --nofatal - source ./env.sh - kmk all - - make -C "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src" - make -C "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" -} - -package_virtualbox-parabola-modules(){ - pkgdesc="Additions only for Parabola guests (kernel modules)" - license=('GPL') - install=virtualbox-parabola-modules.install - depends=('linux-libre>=3.5' 'linux-libre<3.6') - replaces=('virtualbox-archlinux-modules') - conflicts=('virtualbox-archlinux-modules') - provides=("virtualbox-archlinux-modules=$pkgver") - - source "$srcdir/VirtualBox-${pkgver}/env.sh" - - cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" - - for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do - install -D -m644 ${module} \ - "$pkgdir/lib/modules/${_extramodules}/${module}" - done - - install -D -m 0644 "$srcdir/60-vboxguest.rules" \ - "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules" - - find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; - - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-parabola-modules.install" -} - -package_virtualbox-modules(){ - pkgdesc="Kernel modules for VirtualBox" - license=('GPL') - install=virtualbox-modules.install - depends=('linux-libre>=3.5' 'linux-libre<3.6') - - source "$srcdir/VirtualBox-${pkgver}/env.sh" - - - cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src" - - install -D -m644 vboxdrv.ko \ - "$pkgdir/usr/lib/modules/${_extramodules}/vboxdrv.ko" - - install -D -m644 vboxnetadp.ko \ - "$pkgdir/usr/lib/modules/${_extramodules}/vboxnetadp.ko" - - install -D -m644 vboxnetflt.ko \ - "$pkgdir/usr/lib/modules/${_extramodules}/vboxnetflt.ko" - - install -D -m644 vboxpci.ko \ - "$pkgdir/usr/lib/modules/${_extramodules}/vboxpci.ko" - - find "${pkgdir}" -name '*.ko' -exec gzip -9 {} + - - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-modules.install" -} diff --git a/libre/virtualbox-modules/linux34.patch b/libre/virtualbox-modules/linux34.patch deleted file mode 100644 index 05ec78557..000000000 --- a/libre/virtualbox-modules/linux34.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur VirtualBox-4.1.14.orig/Config.kmk VirtualBox-4.1.14/Config.kmk ---- VirtualBox-4.1.14.orig/Config.kmk 2012-04-26 16:56:21.000000000 +0000 -+++ VirtualBox-4.1.14/Config.kmk 2012-05-21 14:35:22.348398884 +0000 -@@ -2856,7 +2856,7 @@ - TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow \ - -fno-reorder-blocks -ffreestanding -fno-asynchronous-unwind-tables -funit-at-a-time \ - -Wno-sign-compare -Wdeclaration-after-statement --TEMPLATE_VBOXR0DRV_CXXFLAGS = $(filter-out -Wstrict-prototypes -Wno-pointer-sign -ffreestanding -Wdeclaration-after-statement -Werror-implicit-function-declaration,$(TEMPLATE_VBOXR0DRV_CFLAGS) $(TEMPLATE_VBOXR0DRV_CFLAGS.$(KBUILD_TARGET_ARCH))) -fno-exceptions -fno-rtti -+TEMPLATE_VBOXR0DRV_CXXFLAGS = $(filter-out -Wstrict-prototypes -Wno-pointer-sign -ffreestanding -Wdeclaration-after-statement -Werror-implicit-function-declaration,$(TEMPLATE_VBOXR0DRV_CFLAGS) $(TEMPLATE_VBOXR0DRV_CFLAGS.$(KBUILD_TARGET_ARCH))) -fno-exceptions -fno-rtti -fpermissive - ifndef VBOX_LINUX_VERSION_2_4 - # 2.6 - TEMPLATE_VBOXR0DRV_SYSSUFF = .ko diff --git a/libre/virtualbox-modules/virtualbox-modules.install b/libre/virtualbox-modules/virtualbox-modules.install deleted file mode 100644 index 3f2a12a3f..000000000 --- a/libre/virtualbox-modules/virtualbox-modules.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { -/bin/cat << EOF -===> You must load vboxdrv module before starting VirtualBox: -===> # modprobe vboxdrv -EOF - EXTRAMODULES='extramodules-3.5-LIBRE' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.5-LIBRE' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - echo 'In order to use the new version, reload all virtualbox modules manually.' -} - -post_remove() { - EXTRAMODULES='extramodules-3.5-LIBRE' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} diff --git a/libre/virtualbox-modules/virtualbox-parabola-modules.install b/libre/virtualbox-modules/virtualbox-parabola-modules.install deleted file mode 100644 index c3419c991..000000000 --- a/libre/virtualbox-modules/virtualbox-parabola-modules.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { -cat << EOF -===> You may want to load vboxguest, vboxsf and vboxvideo -EOF - EXTRAMODULES='extramodules-3.5-LIBRE' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.5-LIBRE' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_remove() { - EXTRAMODULES='extramodules-3.5-LIBRE' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} |