summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community-staging/acetoneiso2/PKGBUILD32
-rw-r--r--community-staging/acetoneiso2/acetoneiso2.install11
-rw-r--r--community-staging/clipgrab/PKGBUILD28
-rw-r--r--community-staging/clipgrab/clipgrab.desktop13
-rw-r--r--community-staging/clipgrab/clipgrab.pngbin571 -> 0 bytes
-rw-r--r--community-staging/fatrat/PKGBUILD35
-rw-r--r--community-staging/gambas3/PKGBUILD1097
-rw-r--r--community-staging/gambas3/gambas3-runtime.install10
-rw-r--r--community-staging/gambas3/gambas3-script.install15
-rw-r--r--community-staging/goldendict/PKGBUILD37
-rw-r--r--community-staging/goldendict/goldendict-paths.diff10
-rw-r--r--community-staging/goldendict/goldendict.changelog8
-rw-r--r--community-staging/google-gadgets/PKGBUILD158
-rw-r--r--community-staging/google-gadgets/google-gadgets-common.install15
-rw-r--r--community-staging/google-gadgets/google-gadgets.changelog8
-rw-r--r--community-staging/google-gadgets/google-gadgets.install15
-rw-r--r--community-staging/google-gadgets/wifi-types.patch36
-rw-r--r--community-staging/gpsbabel/PKGBUILD48
-rw-r--r--community-staging/kadu/PKGBUILD28
-rw-r--r--community-staging/kvirc/PKGBUILD24
-rw-r--r--community-staging/kvirc/kvirc.install13
-rw-r--r--community-staging/libraw/PKGBUILD30
-rw-r--r--community-staging/luminancehdr/PKGBUILD37
-rw-r--r--community-staging/luminancehdr/luminancehdr.changelog33
-rw-r--r--community-staging/luminancehdr/luminancehdr.install12
-rw-r--r--community-staging/mythtv/PKGBUILD82
-rw-r--r--community-staging/mythtv/build.patch13
-rw-r--r--community-staging/mythtv/mythbackend.conf92
-rw-r--r--community-staging/mythtv/mythbackend.rc82
-rw-r--r--community-staging/mythtv/mythtv-v4l2-fix.patch724
-rw-r--r--community-staging/mythtv/mythtv.install11
-rw-r--r--community-staging/paraview/PKGBUILD86
-rw-r--r--community-staging/paraview/fixkernelversioncheck.diff19
-rw-r--r--community-staging/paraview/paraview.desktop10
-rw-r--r--community-staging/paraview/paraview.pngbin367 -> 0 bytes
-rw-r--r--community-staging/qbittorrent/PKGBUILD38
-rw-r--r--community-staging/qbittorrent/qbittorrent.install11
-rw-r--r--community-staging/qmc2/PKGBUILD28
-rw-r--r--community-staging/qtcreator/PKGBUILD50
-rw-r--r--community-staging/qtcreator/qtcreator.desktop10
-rw-r--r--community-staging/ruby-glib2/PKGBUILD26
-rw-r--r--community-staging/shotwell/PKGBUILD47
-rw-r--r--community-staging/shotwell/build-hack.patch81
-rw-r--r--community-staging/shotwell/shotwell.install17
-rw-r--r--community-staging/sigil/PKGBUILD45
-rwxr-xr-xcommunity-staging/sigil/sigil.desktop10
-rw-r--r--community-staging/sigil/sigil.install12
-rw-r--r--community-staging/texmaker/PKGBUILD34
-rw-r--r--community-staging/wkhtmltopdf/PKGBUILD30
-rw-r--r--community-testing/gedit-plugins/PKGBUILD33
-rw-r--r--community-testing/gedit-plugins/gedit-plugins.install23
-rw-r--r--community/cherokee/cherokee-admin-socket-bind.patch23
-rw-r--r--community/clamz/unencrypted-amz.patch27
-rw-r--r--community/dvdstyler/dvdstyler-ffmpeg.patch1915
-rw-r--r--community/e4rat/e4rat.install20
-rw-r--r--community/epdfview/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch60
-rw-r--r--community/epdfview/PKGBUILD41
-rw-r--r--community/epdfview/epdfview.desktop.patch11
-rw-r--r--community/epdfview/epdfview.install12
-rw-r--r--community/gcompris/gcompris-data.install22
-rw-r--r--community/gpa/ChangeLog3
-rw-r--r--community/gpa/PKGBUILD23
-rw-r--r--community/gtk2hs-cairo/PKGBUILD41
-rw-r--r--community/gtk2hs-cairo/gtk2hs-cairo.install18
-rw-r--r--community/gtk2hs-glib/PKGBUILD41
-rw-r--r--community/gtk2hs-glib/gtk2hs-glib.install18
-rw-r--r--community/gtk2hs-gtk/PKGBUILD41
-rw-r--r--community/gtk2hs-gtk/gtk2hs-gtk.install18
-rw-r--r--community/gtk2hs-pango/PKGBUILD41
-rw-r--r--community/gtk2hs-pango/gtk2hs-pango.install18
-rw-r--r--community/libcuefile/ChangeLog3
-rw-r--r--community/lmctl/PKGBUILD39
-rw-r--r--community/lmctl/lmctl.conf.d6
-rw-r--r--community/lmctl/lmctl.rc.d21
-rw-r--r--community/lmctl/mx-support-cmdline.patch37
-rw-r--r--community/lmctl/mx-support-man.patch17
-rw-r--r--community/lmctl/mx-support.patch29
-rw-r--r--community/mediatomb/PKGBUILD49
-rw-r--r--community/mediatomb/gcc46.patch10
-rw-r--r--community/mediatomb/mediatomb.conf23
-rw-r--r--community/mediatomb/mediatomb.install9
-rw-r--r--community/mediatomb/mediatomb.rc54
-rw-r--r--community/mediatomb/tonewjs.patch564
-rw-r--r--community/ruby-atk/PKGBUILD26
-rw-r--r--community/ruby-gdkpixbuf2/PKGBUILD27
-rw-r--r--community/ruby-gio2/PKGBUILD24
-rw-r--r--community/ruby-glib2/PKGBUILD26
-rw-r--r--community/ruby-pango/PKGBUILD26
-rw-r--r--community/solfege/solfege.changelog95
-rw-r--r--core/glibc/glibc-2.13-dlclose-search-reset.patch196
-rw-r--r--core/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch26
-rw-r--r--core/pcre/r661.diff26
-rw-r--r--core/udev/bluetooth.patch36
-rw-r--r--core/util-linux/agetty-typo.patch27
-rw-r--r--core/util-linux/dmesg-non-printk.patch69
-rw-r--r--core/util-linux/dmesg-space.patch31
-rw-r--r--core/util-linux/dont-close-0.patch32
-rw-r--r--core/util-linux/fix-remount.patch37
-rw-r--r--core/util-linux/write-freopen.patch27
-rw-r--r--extra/conky/current-power.patch12
-rw-r--r--extra/gdm/check-for-shell.patch26
-rw-r--r--extra/gnome-settings-daemon/fix_color_crash.patch186
-rw-r--r--extra/gnutls/addGNU-stack.diff13
-rw-r--r--extra/gtk2/gtk2-dont-ellipsize-filters.diff28
-rw-r--r--extra/hplip/hplip-cups-1.5.0-compatibility.patch10
-rw-r--r--extra/htop/htop.c.patch15
-rw-r--r--extra/pidgin/pidgin-2.10.0-silc-remote-crash-fix.diff21
-rw-r--r--extra/pulseaudio/dont-require-dbus.patch46
-rw-r--r--extra/pulseaudio/version-number.patch40
-rw-r--r--extra/silc-toolkit/PKGBUILD27
-rw-r--r--libre/initscripts/parabola-branding.patch52
-rw-r--r--libre/virtualbox/10-vboxdrv.rules6
-rw-r--r--libre/virtualbox/18-system-xorg.patch278
-rw-r--r--libre/virtualbox/60-vboxguest.rules3
-rw-r--r--libre/virtualbox/LocalConfig.kmk20
-rw-r--r--libre/virtualbox/PKGBUILD212
-rw-r--r--libre/virtualbox/change_default_driver_dir.patch19
-rw-r--r--libre/virtualbox/vbox-service.conf3
-rw-r--r--libre/virtualbox/vbox-service.rc40
-rw-r--r--libre/virtualbox/vboxbuild79
-rw-r--r--libre/virtualbox/vboxdrv-reference.patch46
-rw-r--r--libre/virtualbox/virtualbox-4-makeself-check.patch11
-rw-r--r--libre/virtualbox/virtualbox-4-mkisofs-check.patch11
-rw-r--r--libre/virtualbox/virtualbox-parabola-modules.install25
-rw-r--r--libre/virtualbox/virtualbox.install52
-rw-r--r--multilib-testing/gcc-multilib/PKGBUILD303
-rw-r--r--multilib-testing/gcc-multilib/gcc-ada.install20
-rw-r--r--multilib-testing/gcc-multilib/gcc-fortran.install16
-rw-r--r--multilib-testing/gcc-multilib/gcc-go.install20
-rw-r--r--multilib-testing/gcc-multilib/gcc-hash-style-both.patch122
-rw-r--r--multilib-testing/gcc-multilib/gcc-libs.install16
-rw-r--r--multilib-testing/gcc-multilib/gcc.install20
-rw-r--r--multilib-testing/gcc-multilib/gcc_pure64.patch26
-rw-r--r--multilib-testing/lib32-glibc/PKGBUILD167
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch42
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch13
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch11
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch26
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.13-futex.patch31
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch132
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch26
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch28
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch37
-rw-r--r--multilib-testing/lib32-glibc/glibc-__i686.patch13
-rw-r--r--multilib-testing/lib32-glibc/lib32-glibc.conf2
-rw-r--r--multilib-testing/libtool-multilib/PKGBUILD73
-rw-r--r--multilib-testing/libtool-multilib/libtool.install22
-rw-r--r--multilib/lib32-glibc/glibc-2.13-dlclose-search-reset.patch196
-rw-r--r--multilib/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch26
-rw-r--r--multilib/lib32-libpulse/version-number.patch40
-rw-r--r--staging/arora/PKGBUILD28
-rw-r--r--staging/arora/install12
-rw-r--r--staging/kadu/PKGBUILD28
-rw-r--r--staging/kdelibs/kdelibs-nepomuk-unicode.diff65
-rw-r--r--staging/pyqt/PKGBUILD77
-rw-r--r--staging/qt/PKGBUILD128
-rw-r--r--staging/qt/assistant.desktop9
-rw-r--r--staging/qt/designer.desktop11
-rw-r--r--staging/qt/linguist.desktop10
-rw-r--r--staging/qt/qt.install12
-rw-r--r--staging/qt/qtconfig.desktop10
-rw-r--r--staging/qtwebkit/PKGBUILD36
-rw-r--r--staging/qtwebkit/python2-path.patch29
-rw-r--r--staging/sip/PKGBUILD55
-rw-r--r--testing/aisleriot/PKGBUILD36
-rw-r--r--testing/aisleriot/aisleriot.install22
-rw-r--r--testing/anjuta/PKGBUILD33
-rw-r--r--testing/anjuta/anjuta.install21
-rw-r--r--testing/at-spi2-atk/PKGBUILD34
-rw-r--r--testing/at-spi2-atk/at-spi2-atk.install11
-rw-r--r--testing/at-spi2-core/PKGBUILD33
-rw-r--r--testing/caribou/PKGBUILD36
-rw-r--r--testing/caribou/caribou.install13
-rw-r--r--testing/cheese/PKGBUILD32
-rw-r--r--testing/cheese/cheese.install20
-rw-r--r--testing/clutter/PKGBUILD28
-rw-r--r--testing/cogl/PKGBUILD28
-rw-r--r--testing/conky/PKGBUILD48
-rw-r--r--testing/conky/PKGBUILD.cmake47
-rw-r--r--testing/empathy/PKGBUILD41
-rw-r--r--testing/empathy/empathy.install18
-rw-r--r--testing/eog/PKGBUILD32
-rw-r--r--testing/eog/eog.install19
-rw-r--r--testing/epiphany/PKGBUILD32
-rw-r--r--testing/epiphany/epiphany.install20
-rw-r--r--testing/erlang/PKGBUILD62
-rw-r--r--testing/evince/PKGBUILD36
-rw-r--r--testing/evince/evince.install19
-rw-r--r--testing/evolution-data-server/PKGBUILD31
-rw-r--r--testing/evolution-exchange/PKGBUILD33
-rw-r--r--testing/evolution-exchange/evolution-exchange.install17
-rw-r--r--testing/evolution-groupwise/PKGBUILD32
-rw-r--r--testing/evolution/PKGBUILD45
-rw-r--r--testing/evolution/evolution.install24
-rw-r--r--testing/folks/PKGBUILD29
-rw-r--r--testing/gcc/PKGBUILD254
-rw-r--r--testing/gcc/gcc-ada.install20
-rw-r--r--testing/gcc/gcc-fortran.install16
-rw-r--r--testing/gcc/gcc-go.install20
-rw-r--r--testing/gcc/gcc-hash-style-both.patch122
-rw-r--r--testing/gcc/gcc-libs.install16
-rw-r--r--testing/gcc/gcc.install20
-rw-r--r--testing/gcc/gcc_pure64.patch26
-rw-r--r--testing/gdm/PKGBUILD66
-rw-r--r--testing/gdm/fix_external_program_directories.patch34
-rwxr-xr-xtesting/gdm/gdm36
-rw-r--r--testing/gdm/gdm-autologin.pam18
-rw-r--r--testing/gdm/gdm-fingerprint.pam18
-rw-r--r--testing/gdm/gdm-password.pam20
-rw-r--r--testing/gdm/gdm-smartcard.pam18
-rw-r--r--testing/gdm/gdm-vt-allocation-hack.patch118
-rw-r--r--testing/gdm/gdm-welcome.pam12
-rw-r--r--testing/gdm/gdm.install31
-rw-r--r--testing/gdm/gdm.pam10
-rw-r--r--testing/gedit/PKGBUILD32
-rw-r--r--testing/gedit/gedit.install18
-rw-r--r--testing/glib-networking/PKGBUILD31
-rw-r--r--testing/glib-networking/glib-networking.install11
-rw-r--r--testing/glib2/PKGBUILD43
-rw-r--r--testing/glib2/glib2.csh1
-rw-r--r--testing/glib2/glib2.sh1
-rw-r--r--testing/glibc/PKGBUILD204
-rw-r--r--testing/glibc/glibc-2.10-bz4781.patch42
-rw-r--r--testing/glibc/glibc-2.10-dont-build-timezone.patch13
-rw-r--r--testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch11
-rw-r--r--testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch26
-rw-r--r--testing/glibc/glibc-2.13-futex.patch31
-rw-r--r--testing/glibc/glibc-2.14-libdl-crash.patch132
-rw-r--r--testing/glibc/glibc-2.14-reexport-rpc-interface.patch26
-rw-r--r--testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch28
-rw-r--r--testing/glibc/glibc-2.14-revert-4768ae77.patch37
-rw-r--r--testing/glibc/glibc-__i686.patch13
-rw-r--r--testing/glibc/glibc.install20
-rwxr-xr-xtesting/glibc/locale-gen42
-rw-r--r--testing/glibc/locale.gen.txt23
-rwxr-xr-xtesting/glibc/nscd40
-rw-r--r--testing/gnome-applets/PKGBUILD36
-rw-r--r--testing/gnome-applets/gnome-applets.install22
-rw-r--r--testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules11
-rw-r--r--testing/gnome-bluetooth/PKGBUILD40
-rw-r--r--testing/gnome-bluetooth/gnome-bluetooth.install12
-rw-r--r--testing/gnome-color-manager/PKGBUILD34
-rw-r--r--testing/gnome-color-manager/gnome-color-manager.install19
-rw-r--r--testing/gnome-contacts/PKGBUILD29
-rw-r--r--testing/gnome-control-center/PKGBUILD38
-rw-r--r--testing/gnome-control-center/gnome-control-center.install19
-rw-r--r--testing/gnome-desktop/PKGBUILD31
-rw-r--r--testing/gnome-documents/PKGBUILD35
-rw-r--r--testing/gnome-documents/gnome-documents.install13
-rw-r--r--testing/gnome-games/PKGBUILD41
-rw-r--r--testing/gnome-games/gnome-games.install153
-rw-r--r--testing/gnome-keyring/PKGBUILD32
-rw-r--r--testing/gnome-keyring/gnome-keyring.install15
-rw-r--r--testing/gnome-online-accounts/PKGBUILD29
-rw-r--r--testing/gnome-online-accounts/gnome-online-accounts.install11
-rw-r--r--testing/gnome-panel/PKGBUILD38
-rw-r--r--testing/gnome-panel/gnome-panel.install24
-rw-r--r--testing/gnome-power-manager/PKGBUILD32
-rw-r--r--testing/gnome-power-manager/gnome-power-manager.install19
-rw-r--r--testing/gnome-session/PKGBUILD30
-rw-r--r--testing/gnome-session/gnome-session.install18
-rw-r--r--testing/gnome-settings-daemon/PKGBUILD34
-rw-r--r--testing/gnome-settings-daemon/gnome-settings-daemon.install18
-rw-r--r--testing/gnome-shell/PKGBUILD38
-rw-r--r--testing/gnome-shell/gnome-shell.install22
-rw-r--r--testing/gnome-system-monitor/PKGBUILD29
-rw-r--r--testing/gnome-system-monitor/gnome-system-monitor.install19
-rw-r--r--testing/gnome-terminal/PKGBUILD33
-rw-r--r--testing/gnome-terminal/gnome-terminal.install17
-rw-r--r--testing/gnome-themes-standard/PKGBUILD30
-rw-r--r--testing/gnome-user-share/PKGBUILD33
-rw-r--r--testing/gnome-user-share/gnome-user-share.install22
-rw-r--r--testing/gnome-utils/PKGBUILD41
-rw-r--r--testing/gnome-utils/gnome-utils.install26
-rw-r--r--testing/gtk2/PKGBUILD55
-rw-r--r--testing/gtk2/gtk2.install16
-rw-r--r--testing/gtk2/xid-collision-debug.patch15
-rw-r--r--testing/gtk3/PKGBUILD38
-rw-r--r--testing/gtk3/gtk3.install15
-rw-r--r--testing/gtk3/settings.ini2
-rw-r--r--testing/gtkhtml4/PKGBUILD29
-rw-r--r--testing/gtksourceview3/PKGBUILD28
-rw-r--r--testing/gucharmap/PKGBUILD33
-rw-r--r--testing/gucharmap/gucharmap.install22
-rw-r--r--testing/gvfs/PKGBUILD113
-rw-r--r--testing/gvfs/gvfs-module.install7
-rw-r--r--testing/gvfs/gvfs-smb.install12
-rw-r--r--testing/gvfs/gvfs.install14
-rw-r--r--testing/hplip/PKGBUILD60
-rw-r--r--testing/hplip/hplip.install10
-rw-r--r--testing/icedtea-web-java7/PKGBUILD97
-rw-r--r--testing/icedtea-web-java7/icedtea-web-java7.install11
-rw-r--r--testing/java7-openjdk/PKGBUILD264
-rw-r--r--testing/java7-openjdk/fix_corba_cmds_path.diff33
-rw-r--r--testing/java7-openjdk/fontconfig-paths.diff134
-rw-r--r--testing/java7-openjdk/jconsole.desktop10
-rw-r--r--testing/java7-openjdk/jdk7-openjdk.profile6
-rw-r--r--testing/java7-openjdk/jdk7-openjdk.profile.csh1
-rw-r--r--testing/java7-openjdk/jre7-openjdk.install24
-rw-r--r--testing/java7-openjdk/jre7-openjdk.profile5
-rw-r--r--testing/java7-openjdk/jre7-openjdk.profile.csh5
-rw-r--r--testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff24
-rw-r--r--testing/java7-openjdk/openjdk7_nonreparenting-wm.diff58
-rw-r--r--testing/java7-openjdk/policytool.desktop10
-rw-r--r--testing/kbd/PKGBUILD44
-rw-r--r--testing/kbd/fix-es.po.patch11
-rw-r--r--testing/krb5/PKGBUILD91
-rw-r--r--testing/krb5/krb5-1.9.1-2011-006.patch75
-rw-r--r--testing/krb5/krb5-1.9.1-canonicalize-fallback.patch58
-rw-r--r--testing/krb5/krb5-1.9.1-config-script.patch27
-rw-r--r--testing/krb5/krb5-kadmind40
-rw-r--r--testing/krb5/krb5-kdc40
-rw-r--r--testing/libarchive/PKGBUILD38
-rw-r--r--testing/libarchive/release-2.8-fixes.patch234
-rw-r--r--testing/libevent/PKGBUILD34
-rw-r--r--testing/libsoup/PKGBUILD48
-rw-r--r--testing/libtool/PKGBUILD49
-rw-r--r--testing/libtool/libtool.install20
-rw-r--r--testing/libwnck3/PKGBUILD28
-rw-r--r--testing/llvm/PKGBUILD231
-rw-r--r--testing/llvm/bug-9869-operator-h-c++0x.patch57
-rw-r--r--testing/llvm/cindexer-clang-path.patch10
-rw-r--r--testing/llvm/clang-plugin-loader-registry.patch11
-rw-r--r--testing/llvm/clang-pure64.patch38
-rw-r--r--testing/llvm/clang-toolchains-gcc-versions.patch12
-rw-r--r--testing/llvm/enable-lto.patch36
-rw-r--r--testing/mkinitcpio-busybox/PKGBUILD34
-rw-r--r--testing/mkinitcpio-busybox/config1013
-rw-r--r--testing/mousetweaks/PKGBUILD29
-rw-r--r--testing/mousetweaks/mousetweaks.install17
-rw-r--r--testing/mutter/PKGBUILD36
-rw-r--r--testing/mutter/mutter.install17
-rw-r--r--testing/nautilus/PKGBUILD34
-rw-r--r--testing/nautilus/nautilus.install20
-rw-r--r--testing/network-manager-applet/PKGBUILD42
-rw-r--r--testing/network-manager-applet/network-manager-applet.install18
-rw-r--r--testing/networkmanager-openconnect/PKGBUILD31
-rw-r--r--testing/networkmanager-openconnect/networkmanager-openconnect.install16
-rw-r--r--testing/networkmanager-openvpn/PKGBUILD31
-rw-r--r--testing/networkmanager-openvpn/networkmanager-openvpn.install11
-rw-r--r--testing/networkmanager-pptp/PKGBUILD31
-rw-r--r--testing/networkmanager-pptp/networkmanager-pptp.install11
-rw-r--r--testing/networkmanager-vpnc/PKGBUILD31
-rw-r--r--testing/networkmanager-vpnc/networkmanager-vpnc.install11
-rw-r--r--testing/networkmanager/NetworkManager.conf2
-rw-r--r--testing/networkmanager/PKGBUILD61
-rw-r--r--testing/networkmanager/disable_set_hostname.patch19
-rw-r--r--testing/networkmanager/networkmanager.install9
-rw-r--r--testing/notification-daemon/PKGBUILD30
-rw-r--r--testing/notification-daemon/notification-daemon.install22
-rw-r--r--testing/openssh/PKGBUILD67
-rwxr-xr-xtesting/openssh/sshd45
-rw-r--r--testing/openssh/sshd.confd4
-rw-r--r--testing/openssh/sshd.pam11
-rw-r--r--testing/pam/PKGBUILD60
-rw-r--r--testing/pam/other5
-rw-r--r--testing/pam/pam.install12
-rw-r--r--testing/pcre/PKGBUILD43
-rw-r--r--testing/polkit-gnome/PKGBUILD33
-rw-r--r--testing/polkit-gnome/polkit-gnome-authentication-agent-1.desktop88
-rw-r--r--testing/postfix/PKGBUILD64
-rw-r--r--testing/postfix/aliases.patch18
-rw-r--r--testing/postfix/install34
-rwxr-xr-xtesting/postfix/rc.d36
-rw-r--r--testing/qemu-kvm/65-kvm.rules1
-rw-r--r--testing/qemu-kvm/PKGBUILD58
-rw-r--r--testing/qemu-kvm/qemu-kvm.install16
-rw-r--r--testing/qemu/65-kvm.rules1
-rw-r--r--testing/qemu/PKGBUILD44
-rw-r--r--testing/qemu/qemu.install24
-rw-r--r--testing/samba/PKGBUILD146
-rw-r--r--testing/samba/fix-ipv6-mount.patch11
-rwxr-xr-xtesting/samba/samba57
-rw-r--r--testing/samba/samba.conf.d7
-rw-r--r--testing/samba/samba.logrotate9
-rw-r--r--testing/samba/samba.pam3
-rw-r--r--testing/samba/swat.xinetd10
-rw-r--r--testing/seahorse/PKGBUILD40
-rw-r--r--testing/seahorse/seahorse-ssh-askpass.sh3
-rw-r--r--testing/seahorse/seahorse.install21
-rw-r--r--testing/sudo/PKGBUILD38
-rw-r--r--testing/sudo/sudo.pam3
-rw-r--r--testing/sushi/PKGBUILD29
-rw-r--r--testing/totem/PKGBUILD70
-rw-r--r--testing/totem/totem.install19
-rw-r--r--testing/truecrypt/PKGBUILD50
-rw-r--r--testing/truecrypt/truecrypt-arch-detection.patch15
-rw-r--r--testing/truecrypt/truecrypt.desktop9
-rw-r--r--testing/udev/81-arch.rules9
-rw-r--r--testing/udev/PKGBUILD101
-rw-r--r--testing/udev/udev.install62
-rw-r--r--testing/util-linux/PKGBUILD45
-rw-r--r--testing/vinagre/PKGBUILD37
-rw-r--r--testing/vinagre/vinagre.install20
-rw-r--r--testing/vino/PKGBUILD33
-rw-r--r--testing/vino/vino.install18
-rw-r--r--testing/vte3/PKGBUILD42
-rw-r--r--testing/yelp/PKGBUILD29
-rw-r--r--testing/yelp/yelp.install19
399 files changed, 0 insertions, 19924 deletions
diff --git a/community-staging/acetoneiso2/PKGBUILD b/community-staging/acetoneiso2/PKGBUILD
deleted file mode 100644
index 9e0bb04cd..000000000
--- a/community-staging/acetoneiso2/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Wes Brewer <brewerw@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=acetoneiso2
-pkgver=2.3
-pkgrel=3
-pkgdesc="An all in one ISO tool (bin mdf nrg img daa dmg cdi b5i bwi pdi iso)"
-arch=('i686' 'x86_64')
-url="http://www.acetoneteam.org"
-license=('GPL3')
-depends=('qtwebkit' 'fuseiso' 'cdrdao' 'cdrkit' 'dvd+rw-tools' 'gnupg2' 'pinentry' 'mplayer' 'phonon')
-optdepends=("p7zip: for ISO compress/decompress support")
-conflicts=('acetoneiso')
-install=${pkgname}.install
-source=(http://downloads.sourceforge.net/acetoneiso/AcetoneISO/AcetoneISO%202.3/acetoneiso_${pkgver}.tar.gz)
-md5sums=('225f7af687016690ff28b9771a1ce179')
-
-build() {
- cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso
-
- qmake
- # needed for phonon
- sed -i 's|-I/usr/include/QtCore|-I/usr/include/QtCore -I/usr/include/KDE|' Makefile
- make
-}
-
-package() {
- cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso
-
- make INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/community-staging/acetoneiso2/acetoneiso2.install b/community-staging/acetoneiso2/acetoneiso2.install
deleted file mode 100644
index 1a3984e24..000000000
--- a/community-staging/acetoneiso2/acetoneiso2.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-cat << EOF
- -->
- --> Please remember to add 'fuse' to your MODULES array in /etc/rc.conf
- -->
-EOF
-}
-
-post_upgrade() {
- post_install $*
-}
diff --git a/community-staging/clipgrab/PKGBUILD b/community-staging/clipgrab/PKGBUILD
deleted file mode 100644
index df3c57383..000000000
--- a/community-staging/clipgrab/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: thacrazze <thacrazze|googlemail|com>
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-pkgname=clipgrab
-pkgver=3.1.0.2
-pkgrel=2
-pkgdesc='A video downloader and converter for YouTube, Veoh, DailyMotion, MyVideo, ...'
-arch=('i686' 'x86_64')
-url='http://clipgrab.de/'
-license=('GPL')
-depends=('qt' 'qtwebkit')
-optdepends=('ffmpeg: for some encodings')
-source=(http://clipgrab.de/download/${pkgname}-${pkgver}.tar.bz2 ${pkgname}.png ${pkgname}.desktop)
-md5sums=('1250e1fb29cd88b7ce1a37d937de0146'
- 'ef030502ae0922e632742f47283313f4'
- '9a141791f6952917c441050c3dac81ce')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- qmake && make
-}
-package() {
- cd $srcdir/$pkgname-$pkgver
- install -Dm755 ${pkgname} $pkgdir/usr/bin/${pkgname}
- install -Dm644 $srcdir/${pkgname}.png \
- $pkgdir/usr/share/pixmaps/${pkgname}.png
- install -Dm644 $srcdir/${pkgname}.desktop \
- ${pkgdir}/usr/share/applications/${pkgname}.desktop
-}
diff --git a/community-staging/clipgrab/clipgrab.desktop b/community-staging/clipgrab/clipgrab.desktop
deleted file mode 100644
index dad31cfdd..000000000
--- a/community-staging/clipgrab/clipgrab.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=ClipGrab
-GenericName=Video Downloader
-GenericName[de]=Video-Downloader
-Comment=Download videos and convert it
-Comment[de]=Videos herunterladen und konvertieren
-Icon=/usr/share/pixmaps/clipgrab.png
-Exec=clipgrab
-TryExec=clipgrab
-Terminal=false
-Categories=Qt;AudioVideo;Audio;Video;
diff --git a/community-staging/clipgrab/clipgrab.png b/community-staging/clipgrab/clipgrab.png
deleted file mode 100644
index 2573fed20..000000000
--- a/community-staging/clipgrab/clipgrab.png
+++ /dev/null
Binary files differ
diff --git a/community-staging/fatrat/PKGBUILD b/community-staging/fatrat/PKGBUILD
deleted file mode 100644
index 9f307fec3..000000000
--- a/community-staging/fatrat/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 57158 2011-10-22 17:28:35Z andrea $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-
-pkgname=fatrat
-pkgver=1.1.3
-pkgrel=6
-pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
-arch=('i686' 'x86_64')
-url="http://fatrat.dolezel.info/"
-license=('GPL')
-depends=('gloox' 'qt' 'libtorrent-rasterbar' 'qtwebkit')
-optdepends=('geoip: GeoIP support')
-makedepends=('asio' 'cmake')
-source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.gz)
-md5sums=('6d4a00cdd0b59a05b1521184508d4637')
-
-build() {
- cd $pkgname-$pkgver
-
- export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
-
- cmake \
- -DWITH_EVERYTHING=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- .
-
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/gambas3/PKGBUILD b/community-staging/gambas3/PKGBUILD
deleted file mode 100644
index 4956a1819..000000000
--- a/community-staging/gambas3/PKGBUILD
+++ /dev/null
@@ -1,1097 +0,0 @@
-# $Id: PKGBUILD 57146 2011-10-22 15:06:35Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-
-pkgbase=gambas3
-pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart'
- 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql'
- 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3'
- 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form'
- 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-form-stock' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image'
- 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl'
- 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre'
- 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit'
- 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
- 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web')
-pkgver=2.99.5
-pkgrel=2
-pkgdesc="A free development environment based on a Basic interpreter."
-arch=('i686' 'x86_64')
-url="http://gambas.sourceforge.net/"
-license=('GPL')
-groups=('gambas3')
-makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils'
- 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'qtwebkit' 'gtk2' 'imlib2' 'gdk-pixbuf2'
- 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg'
- 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre'
- 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring')
-options=('!emptydirs' '!makeflags')
-source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
- 'gambas3-script.install' 'gambas3-runtime.install')
-md5sums=('dfa16f5208463e81ba8ca801948c353a'
- 'b284be39d147ec799f1116a6abc068b4'
- 'b5cc403990f31b8ea1c5cf37366d3d29')
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- ./reconf-all
- ./configure --prefix=/usr -C
-
- make bindir=${pkgdir}/usr/bin
-}
-
-package_gambas3-runtime() {
- depends=('libffi' 'xdg-utils')
- pkgdesc="Runtime environment"
- install=gambas3-runtime.install
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
- make DESTDIR="${pkgdir}" install
-
- cd ../gbx
- make DESTDIR="${pkgdir}" install
- cd ../lib/debug
- make DESTDIR="${pkgdir}" install
- cd ../eval
- make DESTDIR="${pkgdir}" install
- cd ../draw
- make DESTDIR="${pkgdir}" install
- install -D -m644 ../gb.component \
- ${pkgdir}/usr/lib/gambas3
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- ln -s gbx3 ${pkgdir}/usr/bin/gbr3
- gbc/gbi3 -r ${pkgdir}/usr gb
- rm -f ${pkgdir}/usr/lib/gambas3/gb.{so*,la}
-
- ## needed for postinst with xdg-utils
- install -d -m755 ${pkgdir}/usr/share/gambas3/mime
- install -D -m644 mime/* \
- ${pkgdir}/usr/share/gambas3/mime/
- install -d -m755 ${pkgdir}/usr/share/gambas3/icons
- install -D -m644 mime/application-x-gambas3.png \
- ${pkgdir}/usr/share/gambas3/icons/application-x-gambas3.png
-
- cd gbc
- make DESTDIR="${pkgdir}" uninstall
-}
-
-package_gambas3-devel() {
- depends=('gambas3-runtime')
- pkgdesc="Development environment"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
- make DESTDIR="${pkgdir}" install
-}
-
-package_gambas3-ide() {
- depends=('gambas3-devel' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight'
- 'gambas3-gb-form-dialog' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect'
- 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit')
- pkgdesc="Integrated Development Environment"
-
- cd ${srcdir}/${pkgbase}-${pkgver}
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-#!! with the ide !!
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \
- ${pkgdir}/usr/share/applications/gambas3.desktop
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \
- ${pkgdir}/usr/share/pixmaps/gambas3.png
-
- rm -r ${pkgdir}/usr/bin/gb*
- rm -r ${pkgdir}/usr/lib
- rm -r ${pkgdir}/usr/share/gambas3
-}
-
-package_gambas3-script() {
- depends=('gambas3-devel')
- pkgdesc="Scripter and server programs support"
- install=gambas3-script.install
-
- cd ${srcdir}/${pkgbase}-${pkgver}
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## needed for postinst with xdg-utils
- cd ${srcdir}/${pkgbase}-${pkgver}/app/mime
- install -d -m755 ${pkgdir}/usr/share/gambas3/mime
- install -D -m644 *.xml ${pkgdir}/usr/share/gambas3/mime/
- install -D -m644 *.png ${pkgdir}/usr/share/gambas3/mime/
- ##
-
- rm -r ${pkgdir}/usr/bin/{gambas*,gb{[a-r]*,x*}}
- rm -r ${pkgdir}/usr/lib
- rm -r ${pkgdir}/usr/share/gambas3/[c-i]*
-}
-
-package_gambas3-examples() {
- depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db'
- 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2'
- 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog'
- 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib'
- 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl'
- 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl'
- 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
- 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web')
- pkgdesc="Applications examples"
-
- cd ${srcdir}/${pkgbase}-${pkgver}
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- rm -r ${pkgdir}/usr/{bin,lib}
- rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl}
-}
-
-package_gambas3-gb-cairo() {
- depends=('gambas3-runtime' 'cairo')
- pkgdesc="Cairo component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-chart() {
- depends=('gambas3-gb-form')
- pkgdesc="Chart component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control
- rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]*
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]*
- ##
-}
-
-package_gambas3-gb-compress() {
- depends=('gambas3-runtime' 'bzip2' 'zlib')
- pkgdesc="Compression support component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2
- make DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.component,gb.[d-v]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-v]*
- ##
-}
-
-package_gambas3-gb-crypt() {
- depends=('gambas3-runtime')
- pkgdesc="MD5/DES crypting component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-db() {
- depends=('gambas3-runtime')
- pkgdesc="Database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## Workaround for splitting
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{e,r}*,gb.[e-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.de*,gb.[e-z]*}
- ##
-}
-
-package_gambas3-gb-db-form() {
- depends=('gambas3-gb-db' 'gambas3-gb-form')
- pkgdesc="Database form component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*}
- ##
-}
-
-package_gambas3-gb-db-mysql() {
- depends=('gambas3-gb-db' 'libmysqlclient')
- pkgdesc="MySQL database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-db-odbc() {
- depends=('gambas3-gb-db' 'unixodbc')
- pkgdesc="ODBC database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-db-postgresql() {
- depends=('gambas3-gb-db' 'postgresql-libs')
- pkgdesc="PostgreSQL database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-db-sqlite2() {
- depends=('gambas3-gb-db' 'sqlite2')
- pkgdesc="Sqlite2 database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-db-sqlite3() {
- depends=('gambas3-gb-db' 'sqlite3')
- pkgdesc="Sqlite3 database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-desktop() {
- depends=('gambas3-gb-image' 'libsm' 'libxtst' 'libgnome-keyring')
- pkgdesc="Desktop component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop
- make DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-dbus() {
- depends=('gambas3-runtime' 'dbus-core')
- pkgdesc="DBUS component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-eval-highlight() {
- depends=('gambas3-runtime')
- pkgdesc="Expression evaluator highlight component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/lib/gambas3/gb.[f-z]*
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.[f-z]*
- ##
-}
-
-package_gambas3-gb-form() {
- depends=('gambas3-gb-gui')
- pkgdesc="Form component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report}
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
- ##
-}
-
-package_gambas3-gb-form-dialog() {
- depends=('gambas3-gb-form')
- pkgdesc="Form dialog component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}}
- ##
-}
-
-package_gambas3-gb-form-mdi() {
- depends=('gambas3-gb-form')
- pkgdesc="Form MDI component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report}
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}}
- ##
-}
-
-package_gambas3-gb-form-stock() {
- depends=('gambas3-runtime')
- pkgdesc="Default stock icons component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*}
- ##
-}
-
-package_gambas3-gb-gtk() {
- depends=('gambas3-gb-image' 'gtk2' 'librsvg')
- pkgdesc="GTK+ toolkit component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-gui() {
- depends=('gambas3-gb-qt4' 'gambas3-gb-gtk')
- pkgdesc="Automatic gui toolkit chooser"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-e]*,gb.[i-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-e]*,gb.[i-z]*}
- ##
-}
-
-package_gambas3-gb-image() {
- depends=('gambas3-runtime')
- pkgdesc="Image component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## cleanup the workaround
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.e*,gb.[j-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.e*,gb.[j-z]*}
- ##
-}
-
-package_gambas3-gb-image-effect() {
- depends=('gambas3-gb-image')
- pkgdesc="Image effect component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## cleanup the workaround
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.{c*,l*,s*},gb.[j-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.{i*,l*},gb.[j-z]*}
- ##
-}
-
-package_gambas3-gb-image-imlib() {
- depends=('gambas3-gb-image' 'imlib2')
- pkgdesc="Imlib component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-image-io() {
- depends=('gambas3-gb-image' 'gdk-pixbuf2')
- pkgdesc="Input/Output component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-net() {
- depends=('gambas3-runtime')
- pkgdesc="Network component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-net-curl() {
- depends=('gambas3-gb-net' 'curl')
- pkgdesc="Curl component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-net-smtp() {
- depends=('gambas3-runtime' 'glib2')
- pkgdesc="SMTP component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-opengl() {
- depends=('gambas3-runtime' 'libgl' 'glew')
- pkgdesc="OpenGL component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-opengl-glu() {
- depends=('gambas3-gb-opengl')
- pkgdesc="GL Utility component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-opengl-glsl() {
- depends=('gambas3-gb-opengl')
- pkgdesc="GLSL component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-option() {
- depends=('gambas3-runtime')
- pkgdesc="Getopt component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## cleanup the workaround
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-n]*,gb.[p-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-n]*,gb.[p-z]*}
- ##
-}
-
-package_gambas3-gb-pcre() {
- depends=('gambas3-runtime' 'pcre')
- pkgdesc="PCRE component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-pdf() {
- depends=('gambas3-runtime' 'poppler')
- pkgdesc="PDF component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-qt4() {
- depends=('gambas3-gb-image' 'qt')
- pkgdesc="Qt4 toolkit component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-qt4-ext() {
- depends=('gambas3-gb-qt4')
- pkgdesc="Qt4 toolkit extended component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-qt4-opengl() {
- depends=('gambas3-gb-qt4' 'libgl')
- pkgdesc="Qt4 toolkit OpenGL component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-qt4-webkit() {
- depends=('gambas3-gb-qt4' 'qtwebkit')
- pkgdesc="Qt4 toolkit webkit component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-report() {
- depends=('gambas3-gb-form' 'gambas3-gb-image-io')
- pkgdesc="Report component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]*
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*}
- ##
-}
-
-package_gambas3-gb-sdl() {
- depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl')
- pkgdesc="SDL component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-sdl-sound() {
- depends=('gambas3-runtime' 'sdl_mixer')
- pkgdesc="SDL sound component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-settings() {
- depends=('gambas3-runtime')
- pkgdesc="Setting component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*}
- ##
-}
-
-package_gambas3-gb-signal() {
- depends=('gambas3-runtime')
- pkgdesc="Signal component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## cleanup the workaround
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-r]*,gb.[t-z]*,gb.so*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-r]*,gb.[t-z]*}
- ##
-}
-
-package_gambas3-gb-v4l() {
- depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng')
- pkgdesc="Video4linux component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-vb() {
- depends=('gambas3-runtime')
- pkgdesc="VB transitional component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## Workaround for splitting
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-u]*
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-u]*
- ##
-}
-
-package_gambas3-gb-xml() {
- depends=('gambas3-runtime' 'libxml2')
- pkgdesc="XML component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-xml-rpc() {
- depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl')
- pkgdesc="XML-RPC component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/lib/gambas3/gb.xml.{[c-l]*,xslt*,so*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.xml.{[i-l]*,x*}
- ##
-}
-
-package_gambas3-gb-xml-xslt() {
- depends=('gambas3-gb-xml' 'libxslt')
- pkgdesc="XML-XSLT component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-web() {
- depends=('gambas3-runtime')
- pkgdesc="CGI component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]*
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]*
- ##
-}
diff --git a/community-staging/gambas3/gambas3-runtime.install b/community-staging/gambas3/gambas3-runtime.install
deleted file mode 100644
index 6c8201a6a..000000000
--- a/community-staging/gambas3/gambas3-runtime.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas3/mime/application-x-gambas.png application-x-gambas3
- xdg-mime install /usr/share/gambas3/mime/application-x-gambas3.xml
-}
-
-pre_remove() {
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3
- xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas3.xml
-}
diff --git a/community-staging/gambas3/gambas3-script.install b/community-staging/gambas3/gambas3-script.install
deleted file mode 100644
index 77c1aa52f..000000000
--- a/community-staging/gambas3/gambas3-script.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas3/mime/application-x-gambasscript.png application-x-gambasscript
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas3/mime/application-x-gambasserverpage.png application-x-gambasserverpage
- xdg-mime install /usr/share/gambas3/mime/application-x-gambasscript.xml
- xdg-mime install /usr/share/gambas3/mime/application-x-gambasserverpage.xml
-}
-
-pre_remove() {
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage
- xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasscript.xml
- xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasserverpage.xml
-}
diff --git a/community-staging/goldendict/PKGBUILD b/community-staging/goldendict/PKGBUILD
deleted file mode 100644
index edab6800d..000000000
--- a/community-staging/goldendict/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 57160 2011-10-22 17:43:27Z andrea $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: m0rph <m0rph.mailbox@gmail.com>
-
-pkgname=goldendict
-pkgver=1.0.1
-pkgrel=5
-pkgdesc="Feature-rich dictionary lookup program"
-arch=('i686' 'x86_64')
-url="http://goldendict.berlios.de/"
-license=('GPL3')
-depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qtwebkit' 'phonon')
-provides=('stardict')
-changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2 \
- $pkgname-paths.diff)
-sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6'
- '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589')
-
-build(){
- cd ${srcdir}
-
- patch -Np0 -i ${srcdir}/$pkgname-paths.diff
-
- qmake
- make
- qmake
-}
-
-package() {
- cd ${srcdir}
-
- make INSTALL_ROOT=${pkgdir} install
-
- #removing unneeded
- rm -rf ${pkgdir}/usr/share/app-install
-}
diff --git a/community-staging/goldendict/goldendict-paths.diff b/community-staging/goldendict/goldendict-paths.diff
deleted file mode 100644
index 812dfdb97..000000000
--- a/community-staging/goldendict/goldendict-paths.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- goldendict.pro~ 2010-12-27 22:52:21.000000000 +0100
-+++ goldendict.pro 2010-12-27 22:52:21.000000000 +0100
-@@ -63,2 +63,2 @@
-- isEmpty( PREFIX ):PREFIX = /usr/local
-- DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/apps/goldendict/\\\"
-+ isEmpty( PREFIX ):PREFIX = /usr
-+ DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/goldendict/\\\"
-@@ -66 +66 @@
-- locale.path = $$PREFIX/share/apps/goldendict/locale/
-+ locale.path = $$PREFIX/share/goldendict/locale/
diff --git a/community-staging/goldendict/goldendict.changelog b/community-staging/goldendict/goldendict.changelog
deleted file mode 100644
index 8ec311fe1..000000000
--- a/community-staging/goldendict/goldendict.changelog
+++ /dev/null
@@ -1,8 +0,0 @@
-2010-12-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Update to major release 1.0.1
-
-2010-02-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * FS#18350 fixed in 0.9.0-5
-
-2009-06-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Package moved to [community] in v0.9.0
diff --git a/community-staging/google-gadgets/PKGBUILD b/community-staging/google-gadgets/PKGBUILD
deleted file mode 100644
index 870e8dc59..000000000
--- a/community-staging/google-gadgets/PKGBUILD
+++ /dev/null
@@ -1,158 +0,0 @@
-# $Id: PKGBUILD 57164 2011-10-22 18:51:22Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-
-pkgbase=google-gadgets
-pkgname=('google-gadgets-common' 'google-gadgets-gtk' 'google-gadgets-qt')
-_realname=$pkgbase-for-linux
-_basedir="$startdir/pkg/base"
-pkgver=0.11.2
-_sover=1.0
-_sobump=0.0.0
-pkgrel=5
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/google-gadgets-for-linux/"
-license=('APACHE')
-makedepends=('gstreamer0.10-base-plugins' 'libwebkit'
- 'desktop-file-utils' 'xdg-utils'
- 'librsvg' 'curl' 'libsoup-gnome'
- 'qt'
- 'networkmanager'
- 'zip' 'flex')
-options=('!libtool')
-source=("http://google-gadgets-for-linux.googlecode.com/files/$_realname-$pkgver.tar.bz2"
- "wifi-types.patch")
-md5sums=('279305553bcbf74f3e3615f6abc36a5e'
- 'f0df71c60a174e9d629db87b8bd9e102')
-
-build() {
- cd "$srcdir/$_realname-$pkgver"
-
- # Building thrice is expensive;
- # we move files around instead
- #
- # xulrunner 2.0 is incompatible;
- # we build without smjs-script/browser-element
-
- patch -p1 <$srcdir/wifi-types.patch
- ./configure --prefix=/usr \
- --disable-werror \
- --disable-update-desktop-database \
- --disable-update-mime-database \
- --with-oem-brand=Arch \
- --with-ssl-ca-file=/etc/ssl/certs/ca-certificates.crt \
- --with-browser-plugins-dir=/usr/lib/mozilla/plugins \
- --disable-gtkmoz-browser-element \
- --disable-smjs-script-runtime
- make
-}
-
-package_google-gadgets-common() {
- pkgdesc="Desktop widgets from Google (common files)"
- install=$pkgbase-common.install
- depends=('hicolor-icon-theme' 'shared-mime-info')
- optdepends=('google-gadgets-gtk: GTK+ (full) UI'
- 'google-gadgets-qt: Qt (partial) UI')
-
- cd "$srcdir/$_realname-$pkgver"
-
- make -j1 DESTDIR="$pkgdir/" install
-
- # we need to remove stuff in this package
- cp -a "$pkgdir" "$_basedir"
-
- # do not force any removal; we want to know in case files change
- cd "$pkgdir/usr"
- rm -r bin
- rm -r share/applications
-
- cd "$pkgdir/usr/lib/$pkgbase"
-
- # gtk-related
- #rm gtkmoz-browser-child
- rm ../lib*gtk*
- rm modules/gtk*.so
-
- # qt-related
- rm ../lib*qt*
- rm modules/qt*.so
-}
-
-package_google-gadgets-gtk() {
- pkgdesc="Desktop widgets from Google (full GTK+ front-end)"
- groups=('google-gadgets')
- install=$pkgbase.install
- depends=('google-gadgets-common'
- 'desktop-file-utils' 'xdg-utils'
- 'gstreamer0.10-base-plugins' 'libwebkit' 'libsoup-gnome'
- 'librsvg' 'curl')
- optdepends=('networkmanager: desktop integration')
-
- # install the gtk binary
- cd "$_basedir"
- install -Dm755 "usr/bin/ggl-gtk" "$pkgdir/usr/bin/ggl-gtk"
-
- # gtk-only browser stuff
- #install -Dm755 usr/lib/$pkgbase/gtkmoz-browser-child \
- # "$pkgdir/usr/lib/$pkgbase/gtkmoz-browser-child"
-
- # now the gtk libraries
- mkdir -p "$pkgdir/usr/lib/$pkgbase/modules"
-
- install -m755 usr/lib/$pkgbase/modules/gtk*.so \
- "$pkgdir/usr/lib/$pkgbase/modules/"
-
- install -m755 usr/lib/lib*gtk* "$pkgdir/usr/lib"
-
- # fix permissions and symlinks
- find "$pkgdir/usr/lib" -name *.a -exec chmod 644 {} \;
-
- ln -sf /usr/lib/libggadget-gtk-$_sover.so.$_sobump \
- "$pkgdir/usr/lib/libggadget-gtk-$_sover.so"
-
- ln -sf /usr/lib/libggadget-gtk-$_sover.so.$_sobump \
- "$pkgdir/usr/lib/libggadget-gtk-$_sover.so.0"
-
- # freedesktop.org for gtk
- install -Dm644 usr/share/applications/ggl-gtk.desktop \
- "$pkgdir/usr/share/applications/ggl-gtk.desktop"
-
- install -m644 usr/share/applications/ggl-designer.desktop \
- "$pkgdir/usr/share/applications/"
-}
-
-package_google-gadgets-qt() {
- pkgdesc="Desktop widgets from Google (partial Qt front-end)"
- groups=('google-gadgets')
- install=$pkgbase.install
- depends=('google-gadgets-common' 'qt'
- 'desktop-file-utils' 'xdg-utils'
- 'gstreamer0.10-base-plugins' 'libwebkit')
- optdepends=('networkmanager: desktop integration')
-
- # install the qt binary
- cd "$_basedir"
- install -Dm755 usr/bin/ggl-qt "$pkgdir/usr/bin/ggl-qt"
-
- # the qt libraries
- mkdir -p "$pkgdir/usr/lib/$pkgbase/modules"
-
- install -m755 usr/lib/$pkgbase/modules/qt*.so \
- "$pkgdir/usr/lib/$pkgbase/modules/"
-
- install -m755 usr/lib/lib*qt* "$pkgdir/usr/lib/"
-
- # fix permissions and symlinks
- find "$pkgdir/usr/lib" -name *.a -exec chmod 644 {} \;
-
- ln -sf /usr/lib/libggadget-qt-$_sover.so.$_sobump \
- "$pkgdir/usr/lib/libggadget-qt-$_sover.so"
-
- ln -sf /usr/lib/libggadget-qt-$_sover.so.$_sobump \
- "$pkgdir/usr/lib/libggadget-qt-$_sover.so.0"
-
- # freedesktop.org for qt
- install -Dm644 usr/share/applications/ggl-qt.desktop \
- "$pkgdir/usr/share/applications/ggl-qt.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/google-gadgets/google-gadgets-common.install b/community-staging/google-gadgets/google-gadgets-common.install
deleted file mode 100644
index 210cbc869..000000000
--- a/community-staging/google-gadgets/google-gadgets-common.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- echo "==> Updating desktop database..."
- gtk-update-icon-cache --quiet usr/share/icons/hicolor
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/google-gadgets/google-gadgets.changelog b/community-staging/google-gadgets/google-gadgets.changelog
deleted file mode 100644
index 5b8f85a71..000000000
--- a/community-staging/google-gadgets/google-gadgets.changelog
+++ /dev/null
@@ -1,8 +0,0 @@
-25 Mar 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
- * 0.11.2-3:
- xulrunner rebuild
- - undepend on xulrunner (2.0 incompatible)
- - disable smjs-script/browser-element
- Cleaned up scriptlets (too many blank lines)
- Added this changelog
diff --git a/community-staging/google-gadgets/google-gadgets.install b/community-staging/google-gadgets/google-gadgets.install
deleted file mode 100644
index fd88688fc..000000000
--- a/community-staging/google-gadgets/google-gadgets.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- echo "==> Updating desktop database..."
- update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/google-gadgets/wifi-types.patch b/community-staging/google-gadgets/wifi-types.patch
deleted file mode 100644
index be9383a61..000000000
--- a/community-staging/google-gadgets/wifi-types.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -wbBur google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/network.cc
---- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc 2009-03-15 04:12:42.000000000 +0000
-+++ google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/network.cc 2011-04-08 20:57:16.000000000 +0000
-@@ -23,17 +23,9 @@
- namespace framework {
- namespace linux_system {
-
--#ifdef NM_DEVICE_TYPE_WIFI
- static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI;
--#else
--static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS;
--#endif
-
--#ifdef NM_DEVICE_TYPE_ETHERNET
- static const int kDeviceTypeEthernet = NM_DEVICE_TYPE_ETHERNET;
--#else
--static const int kDeviceTypeEthernet = DEVICE_TYPE_802_3_ETHERNET;
--#endif
-
- static const int kDeviceTypeUnknown = 0;
-
-diff -wbBur google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/wireless.cc
---- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc 2009-12-28 10:39:53.000000000 +0000
-+++ google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/wireless.cc 2011-04-08 20:57:39.000000000 +0000
-@@ -77,11 +77,7 @@
-
- using namespace ggadget::dbus;
-
--#ifdef NM_DEVICE_TYPE_WIFI
- static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI;
--#else
--static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS;
--#endif
-
- // Defined in nm 0.7
- static const int kDeviceStateActivated = 8;
diff --git a/community-staging/gpsbabel/PKGBUILD b/community-staging/gpsbabel/PKGBUILD
deleted file mode 100644
index 467a2d404..000000000
--- a/community-staging/gpsbabel/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 57111 2011-10-21 23:00:10Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=gpsbabel
-pkgver=1.4.2
-pkgrel=4
-pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats"
-arch=('i686' 'x86_64')
-url="http://www.gpsbabel.org"
-license=('GPL')
-depends=('libusb-compat' 'expat')
-makedepends=('fop' 'qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit')
-optdepends=('qt' 'qtwebkit')
-options=('docs')
-source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz"
- "gpsbabel.desktop::http://pkgs.fedoraproject.org/gitweb/?p=gpsbabel.git;a=blob_plain;f=gpsbabel.desktop;hb=HEAD")
-md5sums=('76ea9f7852be2e98aa18976c4697ca93'
- '7bdbd243e29a8831842d31c079f04c45')
-
-build() {
- cd $srcdir/gpsbabel-$pkgver
- ./configure --prefix=/usr
- make
- make doc
- (cd gui && qmake && make)
-}
-
-package() {
- cd $srcdir/gpsbabel-$pkgver
- make DESTDIR=$pkgdir install
-
- # GUI
- install -Dm755 gui/objects/gpsbabelfe-bin ${pkgdir}/usr/bin/gpsbabelfe-bin
- install -Dm644 gui/images/appicon.png $pkgdir/usr/share/pixmaps/gpsbabel.png
- install -Dm644 $srcdir/gpsbabel.desktop $pkgdir/usr/share/applications/gpsbabel.desktop
-
- # Header install
- mkdir -p $pkgdir/usr/include/gpsbabel
- cp {defs.h,queue.h,gbtypes.h,filterdefs.h,cet.h,cet_util.h,garmin_tables.h} \
- $pkgdir/usr/include/gpsbabel
-
- # Doc install
- mkdir -p $pkgdir/usr/share/doc/$pkgname
- cp -r $srcdir/babelweb/* $pkgdir/usr/share/doc/$pkgname/
- cp README* $pkgdir/usr/share/doc/$pkgname/
-}
diff --git a/community-staging/kadu/PKGBUILD b/community-staging/kadu/PKGBUILD
deleted file mode 100644
index 3865d1aae..000000000
--- a/community-staging/kadu/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 57138 2011-10-22 11:49:58Z bpiotrowski $
-# Maintainer: Mateusz Herych
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-
-pkgname=kadu
-pkgver=0.10.1
-pkgrel=2
-pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client"
-arch=('i686' 'x86_64')
-url="http://www.kadu.net/"
-license=('GPL')
-depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit')
-makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl')
-source=(http://www.kadu.net/download/stable/$pkgname-$pkgver.tar.bz2)
-md5sums=('6211a9a9e02d645268cbf055892601a0')
-
-build() {
- cd $srcdir/kadu-$pkgver
- cmake . -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd $srcdir/kadu-$pkgver
- make DESTDIR=$pkgdir install
- rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig}
- rm -rf $pkgdir/usr/share/kadu/{HISTORY,README}
-}
diff --git a/community-staging/kvirc/PKGBUILD b/community-staging/kvirc/PKGBUILD
deleted file mode 100644
index 9eab1adac..000000000
--- a/community-staging/kvirc/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 57113 2011-10-21 23:00:54Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=kvirc
-pkgver=4.0.4
-pkgrel=4
-pkgdesc="Qt-based IRC client"
-url="http://www.kvirc.net"
-depends=('python2' 'qt' 'libxss' 'qtwebkit')
-arch=(i686 x86_64)
-makedepends=('cmake')
-license=('GPL')
-options=("!libtool")
-install=kvirc.install
-source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/kvirc-$pkgver.tar.bz2)
-md5sums=('26fd24979ae4a29bac9309b3b0c98788')
-
-build() {
- cd $srcdir/kvirc-$pkgver
- [ $NOEXTRACT -eq 1 ] || cmake -DWANT_KDE4=OFF -DWANT_PERL=ON -DWANT_PHONON=OFF -DCMAKE_INSTALL_PREFIX=/usr .
- make
- make DESTDIR=$pkgdir install
-}
diff --git a/community-staging/kvirc/kvirc.install b/community-staging/kvirc/kvirc.install
deleted file mode 100644
index 8f76d007f..000000000
--- a/community-staging/kvirc/kvirc.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &>/dev/null
- true
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- xdg-icon-resource forceupdate --theme hicolor &>/dev/null
- true
-}
diff --git a/community-staging/libraw/PKGBUILD b/community-staging/libraw/PKGBUILD
deleted file mode 100644
index c37c8e9a0..000000000
--- a/community-staging/libraw/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 57457 2011-10-28 07:42:04Z lcarlier $
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-
-pkgname=libraw
-_pkgbasename=LibRaw
-pkgver=0.14.3
-pkgrel=1
-pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"
-arch=('i686' 'x86_64')
-url="http://www.libraw.org/"
-license=('CDDL' 'LGPL' 'custom')
-depends=('lcms')
-options=('!makeflags')
-source=(http://www.libraw.org/data/${_pkgbasename}-${pkgver}.tar.gz)
-md5sums=('d8f81a52b0fada9d5bf7e659e21e3a57')
-
-build() {
- cd ${srcdir}/${_pkgbasename}-${pkgver}
-
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd ${srcdir}/${_pkgbasename}-${pkgver}
-
- make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/luminancehdr/PKGBUILD b/community-staging/luminancehdr/PKGBUILD
deleted file mode 100644
index 3f3b363bf..000000000
--- a/community-staging/luminancehdr/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 57156 2011-10-22 16:03:24Z andrea $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: Dmitry N. Shilov <stormblast@land.ru>
-
-pkgname=luminancehdr
-pkgver=2.1.0
-pkgrel=3
-pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
-arch=('i686' 'x86_64')
-url='http://qtpfsgui.sourceforge.net/'
-license=('GPL')
-depends=('exiv2' 'fftw' 'gsl' 'libraw' 'openexr' 'qt' 'qtwebkit')
-optdepends=('hugin: align image stack functionality')
-install=$pkgname.install
-changelog=$pkgname.changelog
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-${pkgver}.tar.gz)
-sha256sums=('0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac')
-
-build() {
- cd "${srcdir}/luminance-hdr-${pkgver}"
-
- if [ ${CARCH} = i686 ]; then
- sed -i 's/ -msse2//' project.pro
- fi
-
- lrelease project.pro
- qmake PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}/luminance-hdr-${pkgver}"
-
- make INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/community-staging/luminancehdr/luminancehdr.changelog b/community-staging/luminancehdr/luminancehdr.changelog
deleted file mode 100644
index 378053ef5..000000000
--- a/community-staging/luminancehdr/luminancehdr.changelog
+++ /dev/null
@@ -1,33 +0,0 @@
-2011-08-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * luminancehdr 2.1.0-1
-
-2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * luminancehdr 2.0.2-1
-
-2010-10-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * exiv2 0.20 rebuild
-
-2010-10-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Update to major release 2.0.1
-
-2010-06-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Package renamed to LuminanceHDR
- * Update to major release 2.0.0
-
-2010-03-09 Andrea Scarpino <andrea@archlinux.org>
- * exiv2 0.19 rebuild
-
-2009-11-02 Biru Ionut <ionut@archlinux.ro>
- * add translation and fix segfault on old i686 procesors
-
-2009-04-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Update to major release v1.9.3
-
-2009-04-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Minor version (v1.9.2-3) update caused by exiv2 upgrade.
-
-2008-11-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Minor version (v1.9.2-2) update caused by openexr upgrade.
-
-2008-09-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Package moved to [community]
diff --git a/community-staging/luminancehdr/luminancehdr.install b/community-staging/luminancehdr/luminancehdr.install
deleted file mode 100644
index 279762804..000000000
--- a/community-staging/luminancehdr/luminancehdr.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/community-staging/mythtv/PKGBUILD b/community-staging/mythtv/PKGBUILD
deleted file mode 100644
index d9ee4955a..000000000
--- a/community-staging/mythtv/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: PKGBUILD 57173 2011-10-23 02:45:26Z jconder $
-# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: <kleptophobiac@gmail.com>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=mythtv
-pkgver=0.24.1
-pkgrel=3
-epoch=1
-pkgdesc="A Homebrew PVR project"
-arch=('i686' 'x86_64')
-url="http://www.mythtv.org/"
-license=('GPL')
-depends=('lame' 'libavc1394' 'libiec61883' 'libpulse' 'libvdpau' 'libxinerama'
- 'libxvmc' 'lirc-utils' 'mesa' 'mysql-clients' 'mysql-python'
- 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp' 'python-lxml' 'qt'
- 'qtwebkit' 'wget')
-makedepends=('yasm')
-optdepends=('xmltv: to download tv listings')
-backup=('etc/conf.d/mythbackend')
-install='mythtv.install'
-source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
- 'mythbackend.rc'
- 'mythbackend.conf'
- 'mythtv-v4l2-fix.patch'
- 'build.patch')
-md5sums=('6870c679619ec58456e76839745411d8'
- 'feadcc9ad064d93d6dceab1efc0bd9ed'
- 'bb8e4033d82428d827570fae9ba15e6a'
- 'ba5c91df80f0d3f7563a873e71a3725c'
- '3188962917e98c4e07818dccd64bc423')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
- patch -Np2 -i ${srcdir}/mythtv-v4l2-fix.patch
- patch -Np1 -i ${srcdir}/build.patch
-
- ARCH="${CARCH/_/-}"
- ./configure --prefix=/usr --cpu="$ARCH" \
- --enable-mmx \
- --enable-audio-oss \
- --enable-audio-alsa \
- --disable-audio-jack \
- --enable-audio-pulse \
- --disable-altivec \
- --disable-distcc \
- --disable-ccache \
- --enable-vdpau \
- --enable-dvb \
- --dvb-path=/usr/include \
- --enable-lirc \
- --enable-joystick-menu \
- --enable-v4l \
- --enable-ivtv \
- --enable-xvmc \
- --enable-xvmcw \
- --enable-xvmc-vld \
- --enable-firewire \
- --enable-opengl-vsync \
- --enable-xrandr \
- --enable-xv \
- --enable-x11 \
- --with-bindings=perl,python \
- --python=python2
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make INSTALL_ROOT="$pkgdir" install
-
- install -D -m755 "$srcdir/mythbackend.rc" "$pkgdir/etc/rc.d/mythbackend"
- install -D -m644 "$srcdir/mythbackend.conf" "$pkgdir/etc/conf.d/mythbackend"
- install -D -m644 'database/mc.sql' "$pkgdir/usr/share/mythtv/mc.sql"
-
- mkdir -p "$pkgdir/usr/share/mythtv"
- cp -R 'contrib' "$pkgdir/usr/share/mythtv"
-}
diff --git a/community-staging/mythtv/build.patch b/community-staging/mythtv/build.patch
deleted file mode 100644
index 35dccd618..000000000
--- a/community-staging/mythtv/build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nru a/libs/libmythui/mythrender_opengl.cpp b/libs/libmythui/mythrender_opengl.cpp
---- a/libs/libmythui/mythrender_opengl.cpp 2011-05-16 08:57:52.000000000 +1200
-+++ b/libs/libmythui/mythrender_opengl.cpp 2011-10-23 15:05:33.178392264 +1300
-@@ -2,6 +2,8 @@
- #include "mythrender_opengl.h"
- #include "mythxdisplay.h"
-
-+#include <GL/glu.h>
-+
- #define LOC QString("OpenGL: ")
- #define LOC_ERR QString("OpenGL Error: ")
-
-Binary files a/libs/libmythui/.mythrender_opengl.cpp.swp and b/libs/libmythui/.mythrender_opengl.cpp.swp differ
diff --git a/community-staging/mythtv/mythbackend.conf b/community-staging/mythtv/mythbackend.conf
deleted file mode 100644
index e004ae5bd..000000000
--- a/community-staging/mythtv/mythbackend.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/bash
-#
-# Rename this file to:
-#
-# /etc/config.d/mythbackend
-#
-###############################################################################
-#
-# Copyright (c) by the MythTV Development Team.
-#
-# Derived from work by:
-#
-# Michael Thomson <linux at m-thomson dot net>
-# Stu Tomlinson <stu at nosnilmot dot com>
-# Axel Thimm <axel.thimm at atrpms dot net>
-# Adopted for ArchLinux:
-# Jürgen Hoetzel <juergen@archinux.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-###############################################################################
-#
-# Config variables for the mythbackend startup script, which is usually
-# located in /etc/rc.d/mythbackend
-#
-# When the startup script is executed, it sources this file if it exists,
-# otherwise it will fall back on default values.
-#
-# Leave variables commented out to use default values in init script
-# (/etc/rc.d/mythbackend).
-#
-# To override defaults, uncomment the relevant variable definition and
-# edit as required.
-#
-
-#
-# User who should start the mythbackend processes
-#
-# Running mythbackend as non-root requires you to ensure that audio/video
-# devices used for recording have suitable user permissions. One way
-# to achieve this is to modify existing or create new udev rules which
-# assign these devices to a non-root group with rw permissions and add
-# your mythbackend user to that group. Be aware that console.perms can
-# also affect device permissions and may need additional configuration.
-# Running as non-root may also introduce increased process latency.
-#
-# MBE_USER='root'
-
-#
-# Directory holding the mythbackend binary (empty means autodetect).
-#
-# MBE_DIR=''
-
-#
-# Name of mythbackend binary.
-#
-# MBE_PROG='mythbackend'
-
-#
-# Other startup options for mythbackend (see 'mythbackend --help' for a list).
-#
-# MBE_OPTIONS=''
-
-#
-# Directory holding the mythbackend log file
-#
-# LOG_DIR='/var/log/mythtv'
-
-#
-# Name of mythbackend log file.
-#
-# NOTE: If you are running as non-root take care to ensure the mythbackend user
-# has permission to write to this log file.
-#
-# LOG_FILE='mythbackend.log'
-
-#
-# Logging options for mythbackend (see 'mythbackend -v help' for a list)
-#
-# LOG_OPTS=''
diff --git a/community-staging/mythtv/mythbackend.rc b/community-staging/mythtv/mythbackend.rc
deleted file mode 100644
index 410e8de41..000000000
--- a/community-staging/mythtv/mythbackend.rc
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# Default values to use if none are supplied in the config file.
-
-# Running mythbackend as non-root requires you to ensure that audio/video
-# devices used for recording have suitable user permissions. One way
-# to achieve this is to modify existing or create new udev rules which
-# assign these devices to a non-root group with rw permissions and add
-# your mythbackend user to that group. Be aware that console.perms can
-# also affect device permissions and may need additional configuration.
-# Running as non-root may also introduce increased process latency.
-#
-# User who should start the mythbackend processes
-MBE_USER='root'
-
-# Startup options for mythbackend
-MBE_OPTIONS=''
-
-# Name of mythbackend log file
-LOG_FILE='/var/log/mythbackend.log'
-
-# Logging options for mythbackend (empty means '-v important,general')
-LOG_OPTS=''
-
-###############################################################################
-
-CONFIG_FILE=/etc/conf.d/mythbackend
-PIDFILE=/var/run/mythbackend.pid
-
-if [[ -f ${CONFIG_FILE} ]]; then
- . ${CONFIG_FILE}
-fi
-
-pid="$(cat ${PIDFILE} 2>/dev/null || pidof mythbackend)";
-
-# fix FS#11890
-mbe_user_home="$(getent passwd ${MBE_USER}|cut -d : -f 6)"
-
-case "$1" in
- start)
- stat_busy "Starting MythTV Backend"
-
- # already running ?
- if [[ "${pid}" -gt 0 ]] && kill -0 "${pid}"; then
- stat_fail
- exit 1;
- fi
- touch ${PIDFILE} ${LOG_FILE}
- chown "$MBE_USER" ${PIDFILE} ${LOG_FILE}
- if su "$MBE_USER" -c "HOME=${mbe_user_home} mythbackend \
- --daemon \
- --logfile $LOG_FILE $LOG_OPTS \
- --pidfile ${PIDFILE} $MBE_OPTIONS";
- then
- add_daemon mythbackend
- stat_done
- else
- stat_fail
- fi
- ;;
-
- stop)
- stat_busy "Stopping MythTV Backend"
- if [[ "${pid}" -gt 0 ]] && kill $pid &>/dev/null; then
- rm_daemon mythbackend
- stat_done
- rm ${PIDFILE} 2>/dev/null
- else
- stat_fail
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-staging/mythtv/mythtv-v4l2-fix.patch b/community-staging/mythtv/mythtv-v4l2-fix.patch
deleted file mode 100644
index e26e16615..000000000
--- a/community-staging/mythtv/mythtv-v4l2-fix.patch
+++ /dev/null
@@ -1,724 +0,0 @@
-diff --git a/mythtv/configure b/mythtv/configure
-index 1efe803..7bcdf06 100755
---- a/mythtv/configure
-+++ b/mythtv/configure
-@@ -109,7 +109,8 @@ Advanced options (experts only):
- --disable-iptv disable support for recording RTSP/UDP/RTP streams
- --disable-hdhomerun disable support for HDHomeRun boxes
- --disable-v4l disable Video4Linux support
-- --disable-ivtv disable ivtv support (PVR-x50) req. v4l support
-+ --disable-v4l2 disable Video4Linux2 support
-+ --disable-ivtv disable ivtv support (PVR-x50) req. v4l2 support
- --disable-hdpvr disable HD-PVR support
- --disable-dvb disable DVB support
- --dvb-path=HDRLOC location of directory containing
-@@ -1315,6 +1316,7 @@ MYTHTV_CONFIG_LIST='
- qtwebkit
- quartz_video
- v4l
-+ v4l2
- valgrind
- x11
- xrandr
-@@ -1706,8 +1708,8 @@ audio_oss_deps_any="soundcard_h sys_soundcard_h"
- dvb_deps="backend"
- firewire_deps="backend"
- iptv_deps="backend"
--ivtv_deps="backend v4l"
--hdpvr_deps="backend v4l"
-+ivtv_deps="backend v4l2"
-+hdpvr_deps="backend v4l2"
- hdhomerun_deps="backend"
- mpegtsraw_demuxer_deps="merge_libavformat_mpegts_c"
- mythtranscode_deps="backend frontend"
-@@ -1715,6 +1717,7 @@ opengl_deps_any="agl_h GL_gl_h darwin windows x11"
- opengl_video_deps="opengl"
- opengl_vsync_deps="opengl"
- v4l_deps="backend linux_videodev_h linux_videodev2_h"
-+v4l2_deps="backend linux_videodev2_h"
- vdpau_deps="opengl vdpau_vdpau_h vdpau_vdpau_x11_h"
- xrandr_deps="x11"
- xv_deps="x11"
-@@ -1933,6 +1936,7 @@ enable opengl_vsync
- enable opengl_video
- enable quartz_video
- enable v4l
-+enable v4l2
- enable x11
- enable xrandr
- enable xv
-@@ -3062,6 +3066,7 @@ EOF
- fi
- disable opengl_vsync
- disable v4l
-+ disable v4l2
- disable x11
- # Workaround compile errors from missing gmtime_r/localtime_r/uint def
- CFLAGS=`echo $CFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'`
-@@ -3106,6 +3111,7 @@ EOF
- fi
- disable symver
- disable v4l
-+ disable v4l2
- enable windows
- disable x11
- ###### Standard ffmpeg configure stuff follows:
-@@ -4375,6 +4381,7 @@ enabled stripping || strip="echo skipping strip"
-
- if enabled backend; then
- echo "Video4Linux sup. ${v4l-no}"
-+ echo "Video4Linux2 sup. ${v4l2-no}"
- echo "ivtv support ${ivtv-no}"
- echo "HD-PVR support ${hdpvr-no}"
- echo "FireWire support ${firewire-no}"
-diff --git a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
-index 739634d..39e5956 100644
---- a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
-+++ b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
-@@ -42,9 +42,13 @@ extern "C" {
- #include "libswscale/swscale.h"
- }
-
-+#if defined(USING_V4L) || defined(USING_V4L2)
- #ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
-+#endif
-
- #include "go7007_myth.h"
-
-@@ -55,9 +59,9 @@ extern "C" {
- extern "C" {
- #include "vbitext/vbi.h"
- }
--#else // USING_V4l
-+#else // USING_V4L || USING_V4L2
- #define VT_WIDTH 0
--#endif // USING_V4l
-+#endif // USING_V4l || USING_V4L2
-
- #define KEYFRAMEDIST 30
-
-@@ -1019,7 +1023,7 @@ bool NuppelVideoRecorder::Open(void)
-
- void NuppelVideoRecorder::ProbeV4L2(void)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- usingv4l2 = true;
-
- struct v4l2_capability vcap;
-@@ -1049,7 +1053,7 @@ void NuppelVideoRecorder::ProbeV4L2(void)
- QString driver = (char *)vcap.driver;
- if (driver == "go7007")
- go7007 = true;
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- }
-
- void NuppelVideoRecorder::StartRecording(void)
-@@ -2460,7 +2464,7 @@ void NuppelVideoRecorder::doAudioThread(void)
- audio_device->Close();
- }
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- struct VBIData
- {
- NuppelVideoRecorder *nvr;
-@@ -2634,9 +2638,9 @@ void NuppelVideoRecorder::FormatTeletextSubtitles(struct VBIData *vbidata)
- act_text_buffer = 0;
- textbuffer[act]->freeToEncode = 1;
- }
--#else // USING_V4L
-+#else // USING_V4L || USING_V4L2
- void NuppelVideoRecorder::FormatTeletextSubtitles(struct VBIData *vbidata) {}
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
-
- void NuppelVideoRecorder::FormatCC(struct cc *cc)
- {
-@@ -2863,7 +2867,7 @@ void NuppelVideoRecorder::doVbiThread(void)
- //VERBOSE(VB_RECORD, LOC + "vbi end");
- }
-
--#else // USING_V4L
-+#else // USING_V4L
- void NuppelVideoRecorder::doVbiThread(void) { }
- #endif // USING_V4L
-
-diff --git a/mythtv/libs/libmythtv/analogsignalmonitor.cpp b/mythtv/libs/libmythtv/analogsignalmonitor.cpp
-index 2a4f4c5..fa5823a 100644
---- a/mythtv/libs/libmythtv/analogsignalmonitor.cpp
-+++ b/mythtv/libs/libmythtv/analogsignalmonitor.cpp
-@@ -6,7 +6,9 @@
- #include <sys/ioctl.h>
- #include <poll.h>
-
-+#ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-
- #include "mythverbose.h"
- #include "analogsignalmonitor.h"
-@@ -151,6 +153,7 @@ void AnalogSignalMonitor::UpdateValues(void)
- }
- else
- {
-+#ifdef USING_V4L
- struct video_tuner tuner;
- bzero(&tuner, sizeof(tuner));
-
-@@ -163,6 +166,7 @@ void AnalogSignalMonitor::UpdateValues(void)
- {
- isLocked = tuner.signal;
- }
-+#endif
- }
-
- {
-diff --git a/mythtv/libs/libmythtv/cardutil.cpp b/mythtv/libs/libmythtv/cardutil.cpp
-index 8852682..494f48a 100644
---- a/mythtv/libs/libmythtv/cardutil.cpp
-+++ b/mythtv/libs/libmythtv/cardutil.cpp
-@@ -4,7 +4,7 @@
-
- #include <algorithm>
-
--#if defined(USING_V4L) || defined(USING_DVB)
-+#if defined(USING_V4L) || defined(USING_V4L2) || defined(USING_DVB)
- #include <sys/ioctl.h>
- #endif
-
-@@ -28,6 +28,8 @@
-
- #ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
- #endif
-
-@@ -1455,15 +1457,15 @@ uint CardUtil::GetQuickTuning(uint cardid, const QString &input_name)
- bool CardUtil::hasV4L2(int videofd)
- {
- (void) videofd;
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- struct v4l2_capability vcap;
- bzero(&vcap, sizeof(vcap));
-
- return ((ioctl(videofd, VIDIOC_QUERYCAP, &vcap) >= 0) &&
- (vcap.capabilities & V4L2_CAP_VIDEO_CAPTURE));
--#else // if !USING_V4L
-+#else // if !USING_V4L2
- return false;
--#endif // !USING_V4L
-+#endif // !USING_V4L2
- }
-
- bool CardUtil::GetV4LInfo(
-@@ -1475,7 +1477,7 @@ bool CardUtil::GetV4LInfo(
- if (videofd < 0)
- return false;
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- // First try V4L2 query
- struct v4l2_capability capability;
- bzero(&capability, sizeof(struct v4l2_capability));
-@@ -1487,11 +1489,13 @@ bool CardUtil::GetV4LInfo(
- }
- else // Fallback to V4L1 query
- {
-+#ifdef USING_V4L
- struct video_capability capability;
- if (ioctl(videofd, VIDIOCGCAP, &capability) >= 0)
- card = QString::fromAscii((const char*)capability.name);
-+#endif //USING_V4L
- }
--#endif // !USING_V4L
-+#endif // !USING_V4L || USING_V4L2
-
- if (!driver.isEmpty())
- driver.remove( QRegExp("\\[[0-9]\\]$") );
-@@ -1506,9 +1510,9 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
- InputNames list;
- ok = false;
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- bool usingv4l2 = hasV4L2(videofd);
--
-+#ifdef USING_V4L2
- // V4L v2 query
- struct v4l2_input vin;
- bzero(&vin, sizeof(vin));
-@@ -1523,8 +1527,10 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
- ok = true;
- return list;
- }
-+#endif
-
- // V4L v1 query
-+#ifdef USING_V4L
- struct video_capability vidcap;
- bzero(&vidcap, sizeof(vidcap));
- if (ioctl(videofd, VIDIOCGCAP, &vidcap) != 0)
-@@ -1552,15 +1558,15 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
-
- list[i] = test.name;
- }
--
-+#endif
- // Create an input on single input cards that don't advertise input
- if (!list.size())
- list[0] = "Television";
-
- ok = true;
--#else // if !USING_V4L
-+#else // if !USING_V4L || USING_V4L2
- list[-1] += QObject::tr("ERROR, Compile with V4L support to query inputs");
--#endif // !USING_V4L
-+#endif // !USING_V4L || USING_V4L2
- return list;
- }
-
-diff --git a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
-index 832d0a8..e35b186 100644
---- a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
-+++ b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
-@@ -1394,7 +1394,7 @@ const DVBChannel *ChannelScanSM::GetDVBChannel(void) const
-
- V4LChannel *ChannelScanSM::GetV4LChannel(void)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- return dynamic_cast<V4LChannel*>(channel);
- #else
- return NULL;
-diff --git a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
-index 1595d6a..4d2b2cf 100644
---- a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
-+++ b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
-@@ -342,7 +342,7 @@ void ChannelScanner::PreScanCommon(
- channel = new DVBChannel(device);
- #endif
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- if (("V4L" == card_type) || ("MPEG" == card_type))
- channel = new V4LChannel(NULL, device);
- #endif
-diff --git a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
-index 00fd9d3..70e3469 100644
---- a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
-+++ b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
-@@ -27,14 +27,14 @@ static QString card_types(void)
- cardTypes += "'DVB'";
- #endif // USING_DVB
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- if (!cardTypes.isEmpty())
- cardTypes += ",";
- cardTypes += "'V4L'";
- # ifdef USING_IVTV
- cardTypes += ",'MPEG'";
- # endif // USING_IVTV
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
-
- #ifdef USING_IPTV
- if (!cardTypes.isEmpty())
-diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
-index 3d26e0a..ea06ee7 100644
---- a/mythtv/libs/libmythtv/libmythtv.pro
-+++ b/mythtv/libs/libmythtv/libmythtv.pro
-@@ -119,7 +119,7 @@ cygwin:DEFINES += _WIN32
- using_valgrind:DEFINES += USING_VALGRIND
-
- # old libvbitext (Caption decoder)
--using_v4l {
-+using_v4l || using_v4l2 {
- HEADERS += vbitext/cc.h vbitext/dllist.h vbitext/hamm.h vbitext/lang.h
- HEADERS += vbitext/vbi.h vbitext/vt.h
- SOURCES += vbitext/cc.cpp vbitext/vbi.c vbitext/hamm.c vbitext/lang.c
-@@ -471,11 +471,17 @@ using_backend {
- SOURCES += channelchangemonitor.cpp
-
- # Support for Video4Linux devices
-- using_v4l {
-+ using_v4l || using_v4l2 {
- HEADERS += v4lchannel.h analogsignalmonitor.h
- SOURCES += v4lchannel.cpp analogsignalmonitor.cpp
-
-- DEFINES += USING_V4L
-+ using_v4l {
-+ DEFINES += USING_V4L
-+ }
-+
-+ using_v4l2 {
-+ DEFINES += USING_V4L2
-+ }
- }
-
- # Support for cable boxes that provide Firewire out
-diff --git a/mythtv/libs/libmythtv/signalmonitor.cpp b/mythtv/libs/libmythtv/signalmonitor.cpp
-index 221efef..c199b3b 100644
---- a/mythtv/libs/libmythtv/signalmonitor.cpp
-+++ b/mythtv/libs/libmythtv/signalmonitor.cpp
-@@ -23,7 +23,7 @@ extern "C" {
- # include "dvbchannel.h"
- #endif
-
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- # include "analogsignalmonitor.h"
- # include "v4lchannel.h"
- #endif
-@@ -95,7 +95,7 @@ SignalMonitor *SignalMonitor::Init(QString cardtype, int db_cardnum,
- }
- #endif
-
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- if ((cardtype.toUpper() == "HDPVR"))
- {
- V4LChannel *chan = dynamic_cast<V4LChannel*>(channel);
-diff --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp
-index b885eaa..3d9c7ad 100644
---- a/mythtv/libs/libmythtv/tv_rec.cpp
-+++ b/mythtv/libs/libmythtv/tv_rec.cpp
-@@ -57,7 +57,7 @@ using namespace std;
-
- #include "channelgroup.h"
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- #include "v4lchannel.h"
- #endif
-
-@@ -206,7 +206,7 @@ bool TVRec::CreateChannel(const QString &startchannel)
- }
- else // "V4L" or "MPEG", ie, analog TV
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- channel = new V4LChannel(this, genOpt.videodev);
- if (!channel->Open())
- return false;
-@@ -1082,11 +1082,11 @@ bool TVRec::SetupRecorder(RecordingProfile &profile)
- }
- else
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- // V4L/MJPEG/GO7007 from here on
- recorder = new NuppelVideoRecorder(this, channel);
- recorder->SetOption("skipbtaudio", genOpt.skip_btaudio);
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- }
-
- if (recorder)
-@@ -1292,11 +1292,11 @@ FirewireChannel *TVRec::GetFirewireChannel(void)
-
- V4LChannel *TVRec::GetV4LChannel(void)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- return dynamic_cast<V4LChannel*>(channel);
- #else
- return NULL;
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- }
-
- /** \fn TVRec::EventThread(void*)
-@@ -4137,7 +4137,7 @@ void TVRec::TuningNewRecorder(MPEGStreamData *streamData)
- channel->GetCurrentName());
- }
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- if (GetV4LChannel())
- {
- channel->InitPictureAttributes();
-diff --git a/mythtv/libs/libmythtv/v4lchannel.cpp b/mythtv/libs/libmythtv/v4lchannel.cpp
-index bc82b49..7aa47ef 100644
---- a/mythtv/libs/libmythtv/v4lchannel.cpp
-+++ b/mythtv/libs/libmythtv/v4lchannel.cpp
-@@ -16,8 +16,12 @@
- #include <iostream>
- using namespace std;
-
-+#ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
-+#endif
-
- // MythTV headers
- #include "v4lchannel.h"
-@@ -150,8 +154,10 @@ static int format_to_mode(const QString &fmt, int v4l_version)
- {
- if (fmt == "NTSC-JP")
- return 6;
-+#ifdef USING_V4L
- else if (fmt.left(5) == "SECAM")
- return VIDEO_MODE_SECAM;
-+#endif
- else if (fmt == "PAL-NC")
- return 3;
- else if (fmt == "PAL-M")
-@@ -159,6 +165,7 @@ static int format_to_mode(const QString &fmt, int v4l_version)
- else if (fmt == "PAL-N")
- return 5;
- // generics...
-+#ifdef USING_V4L
- else if (fmt.left(3) == "PAL")
- return VIDEO_MODE_PAL;
- else if (fmt.left(4) == "NTSC")
-@@ -166,6 +173,7 @@ static int format_to_mode(const QString &fmt, int v4l_version)
- else if (fmt.left(4) == "ATSC")
- return VIDEO_MODE_NTSC; // We've dropped V4L ATSC support...
- return VIDEO_MODE_NTSC;
-+#endif
- }
-
- VERBOSE(VB_IMPORTANT,
-@@ -237,6 +245,7 @@ static QString mode_to_format(int mode, int v4l_version)
- }
- else if (1 == v4l_version)
- {
-+#ifdef USING_V4L
- if (mode == VIDEO_MODE_NTSC)
- return "NTSC";
- else if (mode == VIDEO_MODE_PAL)
-@@ -249,6 +258,7 @@ static QString mode_to_format(int mode, int v4l_version)
- return "PAL-N";
- else if (mode == 6)
- return "NTSC-JP";
-+#endif
- }
- else
- {
-@@ -676,6 +686,7 @@ bool V4LChannel::Tune(uint frequency, QString inputname,
- return true;
- }
-
-+#ifdef USING_V4L
- // Video4Linux version 1 tuning
- uint freq = frequency / 62500;
- ioctlval = ioctl(videofd, VIDIOCSFREQ, &freq);
-@@ -687,6 +698,7 @@ bool V4LChannel::Tune(uint frequency, QString inputname,
- .arg(device).arg(ioctlval).arg(strerror(errno)));
- return false;
- }
-+#endif
-
- SetSIStandard(si_std);
-
-@@ -858,6 +870,7 @@ bool V4LChannel::SetInputAndFormat(int inputNum, QString newFmt)
-
- if (usingv4l1)
- {
-+#ifdef USING_V4L
- VERBOSE(VB_CHANNEL, LOC + msg + "(v4l v1)");
-
- // read in old settings
-@@ -875,8 +888,9 @@ bool V4LChannel::SetInputAndFormat(int inputNum, QString newFmt)
- {
- VERBOSE(VB_IMPORTANT, LOC_ERR + msg +
- "\n\t\t\twhile setting format (v4l v1)" + ENO);
-- }
-- else if (usingv4l2)
-+ } else
-+#endif
-+ if (usingv4l2)
- {
- VERBOSE(VB_IMPORTANT, LOC + msg +
- "\n\t\t\tSetting video mode with v4l version 1 worked");
-@@ -951,6 +965,7 @@ bool V4LChannel::SwitchToInput(int inputnum, bool setstarting)
- return ok;
- }
-
-+#ifdef USING_V4L
- static unsigned short *get_v4l1_field(
- int v4l2_attrib, struct video_picture &vid_pic)
- {
-@@ -970,6 +985,7 @@ static unsigned short *get_v4l1_field(
- }
- return NULL;
- }
-+#endif
-
- static int get_v4l2_attribute(const QString &db_col_name)
- {
-@@ -1067,6 +1083,7 @@ bool V4LChannel::InitPictureAttribute(const QString db_col_name)
- }
-
- // V4L1
-+#ifdef USING_V4L
- unsigned short *setfield;
- struct video_picture vid_pic;
- bzero(&vid_pic, sizeof(vid_pic));
-@@ -1087,7 +1104,7 @@ bool V4LChannel::InitPictureAttribute(const QString db_col_name)
- VERBOSE(VB_IMPORTANT, loc_err + "failed to set controls." + ENO);
- return false;
- }
--
-+#endif
- return true;
- }
-
-@@ -1154,6 +1171,7 @@ static int get_v4l2_attribute_value(int videofd, int v4l2_attrib)
-
- static int get_v4l1_attribute_value(int videofd, int v4l2_attrib)
- {
-+#ifdef USING_V4L
- struct video_picture vid_pic;
- bzero(&vid_pic, sizeof(vid_pic));
-
-@@ -1167,6 +1185,7 @@ static int get_v4l1_attribute_value(int videofd, int v4l2_attrib)
- unsigned short *setfield = get_v4l1_field(v4l2_attrib, vid_pic);
- if (setfield)
- return *setfield;
-+#endif
-
- return -1;
- }
-@@ -1210,6 +1229,7 @@ static int set_v4l2_attribute_value(int videofd, int v4l2_attrib, int newvalue)
-
- static int set_v4l1_attribute_value(int videofd, int v4l2_attrib, int newvalue)
- {
-+#ifdef USING_V4L
- unsigned short *setfield;
- struct video_picture vid_pic;
- bzero(&vid_pic, sizeof(vid_pic));
-@@ -1236,7 +1256,7 @@ static int set_v4l1_attribute_value(int videofd, int v4l2_attrib, int newvalue)
- // ???
- return -1;
- }
--
-+#endif
- return 0;
- }
-
-diff --git a/mythtv/libs/libmythtv/v4lchannel.h b/mythtv/libs/libmythtv/v4lchannel.h
-index b059c64..aa6d934 100644
---- a/mythtv/libs/libmythtv/v4lchannel.h
-+++ b/mythtv/libs/libmythtv/v4lchannel.h
-@@ -4,11 +4,11 @@
- #define CHANNEL_H
-
- #include "dtvchannel.h"
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- #include <linux/videodev2.h> // needed for v4l2_std_id type
- #else
- typedef uint64_t v4l2_std_id;
--#endif //USING_V4L
-+#endif //USING_V4L2
-
- using namespace std;
-
-diff --git a/mythtv/libs/libmythtv/vbitext/vbi.c b/mythtv/libs/libmythtv/vbitext/vbi.c
-index 15f8d85..4c50e8d 100644
---- a/mythtv/libs/libmythtv/vbitext/vbi.c
-+++ b/mythtv/libs/libmythtv/vbitext/vbi.c
-@@ -14,8 +14,12 @@
- // compiling with -std=c99. We could remove this in the .pro file,
- // but that would disable it for all .c files.
- #undef __STRICT_ANSI__
-+#ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
-+#endif
-
- // vbitext headers
- #include "vt.h"
-@@ -29,8 +33,13 @@ static int rawbuf_size; // its current size
-
-
- /***** bttv api *****/
-+#ifdef USING_V4L
- #define BTTV_VBISIZE _IOR('v' , BASE_VIDIOCPRIVATE+8, int)
--
-+#else // !USING_V4L
-+#ifdef USING_V4L2
-+#define BTTV_VBISIZE _IOR('v' , BASE_VIDIOC_PRIVATE+8, int)
-+#endif // USING_V4L2
-+#endif // !USING_V4L
-
- static void
- error(const char *str, ...)
-diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp
-index 5d7a508..635faeb 100644
---- a/mythtv/libs/libmythtv/videosource.cpp
-+++ b/mythtv/libs/libmythtv/videosource.cpp
-@@ -45,7 +45,7 @@ using namespace std;
- #include "dvbtypes.h"
- #endif
-
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
- #endif
-
-@@ -2012,7 +2012,7 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent) :
- setTrigger(cardtype);
- setSaveAll(false);
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- addTarget("V4L", new V4LConfigurationGroup(parent));
- # ifdef USING_IVTV
- addTarget("MPEG", new MPEGConfigurationGroup(parent));
-@@ -2020,7 +2020,7 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent) :
- # ifdef USING_HDPVR
- addTarget("HDPVR", new HDPVRConfigurationGroup(parent));
- # endif // USING_HDPVR
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
-
- #ifdef USING_DVB
- addTarget("DVB", new DVBConfigurationGroup(parent));
-@@ -2201,7 +2201,7 @@ CardType::CardType(const CaptureCard &parent) :
-
- void CardType::fillSelections(SelectSetting* setting)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- setting->addSelection(
- QObject::tr("Analog V4L capture card"), "V4L");
- setting->addSelection(
-@@ -2214,7 +2214,7 @@ void CardType::fillSelections(SelectSetting* setting)
- setting->addSelection(
- QObject::tr("H.264 encoder card (HD-PVR)"), "HDPVR");
- # endif // USING_HDPVR
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
-
- #ifdef USING_DVB
- setting->addSelection(
-@@ -2226,11 +2226,11 @@ void CardType::fillSelections(SelectSetting* setting)
- QObject::tr("FireWire cable box"), "FIREWIRE");
- #endif // USING_FIREWIRE
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- setting->addSelection(
- QObject::tr("USB MPEG-4 encoder box (Plextor ConvertX, etc)"),
- "GO7007");
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
-
- #ifdef USING_HDHOMERUN
- setting->addSelection(
diff --git a/community-staging/mythtv/mythtv.install b/community-staging/mythtv/mythtv.install
deleted file mode 100644
index c29a53454..000000000
--- a/community-staging/mythtv/mythtv.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- echo "See \"MythTV\" on the Archlinux Wiki for installation information - Extensive!!"
-}
-
-post_upgrade() {
- return
-}
-
-post_remove() {
- echo -e "NOTE: mysql database was not removed. To remove run:\nmysql -u root -e 'drop database mythconverg;'"
-}
diff --git a/community-staging/paraview/PKGBUILD b/community-staging/paraview/PKGBUILD
deleted file mode 100644
index 38e3fab49..000000000
--- a/community-staging/paraview/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Michele Mocciola <mickele>
-# Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name>
-
-pkgname=paraview
-pkgver=3.10.1
-pkgrel=3
-pkgdesc='Parallel Visualization Application using VTK.'
-arch=('i686' 'x86_64')
-url='http://www.paraview.org'
-license=('custom')
-depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'libmysqlclient' 'mesa' 'openmpi') #'hdf5'
-makedepends=('cmake' 'desktop-file-utils')
-source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz"
- 'paraview.png'
- 'paraview.desktop'
- 'fixkernelversioncheck.diff')
-md5sums=('d8a9d4a997a720589ffd57568bcdd449'
- 'db623002bc71a257ddfdd0c9c7b14c3f'
- '4e4b7172ed18171c37446fd7c4f1e8f5'
- '9e137af23701f76fc727222ebac23389')
-
-build() {
- cd ParaView-${pkgver}
-
- # patch vtk to fix http://www.vtk.org/Bug/view.php?id=12568
- # remove next pkgver bump
- cd VTK
- patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff
- cd ..
-
- sed -i '20 i#include <stddef.h>' VTK/Utilities/vtkmetaio/metaUtils.cxx
- sed -i 's/stddef.h/cstddef/' VTK/Wrapping/Python/vtkPythonUtil.cxx
- sed -i '36 i#include <vtksys/cstddef>' VTK/Wrapping/Python/PyVTKObject.cxx
-
- # Paraview wants to be built out of source
- mkdir -p build
- cd build
-
- # use -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \ to fix make install error: http://www.cmake.org/pipermail/paraview/2011-February/020268.html
- cmake \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_USE_PTHREADS:BOOL=ON \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DCMAKE_SKIP_RPATH:BOOL=YES \
- -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF \
- -DCMAKE_COLOR_MAKEFILE:BOOL=TRUE \
- -DBUILD_SHARED_LIBS:BOOL=ON \
- -DBUILD_DOCUMENTATION:BOOL=OFF \
- -DBUILD_EXAMPLES:BOOL=OFF \
- -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
- -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
- -DVTK_USE_SYSTEM_PNG:BOOL=ON \
- -DVTK_USE_SYSTEM_TIFF:BOOL=ON \
- -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
- -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
- -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON \
- -DVTK_USE_BOOST:BOOL=OFF \
- -DVTK_USE_OFFSCREEN=TRUE \
- -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
- -DPARAVIEW_USE_MPI:BOOL=ON \
- -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \
- -DPARAVIEW_BUILD_QT_GUI:BOOL=ON \
- -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
- -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
- -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \
- ..
-
- make
-}
-
-package() {
- cd ParaView-${pkgver}/build
-
- make DESTDIR=${pkgdir} install
-
- # Install license
- install -Dm644 ${srcdir}/ParaView-${pkgver}/License_v1.2.txt ${pkgdir}/usr/share/licenses/paraview/LICENSE
-
- # Install desktop shortcuts
- install -Dm644 ${srcdir}/paraview.png ${pkgdir}/usr/share/pixmaps/paraview.png
- desktop-file-install --dir=${pkgdir}/usr/share/applications ${srcdir}/paraview.desktop
-
- # Removes VTK plugin for designer - if you need, you can install vtk
- #rm -rf ${pkgdir}/opt/paraview/plugins
-}
diff --git a/community-staging/paraview/fixkernelversioncheck.diff b/community-staging/paraview/fixkernelversioncheck.diff
deleted file mode 100644
index 165f07366..000000000
--- a/community-staging/paraview/fixkernelversioncheck.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Utilities/vtkhdf5/ConfigureChecks.cmake
-+++ b/Utilities/vtkhdf5/ConfigureChecks.cmake
-@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION)
- ENDIF (HDF5_WANT_DCONV_EXCEPTION)
-
- SET (LINUX_LFS 0)
--IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+IF (CMAKE_SYSTEM MATCHES "Linux")
- # Linux Specific flags
- ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE)
- OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON)
- IF (HDF5_ENABLE_LARGE_FILE)
- SET (LARGEFILE 1)
- ENDIF (HDF5_ENABLE_LARGE_FILE)
--ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+ENDIF (CMAKE_SYSTEM MATCHES "Linux")
- SET (HDF5_EXTRA_FLAGS)
- IF (LINUX_LFS)
- SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
diff --git a/community-staging/paraview/paraview.desktop b/community-staging/paraview/paraview.desktop
deleted file mode 100644
index 2f5b8ec69..000000000
--- a/community-staging/paraview/paraview.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=ParaView
-GenericName=Data Viewer
-Comment=ParaView allows visualization of large data sets
-Type=Application
-Terminal=false
-Icon=paraview
-Categories=Graphics;
-Exec=/usr/bin/paraview
diff --git a/community-staging/paraview/paraview.png b/community-staging/paraview/paraview.png
deleted file mode 100644
index 6e39f3d4f..000000000
--- a/community-staging/paraview/paraview.png
+++ /dev/null
Binary files differ
diff --git a/community-staging/qbittorrent/PKGBUILD b/community-staging/qbittorrent/PKGBUILD
deleted file mode 100644
index 555de294c..000000000
--- a/community-staging/qbittorrent/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-
-pkgname=qbittorrent
-pkgver=2.9.1
-pkgrel=2
-pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library"
-arch=('i686' 'x86_64')
-url="http://www.qbittorrent.org/"
-license=('GPL')
-depends=('qt' 'libtorrent-rasterbar' 'xdg-utils')
-makedepends=('boost' 'geoip')
-optdepends=('python2: needed for search'
- 'geoip: improves peer country resolution')
-install='qbittorrent.install'
-source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz")
-md5sums=('093bb1f7779378a339c20aa3e4ea6d36')
-
-build() {
- cd qbittorrent-${pkgver}
-
- sed -i \
- -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
- -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
- $(find ./ -name '*.py')
-
- ./configure \
- --prefix=/usr
-
- make
-}
-
-package() {
- cd qbittorrent-${pkgver}
-
- make INSTALL_ROOT=${pkgdir} install
-}
diff --git a/community-staging/qbittorrent/qbittorrent.install b/community-staging/qbittorrent/qbittorrent.install
deleted file mode 100644
index e70c054ec..000000000
--- a/community-staging/qbittorrent/qbittorrent.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/community-staging/qmc2/PKGBUILD b/community-staging/qmc2/PKGBUILD
deleted file mode 100644
index 6f94c41ac..000000000
--- a/community-staging/qmc2/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 57115 2011-10-21 23:01:43Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: JJDaNiMoTh <jjdanimoth@gmail.com>
-
-pkgname=qmc2
-pkgver=0.2.b20
-pkgrel=2
-pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME."
-url="http://qmc2.arcadehits.net"
-license=("GPL")
-arch=('i686' 'x86_64')
-depends=('qt' 'phonon' 'sdl' 'libxmu' 'qtwebkit')
-makedepends=('rsync' 'mesa')
-source=("http://downloads.sourceforge.net/project/qmc2/qmc2/$pkgver/qmc2-$pkgver.tar.bz2")
-md5sums=('e868144815ff44a2146e839c2395c6d1')
-
-build() {
- cd "$srcdir/$pkgname"
- export CTIME=0
- make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr
-}
-
-package() {
- cd "$srcdir/$pkgname"
- make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr DESTDIR=$pkgdir install
- mkdir -p $pkgdir/usr/share/{applications,pixmaps}
- install -D -m644 "$srcdir/qmc2/data/img/mame.png" "$pkgdir/usr/share/pixmaps"
-}
diff --git a/community-staging/qtcreator/PKGBUILD b/community-staging/qtcreator/PKGBUILD
deleted file mode 100644
index ab30a1577..000000000
--- a/community-staging/qtcreator/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 57122 2011-10-22 02:45:08Z svenstaro $
-# Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: Dan Vratil <progdan@progdansoft.com>
-# Contributor: thotypous <matiasΘarchlinux-br·org>
-# Contributor: delor <bartekpiech gmail com>
-
-pkgname="qtcreator"
-pkgver=2.3.1
-pkgrel=2
-pkgdesc='Lightweight, cross-platform integrated development environment'
-arch=('i686' 'x86_64')
-url='http://qt.nokia.com/products/developer-tools'
-license=('LGPL')
-depends=('qt>=4.7.4')
-makedepends=('qt-private-headers>=4.7.4' 'git')
-options=('docs')
-source=("http://get.qt.nokia.com/qtcreator/qt-creator-${pkgver}-src.tar.gz"
- 'qtcreator.desktop')
-md5sums=('8aa296ed9034f847bd53ee0424e5ef08'
- 'f1f4680b9838ff0b8f4cf11eb850d662')
-
-build() {
- cd ${srcdir}
- [[ -d build ]] && rm -r build
- mkdir build && cd build
-
- qmake ${srcdir}/qt-creator-${pkgver}-src/qtcreator.pro
- make
-}
-
-package() {
- optdepends=('qt-doc: for the integrated Qt documentation'
- 'gdb: for the debugger'
- 'cmake: for cmake project suppport'
- 'openssh-askpass: for ssh support'
- 'git: for git support'
- 'mercurial: for mercurial support'
- 'bzr: for bazaar support')
-
- cd ${srcdir}/build
-
- make INSTALL_ROOT="${pkgdir}/usr/" install
-
- install -Dm644 ${srcdir}/qtcreator.desktop \
- ${pkgdir}/usr/share/applications/qtcreator.desktop
- install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \
- ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT
-}
diff --git a/community-staging/qtcreator/qtcreator.desktop b/community-staging/qtcreator/qtcreator.desktop
deleted file mode 100644
index 0fd562bd9..000000000
--- a/community-staging/qtcreator/qtcreator.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/qtcreator
-Name=Qt-Creator
-GenericName=C++ IDE
-X-KDE-StartupNotify=true
-Icon=/usr/share/icons/hicolor/128x128/apps/qtcreator.png
-Terminal=false
-Type=Application
-Categories=Qt;Development
diff --git a/community-staging/ruby-glib2/PKGBUILD b/community-staging/ruby-glib2/PKGBUILD
deleted file mode 100644
index bcb4b284a..000000000
--- a/community-staging/ruby-glib2/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 55742 2011-09-18 19:59:34Z bfanella $
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
-# Contributor: kritoke <kritoke@nospam.gmail.com>
-
-pkgname=ruby-glib2
-pkgver=1.0.2
-pkgrel=1
-pkgdesc="Ruby bindings for glib2."
-arch=('i686' 'x86_64')
-url="http://ruby-gnome2.sourceforge.jp"
-license=('LGPL')
-depends=('ruby')
-makedepends=('ruby-pkgconfig')
-source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz)
-md5sums=('231a8a8995c10faacc2fc43d450b6295')
-
-build() {
- cd "$srcdir/ruby-gtk2-$pkgver"
- ruby extconf.rb glib2 --topdir=$pkgdir
- make
-}
-package() {
- cd "$srcdir/ruby-gtk2-$pkgver"
- make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/shotwell/PKGBUILD b/community-staging/shotwell/PKGBUILD
deleted file mode 100644
index 635643525..000000000
--- a/community-staging/shotwell/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 57463 2011-10-28 09:01:56Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
-
-pkgname=shotwell
-pkgver=0.11.4
-pkgrel=5
-pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
-arch=('i686' 'x86_64')
-url="http://yorba.org/shotwell/"
-license=('LGPL2.1')
-depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libraw'
- 'librsvg' 'json-glib' 'desktop-file-utils' 'dconf')
-makedepends=('intltool' 'vala')
-install=shotwell.install
-source=("http://yorba.org/download/shotwell/0.11/shotwell-${pkgver}.tar.bz2"
- "http://ftp.gnome.org/pub/gnome/sources/vala/0.12/vala-0.12.1.tar.bz2"
- "build-hack.patch")
-md5sums=('150899574f8fd96b6a5b87173a6ef3e0'
- 'bf35262cc611de447147d01cbac33767'
- 'afc8657b3fb3803d40f5e621e7857af8')
-
-build() {
- cd "${srcdir}/vala-0.12.1"
- ./configure --prefix=$srcdir/vala --enable-vapigen
- make
- make install
- export PATH=$srcdir/vala/bin:$PATH
-
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr \
- --with-gconf-schema-file-dir=/usr/share/gconf/schemas \
- --disable-schemas-install \
- --disable-desktop-update \
- --disable-icon-update
- # hack
- make || true
- patch -p1 <$srcdir/build-hack.patch
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- rm -f $pkgdir/usr/share/glib-2.0/schemas/gschemas.compiled
-}
diff --git a/community-staging/shotwell/build-hack.patch b/community-staging/shotwell/build-hack.patch
deleted file mode 100644
index 8c65f6a8f..000000000
--- a/community-staging/shotwell/build-hack.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -wbBur shotwell-0.11.4/src/photos/GRaw.c shotwell-0.11.4.my/src/photos/GRaw.c
---- shotwell-0.11.4/src/photos/GRaw.c 2011-10-28 12:44:04.000000000 +0400
-+++ shotwell-0.11.4.my/src/photos/GRaw.c 2011-10-28 12:41:48.000000000 +0400
-@@ -210,7 +210,7 @@
- };
- GRawProcessor* graw_processor_new (enum LibRaw_constructor_flags options);
- GRawProcessor* graw_processor_construct (GType object_type, enum LibRaw_constructor_flags options);
--void graw_processor_add_masked_borders_to_bitmap (GRawProcessor* self);
-+//void graw_processor_add_masked_borders_to_bitmap (GRawProcessor* self);
- void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error);
- void graw_processor_document_mode_processing (GRawProcessor* self, GError** error);
- libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self);
-@@ -223,7 +223,7 @@
- void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GError** error);
- void graw_processor_process (GRawProcessor* self, GError** error);
- void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename, GError** error);
--void graw_processor_rotate_fuji_raw (GRawProcessor* self, GError** error);
-+//void graw_processor_rotate_fuji_raw (GRawProcessor* self, GError** error);
- void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GError** error);
- void graw_processor_recycle (GRawProcessor* self);
- void graw_processor_unpack (GRawProcessor* self, GError** error);
-@@ -677,12 +677,12 @@
- return graw_processor_construct (GRAW_TYPE_PROCESSOR, options);
- }
-
--
-+#if 0
- void graw_processor_add_masked_borders_to_bitmap (GRawProcessor* self) {
- g_return_if_fail (GRAW_IS_PROCESSOR (self));
- libraw_add_masked_borders_to_bitmap (self->priv->proc);
- }
--
-+#endif
-
- void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error) {
- enum LibRaw_errors _tmp0_;
-@@ -909,7 +909,7 @@
- }
- }
-
--
-+#if 0
- void graw_processor_rotate_fuji_raw (GRawProcessor* self, GError** error) {
- enum LibRaw_errors _tmp0_;
- GError * _inner_error_ = NULL;
-@@ -927,7 +927,7 @@
- }
- }
- }
--
-+#endif
-
- void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GError** error) {
- enum LibRaw_errors _tmp0_;
-@@ -1044,8 +1044,8 @@
- (*_tmp8_).use_camera_matrix = TRUE;
- _tmp9_ = graw_processor_get_output_params (self);
- (*_tmp9_).output_color = (gint) GRAW_COLORSPACE_SRGB;
-- _tmp10_ = graw_processor_get_output_params (self);
-- (*_tmp10_).filtering_mode = LIBRAW_FILTERING_AUTOMATIC;
-+// _tmp10_ = graw_processor_get_output_params (self);
-+// (*_tmp10_).filtering_mode = LIBRAW_FILTERING_AUTOMATIC;
- _tmp11_ = graw_processor_get_output_params (self);
- (*_tmp11_).output_bps = 8;
- _tmp12_ = graw_processor_get_output_params (self);
-@@ -1356,6 +1356,7 @@
- return;
- }
- }
-+#if 0
- case LIBRAW_CANNOT_ADDMASK:
- {
- GError* _tmp10_ = NULL;
-@@ -1372,6 +1373,7 @@
- return;
- }
- }
-+#endif
- case LIBRAW_UNSUFFICIENT_MEMORY:
- {
- GError* _tmp11_ = NULL;
diff --git a/community-staging/shotwell/shotwell.install b/community-staging/shotwell/shotwell.install
deleted file mode 100644
index bab8ecd29..000000000
--- a/community-staging/shotwell/shotwell.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=shotwell
-
-post_install() {
- gtk-update-icon-cache -fq -t usr/share/icons/hicolor
- update-desktop-database -q
- glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- update-desktop-database -q
- gtk-update-icon-cache -fq -t usr/share/icons/hicolor
- glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/community-staging/sigil/PKGBUILD b/community-staging/sigil/PKGBUILD
deleted file mode 100644
index 0b61ea9bf..000000000
--- a/community-staging/sigil/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 57149 2011-10-22 15:18:04Z andrea $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
-
-pkgname=sigil
-pkgver=0.4.2
-pkgrel=2
-pkgdesc="A WYSIWYG ebook editor"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/sigil/"
-license=('GPL3')
-depends=('qt' 'qtwebkit')
-makedepends=('cmake')
-install=sigil.install
-source=(http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip
- ${pkgname}.desktop)
-md5sums=('ce27976254236f8b11b787fd05be9acb'
- 'fef6aa492af487ccccd6b133635cee5a')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake -G "Unix Makefiles" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
- -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON ..
-
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make install DESTDIR="${pkgdir}"
-
- install -d -m 0755 "${pkgdir}"/usr/share/applications
- install -m 0644 "${srcdir}"/${pkgname}.desktop "${pkgdir}"/usr/share/applications
-
- for _pic in 16 32 48 128 256; do
- install -D -m 0644 ../src/Sigil/Resource_Files/icon/app_icon_${_pic}.png \
- "${pkgdir}"/usr/share/icons/hicolor/${_pic}x${_pic}/apps/${pkgname}.png
- done
-}
diff --git a/community-staging/sigil/sigil.desktop b/community-staging/sigil/sigil.desktop
deleted file mode 100755
index 4f3a14d20..000000000
--- a/community-staging/sigil/sigil.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Sigil
-Comment=E-book reader and WYSIWYG editor
-TryExec=sigil
-Exec=sigil
-Icon=sigil
-Categories=Office;
-Terminal=false
-StartupNotify=false
diff --git a/community-staging/sigil/sigil.install b/community-staging/sigil/sigil.install
deleted file mode 100644
index ec506fa93..000000000
--- a/community-staging/sigil/sigil.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/community-staging/texmaker/PKGBUILD b/community-staging/texmaker/PKGBUILD
deleted file mode 100644
index 7db874e08..000000000
--- a/community-staging/texmaker/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: furester <xfurester@hotmail.com>
-# Contributor: Firmicus <firmicus gmx net>
-# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
-
-pkgname=texmaker
-pkgver=3.1
-pkgrel=2
-pkgdesc='Free cross-platform latex editor'
-arch=('i686' 'x86_64')
-url="http://www.xm1math.net/texmaker/index.html"
-license=('GPL')
-depends=('poppler-qt' 'ghostscript' 'qtwebkit')
-source=("http://www.xm1math.net/texmaker/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('10a14c75abbb7234d4e5e58a7c85b110')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- export INSTALL_ROOT=${pkgdir}
-
- qmake -unix PREFIX=//usr texmaker.pro
-
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- export INSTALL_PATH=${pkgdir}
-
- make install
-}
diff --git a/community-staging/wkhtmltopdf/PKGBUILD b/community-staging/wkhtmltopdf/PKGBUILD
deleted file mode 100644
index ba585ae29..000000000
--- a/community-staging/wkhtmltopdf/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 57150 2011-10-22 15:18:09Z andrea $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-
-pkgname=wkhtmltopdf
-pkgver=0.9.9
-pkgrel=2
-pkgdesc="Simple shell utility to convert html to pdf using the webkit rendering engine, and qt"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/wkhtmltopdf/"
-license=('GPL3')
-depends=('qt' 'qtwebkit')
-optdepends=('xorg-server: wkhtmltopdf needs X or Xvfb to operate')
-source=(http://wkhtmltopdf.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-sha1sums=('41f598c0103326e7c13101391447b0284b4ba3cb')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- qmake wkhtmltopdf.pro
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make INSTALL_ROOT="$pkgdir/usr" install
-
- # Generate and install man page
- install -d "$pkgdir/usr/share/man/man1"
- ./wkhtmltopdf --manpage >"$pkgdir/usr/share/man/man1/wkhtmltopdf.1"
-}
diff --git a/community-testing/gedit-plugins/PKGBUILD b/community-testing/gedit-plugins/PKGBUILD
deleted file mode 100644
index be9ad0d28..000000000
--- a/community-testing/gedit-plugins/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 56919 2011-10-16 20:32:19Z ibiru $
-#Maintainer: Ionut Biru <ibiru@archlinux.org>
-#Contributor: Hugo Doria <hugo@archlinux.org>
-#Contributor: Sergej Chodarev <sergejx@centrum.sk>
-#Contributor: zhuqin <zhuqin83@gmail.com>
-
-pkgname=gedit-plugins
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="Set of plugins for gedit"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://live.gnome.org/GeditPlugins"
-depends=('gedit' 'dbus-python')
-optdepends=('gucharmap: for charmap plugin')
-makedepends=('intltool' 'gnome-doc-utils')
-options=('!libtool' '!emptydirs')
-install=gedit-plugins.install
-source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('45dee01a196a7d5e87027187e76d57643b146ea1c313cad2686ebd369890f841')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --with-plugins=all \
- --disable-schemas-compile
-
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
-}
diff --git a/community-testing/gedit-plugins/gedit-plugins.install b/community-testing/gedit-plugins/gedit-plugins.install
deleted file mode 100644
index d5bcc00ae..000000000
--- a/community-testing/gedit-plugins/gedit-plugins.install
+++ /dev/null
@@ -1,23 +0,0 @@
-pkgname=gedit-plugins
-
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
- if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
- usr/sbin/gconfpkg --uninstall ${pkgname}
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-
-post_remove() {
- post_install $1
-}
-
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/cherokee/cherokee-admin-socket-bind.patch b/community/cherokee/cherokee-admin-socket-bind.patch
deleted file mode 100644
index 0b266a245..000000000
--- a/community/cherokee/cherokee-admin-socket-bind.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/cherokee/main_admin.c b/cherokee/main_admin.c
-index 861473f..e52b2d6 100644
---- a/cherokee/main_admin.c
-+++ b/cherokee/main_admin.c
-@@ -89,9 +89,9 @@ find_empty_port (int starting, int *port)
- cherokee_buffer_add_str (&bind_, "127.0.0.1");
-
- cherokee_socket_init (&s);
-- cherokee_socket_create_fd (&s, AF_INET);
-
- while (true) {
-+ cherokee_socket_create_fd (&s, AF_INET);
- ret = cherokee_socket_bind (&s, p, &bind_);
- if (ret == ret_ok)
- break;
-@@ -104,6 +104,7 @@ find_empty_port (int starting, int *port)
- }
- }
-
-+ cherokee_socket_close (&s);
- cherokee_socket_mrproper (&s);
- cherokee_buffer_mrproper (&bind_);
-
diff --git a/community/clamz/unencrypted-amz.patch b/community/clamz/unencrypted-amz.patch
deleted file mode 100644
index 49b03ba8a..000000000
--- a/community/clamz/unencrypted-amz.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- playlist.c 2010-04-19 16:01:59.000000000 -0700
-+++ clamz-0.4/playlist.c 2011-10-18 20:35:39.850146353 -0700
-@@ -499,12 +499,21 @@
- {
- struct parseinfo pi;
- unsigned char *decrypted, *xml;
-- unsigned long decrypted_len;
-+ unsigned long decrypted_len, i;
- int xerr;
-
- decrypted = decrypt_amz_file(b64data, b64len, fname);
-- if (!decrypted)
-- return 1;
-+ if (!decrypted){
-+ // XXX Perhaps the code file is unencrypted already.
-+ decrypted = malloc((b64len + 1) * sizeof(char));
-+ if (!decrypted) {
-+ print_error("Out of memory");
-+ return 1;
-+ }
-+ for (i = 0; i < b64len; i++) {
-+ decrypted[i] = b64data[i];
-+ }
-+ }
- decrypted_len = strlen((char*) decrypted);
-
- pi.parser = XML_ParserCreate(NULL);
diff --git a/community/dvdstyler/dvdstyler-ffmpeg.patch b/community/dvdstyler/dvdstyler-ffmpeg.patch
deleted file mode 100644
index f2f56f6ff..000000000
--- a/community/dvdstyler/dvdstyler-ffmpeg.patch
+++ /dev/null
@@ -1,1915 +0,0 @@
-diff -Naur DVDStyler-1.8.4.3.orig/src/mediatrc_ffmpeg.cpp DVDStyler-1.8.4.3/src/mediatrc_ffmpeg.cpp
---- DVDStyler-1.8.4.3.orig/src/mediatrc_ffmpeg.cpp 2011-05-15 09:23:34.000000000 -0400
-+++ DVDStyler-1.8.4.3/src/mediatrc_ffmpeg.cpp 2011-09-18 18:13:03.000000000 -0400
-@@ -3,7 +3,7 @@
- // Purpose: FFMPEG Media Transcoder
- // Author: Alex Thuering
- // Created: 26.04.2008
--// RCS-ID: $Id: mediatrc_ffmpeg.cpp,v 1.33 2011/05/15 13:23:34 ntalex Exp $
-+// RCS-ID: $Id: mediatrc_ffmpeg.cpp,v 1.34 2011/07/24 07:58:21 ntalex Exp $
- // Copyright: (c) Alex Thuering
- // Licence: GPL
- /////////////////////////////////////////////////////////////////////////////
-@@ -17,21 +17,16 @@
- #include <math.h>
- #include <errno.h>
- extern "C" {
--#ifdef HAVE_FFMPEG_AVUTIL_H
--#include <opt.h>
--#include <swscale.h>
--#include <avutil.h>
--#include <fifo.h>
--#include <avfilter.h>
--#include <avfiltergraph.h>
--#else
--#include <libavcodec/opt.h>
--#include <libswscale/swscale.h>
-+#include <libavutil/opt.h>
- #include <libavutil/avutil.h>
- #include <libavutil/fifo.h>
-+#include <libavutil/dict.h>
-+#include <libavutil/pixdesc.h>
-+#include <libswscale/swscale.h>
-+#include <libavfilter/avcodec.h>
- #include <libavfilter/avfilter.h>
- #include <libavfilter/avfiltergraph.h>
--#endif
-+#include <libavfilter/vsink_buffer.h>
- }
-
- #define AUDIO_BUF_SIZE 50000
-@@ -48,101 +43,19 @@
- #define INT64_MAX INT64_C(9223372036854775807)
- #endif
-
--#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 45, 0)
--#define av_guess_format guess_format
--#endif
--
--#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 64, 0)
--#define AVMediaType CodecType
--#define AVMEDIA_TYPE_UNKNOWN CODEC_TYPE_UNKNOWN
--#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
--#define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
--#define AVMEDIA_TYPE_DATA CODEC_TYPE_DATA
--#define AVMEDIA_TYPE_SUBTITLE CODEC_TYPE_SUBTITLE
--#define AVMEDIA_TYPE_ATTACHMENT CODEC_TYPE_ATTACHMENT
--#define AVMEDIA_TYPE_NB CODEC_TYPE_NB
-+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 4, 0)
-+#define AVIO_FLAG_WRITE AVIO_WRONLY
- #endif
-
- //////////////////////////// AVAudioConvert /////////////////////////////////
--
--struct AVAudioConvert {
-- int in_channels, out_channels;
-- int fmt_pair;
--};
--
--AVAudioConvert *av_audio_convert_alloc(enum AVSampleFormat out_fmt, int out_channels,
-- enum AVSampleFormat in_fmt, int in_channels,
-- const float *matrix, int flags) {
-- AVAudioConvert *ctx;
-- if (in_channels != out_channels)
-- return NULL;
-- ctx = (AVAudioConvert*) av_malloc(sizeof(AVAudioConvert));
-- if (!ctx)
-- return NULL;
-- ctx->in_channels = in_channels;
-- ctx->out_channels = out_channels;
-- ctx->fmt_pair = out_fmt + AV_SAMPLE_FMT_NB * in_fmt;
-- return ctx;
--}
--
--void av_audio_convert_free(AVAudioConvert *ctx) {
-- av_free(ctx);
--}
--
--int av_audio_convert(AVAudioConvert *ctx,
-- void * const out[6], const int out_stride[6],
-- const void * const in[6], const int in_stride[6], int len) {
-- int ch;
--
-- //FIXME optimize common cases
--
-- for (ch = 0; ch < ctx->out_channels; ch++) {
-- const int is = in_stride[ch];
-- const int os = out_stride[ch];
-- const uint8_t *pi = (const uint8_t *) in[ch];
-- uint8_t *po = (uint8_t *) out[ch];
-- uint8_t *end = po + os * len;
-- if (!out[ch])
-- continue;
--
--#define CONV(ofmt, otype, ifmt, expr)\
--if(ctx->fmt_pair == ofmt + AV_SAMPLE_FMT_NB*ifmt){\
-- do{\
-- *(otype*)po = expr; pi += is; po += os;\
-- }while(po < end);\
--}
--
--//FIXME put things below under ifdefs so we do not waste space for cases no codec will need
--//FIXME rounding ?
--
-- CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_U8 , *(const uint8_t*)pi)
-- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)<<8)
-- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)<<24)
-- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)*(1.0 / (1<<7)))
-- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)*(1.0 / (1<<7)))
-- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_S16, (*(const int16_t*)pi>>8) + 0x80)
-- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_S16, *(const int16_t*)pi)
-- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_S16, *(const int16_t*)pi<<16)
-- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_S16, *(const int16_t*)pi*(1.0 / (1<<15)))
-- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_S16, *(const int16_t*)pi*(1.0 / (1<<15)))
-- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_S32, (*(const int32_t*)pi>>24) + 0x80)
-- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_S32, *(const int32_t*)pi>>16)
-- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_S32, *(const int32_t*)pi)
-- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_S32, *(const int32_t*)pi*(1.0 / (1U<<31)))
-- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_S32, *(const int32_t*)pi*(1.0 / (1U<<31)))
-- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_FLT, av_clip_uint8( lrintf(*(const float*)pi * (1<<7)) + 0x80))
-- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_FLT, av_clip_int16( lrintf(*(const float*)pi * (1<<15))))
-- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_FLT, av_clipl_int32(llrintf(*(const float*)pi * (1U<<31))))
-- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_FLT, *(const float*)pi)
-- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_FLT, *(const float*)pi)
-- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_DBL, av_clip_uint8( lrint(*(const double*)pi * (1<<7)) + 0x80))
-- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_DBL, av_clip_int16( lrint(*(const double*)pi * (1<<15))))
-- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_DBL, av_clipl_int32(llrint(*(const double*)pi * (1U<<31))))
-- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_DBL, *(const double*)pi)
-- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_DBL, *(const double*)pi)
-- else return -1;
-- }
-- return 0;
-+// audioconvert.h
-+extern "C" {
-+struct AVAudioConvert;
-+AVAudioConvert *av_audio_convert_alloc(enum AVSampleFormat out_fmt, int out_channels, enum AVSampleFormat in_fmt,
-+ int in_channels, const float *matrix, int flags);
-+void av_audio_convert_free(AVAudioConvert *ctx);
-+int av_audio_convert(AVAudioConvert *ctx, void * const out[6], const int out_stride[6], const void * const in[6],
-+ const int in_stride[6], int len);
- }
-
- //////////////////////////// AVOutputStream /////////////////////////////////
-@@ -161,6 +74,8 @@
- struct AVInputStream *sync_ist; /* input stream to sync against */
- int64_t sync_opts; /* output frame counter, could be changed to some true timestamp *///FIXME look at frame_number
- AVBitStreamFilterContext *bitstream_filters;
-+ AVCodec *enc;
-+
- /* video only */
- int video_resample;
- AVFrame resample_frame; /* temporary frame for image resampling */
-@@ -168,17 +83,19 @@
- int resample_height;
- int resample_width;
- int resample_pix_fmt;
-+ AVRational frame_rate;
-
- float frame_aspect_ratio;
-+
- /* forced key frames */
--// int64_t *forced_kf_pts;
--// int forced_kf_count;
--// int forced_kf_index;
-+ int64_t *forced_kf_pts;
-+ int forced_kf_count;
-+ int forced_kf_index;
-
- /* audio only */
- int audio_resample;
- ReSampleContext *resample; /* for audio resampling */
-- int resample_sample_fmt;
-+ AVSampleFormat resample_sample_fmt;
- int resample_channels;
- int resample_sample_rate;
- int reformat_pair;
-@@ -216,94 +133,22 @@
- } AVInputStream;
-
- typedef struct AVInputFile {
-+ AVFormatContext *ctx;
- int eof_reached; /* true if eof reached */
- int ist_index; /* index of first stream in ist_table */
- int buffer_size; /* current total buffer size */
-- int nb_streams; /* nb streams we are aware of */
- } AVInputFile;
-
--//#include <libavfilter/vsrc_buffer.h>
--extern "C" {
-- int av_vsrc_buffer_add_frame2(AVFilterContext *buffer_filter, AVFrame *frame, int64_t pts,
-- AVRational pixel_aspect, int width, int height, enum PixelFormat pix_fmt, const char *sws_param);
--}
--
--//#include "cmdutils.h"
--typedef struct {
-- enum PixelFormat pix_fmt;
--} FFSinkContext;
--
--int ffsink_init(AVFilterContext *ctx, const char *args, void *opaque)
-+static int configure_video_filters(AVInputStream *ist, AVOutputStream *ost)
- {
-- FFSinkContext *priv = (FFSinkContext*) ctx->priv;
--
-- if (!opaque)
-- return AVERROR(EINVAL);
-- *priv = *(FFSinkContext *)opaque;
--
-- return 0;
--}
--
--void null_end_frame(AVFilterLink *inlink) { }
--
--int ffsink_query_formats(AVFilterContext *ctx) {
-- FFSinkContext *priv = (FFSinkContext*) ctx->priv;
-- int pix_fmts[] = { priv->pix_fmt, PIX_FMT_NONE };
--
-- avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts));
-- return 0;
--}
--
--int get_filtered_video_frame(AVFilterContext *ctx, AVFrame *frame, AVFilterBufferRef **picref_ptr, AVRational *tb) {
-- int ret;
-- AVFilterBufferRef *picref;
--
-- if ((ret = avfilter_request_frame(ctx->inputs[0])) < 0)
-- return ret;
-- if (!(picref = ctx->inputs[0]->cur_buf))
-- return AVERROR(ENOENT);
-- *picref_ptr = picref;
-- ctx->inputs[0]->cur_buf = NULL;
-- *tb = ctx->inputs[0]->time_base;
--
-- memcpy(frame->data, picref->data, sizeof(frame->data));
-- memcpy(frame->linesize, picref->linesize, sizeof(frame->linesize));
-- frame->interlaced_frame = picref->video->interlaced;
-- frame->top_field_first = picref->video->top_field_first;
--
-- return 1;
--}
--
--AVFilter ffsink;
--AVFilterPad fInputs[2];
--AVFilterPad fOutputs[1];
--
--int configure_filters(AVInputStream *ist, AVOutputStream *ost) {
- AVFilterContext *last_filter, *filter;
- /** filter graph containing all filters including input & output */
- AVCodecContext *codec = ost->st->codec;
- AVCodecContext *icodec = ist->st->codec;
-- FFSinkContext ffsink_ctx;
-- ffsink_ctx.pix_fmt = codec->pix_fmt;
-+ enum PixelFormat pix_fmts[] = { codec->pix_fmt, PIX_FMT_NONE };
- AVRational sample_aspect_ratio;
- char args[255];
- int ret;
--
-- ffsink.name = "ffsink";
-- ffsink.priv_size = sizeof(FFSinkContext);
-- ffsink.init = ffsink_init;
-- ffsink.query_formats = ffsink_query_formats;
--
-- fInputs[0].name = "default";
-- fInputs[0].type = AVMEDIA_TYPE_VIDEO;
-- fInputs[0].end_frame = null_end_frame;
-- fInputs[0].min_perms = AV_PERM_READ;
-- fInputs[1].name = NULL;
-- ffsink.inputs = fInputs;
-- fOutputs[0].name = NULL;
-- ffsink.outputs = fOutputs;
--
-- int sws_flags = SWS_BICUBIC;
-
- ost->graph = avfilter_graph_alloc();
-
-@@ -320,8 +165,8 @@
- "src", args, NULL, ost->graph);
- if (ret < 0)
- return ret;
-- ret = avfilter_graph_create_filter(&ost->output_video_filter, &ffsink,
-- "out", NULL, &ffsink_ctx, ost->graph);
-+ ret = avfilter_graph_create_filter(&ost->output_video_filter, avfilter_get_by_name("buffersink"),
-+ "out", NULL, pix_fmts, ost->graph);
- if (ret < 0)
- return ret;
- last_filter = ost->input_video_filter;
-@@ -330,7 +175,7 @@
- snprintf(args, 255, "%d:%d:flags=0x%X",
- codec->width,
- codec->height,
-- sws_flags);
-+ ost->sws_flags);
- if ((ret = avfilter_graph_create_filter(&filter, avfilter_get_by_name("scale"),
- NULL, args, NULL, ost->graph)) < 0)
- return ret;
-@@ -339,12 +184,12 @@
- last_filter = filter;
- }
-
-- snprintf(args, sizeof(args), "flags=0x%X", sws_flags);
-+ snprintf(args, sizeof(args), "flags=0x%X", ost->sws_flags);
- ost->graph->scale_sws_opts = av_strdup(args);
-
- if (ost->avfilter) {
-- AVFilterInOut* outputs = (AVFilterInOut*) av_malloc(sizeof(AVFilterInOut));
-- AVFilterInOut* inputs = (AVFilterInOut*) av_malloc(sizeof(AVFilterInOut));
-+ AVFilterInOut *outputs = avfilter_inout_alloc();
-+ AVFilterInOut *inputs = avfilter_inout_alloc();
-
- outputs->name = av_strdup("in");
- outputs->filter_ctx = last_filter;
-@@ -356,7 +201,7 @@
- inputs->pad_idx = 0;
- inputs->next = NULL;
-
-- if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, inputs, outputs, NULL)) < 0)
-+ if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, &inputs, &outputs, NULL)) < 0)
- return ret;
- av_freep(&ost->avfilter);
- } else {
-@@ -370,8 +215,10 @@
- codec->width = ost->output_video_filter->inputs[0]->w;
- codec->height = ost->output_video_filter->inputs[0]->h;
- codec->sample_aspect_ratio = ost->st->sample_aspect_ratio =
-+ ost->frame_aspect_ratio ? // overriden by the -aspect cli option
-+ av_d2q(ost->frame_aspect_ratio*codec->height/codec->width, 255) :
- ost->output_video_filter->inputs[0]->sample_aspect_ratio;
--
-+
- return 0;
- }
-
-@@ -412,12 +259,11 @@
- }
-
- wxFfmpegMediaTranscoder::wxFfmpegMediaTranscoder(int threadCount) {
-- nb_input_files = 0;
- input_files_ts_scale[0] = NULL;
- nb_input_files_ts_scale[0] = 0;
-- output_codecs = NULL;
-+ input_codecs = NULL;
-+ nb_input_codecs = 0;
- nb_output_files = 0;
-- nb_output_codecs = 0;
- stream_maps = NULL;
- nb_stream_maps = 0;
- nb_meta_data_maps = 0;
-@@ -429,7 +275,6 @@
- frame_width = 0;
- frame_height = 0;
- frame_aspect_ratio = 0;
-- frame_aspect_ratio_override = 0;
- frame_pix_fmt = PIX_FMT_NONE;
- frame_bits_per_raw_sample = 0;
- audio_sample_fmt = SAMPLE_FMT_NONE;
-@@ -476,12 +321,12 @@
- do_psnr = 0;
- do_pass = 0;
- pass_logfilename_prefix = "ffmpeg2pass";
-- video_sync_method= -1;
-- audio_sync_method= 0;
-- audio_drift_threshold= 0.1;
-- copy_ts= 0;
-- opt_shortest = 0; //
-- video_global_header = 0;
-+ video_sync_method = -1;
-+ audio_sync_method = 0;
-+ audio_drift_threshold = 0.1;
-+ copy_ts = 0;
-+ copy_tb = 0;
-+ opt_shortest = 0;
- vstats_filename = NULL;
- vstats_file = NULL;
- opt_programid = 0;
-@@ -519,6 +364,11 @@
- audio_bitstream_filters = NULL;
- subtitle_bitstream_filters = NULL;
-
-+ input_streams = NULL;
-+ nb_input_streams = 0;
-+ input_files = NULL;
-+ nb_input_files = 0;
-+
- av_log_set_callback(&av_log_wxLog_callback);
- }
-
-@@ -531,20 +381,39 @@
- avfilter_register_all();
- }
-
-+// similar to ff_dynarray_add() and av_fast_realloc()
-+void* grow_array(void *array, int elem_size, int *size, int new_size) {
-+ if (new_size >= INT_MAX / elem_size) {
-+ wxLogError(wxT("Array too big."));
-+ return NULL;
-+ }
-+ if (*size < new_size) {
-+ uint8_t* tmp = (uint8_t*) av_realloc(array, new_size*elem_size);
-+ if (!tmp) {
-+ wxLogError(wxT("Could not alloc buffer."));
-+ return NULL;
-+ }
-+ memset(tmp + *size*elem_size, 0, (new_size-*size) * elem_size);
-+ *size = new_size;
-+ return tmp;
-+ }
-+ return array;
-+}
-+
- bool wxFfmpegMediaTranscoder::AddInputFile(const wxString& fileName, bool disableVideo, bool disableAudio,
- bool disableSubtitle) {
- AVFormatContext *ic;
- int err, i, ret, rfps, rfps_base;
- int64_t timestamp;
--
-+
- /* get default parameters from command line */
- ic = avformat_alloc_context();
- if (!ic) {
- PrintError(fileName, AVERROR(ENOMEM));
- return false;
- }
-- ic->flags |= AVFMT_FLAG_NONBLOCK;
--
-+ ic->flags |= AVFMT_FLAG_NONBLOCK | AVFMT_FLAG_PRIV_OPT;
-+
- // open the input file with generic libav function
- err = av_open_input_file(&ic, (const char*) fileName.mb_str(), NULL, 0, NULL);
- if (err < 0) {
-@@ -606,39 +475,38 @@
- for (i=0; i<(int)ic->nb_streams; i++) {
- AVStream *st = ic->streams[i];
- AVCodecContext *dec = st->codec;
-+ AVInputStream *ist;
-+
- dec->thread_count = thread_count;
-+ input_codecs = (AVCodec**) grow_array(input_codecs, sizeof(*input_codecs), &nb_input_codecs, nb_input_codecs + 1);
-+
-+ input_streams = (AVInputStream*) grow_array(input_streams, sizeof(*input_streams), &nb_input_streams, nb_input_streams + 1);
-+ ist = &input_streams[nb_input_streams - 1];
-+ ist->st = st;
-+ ist->file_index = nb_input_files;
-+ ist->discard = 1;
-+
- switch (dec->codec_type) {
- case AVMEDIA_TYPE_AUDIO:
-+ input_codecs[nb_input_codecs-1] = avcodec_find_decoder(dec->codec_id);
- channel_layout = dec->channel_layout;
-- audio_channels = dec->channels;
-- audio_sample_rate = dec->sample_rate;
- audio_sample_fmt = dec->sample_fmt;
- if (disableAudio)
- st->discard = AVDISCARD_ALL;
-- /* Note that av_find_stream_info can add more streams, and we
-- * currently have no chance of setting up lowres decoding
-- * early enough for them. */
-- if (dec->lowres)
-- audio_sample_rate >>= dec->lowres;
- break;
- case AVMEDIA_TYPE_VIDEO:
-- frame_height = dec->height;
-- frame_width = dec->width;
-+ input_codecs[nb_input_codecs-1] = avcodec_find_decoder(dec->codec_id);
- if(st->sample_aspect_ratio.num)
- frame_aspect_ratio=av_q2d(st->sample_aspect_ratio);
- else
- frame_aspect_ratio=av_q2d(dec->sample_aspect_ratio);
- frame_aspect_ratio *= (float) dec->width / dec->height;
-- frame_aspect_ratio_override = 0;
-- frame_pix_fmt = dec->pix_fmt;
- rfps = st->r_frame_rate.num;
- rfps_base = st->r_frame_rate.den;
-- if(dec->lowres) {
-+ if (dec->lowres) {
- dec->flags |= CODEC_FLAG_EMU_EDGE;
-- frame_height >>= dec->lowres;
-- frame_width >>= dec->lowres;
-- dec->height = frame_height;
-- dec->width = frame_width;
-+ dec->height >>= dec->lowres;
-+ dec->width >>= dec->lowres;
- }
- if (me_threshold)
- dec->debug |= FF_DEBUG_MV;
-@@ -650,9 +518,6 @@
- i, (float)dec->time_base.den / dec->time_base.num, dec->time_base.den, dec->time_base.num,
- (float)rfps / rfps_base, rfps, rfps_base);
- }
-- /* update the current frame rate to match the stream frame rate */
-- frame_rate.num = rfps;
-- frame_rate.den = rfps_base;
-
- if (disableVideo)
- st->discard = AVDISCARD_ALL;
-@@ -660,6 +525,7 @@
- case AVMEDIA_TYPE_DATA:
- break;
- case AVMEDIA_TYPE_SUBTITLE:
-+ input_codecs[nb_input_codecs-1] = avcodec_find_decoder(dec->codec_id);
- if (disableSubtitle)
- st->discard = AVDISCARD_ALL;
- break;
-@@ -672,17 +538,26 @@
- }
- }
-
-- input_files[nb_input_files] = ic;
- input_files_ts_offset[nb_input_files] = input_ts_offset - (copy_ts ? 0 : timestamp);
- /* dump the file content */
- if (verbose >= 0)
- av_dump_format(ic, nb_input_files, (const char*)fileName.mb_str(), 0);
-
-- nb_input_files++;
-+ input_files = (AVInputFile*) grow_array(input_files, sizeof(*input_files), &nb_input_files, nb_input_files + 1);
-+ input_files[nb_input_files - 1].ctx = ic;
-+ input_files[nb_input_files - 1].ist_index = nb_input_streams - ic->nb_streams;
-+
- input_files_ts_scale[nb_input_files] = NULL;
- nb_input_files_ts_scale[nb_input_files] = 0;
--
-+
-+ top_field_first = -1;
- video_channel = 0;
-+ frame_rate = (AVRational){0, 0};
-+ frame_pix_fmt = PIX_FMT_NONE;
-+ frame_height = 0;
-+ frame_width = 0;
-+ audio_sample_rate = 0;
-+ audio_channels = 0;
- return true;
- }
-
-@@ -742,27 +617,27 @@
-
- oc->timestamp = recording_timestamp;
-
-- av_metadata_copy(&oc->metadata, metadata, 0);
-- av_metadata_free(&metadata);
--
-+ av_dict_copy(&oc->metadata, metadata, 0);
-+ av_dict_free(&metadata);
-+
- output_files[nb_output_files++] = oc;
-
- /* check filename in case of an image number is expected */
- if (oc->oformat->flags & AVFMT_NEEDNUMBER) {
- if (!av_filename_number_test(oc->filename)) {
-- PrintError(fileName, AVERROR_NUMEXPECTED);
-+ PrintError(fileName, AVERROR(EINVAL));
- return false;
- }
- }
-
- /* test if it already exists to avoid loosing precious files */
-- if (url_exist((const char*) fileName.mb_str())) {
-+ if (avio_check((const char*) fileName.mb_str(), 0) == 0) {
- wxLogError(wxT("File '%s' already exists"), fileName.c_str());
- return false;
- }
-
- /* open the file */
-- int err = avio_open(&oc->pb, (const char*) fileName.mb_str(), URL_WRONLY);
-+ int err = avio_open(&oc->pb, (const char*) fileName.mb_str(), AVIO_FLAG_WRITE);
- if (err < 0) {
- PrintError(fileName, err);
- return false;
-@@ -777,39 +652,24 @@
- oc->preload= (int)(mux_preload*AV_TIME_BASE);
- oc->max_delay= (int)(mux_max_delay*AV_TIME_BASE);
- oc->loop_output = loop_output;
-- oc->flags |= AVFMT_FLAG_NONBLOCK;
--
-+
-+ frame_rate = (AVRational){0, 0};
-+ frame_width = 0;
-+ frame_height = 0;
-+ audio_sample_rate = 0;
-+ audio_channels = 0;
-+
- return true;
- }
-
- void wxFfmpegMediaTranscoder::PrintError(const wxString& msg, int err) {
-- switch (err) {
-- case AVERROR_NUMEXPECTED:
-- wxLogError(wxT("%s: Incorrect image filename syntax.\n"
-- "Use '%%d' to specify the image number:\n"
-- " for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n"
-- " for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'."), msg.c_str());
-- break;
-- case AVERROR_INVALIDDATA:
-- wxLogError(wxT("%s: Error while parsing header"), msg.c_str());
-- break;
-- case AVERROR_NOFMT:
-- wxLogError(wxT("%s: Unknown format"), msg.c_str());
-- break;
-- case AVERROR(EIO):
-- wxLogError(wxT("%s: I/O error occured\n"
-- "Usually that means that input file is truncated and/or corrupted."), msg.c_str());
-- break;
-- case AVERROR(ENOMEM):
-- wxLogError(wxT("%s: memory allocation error occured"), msg.c_str());
-- break;
-- case AVERROR(ENOENT):
-- wxLogError(wxT("%s: no such file or directory"), msg.c_str());
-- break;
-- default:
-- wxLogError(wxT("%s: Error while opening file"), msg.c_str());
-- break;
-- }
-+ char errbuf[128];
-+ const char *errbuf_ptr = errbuf;
-+
-+ if (av_strerror(err, errbuf, sizeof(errbuf)) < 0)
-+ errbuf_ptr = strerror(AVUNERROR(err));
-+ wxString errorStr(errbuf_ptr, wxConvUTF8);
-+ wxLogError(msg + wxT(": ") + errorStr);
- }
-
- void choose_pixel_fmt(AVStream *st, AVCodec *codec) {
-@@ -819,12 +679,15 @@
- if(*p == st->codec->pix_fmt)
- break;
- }
-- if(*p == -1
-- && !( st->codec->codec_id==CODEC_ID_MJPEG
-- && st->codec->strict_std_compliance <= FF_COMPLIANCE_INOFFICIAL
-- && ( st->codec->pix_fmt == PIX_FMT_YUV420P
-- || st->codec->pix_fmt == PIX_FMT_YUV422P)))
-+ if (*p == -1) {
-+ if(st->codec->pix_fmt != PIX_FMT_NONE)
-+ av_log(NULL, AV_LOG_WARNING,
-+ "Incompatible pixel format '%s' for codec '%s', auto-selecting format '%s'\n",
-+ av_pix_fmt_descriptors[st->codec->pix_fmt].name,
-+ codec->name,
-+ av_pix_fmt_descriptors[codec->pix_fmts[0]].name);
- st->codec->pix_fmt = codec->pix_fmts[0];
-+ }
- }
- }
-
-@@ -835,30 +698,20 @@
- if(*p == st->codec->sample_fmt)
- break;
- }
-- if (*p == -1)
-+ if (*p == -1) {
-+ if ((codec->capabilities & CODEC_CAP_LOSSLESS)
-+ && av_get_sample_fmt_name(st->codec->sample_fmt) > av_get_sample_fmt_name(codec->sample_fmts[0]))
-+ av_log(NULL, AV_LOG_ERROR, "Convertion will not be lossless'\n");
-+ av_log(NULL, AV_LOG_WARNING,
-+ "Incompatible sample format '%s' for codec '%s', auto-selecting format '%s'\n",
-+ av_get_sample_fmt_name(st->codec->sample_fmt),
-+ codec->name,
-+ av_get_sample_fmt_name(codec->sample_fmts[0]));
- st->codec->sample_fmt = codec->sample_fmts[0];
-+ }
- }
- }
-
--// similar to ff_dynarray_add() and av_fast_realloc()
--void* grow_array(void *array, int elem_size, int *size, int new_size) {
-- if (new_size >= INT_MAX / elem_size) {
-- wxLogError(wxT("Array too big."));
-- return NULL;
-- }
-- if (*size < new_size) {
-- uint8_t* tmp = (uint8_t*) av_realloc(array, new_size*elem_size);
-- if (!tmp) {
-- wxLogError(wxT("Could not alloc buffer."));
-- return NULL;
-- }
-- memset(tmp + *size*elem_size, 0, (new_size-*size) * elem_size);
-- *size = new_size;
-- return tmp;
-- }
-- return array;
--}
--
- void choose_sample_rate(AVStream *st, AVCodec *codec) {
- if (codec && codec->supported_samplerates){
- const int *p= codec->supported_samplerates;
-@@ -893,6 +746,8 @@
- }
- ost->file_index = fileIdx;
- ost->index = idx;
-+
-+ ost->sws_flags = SWS_BICUBIC;
- return ost;
- }
-
-@@ -913,8 +768,6 @@
- if (!ost)
- return false;
-
-- output_codecs = (AVCodec**)
-- grow_array(output_codecs, sizeof(*output_codecs), &nb_output_codecs, nb_output_codecs + 1);
- if (videoFormat != vfCOPY) {
- wxSize frameSize = GetFrameSize(videoFormat);
- frame_width = frameSize.GetWidth();
-@@ -929,21 +782,13 @@
- frame_rate.den = 1001;
- }
- codec = avcodec_find_encoder(codecId);
-- output_codecs[nb_output_codecs-1] = codec;
-+ ost->enc = codec;
-
- char* vfilters = NULL;
- if (m_videoFilters.length()) {
- vfilters = (char*) av_realloc(vfilters, m_videoFilters.length() + 1);
- snprintf(vfilters, m_videoFilters.length() + 1, "%s", (const char*) m_videoFilters.mb_str());
- }
-- if (frame_aspect_ratio_override) {
-- int i = vfilters ? strlen(vfilters) : 0;
-- vfilters = (char*) av_realloc(vfilters, i + 100);
-- snprintf(vfilters + i, 100, "%csetdar=%f", i ? ',' : ' ', frame_aspect_ratio);
-- frame_aspect_ratio = 0;
-- frame_aspect_ratio_override = 0;
-- }
--
- ost->avfilter = vfilters;
- }
-
-@@ -954,17 +799,14 @@
- st->codec->thread_count = thread_count;
-
- video_enc = st->codec;
--
-+
- if (video_codec_tag)
- video_enc->codec_tag= video_codec_tag;
--
-- if ((video_global_header&1) || (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))) {
-+
-+ if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
- video_enc->flags |= CODEC_FLAG_GLOBAL_HEADER;
- }
-- if (video_global_header&2) {
-- video_enc->flags2 |= CODEC_FLAG2_LOCAL_HEADER;
-- }
--
-+
- if (videoFormat == vfCOPY) {
- st->stream_copy = 1;
- video_enc->codec_type = AVMEDIA_TYPE_VIDEO;
-@@ -974,8 +816,6 @@
- const char *p;
- int i;
-
-- AVRational fps= frame_rate.num ? frame_rate : (AVRational) {25,1};
--
- av_set_int(video_enc, "gop", isNTSC(videoFormat) ? 15 : 12);
- av_set_int(video_enc, "b", bitrate * 1000);
- av_set_int(video_enc, "maxrate", vbr ? 9000000 : bitrate * 1000);
-@@ -985,20 +825,16 @@
- av_set_int(video_enc, "packetsize", 2048);
- av_set_int(video_enc, "muxrate", 10080000);
-
-+ if (frame_rate.num)
-+ ost->frame_rate = frame_rate;
- video_enc->codec_id = codecId;
-
-- if (codec && codec->supported_framerates && !force_fps)
-- fps = codec->supported_framerates[av_find_nearest_q_idx(fps, codec->supported_framerates)];
-- video_enc->time_base.den = fps.num;
-- video_enc->time_base.num = fps.den;
- video_enc->width = frame_width;
- video_enc->height = frame_height;
- video_enc->sample_aspect_ratio = av_d2q(frame_aspect_ratio*frame_height/frame_width, 255);
- video_enc->pix_fmt = frame_pix_fmt;
- st->sample_aspect_ratio = video_enc->sample_aspect_ratio;
--
-- choose_pixel_fmt(st, codec);
--
-+
- if (intra_only)
- video_enc->gop_size = 0;
- if (video_qscale || same_quality) {
-@@ -1059,7 +895,7 @@
- // parse_forced_key_frames(forced_key_frames, ost, video_enc);
- }
- if (video_language) {
-- av_metadata_set2(&st->metadata, "language", video_language, 0);
-+ av_dict_set(&st->metadata, "language", video_language, 0);
- av_freep(&video_language);
- }
-
-@@ -1084,12 +920,10 @@
- if (!ost)
- return false;
-
-- output_codecs = (AVCodec**)
-- grow_array(output_codecs, sizeof(*output_codecs), &nb_output_codecs, nb_output_codecs + 1);
- if (audioFormat != afNONE && audioFormat != afCOPY) {
- codecId = audioFormat == afMP2 ? CODEC_ID_MP2 : CODEC_ID_AC3;
- codec = avcodec_find_encoder(codecId);
-- output_codecs[nb_output_codecs-1] = codec;
-+ ost->enc = codec;
- }
-
- audio_sample_rate = 48000;
-@@ -1110,8 +944,6 @@
- }
- if (audioFormat == afCOPY) {
- st->stream_copy = 1;
-- audio_enc->channels = audio_channels;
-- audio_enc->sample_rate = audio_sample_rate;
- } else {
- av_set_int(audio_enc, "ab", bitrate*1000);
- codec = avcodec_find_encoder(codecId);
-@@ -1122,19 +954,16 @@
- st->quality = FF_QP2LAMBDA * audio_qscale;
- audio_enc->global_quality = (int) st->quality;
- }
-- audio_enc->channels = audio_channels;
-+ if (audio_channels)
-+ audio_enc->channels = audio_channels;
- audio_enc->sample_fmt = audio_sample_fmt;
-- audio_enc->sample_rate = audio_sample_rate;
-+ if (audio_sample_rate)
-+ audio_enc->sample_rate = audio_sample_rate;
- audio_enc->channel_layout = channel_layout;
-- if (av_get_channel_layout_nb_channels(channel_layout) != audio_channels)
-- audio_enc->channel_layout = 0;
- choose_sample_fmt(st, codec);
-- choose_sample_rate(st, codec);
- }
-- audio_enc->sample_rate = audio_sample_rate;
-- audio_enc->time_base= (AVRational) {1, audio_sample_rate};
- if (audio_language) {
-- av_metadata_set2(&st->metadata, "language", audio_language, 0);
-+ av_dict_set(&st->metadata, "language", audio_language, 0);
- av_freep(&audio_language);
- }
-
-@@ -1158,11 +987,10 @@
- return false;
- subtitle_enc = st->codec;
-
-- output_codecs = (AVCodec**)
-- grow_array(output_codecs, sizeof(*output_codecs), &nb_output_codecs, nb_output_codecs + 1);
- if (subtitleFormat != sfNONE) {
- codecId = CODEC_ID_DVD_SUBTITLE;
-- codec = output_codecs[nb_output_codecs-1] = avcodec_find_encoder(codecId);
-+ codec = avcodec_find_encoder(codecId);
-+ ost->enc = codec;
- }
- avcodec_get_context_defaults3(st->codec, codec);
-
-@@ -1181,7 +1009,7 @@
- }
-
- if (subtitle_language) {
-- av_metadata_set2(&st->metadata, "language", subtitle_language, 0);
-+ av_dict_set(&st->metadata, "language", subtitle_language, 0);
- av_freep(&subtitle_language);
- }
-
-@@ -1233,7 +1061,7 @@
- }
-
- int wxFfmpegMediaTranscoder::CopyChapters(int infile, int outfile) {
-- AVFormatContext *is = input_files[infile];
-+ AVFormatContext *is = input_files[infile].ctx;
- AVFormatContext *os = output_files[outfile];
-
- for (unsigned int i = 0; i < is->nb_chapters; i++) {
-@@ -1259,7 +1087,7 @@
- out_ch->end = FFMIN(rt, in_ch->end - ts_off);
-
- if (metadata_chapters_autocopy)
-- av_metadata_copy(&out_ch->metadata, in_ch->metadata, 0);
-+ av_dict_copy(&out_ch->metadata, in_ch->metadata, 0);
-
- os->nb_chapters++;
- os->chapters = (AVChapter**) av_realloc(os->chapters, sizeof(AVChapter)*os->nb_chapters);
-@@ -1272,11 +1100,11 @@
-
- /** Starts transcoding. */
- bool wxFfmpegMediaTranscoder::Run(bool& canceled) {
-- int ret = 0, i, j, k, n, nb_istreams = 0, nb_ostreams = 0, step;
-+ int ret = 0, i, j, k, n, nb_ostreams = 0, step;
- AVFormatContext *is, *os;
- AVCodecContext *codec, *icodec;
- AVOutputStream *ost, **ost_table= NULL;
-- AVInputStream *ist, **ist_table= NULL;
-+ AVInputStream *ist = NULL;
- wxString error;
- int want_sdp = 1;
- int bit_buffer_size = 1024*256;
-@@ -1289,46 +1117,10 @@
- if (canceled)
- return false;
-
-- AVInputFile* file_table = (AVInputFile*) av_mallocz(nb_input_files*sizeof(AVInputFile));
-- if (!file_table)
-- goto fail;
--
-- /* input stream init */
-- j = 0;
-- for (i=0; i<nb_input_files; i++) {
-- is = input_files[i];
-- file_table[i].ist_index = j;
-- file_table[i].nb_streams = is->nb_streams;
-- j += is->nb_streams;;
-- }
-- nb_istreams = j;
--
-- ist_table = (AVInputStream**) av_mallocz(nb_istreams * sizeof(AVInputStream *));
-- if (!ist_table)
-- goto fail;
--
-- for (i=0; i<nb_istreams; i++) {
-- ist = (AVInputStream*) av_mallocz(sizeof(AVInputStream));
-- if (!ist)
-- goto fail;
-- ist_table[i] = ist;
-- }
-- j = 0;
-- for (i=0; i<nb_input_files; i++) {
-- is = input_files[i];
-- for (k=0; k<(int)is->nb_streams; k++) {
-- ist = ist_table[j++];
-- ist->st = is->streams[k];
-- ist->file_index = i;
-- ist->index = k;
-- ist->discard = 1; /* the stream is discarded by default (changed later) */
--
-- if (rate_emu) {
-- ist->start = av_gettime();
-- }
-- }
-- }
--
-+ if (rate_emu)
-+ for (i = 0; i < nb_input_streams; i++)
-+ input_streams[i].start = av_gettime();
-+
- /* output stream init */
- nb_ostreams = 0;
- for (i=0; i<nb_output_files; i++) {
-@@ -1350,15 +1142,15 @@
- int fi = stream_maps[i].file_index;
- int si = stream_maps[i].stream_index;
-
-- if (fi < 0 || fi > nb_input_files - 1 ||
-- si < 0 || si > file_table[fi].nb_streams - 1) {
-+ if (fi < 0 || fi > (int) nb_input_files - 1 ||
-+ si < 0 || si > (int) input_files[fi].ctx->nb_streams - 1) {
- wxLogError(wxT("Could not find input stream #%d.%d"), fi, si);
- return false;
- }
- fi = stream_maps[i].sync_file_index;
- si = stream_maps[i].sync_stream_index;
- if (fi < 0 || fi> nb_input_files - 1 ||
-- si < 0 || si> file_table[fi].nb_streams - 1) {
-+ si < 0 || si > (int) input_files[fi].ctx->nb_streams - 1) {
- wxLogError(wxT("Could not find sync stream #%d.%d"), fi, si);
- return false;
- }
-@@ -1379,11 +1171,11 @@
- for(j=0; j<AVMEDIA_TYPE_NB; j++)
- nb_frame_threshold[j] += step;
-
-- for(j=0; j<nb_istreams; j++) {
-+ for(j=0; j<nb_input_streams; j++) {
- int skip=0;
-- ist = ist_table[j];
-+ ist = &input_streams[j];
- if(opt_programid){
-- AVFormatContext *f= input_files[ ist->file_index ];
-+ AVFormatContext *f= input_files[ist->file_index].ctx;
- skip=1;
- for (unsigned int pi=0; pi<f->nb_programs; pi++) {
- AVProgram *p= f->programs[pi];
-@@ -1411,11 +1203,11 @@
- ost = ost_table[n] = output_streams_for_file[k][i];
- ost->st = os->streams[i];
- if (nb_stream_maps > 0) {
-- ost->source_index = file_table[stream_maps[n].file_index].ist_index +
-+ ost->source_index = input_files[stream_maps[n].file_index].ist_index +
- stream_maps[n].stream_index;
-
- /* Sanity check that the stream types match */
-- if (ist_table[ost->source_index]->st->codec->codec_type
-+ if (input_streams[ost->source_index].st->codec->codec_type
- != ost->st->codec->codec_type) {
- wxLogError(wxT("Codec type mismatch for mapping #%d.%d -> #%d.%d"),
- stream_maps[n].file_index, stream_maps[n].stream_index,
-@@ -1426,12 +1218,12 @@
- } else {
- /* get corresponding input stream index : we select the first one with the right type */
- found = 0;
-- for(j=0;j<nb_istreams;j++) {
-+ for (j=0; j < nb_input_streams; j++) {
- int skip=0;
-- ist = ist_table[j];
-+ ist = &input_streams[j];
- if(opt_programid){
- unsigned int pi,si;
-- AVFormatContext *f= input_files[ ist->file_index ];
-+ AVFormatContext *f = input_files[ist->file_index].ctx;
- skip=1;
- for(pi=0; pi<f->nb_programs; pi++){
- AVProgram *p= f->programs[pi];
-@@ -1453,8 +1245,8 @@
- if (!found) {
- if(! opt_programid) {
- /* try again and reuse existing stream */
-- for(j=0;j<nb_istreams;j++) {
-- ist = ist_table[j];
-+ for (j = 0; j < nb_input_streams; j++) {
-+ ist = &input_streams[j];
- if ( ist->st->codec->codec_type == ost->st->codec->codec_type
- && ist->st->discard != AVDISCARD_ALL) {
- ost->source_index = j;
-@@ -1471,10 +1263,10 @@
- }
- }
- }
-- ist = ist_table[ost->source_index];
-+ ist = &input_streams[ost->source_index];
- ist->discard = 0;
- ost->sync_ist = (nb_stream_maps > 0) ?
-- ist_table[file_table[stream_maps[n].sync_file_index].ist_index +
-+ &input_streams[input_files[stream_maps[n].sync_file_index].ist_index +
- stream_maps[n].sync_stream_index] : ist;
- }
- }
-@@ -1483,13 +1275,13 @@
- for (i=0; i<nb_ostreams; i++) {
- ost = ost_table[i];
- os = output_files[ost->file_index];
-- ist = ist_table[ost->source_index];
-+ ist = &input_streams[ost->source_index];
-
- codec = ost->st->codec;
- icodec = ist->st->codec;
-
- if (metadata_streams_autocopy)
-- av_metadata_copy(&ost->st->metadata, ist->st->metadata, AV_METADATA_DONT_OVERWRITE);
-+ av_dict_copy(&ost->st->metadata, ist->st->metadata, AV_DICT_DONT_OVERWRITE);
-
- ost->st->disposition = ist->st->disposition;
- codec->bits_per_raw_sample= icodec->bits_per_raw_sample;
-@@ -1520,11 +1312,13 @@
- goto fail;
- memcpy(codec->extradata, icodec->extradata, icodec->extradata_size);
- codec->extradata_size= icodec->extradata_size;
-- if(av_q2d(icodec->time_base)*icodec->ticks_per_frame > av_q2d(ist->st->time_base) && av_q2d(ist->st->time_base) < 1.0/1000){
-- codec->time_base = icodec->time_base;
-- codec->time_base.num *= icodec->ticks_per_frame;
-- } else
-- codec->time_base = ist->st->time_base;
-+ if(!copy_tb && av_q2d(icodec->time_base)*icodec->ticks_per_frame > av_q2d(ist->st->time_base) && av_q2d(ist->st->time_base) < 1.0/500){
-+ codec->time_base = icodec->time_base;
-+ codec->time_base.num *= icodec->ticks_per_frame;
-+ av_reduce(&codec->time_base.num, &codec->time_base.den,
-+ codec->time_base.num, codec->time_base.den, INT_MAX);
-+ } else
-+ codec->time_base = ist->st->time_base;
- switch (codec->codec_type) {
- case AVMEDIA_TYPE_AUDIO:
- if(audio_volume != 256) {
-@@ -1566,12 +1360,25 @@
- return false;
- }
- } else {
-+ if (!ost->enc)
-+ ost->enc = avcodec_find_encoder(ost->st->codec->codec_id);
- switch (codec->codec_type) {
- case AVMEDIA_TYPE_AUDIO:
- ost->fifo= av_fifo_alloc(1024);
- if(!ost->fifo)
- goto fail;
- ost->reformat_pair = MAKE_SFMT_PAIR(AV_SAMPLE_FMT_NONE,AV_SAMPLE_FMT_NONE);
-+ if (!codec->sample_rate) {
-+ codec->sample_rate = icodec->sample_rate;
-+ if (icodec->lowres)
-+ codec->sample_rate >>= icodec->lowres;
-+ }
-+ choose_sample_rate(ost->st, ost->enc);
-+ codec->time_base = (AVRational){1, codec->sample_rate};
-+ if (!codec->channels)
-+ codec->channels = icodec->channels;
-+ if (av_get_channel_layout_nb_channels(codec->channel_layout) != codec->channels)
-+ codec->channel_layout = 0;
- ost->audio_resample = codec->sample_rate != icodec->sample_rate || audio_sync_method > 1;
- icodec->request_channels = codec->channels;
- ist->decoding_needed = 1;
-@@ -1581,6 +1388,9 @@
- ost->resample_channels = icodec->channels;
- break;
- case AVMEDIA_TYPE_VIDEO:
-+ if (codec->pix_fmt == PIX_FMT_NONE)
-+ codec->pix_fmt = icodec->pix_fmt;
-+ choose_pixel_fmt(ost->st, ost->enc);
- if (ost->st->codec->pix_fmt == PIX_FMT_NONE) {
- wxLogError(wxT("Video pixel format is unknown, stream cannot be encoded"));
- return false;
-@@ -1590,13 +1400,30 @@
- if (ost->video_resample) {
- codec->bits_per_raw_sample= frame_bits_per_raw_sample;
- }
-+ if (!codec->width || !codec->height) {
-+ codec->width = icodec->width;
-+ codec->height = icodec->height;
-+ }
- ost->resample_height = icodec->height;
- ost->resample_width = icodec->width;
- ost->resample_pix_fmt= icodec->pix_fmt;
- ost->encoding_needed = 1;
- ist->decoding_needed = 1;
-+
-+ if (!ost->frame_rate.num)
-+ ost->frame_rate = ist->st->r_frame_rate.num ? ist->st->r_frame_rate : (AVRational){25,1};
-+ if (ost->enc && ost->enc->supported_framerates && !force_fps) {
-+ int idx = av_find_nearest_q_idx(ost->frame_rate, ost->enc->supported_framerates);
-+ ost->frame_rate = ost->enc->supported_framerates[idx];
-+ }
-+ codec->time_base = (AVRational){ost->frame_rate.den, ost->frame_rate.num};
-+ if( av_q2d(codec->time_base) < 0.001 && video_sync_method
-+ && (video_sync_method==1 || (video_sync_method<0 && !(os->oformat->flags & AVFMT_VARIABLE_FPS)))){
-+ av_log(os, AV_LOG_WARNING, "Frame rate very high for a muxer not effciciently supporting it.\n"
-+ "Please consider specifiying a lower framerate, a different muxer or -vsync 2\n");
-+ }
-
-- if (configure_filters(ist, ost)) {
-+ if (configure_video_filters(ist, ost)) {
- wxLogError(wxT("Error opening filters!"));
- return false;
- }
-@@ -1653,10 +1480,8 @@
- for (i=0; i<nb_ostreams; i++) {
- ost = ost_table[i];
- if (ost->encoding_needed) {
-- AVCodec *codec = i < nb_output_codecs ? output_codecs[i] : NULL;
-- AVCodecContext *dec = ist_table[ost->source_index]->st->codec;
-- if (!codec)
-- codec = avcodec_find_encoder(ost->st->codec->codec_id);
-+ AVCodec *codec = ost->enc;
-+ AVCodecContext *dec = input_streams[ost->source_index].st->codec;
- if (!codec) {
- error = wxString::Format(wxT("Encoder (codec id %d) not found for output stream #%d.%d"),
- ost->st->codec->codec_id, ost->file_index, ost->index);
-@@ -1683,18 +1508,18 @@
- }
-
- /* open each decoder */
-- for (i=0; i<nb_istreams; i++) {
-- ist = ist_table[i];
-+ for (i = 0; i < nb_input_streams; i++) {
-+ ist = &input_streams[i];
- if (ist->decoding_needed) {
- AVCodec *codec = avcodec_find_decoder(ist->st->codec->codec_id);
- if (!codec) {
- wxLogError(wxT("Decoder (codec id %d) not found for input stream #%d.%d"),
-- ist->st->codec->codec_id, ist->file_index, ist->index);
-+ ist->st->codec->codec_id, ist->file_index, ist->st->index);
- return false;
- }
- if (avcodec_open(ist->st->codec, codec) < 0) {
- wxLogError(wxT("Error while opening decoder for input stream #%d.%d"),
-- ist->file_index, ist->index);
-+ ist->file_index, ist->st->index);
- return false;
- }
- //if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
-@@ -1703,20 +1528,68 @@
- }
-
- /* init pts */
-- for (i=0; i<nb_istreams; i++) {
-+ for (i = 0; i < nb_input_streams; i++) {
- AVStream *st;
-- ist = ist_table[i];
-+ ist = &input_streams[i];
- st= ist->st;
- ist->pts = st->avg_frame_rate.num ? - st->codec->has_b_frames*AV_TIME_BASE / av_q2d(st->avg_frame_rate) : 0;
- ist->next_pts = AV_NOPTS_VALUE;
- ist->is_start = 1;
- }
-+
-+ /* set meta data information from input file if required */
-+ for (i=0;i<nb_meta_data_maps;i++) {
-+ AVFormatContext *files[2];
-+ AVDictionary **meta[2];
-+ int j;
-+
-+#define METADATA_CHECK_INDEX(index, nb_elems, desc)\
-+ if ((index) < 0 || (index) >= (int) (nb_elems)) {\
-+ error = wxString::Format(wxT("Invalid %s index %d while processing metadata maps."), (desc), (index));\
-+ ret = AVERROR(EINVAL);\
-+ goto dump_format;\
-+ }
-+
-+ int out_file_index = meta_data_maps[i][0].file;
-+ int in_file_index = meta_data_maps[i][1].file;
-+ if (in_file_index < 0 || out_file_index < 0)
-+ continue;
-+ METADATA_CHECK_INDEX(out_file_index, nb_output_files, "output file")
-+ METADATA_CHECK_INDEX(in_file_index, nb_input_files, "input file")
-+
-+ files[0] = output_files[out_file_index];
-+ files[1] = input_files[in_file_index].ctx;
-+
-+ for (j = 0; j < 2; j++) {
-+ AVMetaDataMap *map = &meta_data_maps[i][j];
-
-+ switch (map->type) {
-+ case 'g':
-+ meta[j] = &files[j]->metadata;
-+ break;
-+ case 's':
-+ METADATA_CHECK_INDEX(map->index, files[j]->nb_streams, "stream")
-+ meta[j] = &files[j]->streams[map->index]->metadata;
-+ break;
-+ case 'c':
-+ METADATA_CHECK_INDEX(map->index, files[j]->nb_chapters, "chapter")
-+ meta[j] = &files[j]->chapters[map->index]->metadata;
-+ break;
-+ case 'p':
-+ METADATA_CHECK_INDEX(map->index, files[j]->nb_programs, "program")
-+ meta[j] = &files[j]->programs[map->index]->metadata;
-+ break;
-+ }
-+ }
-+
-+ av_dict_copy(meta[0], *meta[1], AV_DICT_DONT_OVERWRITE);
-+ }
-+
- /* copy global metadata by default */
- if (metadata_global_autocopy) {
-
- for (i = 0; i < nb_output_files; i++)
-- av_metadata_copy(&output_files[i]->metadata, input_files[0]->metadata, AV_METADATA_DONT_OVERWRITE);
-+ av_dict_copy(&output_files[i]->metadata, input_files[0].ctx->metadata, AV_DICT_DONT_OVERWRITE);
- }
-
- /* copy chapters according to chapter maps */
-@@ -1742,7 +1615,7 @@
- /* copy chapters from the first input file that has them*/
- if (!nb_chapter_maps)
- for (i = 0; i < nb_input_files; i++) {
-- if (!input_files[i]->nb_chapters)
-+ if (!input_files[i].ctx->nb_chapters)
- continue;
-
- for (j = 0; j < nb_output_files; j++)
-@@ -1776,10 +1649,10 @@
- for(i=0;i<nb_ostreams;i++) {
- ost = ost_table[i];
- wxString msg = wxString::Format(wxT(" Stream #%d.%d -> #%d.%d"),
-- ist_table[ost->source_index]->file_index, ist_table[ost->source_index]->index,
-+ input_streams[ost->source_index].file_index, input_streams[ost->source_index].st->index,
- ost->file_index, ost->index);
-- if (ost->sync_ist != ist_table[ost->source_index])
-- msg += wxString::Format(wxT(" [sync #%d.%d]"), ost->sync_ist->file_index, ost->sync_ist->index);
-+ if (ost->sync_ist != &input_streams[ost->source_index])
-+ msg += wxString::Format(wxT(" [sync #%d.%d]"), ost->sync_ist->file_index, ost->sync_ist->st->index);
- wxLogMessage(msg);
- }
- }
-@@ -1815,12 +1688,12 @@
- double ipts, opts;
- ost = ost_table[i];
- os = output_files[ost->file_index];
-- ist = ist_table[ost->source_index];
-+ ist = &input_streams[ost->source_index];
- if (ist->is_past_recording_time || no_packet[ist->file_index])
- continue;
- opts = ost->st->pts.val * av_q2d(ost->st->time_base);
- ipts = (double)ist->pts;
-- if (!file_table[ist->file_index].eof_reached) {
-+ if (!input_files[ist->file_index].eof_reached) {
- if (ipts < ipts_min) {
- ipts_min = ipts;
- if (input_sync)
-@@ -1853,7 +1726,7 @@
- break;
-
- /* read a frame from it and output it in the fifo */
-- is = input_files[file_index];
-+ is = input_files[file_index].ctx;
- ret= av_read_frame(is, &pkt);
- if(ret == AVERROR(EAGAIN)){
- no_packet[file_index]=1;
-@@ -1861,7 +1734,7 @@
- continue;
- }
- if (ret < 0) {
-- file_table[file_index].eof_reached = 1;
-+ input_files[file_index].eof_reached = 1;
- if (opt_shortest)
- break;
- else
-@@ -1876,11 +1749,11 @@
- // }
-
- /* the following test is needed in case new streams appear
-- dynamically in stream : we ignore them */
-- if (pkt.stream_index >= file_table[file_index].nb_streams)
-+ dynamically in stream : we ignore them */
-+ if (pkt.stream_index >= (int) input_files[file_index].ctx->nb_streams)
- goto discard_packet;
-- ist_index = file_table[file_index].ist_index + pkt.stream_index;
-- ist = ist_table[ist_index];
-+ ist_index = input_files[file_index].ist_index + pkt.stream_index;
-+ ist = &input_streams[ist_index];
- if (ist->discard)
- goto discard_packet;
-
-@@ -1926,7 +1799,7 @@
- //wxLogMessage(wxT("read #%d.%d size=%d"), ist->file_index, ist->index, pkt.size);
- if (!OutputPacket(ist, ist_index, ost_table, nb_ostreams, &pkt, bit_buffer_size, bit_buffer)) {
- if (verbose >= 0)
-- wxLogMessage(wxT("Error while decoding stream #%d.%d"), ist->file_index, ist->index);
-+ wxLogMessage(wxT("Error while decoding stream #%d.%d"), ist->file_index, ist->st->index);
- if (exit_on_error)
- return false;
- av_free_packet(&pkt);
-@@ -1941,8 +1814,8 @@
- }
-
- /* at the end of stream, we must flush the decoder buffers */
-- for (i=0; i<nb_istreams; i++) {
-- ist = ist_table[i];
-+ for (i = 0; i < nb_input_streams; i++) {
-+ ist = &input_streams[i];
- if (ist->decoding_needed)
- OutputPacket(ist, i, ost_table, nb_ostreams, NULL, bit_buffer_size, bit_buffer);
- }
-@@ -1967,8 +1840,8 @@
- }
-
- /* close each decoder */
-- for (i=0; i<nb_istreams; i++) {
-- ist = ist_table[i];
-+ for (i = 0; i < nb_input_streams; i++) {
-+ ist = &input_streams[i];
- if (ist->decoding_needed) {
- avcodec_close(ist->st->codec);
- }
-@@ -1978,15 +1851,7 @@
- ret = 0;
- fail:
- av_freep(&bit_buffer);
-- av_free(file_table);
-
-- if (ist_table) {
-- for (i=0; i<nb_istreams; i++) {
-- ist = ist_table[i];
-- av_free(ist);
-- }
-- av_free(ist_table);
-- }
- if (ost_table) {
- for (i=0; i<nb_ostreams; i++) {
- ost = ost_table[i];
-@@ -2000,7 +1865,7 @@
- av_fifo_free(ost->fifo); /* works even if fifo is not initialized but set to zero */
- av_freep(&ost->st->codec->subtitle_header);
- av_free(ost->resample_frame.data[0]);
--// av_free(ost->forced_kf_pts);
-+ av_free(ost->forced_kf_pts);
- if (ost->video_resample)
- sws_freeContext(ost->img_resample_ctx);
- if (ost->resample)
-@@ -2029,15 +1894,15 @@
- AVFormatContext *os;
- AVOutputStream *ost;
- int ret, i;
-- int got_picture;
-+ int got_output;
- AVFrame picture;
-- void *buffer_to_free;
-+ void *buffer_to_free = NULL;
- unsigned int samples_size = 0;
- AVSubtitle subtitle, *subtitle_to_free;
- int frame_available;
-
- AVPacket avpkt;
-- int bps = av_get_bits_per_sample_fmt(ist->st->codec->sample_fmt)>>3;
-+ int bps = av_get_bytes_per_sample(ist->st->codec->sample_fmt);
-
- if(ist->next_pts == (int64_t) AV_NOPTS_VALUE)
- ist->next_pts= ist->pts;
-@@ -2056,7 +1921,7 @@
- ist->next_pts = ist->pts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q);
-
- //while we have more to decode or while the decoder did output something on EOF
-- while (avpkt.size > 0 || (!pkt && ist->next_pts != ist->pts)) {
-+ while (avpkt.size > 0 || (!pkt && got_output)) {
- uint8_t *data_buf, *decoded_data_buf;
- int data_size, decoded_data_size;
- handle_eof:
-@@ -2090,9 +1955,10 @@
- avpkt.data += ret;
- avpkt.size -= ret;
- data_size = ret;
-+ got_output = decoded_data_size > 0;
- // Some bug in mpeg audio decoder gives
- // decoded_data_size < 0, it seems they are overflows
-- if (decoded_data_size <= 0) {
-+ if (!got_output) {
- // no audio frame
- continue;
- }
-@@ -2106,11 +1972,11 @@
- // XXX: allocate picture correctly
- avcodec_get_frame_defaults(&picture);
-
-- ret = avcodec_decode_video2(ist->st->codec, &picture, &got_picture, &avpkt);
-+ ret = avcodec_decode_video2(ist->st->codec, &picture, &got_output, &avpkt);
- ist->st->quality= picture.quality;
- if (ret < 0)
- goto fail_decode;
-- if (!got_picture) {
-+ if (!got_output) {
- // no picture yet
- goto discard_packet;
- }
-@@ -2121,12 +1987,14 @@
- / ist->st->codec->time_base.den;
- }
- avpkt.size = 0;
-+ buffer_to_free = NULL;
-+ pre_process_video_frame(ist, (AVPicture *)&picture, &buffer_to_free);
- break;
- case AVMEDIA_TYPE_SUBTITLE:
-- ret = avcodec_decode_subtitle2(ist->st->codec, &subtitle, &got_picture, &avpkt);
-+ ret = avcodec_decode_subtitle2(ist->st->codec, &subtitle, &got_output, &avpkt);
- if (ret < 0)
- goto fail_decode;
-- if (!got_picture) {
-+ if (!got_output) {
- goto discard_packet;
- }
- subtitle_to_free = &subtitle;
-@@ -2157,26 +2025,19 @@
- avpkt.size = 0;
- }
-
-- buffer_to_free = NULL;
-- if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
-- pre_process_video_frame(ist, (AVPicture *)&picture, &buffer_to_free);
-- }
--
-- if(ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO){
-- for(i=0;i<nb_ostreams;i++) {
-- ost = ost_table[i];
-- if (ost->input_video_filter && ost->source_index == ist_index) {
-- AVRational sar;
-- if (ist->st->sample_aspect_ratio.num) sar = ist->st->sample_aspect_ratio;
-- else sar = ist->st->codec->sample_aspect_ratio;
-- // add it to be filtered
-- av_vsrc_buffer_add_frame2(ost->input_video_filter, &picture,
-- ist->pts,
-- sar, ist->st->codec->width, ist->st->codec->height,
-- ist->st->codec->pix_fmt, "0:0");
-- }
-- }
-- }
-+ if(ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
-+ if (start_time == 0 || ist->pts >= start_time) {
-+ for(i=0;i<nb_ostreams;i++) {
-+ ost = ost_table[i];
-+ if (ost->input_video_filter && ost->source_index == ist_index) {
-+ if (!picture.sample_aspect_ratio.num)
-+ picture.sample_aspect_ratio = ist->st->sample_aspect_ratio;
-+ picture.pts = ist->pts;
-+
-+ av_vsrc_buffer_add_frame(ost->input_video_filter, &picture, AV_VSRC_BUF_FLAG_OVERWRITE);
-+ }
-+ }
-+ }
-
- // preprocess audio (volume)
- if (ist->st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
-@@ -2209,14 +2070,18 @@
-
- ost = ost_table[i];
- if (ost->source_index == ist_index) {
-- frame_available = ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO ||
-- !ost->output_video_filter || avfilter_poll_frame(ost->output_video_filter->inputs[0]);
-- while (frame_available) {
-- AVRational ist_pts_tb;
-- if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && ost->output_video_filter)
-- get_filtered_video_frame(ost->output_video_filter, &picture, &ost->picref, &ist_pts_tb);
-- if (ost->picref)
-- ist->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q);
-+ frame_available = ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO ||
-+ !ost->output_video_filter || avfilter_poll_frame(ost->output_video_filter->inputs[0]);
-+ while (frame_available) {
-+ if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && ost->output_video_filter) {
-+ AVRational ist_pts_tb = ost->output_video_filter->inputs[0]->time_base;
-+ if (av_vsink_buffer_get_video_buffer_ref(ost->output_video_filter, &ost->picref, 0) < 0)
-+ goto cont;
-+ if (ost->picref) {
-+ avfilter_fill_frame_from_video_buffer_ref(&picture, ost->picref);
-+ ist->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q);
-+ }
-+ }
- os = output_files[ost->file_index];
-
- // set the input output pts pairs
-@@ -2232,7 +2097,7 @@
- break;
- case AVMEDIA_TYPE_VIDEO:
- if (ost->picref->video)
-- ost->st->codec->sample_aspect_ratio = ost->picref->video->pixel_aspect;
-+ ost->st->codec->sample_aspect_ratio = ost->picref->video->sample_aspect_ratio;
- if (!DoVideoOut(os, ost, ist, &picture, &frame_size, bit_buffer_size, bit_buffer))
- return false;
- // if (vstats_filename && frame_size)
-@@ -2249,6 +2114,7 @@
- }
- } else {
- AVFrame avframe; //FIXME/XXX remove this
-+ AVPicture pict;
- AVPacket opkt;
- int64_t ost_tb_start_time= av_rescale_q(start_time, AV_TIME_BASE_Q, ost->st->time_base);
-
-@@ -2298,6 +2164,14 @@
- opkt.size = data_size;
- }
-
-+ if (os->oformat->flags & AVFMT_RAWPICTURE) {
-+ /* store AVPicture in AVPacket, as expected by the output format */
-+ avpicture_fill(&pict, opkt.data, ost->st->codec->pix_fmt, ost->st->codec->width, ost->st->codec->height);
-+ opkt.data = (uint8_t *)&pict;
-+ opkt.size = sizeof(AVPicture);
-+ opkt.flags |= AV_PKT_FLAG_KEY;
-+ }
-+
- if (!WriteFrame(os, &opkt, ost->st->codec, ost->bitstream_filters))
- return false;
-
-@@ -2308,8 +2182,7 @@
- cont:
- frame_available = (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) &&
- ost->output_video_filter && avfilter_poll_frame(ost->output_video_filter->inputs[0]);
-- if(ost->picref)
-- avfilter_unref_buffer(ost->picref);
-+ avfilter_unref_buffer(ost->picref);
- }
- }
- }
-@@ -2348,7 +2221,7 @@
- ret = 0;
- // encode any samples remaining in fifo
- if (fifo_bytes > 0) {
-- int osize = av_get_bits_per_sample_fmt(enc->sample_fmt) >> 3;
-+ int osize = av_get_bytes_per_sample(enc->sample_fmt);
- int fs_tmp = enc->frame_size;
- av_fifo_generic_read(ost->fifo, audio_buf, fifo_bytes, NULL);
- if (enc->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) {
-@@ -2447,11 +2320,11 @@
- int64_t audio_out_size, audio_buf_size;
- int64_t allocated_for_size= size;
-
-- int size_out, frame_bytes, ret;
-+ int size_out, frame_bytes, ret, resample_changed;
- AVCodecContext *enc= ost->st->codec;
- AVCodecContext *dec= ist->st->codec;
-- int osize= av_get_bits_per_sample_fmt(enc->sample_fmt)/8;
-- int isize= av_get_bits_per_sample_fmt(dec->sample_fmt)/8;
-+ int osize= av_get_bytes_per_sample(enc->sample_fmt);
-+ int isize= av_get_bytes_per_sample(dec->sample_fmt);
- const int coded_bps = av_get_bits_per_sample(enc->codec->id);
-
- need_realloc:
-@@ -2481,18 +2354,42 @@
- if (enc->channels != dec->channels)
- ost->audio_resample = 1;
-
-- if (ost->audio_resample && !ost->resample) {
-- if (dec->sample_fmt != SAMPLE_FMT_S16)
-- wxLogWarning(wxT("Warning, using s16 intermediate sample format for resampling"));
-- ost->resample = av_audio_resample_init(enc->channels, dec->channels,
-- enc->sample_rate, dec->sample_rate,
-- enc->sample_fmt, dec->sample_fmt,
-- 16, 10, 0, 0.8);
-- if (!ost->resample) {
-- wxLogError(wxT("Can not resample %d channels @ %d Hz to %d channels @ %d Hz"),
-- dec->channels, dec->sample_rate,
-- enc->channels, enc->sample_rate);
-- return false;
-+ resample_changed = ost->resample_sample_fmt != dec->sample_fmt ||
-+ ost->resample_channels != dec->channels ||
-+ ost->resample_sample_rate != dec->sample_rate;
-+
-+ if ((ost->audio_resample && !ost->resample) || resample_changed) {
-+ if (resample_changed) {
-+ av_log(NULL, AV_LOG_INFO, "Input stream #%d.%d frame changed from rate:%d fmt:%s ch:%d to rate:%d fmt:%s ch:%d\n",
-+ ist->file_index, ist->st->index,
-+ ost->resample_sample_rate, av_get_sample_fmt_name(ost->resample_sample_fmt), ost->resample_channels,
-+ dec->sample_rate, av_get_sample_fmt_name(dec->sample_fmt), dec->channels);
-+ ost->resample_sample_fmt = dec->sample_fmt;
-+ ost->resample_channels = dec->channels;
-+ ost->resample_sample_rate = dec->sample_rate;
-+ if (ost->resample)
-+ audio_resample_close(ost->resample);
-+ }
-+ /* if audio_sync_method is >1 the resampler is needed for audio drift compensation */
-+ if (audio_sync_method <= 1 &&
-+ ost->resample_sample_fmt == enc->sample_fmt &&
-+ ost->resample_channels == enc->channels &&
-+ ost->resample_sample_rate == enc->sample_rate) {
-+ ost->resample = NULL;
-+ ost->audio_resample = 0;
-+ } else {
-+ if (dec->sample_fmt != SAMPLE_FMT_S16)
-+ wxLogWarning(wxT("Warning, using s16 intermediate sample format for resampling"));
-+ ost->resample = av_audio_resample_init(enc->channels, dec->channels,
-+ enc->sample_rate, dec->sample_rate,
-+ enc->sample_fmt, dec->sample_fmt,
-+ 16, 10, 0, 0.8);
-+ if (!ost->resample) {
-+ wxLogError(wxT("Can not resample %d channels @ %d Hz to %d channels @ %d Hz"),
-+ dec->channels, dec->sample_rate,
-+ enc->channels, enc->sample_rate);
-+ return false;
-+ }
- }
- }
-
-@@ -2619,7 +2516,7 @@
- pkt.size= ret;
- if(enc->coded_frame && enc->coded_frame->pts != (int64_t) AV_NOPTS_VALUE)
- pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base);
-- pkt.flags |= PKT_FLAG_KEY;
-+ pkt.flags |= AV_PKT_FLAG_KEY;
- if (!WriteFrame(s, &pkt, ost->st->codec, ost->bitstream_filters))
- return false;
-
-@@ -2704,7 +2601,7 @@
- bool wxFfmpegMediaTranscoder::DoVideoOut(AVFormatContext *s, AVOutputStream *ost,
- AVInputStream *ist, AVFrame *in_picture, int *frame_size,
- int bit_buffer_size, uint8_t* bit_buffer) {
-- int nb_frames, i, ret, av_unused resample_changed;
-+ int nb_frames, i, ret;
- AVFrame *final_picture, *formatted_picture;
- AVCodecContext *enc, *dec;
- double sync_ipts;
-@@ -2787,15 +2684,13 @@
- // handles sameq here. This is not correct because it may not be a global option
- big_picture.quality = same_quality ? (int) ist->st->quality : (int) ost->st->quality;
- if (!me_threshold)
-- big_picture.pict_type = 0;
--// big_picture.pts = AV_NOPTS_VALUE;
-+ big_picture.pict_type = (AVPictureType) 0;
- big_picture.pts= ost->sync_opts;
--// big_picture.pts= av_rescale(ost->sync_opts, AV_TIME_BASE*(int64_t)enc->time_base.num, enc->time_base.den);
--// if (ost->forced_kf_index < ost->forced_kf_count &&
--// big_picture.pts >= ost->forced_kf_pts[ost->forced_kf_index]) {
--// big_picture.pict_type = AV_PICTURE_TYPE_I;
--// ost->forced_kf_index++;
--// }
-+ if (ost->forced_kf_index < ost->forced_kf_count &&
-+ big_picture.pts >= ost->forced_kf_pts[ost->forced_kf_index]) {
-+ big_picture.pict_type = AV_PICTURE_TYPE_I;
-+ ost->forced_kf_index++;
-+ }
- ret = avcodec_encode_video(enc, bit_buffer, bit_buffer_size, &big_picture);
- if (ret < 0) {
- wxLogError(wxT("Video encoding failed"));
-@@ -2806,17 +2701,12 @@
- pkt.size= ret;
- if(enc->coded_frame->pts != (int64_t) AV_NOPTS_VALUE)
- pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base);
-- //av_log(NULL, AV_LOG_DEBUG, "encoder -> %"PRId64"/%"PRId64"\n",
-- //pkt.pts != AV_NOPTS_VALUE ? av_rescale(pkt.pts, enc->time_base.den, AV_TIME_BASE*(int64_t)enc->time_base.num) : -1,
-- //pkt.dts != AV_NOPTS_VALUE ? av_rescale(pkt.dts, enc->time_base.den, AV_TIME_BASE*(int64_t)enc->time_base.num) : -1);
--
-+
- if(enc->coded_frame->key_frame)
- pkt.flags |= AV_PKT_FLAG_KEY;
- WriteFrame(s, &pkt, ost->st->codec, ost->bitstream_filters);
- *frame_size = ret;
- video_size += ret;
-- //wxLogError(wxT("Frame: %3d size: %5d type: %d"),
-- // enc->frame_number-1, ret, enc->pict_type);
- // if two pass, output log
- if (ost->logfile && enc->stats_out) {
- fprintf(ost->logfile, "%s", enc->stats_out);
-@@ -2896,7 +2786,8 @@
- int64_t total_size;
- AVCodecContext *enc;
- int frame_number, vid, i;
-- double bitrate, ti1, pts;
-+ double bitrate;
-+ int64_t pts = INT64_MAX;
- static int64_t last_time = -1;
- static int qp_histogram[52];
-
-@@ -2920,11 +2811,13 @@
- total_size= avio_tell(oc->pb);
-
- wxString msg;
-- ti1 = 1e10;
- vid = 0;
- for (i=0; i<nb_ostreams; i++) {
-+ float q = -1;
- ost = ost_table[i];
- enc = ost->st->codec;
-+ if (!ost->st->stream_copy && enc->coded_frame)
-+ q = enc->coded_frame->quality/(float)FF_QP2LAMBDA;
- if (vid && enc->codec_type == AVMEDIA_TYPE_VIDEO) {
- msg += wxString::Format(wxT("q=%2.1f "),
- !ost->st->stream_copy ? enc->coded_frame->quality/(float)FF_QP2LAMBDA : -1);
-@@ -2940,7 +2833,7 @@
- msg += wxString::Format(wxT("L"));
- if (qp_hist) {
- int j;
-- int qp = (int) rint(enc->coded_frame->quality/(float)FF_QP2LAMBDA);
-+ int qp = lrintf(q);
- if (qp>=0 && qp < (int) (FF_ARRAY_ELEMS(qp_histogram)))
- qp_histogram[qp]++;
- for (j=0; j<32; j++)
-@@ -2971,18 +2864,22 @@
- vid = 1;
- }
- // compute min output value
-- pts = (double)ost->st->pts.val * av_q2d(ost->st->time_base);
-- if ((pts < ti1) && (pts > 0))
-- ti1 = pts;
-+ pts = FFMIN(pts, av_rescale_q(ost->st->pts.val, ost->st->time_base, AV_TIME_BASE_Q));
- }
-- if (ti1 < 0.01)
-- ti1 = 0.01;
-
- if (verbose || is_last_report) {
-- bitrate = (double)(total_size * 8) / ti1 / 1000.0;
-+ int hours, mins, secs, us;
-+ secs = pts / AV_TIME_BASE;
-+ us = pts % AV_TIME_BASE;
-+ mins = secs / 60;
-+ secs %= 60;
-+ hours = mins / 60;
-+ mins %= 60;
-+
-+ bitrate = pts ? total_size * 8 / (pts / 1000.0) : 0;
-
-- msg += wxString::Format(wxT("size=%8.0fkB time=%0.2f bitrate=%6.1fkbits/s"),
-- (double)total_size / 1024, ti1, bitrate);
-+ msg += wxString::Format(wxT("size=%8.0fkB time=%02d:%02d:%02d.%02d bitrate=%6.1fkbits/s"),
-+ (double) total_size / 1024, hours, mins, secs, (100 * us) / AV_TIME_BASE, bitrate);
-
- if (nb_frames_dup || nb_frames_drop)
- msg += wxString::Format(wxT(" dup=%d drop=%d"), nb_frames_dup, nb_frames_drop);
-@@ -3013,10 +2910,9 @@
- }
- nb_output_files = 0;
- for (int i=0; i<nb_input_files; i++) {
-- av_close_input_file(input_files[i]);
-+ av_close_input_file(input_files[i].ctx);
- av_free(input_files_ts_scale[i]);
- }
-- nb_input_files = 0;
-
- av_freep(&intra_matrix);
- av_freep(&inter_matrix);
-@@ -3025,11 +2921,14 @@
- fclose(vstats_file);
- av_freep(&vstats_filename);
-
-- av_freep(&output_codecs);
-- nb_output_codecs = 0;
- av_freep(&stream_maps);
- nb_stream_maps = 0;
-
-+ av_freep(&input_streams);
-+ nb_input_streams = 0;
-+ av_freep(&input_files);
-+ nb_input_files = 0;
-+
- av_freep(&video_standard);
- av_freep(&audio_buf);
- av_freep(&audio_out);
-diff -Naur DVDStyler-1.8.4.3.orig/src/mediatrc_ffmpeg.h DVDStyler-1.8.4.3/src/mediatrc_ffmpeg.h
---- DVDStyler-1.8.4.3.orig/src/mediatrc_ffmpeg.h 2011-05-15 09:23:34.000000000 -0400
-+++ DVDStyler-1.8.4.3/src/mediatrc_ffmpeg.h 2011-09-18 18:13:29.000000000 -0400
-@@ -3,7 +3,7 @@
- // Purpose: FFMPEG Media Transcoder
- // Author: Alex Thuering
- // Created: 26.04.2008
--// RCS-ID: $Id: mediatrc_ffmpeg.h,v 1.19 2011/05/15 13:23:34 ntalex Exp $
-+// RCS-ID: $Id: mediatrc_ffmpeg.h,v 1.20 2011/07/24 07:58:21 ntalex Exp $
- // Copyright: (c) Alex Thuering
- // Licence: GPL
- /////////////////////////////////////////////////////////////////////////////
-@@ -20,13 +20,8 @@
- extern "C" {
- #define __STDC_CONSTANT_MACROS
- #define __STDC_LIMIT_MACROS
--#ifdef HAVE_FFMPEG_AVUTIL_H
--#include <avformat.h>
--#include <swscale.h>
--#else
- #include <libavformat/avformat.h>
- #include <libswscale/swscale.h>
--#endif
- }
-
- // select an input stream for an output stream
-@@ -39,8 +34,9 @@
-
- // select an input file for an output file
- typedef struct AVMetaDataMap {
-- int out_file;
-- int in_file;
-+ int file; //< file index
-+ char type; //< type of metadata to copy -- (g)lobal, (s)tream, (c)hapter or (p)rogram
-+ int index; //< stream/chapter/program number
- } AVMetaDataMap;
-
- typedef struct AVChapterMap {
-@@ -50,6 +46,8 @@
-
- struct AVInputStream;
- struct AVOutputStream;
-+struct AVDictionary;
-+struct AVInputFile;
-
- #define MAX_FILES 50
- #define MAX_STREAMS_ 20
-@@ -108,21 +106,20 @@
- void PrintReport(AVFormatContext **output_files, AVOutputStream **ost_table,
- int nb_ostreams, int is_last_report);
- int CopyChapters(int infile, int outfile);
-- AVFormatContext *input_files[MAX_FILES];
-- int nb_input_files;
- int64_t input_files_ts_offset[MAX_FILES];
- double* input_files_ts_scale[MAX_FILES];
- int nb_input_files_ts_scale[MAX_FILES];
-+
-+ AVCodec **input_codecs;
-+ int nb_input_codecs;
-
- AVFormatContext* output_files[MAX_FILES];
-- AVCodec** output_codecs;
- int nb_output_files;
-- int nb_output_codecs;
-
- AVStreamMap* stream_maps;
- int nb_stream_maps;
-
-- AVMetaDataMap meta_data_maps[MAX_FILES];
-+ AVMetaDataMap (*meta_data_maps)[2];
- int nb_meta_data_maps;
- int metadata_global_autocopy;
- int metadata_streams_autocopy;
-@@ -134,7 +131,6 @@
- int frame_width;
- int frame_height;
- float frame_aspect_ratio;
-- int frame_aspect_ratio_override;
- PixelFormat frame_pix_fmt;
- int frame_bits_per_raw_sample;
- SampleFormat audio_sample_fmt;
-@@ -163,10 +159,10 @@
- int audio_channels;
- unsigned int audio_codec_tag;
- char *audio_language;
--
-+
- char *subtitle_language;
- unsigned int subtitle_codec_tag;
--
-+
- float mux_preload;
- float mux_max_delay;
-
-@@ -174,7 +170,7 @@
- int64_t start_time;
- int64_t recording_timestamp;
- int64_t input_ts_offset;
-- AVMetadata* metadata;
-+ AVDictionary *metadata;
- int do_psnr;
- int do_pass;
- const char *pass_logfilename_prefix;
-@@ -182,8 +178,8 @@
- int audio_sync_method;
- float audio_drift_threshold;
- int copy_ts;
-- int opt_shortest; //
-- int video_global_header;
-+ int copy_tb;
-+ int opt_shortest;
- char *vstats_filename;
- FILE *vstats_file;
- int opt_programid;
-@@ -222,6 +218,12 @@
- AVBitStreamFilterContext *video_bitstream_filters;
- AVBitStreamFilterContext *audio_bitstream_filters;
- AVBitStreamFilterContext *subtitle_bitstream_filters;
-+
-+ AVInputStream *input_streams;
-+ int nb_input_streams;
-+ AVInputFile *input_files;
-+ int nb_input_files;
-+
- AVOutputStream** output_streams_for_file[MAX_FILES];
- int nb_output_streams_for_file[MAX_FILES];
- };
diff --git a/community/e4rat/e4rat.install b/community/e4rat/e4rat.install
deleted file mode 100644
index 4990280e3..000000000
--- a/community/e4rat/e4rat.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
- echo '--------------------------------------------------------------------------'
- echo ' SETUP INSTRUCTIONS'
- echo
- echo ' https://wiki.archlinux.org/index.php/E4rat'
- echo '--------------------------------------------------------------------------'
- echo
- echo '--------------------------------------------------------------------------'
- echo ' SUMMARY'
- echo 'add to grub kernel line:'
- echo ' init=/sbin/e4rat-collect'
- echo
- echo 'log data for 2 min, then'
- echo ' sudo init 1'
- echo ' e4rat-realloc /var/lib/e4rat/startup.log'
- echo
- echo 'substitute init=/sbin/e4rat-collect with'
- echo ' init=/sbin/e4rat-preload'
- echo '--------------------------------------------------------------------------'
-}
diff --git a/community/epdfview/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch b/community/epdfview/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch
deleted file mode 100644
index e077a15cf..000000000
--- a/community/epdfview/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From d30496f52b85f82947bd07b9bd60f8482843ece8 Mon Sep 17 00:00:00 2001
-From: jordi <jordi@cb4bfb15-1111-0410-82e2-95233c8f1c7e>
-Date: Tue, 5 Jul 2011 09:23:38 +0000
-Subject: [PATCH 1/2] When using Poppler 0.17.0, I needed to swap the blue and
- red channels, otherwise the colors (other than black
- and white) looked wierd.
-
-git-svn-id: svn://svn.emma-soft.com/epdfview/trunk@367 cb4bfb15-1111-0410-82e2-95233c8f1c7e
----
- src/PDFDocument.cxx | 20 ++++++++++++++++++++
- 1 files changed, 20 insertions(+), 0 deletions(-)
-
-diff --git a/src/PDFDocument.cxx b/src/PDFDocument.cxx
-index df5d75f..63b3513 100644
---- a/src/PDFDocument.cxx
-+++ b/src/PDFDocument.cxx
-@@ -20,6 +20,7 @@
- #include <time.h>
- #include <poppler.h>
- #include <unistd.h>
-+#include <algorithm>
- #include "epdfview.h"
-
- using namespace ePDFView;
-@@ -33,6 +34,24 @@ static PageLayout convertPageLayout (gint pageLayout);
- static PageMode convertPageMode (gint pageMode);
- static gchar *getAbsoluteFileName (const gchar *fileName);
-
-+namespace
-+{
-+ void
-+ convert_bgra_to_rgba (guint8 *data, int width, int height)
-+ {
-+ using std::swap;
-+
-+ for (int y = 0; y < height; y++)
-+ {
-+ for (int x = 0; x < width; x++)
-+ {
-+ swap(data[0], data[2]);
-+ data += 4;
-+ }
-+ }
-+ }
-+}
-+
- ///
- /// @brief Constructs a new PDFDocument object.
- ///
-@@ -650,6 +669,7 @@ PDFDocument::renderPage (gint pageNum)
- poppler_page_render (page, context);
- cairo_destroy(context);
- cairo_surface_destroy (surface);
-+ convert_bgra_to_rgba(renderedPage->getData (), width, height);
- #else // !HAVE_POPPLER_0_17_0
- // Create the pixbuf from the data and render to it.
- GdkPixbuf *pixbuf = gdk_pixbuf_new_from_data (renderedPage->getData (),
---
-1.7.7
-
diff --git a/community/epdfview/PKGBUILD b/community/epdfview/PKGBUILD
deleted file mode 100644
index 9beb8974c..000000000
--- a/community/epdfview/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 57042 2011-10-19 06:13:49Z schuay $
-# Maintainer: schuay <jakob.gruber@gmail.com>
-# Contributor: Tom K <tomk@runbox.com>
-# Contributor: Thayer Williams <thayer@archlinux.org>
-
-pkgname=epdfview
-pkgver=0.1.8
-pkgrel=3
-pkgdesc="A free lightweight PDF document viewer."
-url="http://www.emma-soft.com/projects/epdfview/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('poppler-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'gtk2')
-makedepends=('pkgconfig')
-install='epdfview.install'
-source=("http://www.emma-soft.com/projects/${pkgname}/chrome/site/releases/${pkgname}-${pkgver}.tar.bz2"
- "${pkgname}.desktop.patch"
- "0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch")
-md5sums=('e50285b01612169b2594fea375f53ae4'
- 'fbf22bbabdbb7544db615ac5775d57e2'
- '7f9ea101a41f5b4e999fd024f423d41f')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -Np0 -i "${srcdir}/${pkgname}.desktop.patch"
- patch -Np1 -i "${srcdir}/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch"
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
- make
-}
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- for size in 24 32 48; do
- install -Dm644 data/icon_${pkgname}-${size}.png \
- "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${pkgname}.png"
- done
-}
diff --git a/community/epdfview/epdfview.desktop.patch b/community/epdfview/epdfview.desktop.patch
deleted file mode 100644
index d86fc3088..000000000
--- a/community/epdfview/epdfview.desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/epdfview.desktop.bak 2009-04-05 16:55:56.000000000 -0700
-+++ data/epdfview.desktop 2009-04-05 16:56:33.000000000 -0700
-@@ -7,7 +7,7 @@
- GenericName=PDF Viewer
- GenericName[ca]=Visor PDF
- GenericName[es]=Visor PDF
--Icon=icon_epdfview-48
-+Icon=epdfview
- Name=ePDFViewer
- Name[ca]=ePDFViewer
- Name[es]=ePDFViewer
diff --git a/community/epdfview/epdfview.install b/community/epdfview/epdfview.install
deleted file mode 100644
index c317fbaca..000000000
--- a/community/epdfview/epdfview.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/community/gcompris/gcompris-data.install b/community/gcompris/gcompris-data.install
deleted file mode 100644
index 950d17bd7..000000000
--- a/community/gcompris/gcompris-data.install
+++ /dev/null
@@ -1,22 +0,0 @@
-infodir=/usr/share/info
-filelist=(gcompris.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/gpa/ChangeLog b/community/gpa/ChangeLog
deleted file mode 100644
index 811f87d4f..000000000
--- a/community/gpa/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2007-06-28 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
-
diff --git a/community/gpa/PKGBUILD b/community/gpa/PKGBUILD
deleted file mode 100644
index 1b2c51e62..000000000
--- a/community/gpa/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 528 2009-08-01 19:41:58Z giovanni $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: Ravi Desai <ravster3@hotmail.com>
-
-pkgname=gpa
-pkgver=0.9.0
-pkgrel=1
-pkgdesc="A graphical user interface for the GnuPG"
-arch=('i686' 'x86_64')
-url="http://wald.intevation.org/projects/gpa/"
-license=('GPL')
-depends=('gpgme' 'gtk2')
-makedepends=('pkgconfig')
-source=(http://wald.intevation.org/frs/download.php/603/gpa-$pkgver.tar.bz2)
-md5sums=('8859f9cf69e94e10e4895f633a0b268a')
-
-build() {
- cd $startdir/src/$pkgname-$pkgver
- ./configure --prefix=/usr
- make || return 1
- make DESTDIR=$startdir/pkg install
-}
diff --git a/community/gtk2hs-cairo/PKGBUILD b/community/gtk2hs-cairo/PKGBUILD
deleted file mode 100644
index cb3fc256b..000000000
--- a/community/gtk2hs-cairo/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 50211 2011-06-26 20:14:36Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-_hkgname=cairo
-pkgname=gtk2hs-cairo
-pkgver=0.12.0
-pkgrel=4
-pkgdesc="Binding to the cairo library for Gtk2Hs."
-url="http://hackage.haskell.org/package/cairo"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc' 'cairo' 'haskell-mtl=2.0.1.0')
-makedepends=(gtk2hs-buildtools)
-options=('strip')
-install=${pkgname}.install
-source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz)
-md5sums=('e17c7ce086062282dbb405bfdf68191e')
-
-build() {
- cd ${srcdir}/${_hkgname}-$pkgver
- runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
- --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
- --libsubdir=\$compiler/site-local/\$pkgid
- runhaskell Setup build
- runhaskell Setup haddock
- runhaskell Setup register --gen-script
- runhaskell Setup unregister --gen-script
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
- _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-`
- depends=("ghc=${_ghcver}" 'cairo' 'haskell-mtl=2.0.1.0')
-
- cd ${srcdir}/${_hkgname}-${pkgver}
- install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
- install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
- install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
- ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
- runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community/gtk2hs-cairo/gtk2hs-cairo.install b/community/gtk2hs-cairo/gtk2hs-cairo.install
deleted file mode 100644
index 4ec5096b6..000000000
--- a/community/gtk2hs-cairo/gtk2hs-cairo.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-cairo
-post_install() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
- ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
- ${HS_DIR}/unregister.sh
-}
-post_remove() {
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/gtk2hs-glib/PKGBUILD b/community/gtk2hs-glib/PKGBUILD
deleted file mode 100644
index e15d65554..000000000
--- a/community/gtk2hs-glib/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 50214 2011-06-26 20:15:38Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-_hkgname=glib
-pkgname=gtk2hs-glib
-pkgver=0.12.0
-pkgrel=3
-pkgdesc="Binding to the GLIB library for Gtk2Hs."
-url="http://hackage.haskell.org/package/glib"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc' 'glib2')
-makedepends=('gtk2hs-buildtools=0.12.0')
-options=('strip')
-install=gtk2hs-glib.install
-source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz)
-md5sums=('2f334374d14a2f3e221a2ebfce1f8817')
-
-build() {
- cd ${srcdir}/${_hkgname}-$pkgver
- runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
- --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
- --libsubdir=\$compiler/site-local/\$pkgid
- runhaskell Setup build
- runhaskell Setup haddock
- runhaskell Setup register --gen-script
- runhaskell Setup unregister --gen-script
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
- _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-`
- depends=("ghc=${_ghcver}" "glib2")
-
- cd ${srcdir}/${_hkgname}-${pkgver}
- install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
- install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
- install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
- ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
- runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community/gtk2hs-glib/gtk2hs-glib.install b/community/gtk2hs-glib/gtk2hs-glib.install
deleted file mode 100644
index 24025f5d8..000000000
--- a/community/gtk2hs-glib/gtk2hs-glib.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-glib
-post_install() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
- ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
- ${HS_DIR}/unregister.sh
-}
-post_remove() {
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/gtk2hs-gtk/PKGBUILD b/community/gtk2hs-gtk/PKGBUILD
deleted file mode 100644
index 0ce59b9b6..000000000
--- a/community/gtk2hs-gtk/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 50218 2011-06-26 20:25:06Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-_hkgname=gtk
-pkgname=gtk2hs-gtk
-pkgver=0.12.0
-pkgrel=4
-pkgdesc="Binding to the gtk library for Gtk2Hs."
-url="http://hackage.haskell.org/package/gtk"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc' 'gtk2' 'gtk2hs-pango=0.12.0' 'haskell-mtl=2.0.1.0')
-makedepends=('gtk2hs-buildtools=0.12.0')
-options=('strip')
-install=gtk2hs-gtk.install
-source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz)
-md5sums=('17a9d34085b703510d8feb2608b5d776')
-
-build() {
- cd ${srcdir}/${_hkgname}-${pkgver}
- runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
- --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
- --libsubdir=\$compiler/site-local/\$pkgid
- runhaskell Setup build
- runhaskell Setup haddock
- runhaskell Setup register --gen-script
- runhaskell Setup unregister --gen-script
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
- _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-`
- depends=("ghc=${_ghcver}" 'gtk2' 'gtk2hs-pango=0.12.0' 'haskell-mtl=2.0.1.0')
-
- cd ${srcdir}/${_hkgname}-${pkgver}
- install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
- install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
- install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
- ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
- runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community/gtk2hs-gtk/gtk2hs-gtk.install b/community/gtk2hs-gtk/gtk2hs-gtk.install
deleted file mode 100644
index 7ed674b78..000000000
--- a/community/gtk2hs-gtk/gtk2hs-gtk.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-gtk
-post_install() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
- ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
- ${HS_DIR}/unregister.sh
-}
-post_remove() {
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/gtk2hs-pango/PKGBUILD b/community/gtk2hs-pango/PKGBUILD
deleted file mode 100644
index 603918954..000000000
--- a/community/gtk2hs-pango/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 50217 2011-06-26 20:24:03Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-_hkgname=pango
-pkgname=gtk2hs-pango
-pkgver=0.12.0
-pkgrel=4
-pkgdesc="Binding to the pango library for Gtk2Hs."
-url="http://hackage.haskell.org/package/pango"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc' 'pango' 'gtk2hs-glib' 'gtk2hs-cairo')
-makedepends=('gtk2hs-buildtools=0.12.0')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('0260ed21d6ca2a52ebaa0aa212390cf7')
-
-build() {
- cd ${srcdir}/${_hkgname}-${pkgver}
- runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
- --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
- --libsubdir=\$compiler/site-local/\$pkgid
- runhaskell Setup build
- runhaskell Setup haddock
- runhaskell Setup register --gen-script
- runhaskell Setup unregister --gen-script
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
- _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-`
- depends=("ghc=${_ghcver}" 'pango' 'gtk2hs-glib' 'gtk2hs-cairo')
-
- cd ${srcdir}/${_hkgname}-${pkgver}
- install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
- install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
- install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
- ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
- runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community/gtk2hs-pango/gtk2hs-pango.install b/community/gtk2hs-pango/gtk2hs-pango.install
deleted file mode 100644
index f2be2100f..000000000
--- a/community/gtk2hs-pango/gtk2hs-pango.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-pango
-post_install() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
- ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
- ${HS_DIR}/unregister.sh
-}
-post_remove() {
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/libcuefile/ChangeLog b/community/libcuefile/ChangeLog
deleted file mode 100644
index e5a5d81dd..000000000
--- a/community/libcuefile/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2010-02-04 Corrado Primier <bardo@aur.archlinux.org>
-
- * PKGBUILD: added to [community]
diff --git a/community/lmctl/PKGBUILD b/community/lmctl/PKGBUILD
deleted file mode 100644
index 8e8931e66..000000000
--- a/community/lmctl/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Jeff Mickey <j@codemac.net>
-# Contributor: Shadowhand <woody.gilk@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=lmctl
-pkgver=0.3.2
-pkgrel=6
-pkgdesc="Logitech Mouse configuration program"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.bedroomlan.org/~alexios/coding_lmctl.html"
-depends=('libusb-compat')
-source=(http://www.bedroomlan.org/~alexios/files/SOFTWARE/lmctl/${pkgname}\_${pkgver}.tar.gz \
- mx-support-cmdline.patch mx-support-man.patch mx-support.patch \
- lmctl.rc.d lmctl.conf.d)
-md5sums=('c2acb088c95adeac68b6de8f05ddc0e4' '431521026fc07b27e21d65124dd1134f' \
- 'cfc222209b9a9d6b203c5a00dafe57dd' '1b943fe045d8273677be43c79bfd1031'
- 'a62ad322e93c1cbc931bba33fb0a518c' 'a77682cf2d2c9e3d1a53a6444a74ce66' )
-
-build() {
- cd ${srcdir}/${pkgname}-0.3.1
-
- patch -Np1 < ${srcdir}/mx-support-cmdline.patch
- patch -Np1 < ${srcdir}/mx-support-man.patch
- patch -Np1 < ${srcdir}/mx-support.patch
-
- ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-0.3.1
-
- make DESTDIR=${pkgdir} install
-
- # install the init scripts
- install -D -m755 ${srcdir}/lmctl.rc.d ${pkgdir}/etc/rc.d/lmctl
- install -D -m644 ${srcdir}/lmctl.conf.d ${pkgdir}/etc/conf.d/lmctl
-}
diff --git a/community/lmctl/lmctl.conf.d b/community/lmctl/lmctl.conf.d
deleted file mode 100644
index 54e532e25..000000000
--- a/community/lmctl/lmctl.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Parameters to be passed to lmctl
-#
-# lmctl --help for more info
-#
-LMCTL_ARGS="--1600 --no-sms"
diff --git a/community/lmctl/lmctl.rc.d b/community/lmctl/lmctl.rc.d
deleted file mode 100644
index e9eaf7de1..000000000
--- a/community/lmctl/lmctl.rc.d
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-LMCTL_ARGS=
-[ -f /etc/conf.d/lmctl ] && . /etc/conf.d/lmctl
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Setting up Logitech Mouse"
- /usr/bin/lmctl ${LMCTL_ARGS} &>/dev/null
- if [ $? -eq 0 ] ; then
- stat_fail
- else
- stat_done
- add_daemon lmctl
- fi
- ;;
- *)
- echo "usage: $0 {start}"
-esac
diff --git a/community/lmctl/mx-support-cmdline.patch b/community/lmctl/mx-support-cmdline.patch
deleted file mode 100644
index f2f7cf068..000000000
--- a/community/lmctl/mx-support-cmdline.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- lmctl-org/src/cmdline.c 2004-09-07 22:40:15.000000000 +0000
-+++ lmctl-0.3.1/src/cmdline.c 2005-06-29 13:36:33.000000000 +0000
-@@ -128,6 +128,10 @@
- "Set matching devices to a resolution of 400cpi"},
- { "800", '8', NULL, 0,
- "Set matching devices to a resolution of 800cpi"},
-+ { "1200", 'm', NULL, 0,
-+ "Set matching devices to a medium resolution of 1200cpi"},
-+ { "1600", 'h', NULL, 0,
-+ "Set matching devices to a high resolution of 1600cpi"},
-
- { NULL, 0, NULL, 0, _("SmartScroll/Cruise Control (SMS command set)") },
-
-@@ -227,13 +231,22 @@
- command = cmd_set;
- set_res = (int) (key - '0') * 100;
- break;
-+
-+ case 'm':
-+ command = cmd_set;
-+ set_res = (int) (12) * 100;
-+ break;
-+ case 'h':
-+ command = cmd_set;
-+ set_res = (int) (16) *100;
-+ break;
-
- case '1': /* set the channel */
- case '2':
- command = cmd_set;
- set_channel = (int) (key - '0');
- break;
--
-+
- case 'u':
- command = cmd_set;
- set_unlock = 1;
diff --git a/community/lmctl/mx-support-man.patch b/community/lmctl/mx-support-man.patch
deleted file mode 100644
index 78d4ff023..000000000
--- a/community/lmctl/mx-support-man.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- lmctl-org/src/lmctl.1 2004-09-07 22:32:25.000000000 +0000
-+++ lmctl-0.3.1/src/lmctl.1 2005-06-29 14:02:32.000000000 +0000
-@@ -116,6 +116,14 @@
- .BR -8 ", " --800
- Sets matching devices to a resolution of 800 cpi. Very useful on
- certain Logitech mice (the MX500 is one of them) that boot in 400 cpi.
-+.TP
-+.BR -m ", " --1200
-+Sets matching devices to a resolution of 1200 cpi. Very useful on
-+certain Logitech mice (the MX518 is one of them) that boot in 400 cpi.
-+.TP
-+.BR -h ", " --1600
-+Sets matching devices to a resolution of 1600 cpi. Very useful on
-+certain Logitech mice (the MX518 is one of them) that boot in 400 cpi.
- .PP
- The following settings control SmartScroll/Cruise Control, for mice
- that support it (i.e. include the SMS capability).
diff --git a/community/lmctl/mx-support.patch b/community/lmctl/mx-support.patch
deleted file mode 100644
index 9c09a9c9b..000000000
--- a/community/lmctl/mx-support.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- lmctl-org/src/lmctl.c 2004-09-08 07:59:55.000000000 +0000
-+++ lmctl-0.3.1/src/lmctl.c 2005-06-29 14:03:50.000000000 +0000
-@@ -99,6 +99,8 @@
- {0xc00e, "Wheel Mouse Optical", "M-BJ58", 0, 1, 0, 0},
- {0xc00f, "MouseMan Traveler", "M-BJ79", 0, 1, 0, 0},
- {0xc012, "MouseMan Dual Optical", "M-BL63B", 0, 1, 0, 0},
-+ {0xc01d, "MX510 Optical Mouse", "M-BS81A", 0, 1, 1, 0},
-+ {0xc01e, "MX518 Optical Mouse", "M-BS81A", 0, 1, 0, 0},
- {0xc024, "MX300 Optical Mouse", "M-BP82", 0, 1, 0, 0},
- {0xc025, "MX500 Optical Mouse", "M-BP81A", 0, 1, 1, 0},
- {0xc031, "iFeel Mouse (silver)", "M-UT58A", 0, 1, 0, 0},
-@@ -270,7 +272,7 @@
- exit(1);
- }
-
-- assert ((buf [0] == 3) || (buf [0] == 4));
-+ assert ((buf [0] == 3) || (buf [0] == 4) || (buf [0] == 5) || (buf [0] == 6));
-
- printf ("\tResolution (RES): %d cpi\n", (buf [0] - 2) * 400);
- }
-@@ -355,7 +357,7 @@
- unsigned char buf [80];
- if (!set_res) return;
-
-- assert ((set_res == 400) || (set_res == 800));
-+ assert ((set_res == 400) || (set_res == 800) || (set_res == 1200) || (set_res == 1600));
- if (usb_control_msg (handle, 0x40, 0x02, 0x000e, (set_res / 400) + 2,
- buf, 0, TIMEOUT) != 0) {
- perror("Writing to USB device");
diff --git a/community/mediatomb/PKGBUILD b/community/mediatomb/PKGBUILD
deleted file mode 100644
index c8850e23c..000000000
--- a/community/mediatomb/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 51077 2011-07-05 06:51:52Z jconder $
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Nikhil Bysani <nikron@gmail.com>
-# Contributor: Mika Hynnä <igheax@gmail.com>
-# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
-
-pkgname=mediatomb
-pkgver=0.12.1
-pkgrel=5
-pkgdesc="Free UPnP/DLNA media server"
-arch=('i686' 'x86_64')
-url="http://mediatomb.cc/"
-license=('GPL')
-depends=('curl' 'ffmpegthumbnailer' 'js' 'libexif' 'libmp4v2' 'sqlite3' 'taglib')
-backup=('etc/conf.d/mediatomb')
-install=mediatomb.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
- 'mediatomb.rc'
- 'mediatomb.conf'
- 'gcc46.patch'
- 'tonewjs.patch')
-md5sums=('e927dd5dc52d3cfcebd8ca1af6f0d3c2'
- 'aa1191ec508d8bd4b3b9a5fe48efc079'
- 'bec297e4178332a26b42bbde873b94cd'
- '0ae34c0d73b76e3d215887834c3c08cf'
- 'd9e02a9956eecf5ff645bddf6dac0331')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -Np1 -i $srcdir/gcc46.patch
- patch -Np1 -i $srcdir/tonewjs.patch
-
- ./configure --prefix=/usr \
- --disable-mysql \
- --enable-libmagic \
- --enable-libjs \
- --enable-ffmpeg
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir/" install
-
- install -D -m0755 "$srcdir/mediatomb.rc" "$pkgdir/etc/rc.d/mediatomb"
- install -D -m0755 "$srcdir/mediatomb.conf" "$pkgdir/etc/conf.d/mediatomb"
- install -d "$pkgdir/var/lib/mediatomb"
-}
diff --git a/community/mediatomb/gcc46.patch b/community/mediatomb/gcc46.patch
deleted file mode 100644
index 0f4fe490f..000000000
--- a/community/mediatomb/gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/zmm/object.h
-+++ b/src/zmm/object.h
-@@ -33,6 +33,7 @@
- #define __ZMM_OBJECT_H__
-
- #include <new> // for size_t
-+#include <cstddef>
- #include "atomic.h"
-
- namespace zmm
diff --git a/community/mediatomb/mediatomb.conf b/community/mediatomb/mediatomb.conf
deleted file mode 100644
index 798018d2a..000000000
--- a/community/mediatomb/mediatomb.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Parameters to be passed to mediatomb
-#
-
-# Port to listen on
-MT_PORT='50500'
-
-# User and group to run as
-MT_USER='nobody'
-MT_GROUP='nobody'
-
-# Location of the PID file
-MT_PIDFILE='/var/run/mediatomb.pid'
-
-# Location of the log file
-MT_LOGFILE='/var/log/mediatomb.log'
-
-# Location of the config file/database
-MT_HOME='/var/lib/mediatomb'
-MT_CFGDIR='.mediatomb'
-
-# User defined command line options
-MT_OPTIONS=''
diff --git a/community/mediatomb/mediatomb.install b/community/mediatomb/mediatomb.install
deleted file mode 100644
index 56f6ef92c..000000000
--- a/community/mediatomb/mediatomb.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install() {
- echo 'Warning: the MediaTomb web interface exposes your filesystem to the network'
- echo 'For maximum security, set <ui enabled="no"> in your MediaTomb config file'
-}
-
-post_upgrade() {
- # TODO: disable next update
- post_install
-}
diff --git a/community/mediatomb/mediatomb.rc b/community/mediatomb/mediatomb.rc
deleted file mode 100644
index 7b93012cd..000000000
--- a/community/mediatomb/mediatomb.rc
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/mediatomb
-
-MT_OPTIONS="-p $MT_PORT -u $MT_USER -g $MT_GROUP -P $MT_PIDFILE \
- -l $MT_LOGFILE -m $MT_HOME -f $MT_CFGDIR $MT_OPTIONS"
-
-case "$1" in
- start)
- stat_busy "Starting Mediatomb UPnP Media Server"
-
- chown "$MT_USER:$MT_GROUP" "$MT_HOME"
-
- if ! pidof -o %PPID /usr/bin/mediatomb &> /dev/null; then
- rm -f "$MT_PIDFILE"
- fi
-
- PID="$(cat "$MT_PIDFILE" 2> /dev/null)"
-
- if [ -z "$PID" ] && /usr/bin/mediatomb -d $MT_OPTIONS; then
- add_daemon mediatomb
- stat_done
- else
- stat_fail
- fi
- ;;
-
- stop)
- stat_busy "Stopping Mediatomb UPnP Media Server"
-
- PID="$(cat "$MT_PIDFILE" 2> /dev/null)"
-
- if [ -n "$PID" ] && kill "$PID" &> /dev/null; then
- rm -f "$MT_PIDFILE"
- rm_daemon mediatomb
- stat_done
- else
- stat_fail
- fi
- ;;
-
- restart)
- "$0" stop
- sleep 1
- "$0" start
- ;;
-
- *)
- echo "usage: $0 {start|stop|restart}"
- ;;
-esac
-exit 0
diff --git a/community/mediatomb/tonewjs.patch b/community/mediatomb/tonewjs.patch
deleted file mode 100644
index 115968530..000000000
--- a/community/mediatomb/tonewjs.patch
+++ /dev/null
@@ -1,564 +0,0 @@
-diff -up mediatomb-0.12.1-back/build/Makefile.in.tonewjs mediatomb-0.12.1-back/build/Makefile.in
---- mediatomb-0.12.1-back/build/Makefile.in.tonewjs 2010-04-08 00:40:15.000000000 +0200
-+++ mediatomb-0.12.1-back/build/Makefile.in 2011-04-19 17:17:01.343509944 +0200
-@@ -257,7 +257,7 @@ CURL_LIBS = @CURL_LIBS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
--CXXFLAGS = @CXXFLAGS@
-+CXXFLAGS = -fpermissive @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@
- DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@
-diff -up mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/import_script.cc
---- mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs 2011-04-18 13:10:48.000000000 +0200
-+++ mediatomb-0.12.1-back/src/scripting/import_script.cc 2011-04-18 13:29:36.000000000 +0200
-@@ -53,8 +53,8 @@ ImportScript::ImportScript(Ref<Runtime>
- try
- {
- load(scriptPath);
-- root = JS_NewScriptObject(cx, script);
-- JS_AddNamedRoot(cx, &root, "ImportScript");
-+ root = JS_NewObject(cx, NULL, script, NULL);
-+ JS_AddNamedObjectRoot(cx, &root, "ImportScript");
- }
- catch (Exception ex)
- {
-@@ -117,7 +117,7 @@ ImportScript::~ImportScript()
- #endif
-
- if (root)
-- JS_RemoveRoot(cx, &root);
-+ JS_RemoveObjectRoot(cx, &root);
-
- #ifdef JS_THREADSAFE
- JS_EndRequest(cx);
-diff -up mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs mediatomb-0.12.1-back/src/scripting/js_functions.cc
---- mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs 2011-04-18 13:29:55.000000000 +0200
-+++ mediatomb-0.12.1-back/src/scripting/js_functions.cc 2011-04-19 16:48:04.009229611 +0200
-@@ -49,7 +49,7 @@ using namespace zmm;
- extern "C" {
-
- JSBool
--js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+js_print(JSContext *cx, uintN argc, jsval *argv)
- {
- uintN i;
- JSString *str;
-@@ -60,19 +60,21 @@ js_print(JSContext *cx, JSObject *obj, u
- if (!str)
- return JS_TRUE;
- argv[i] = STRING_TO_JSVAL(str);
-- log_js("%s\n", JS_GetStringBytes(str));
-+ char * log_str = JS_EncodeString(cx, str);
-+ log_js("%s\n", log_str);
-+ JS_free(cx, log_str);
- }
- return JS_TRUE;
- }
-
- JSBool
--js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+js_copyObject(JSContext *cx, uintN argc, jsval *argv)
- {
- jsval arg;
- JSObject *js_cds_obj;
- JSObject *js_cds_clone_obj;
-
-- Script *self = (Script *)JS_GetPrivate(cx, obj);
-+ Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
-
- try
- {
-@@ -91,7 +93,7 @@ js_copyObject(JSContext *cx, JSObject *o
-
- self->cdsObject2jsObject(cds_obj, js_cds_clone_obj);
-
-- *rval = OBJECT_TO_JSVAL(js_cds_clone_obj);
-+ JS_SET_RVAL(cx, argv, OBJECT_TO_JSVAL(js_cds_clone_obj));
-
- return JS_TRUE;
-
-@@ -110,7 +112,7 @@ js_copyObject(JSContext *cx, JSObject *o
- }
-
- JSBool
--js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+js_addCdsObject(JSContext *cx, uintN argc, jsval *argv)
- {
- try
- {
-@@ -126,7 +128,7 @@ js_addCdsObject(JSContext *cx, JSObject
- Ref<StringConverter> p2i;
- Ref<StringConverter> i2i;
-
-- Script *self = (Script *)JS_GetPrivate(cx, obj);
-+ Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
-
- if (self == NULL)
- {
-@@ -156,20 +158,20 @@ js_addCdsObject(JSContext *cx, JSObject
- if (!str)
- path = _("/");
- else
-- path = JS_GetStringBytes(str);
-+ path = JS_EncodeString(cx, str);
-
- JSString *cont = JS_ValueToString(cx, argv[2]);
- if (cont)
- {
-- containerclass = JS_GetStringBytes(cont);
-+ containerclass = JS_EncodeString(cx, cont);
- if (!string_ok(containerclass) || containerclass == "undefined")
- containerclass = nil;
- }
-
- if (self->whoami() == S_PLAYLIST)
-- js_orig_obj = self->getObjectProperty(obj, _("playlist"));
-+ js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("playlist"));
- else if (self->whoami() == S_IMPORT)
-- js_orig_obj = self->getObjectProperty(obj, _("orig"));
-+ js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("orig"));
-
- if (js_orig_obj == NULL)
- {
-@@ -285,8 +287,7 @@ js_addCdsObject(JSContext *cx, JSObject
- JSString *str2 = JS_NewStringCopyN(cx, tmp.c_str(), tmp.length());
- if (!str2)
- return JS_TRUE;
-- *rval = STRING_TO_JSVAL(str2);
--
-+ JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2));
- return JS_TRUE;
- }
- catch (ServerShutdownException se)
-@@ -302,7 +303,7 @@ js_addCdsObject(JSContext *cx, JSObject
- return JS_TRUE;
- }
-
--static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval, charset_convert_t chr)
-+static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, charset_convert_t chr)
- {
- try
- {
-@@ -321,7 +322,7 @@ static JSBool convert_charset_generic(JS
- {
- str = JS_ValueToString(cx, argv[0]);
- if (str)
-- result = JS_GetStringBytes(str);
-+ result = JS_EncodeString(cx, str);
- }
-
- if (result != nil)
-@@ -330,7 +331,7 @@ static JSBool convert_charset_generic(JS
- JSString *str2 = JS_NewStringCopyN(cx, result.c_str(), result.length());
- if (!str2)
- return JS_TRUE;
-- *rval = STRING_TO_JSVAL(str2);
-+ JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2));
- }
- }
- catch (ServerShutdownException se)
-@@ -347,24 +348,23 @@ static JSBool convert_charset_generic(JS
- }
-
-
--JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv)
- {
-- return convert_charset_generic(cx, obj, argc, argv, rval, F2I);
-+ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, F2I);
- }
-
--JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv)
- {
-- return convert_charset_generic(cx, obj, argc, argv, rval, M2I);
--}
-+ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, M2I); }
-
--JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv)
- {
-- return convert_charset_generic(cx, obj, argc, argv, rval, P2I);
-+ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, P2I);
- }
-
--JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv)
- {
-- return convert_charset_generic(cx, obj, argc, argv, rval, J2I);
-+ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, J2I);
- }
-
- } // extern "C"
-diff -up mediatomb-0.12.1-back/src/scripting/js_functions.h.tonewjs mediatomb-0.12.1-back/src/scripting/js_functions.h
---- mediatomb-0.12.1-back/src/scripting/js_functions.h.tonewjs 2010-03-25 15:58:05.000000000 +0100
-+++ mediatomb-0.12.1-back/src/scripting/js_functions.h 2011-04-18 13:59:29.000000000 +0200
-@@ -40,18 +40,18 @@
- extern "C" {
-
- /// \brief Log output.
--JSBool js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-+JSBool js_print(JSContext *cx, uintN argc, jsval *argv);
-
- /// \brief Adds an object to the database.
--JSBool js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-+JSBool js_addCdsObject(JSContext *cx, uintN argc, jsval *argv);
-
- /// \brief Makes a copy of an CDS object.
--JSBool js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-+JSBool js_copyObject(JSContext *cx, uintN argc, jsval *argv);
-
--JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
--JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
--JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
--JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-+JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv);
-+JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv);
-+JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv);
-+JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv);
-
- } // extern "C"
-
-diff -up mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc
---- mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs 2011-04-18 13:34:14.000000000 +0200
-+++ mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc 2011-04-18 13:51:59.000000000 +0200
-@@ -46,9 +46,9 @@ using namespace zmm;
- extern "C" {
-
- static JSBool
--js_readln(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+js_readln(JSContext *cx, uintN argc, jsval *argv)
- {
-- PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, obj);
-+ PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
-
- String line;
-
-@@ -69,7 +69,7 @@ js_readln(JSContext *cx, JSObject *obj,
-
- JSString *jsline = JS_NewStringCopyZ(cx, line.c_str());
-
-- *rval = STRING_TO_JSVAL(jsline);
-+ JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(jsline));
-
- return JS_TRUE;
- }
-@@ -93,8 +93,8 @@ PlaylistParserScript::PlaylistParserScri
-
- String scriptPath = ConfigManager::getInstance()->getOption(CFG_IMPORT_SCRIPTING_PLAYLIST_SCRIPT);
- load(scriptPath);
-- root = JS_NewScriptObject(cx, script);
-- JS_AddNamedRoot(cx, &root, "PlaylistScript");
-+ root = JS_NewObject(cx, NULL, script, NULL);
-+ JS_AddNamedObjectRoot(cx, &root, "PlaylistScript");
- }
- catch (Exception ex)
- {
-@@ -245,7 +245,7 @@ PlaylistParserScript::~PlaylistParserScr
- #endif
-
- if (root)
-- JS_RemoveRoot(cx, &root);
-+ JS_RemoveObjectRoot(cx, &root);
-
- #ifdef JS_THREADSAFE
- JS_EndRequest(cx);
-diff -up mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/script.cc
---- mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs 2011-04-18 13:53:07.000000000 +0200
-+++ mediatomb-0.12.1-back/src/scripting/script.cc 2011-04-19 18:26:34.460338804 +0200
-@@ -87,7 +87,7 @@ String Script::getProperty(JSObject *obj
- str = JS_ValueToString(cx, val);
- if (! str)
- return nil;
-- return JS_GetStringBytes(str);
-+ return JS_EncodeString(cx, str);
- }
-
- int Script::getBoolProperty(JSObject *obj, String name)
-@@ -427,14 +427,14 @@ static JSFunctionSpec js_global_function
- try
- {
- common_script = _load(common_scr_path);
-- common_root = JS_NewScriptObject(cx, common_script);
-- JS_AddNamedRoot(cx, &common_root, "common-script");
-+ common_root = JS_NewObject(cx, NULL, common_script, NULL);
-+ JS_AddNamedObjectRoot(cx, &common_root, "common-script");
- _execute(common_script);
- }
- catch (Exception e)
- {
- if (common_root)
-- JS_RemoveRoot(cx, &common_root);
-+ JS_RemoveObjectRoot(cx, &common_root);
-
- log_js("Unable to load %s: %s\n", common_scr_path.c_str(),
- e.getMessage().c_str());
-@@ -460,7 +460,7 @@ Script::~Script()
- JS_BeginRequest(cx);
- #endif
- if (common_root)
-- JS_RemoveRoot(cx, &common_root);
-+ JS_RemoveObjectRoot(cx, &common_root);
-
- /*
- * scripts are unrooted and will be cleaned up by GC
-@@ -504,11 +504,11 @@ void Script::initGlobalObject()
- static JSClass global_class =
- {
- "global", /* name */
-- JSCLASS_HAS_PRIVATE, /* flags */
-+ JSCLASS_HAS_PRIVATE | JSCLASS_GLOBAL_FLAGS,/* flags */
- JS_PropertyStub, /* add property */
- JS_PropertyStub, /* del property */
- JS_PropertyStub, /* get property */
-- JS_PropertyStub, /* set property */
-+ JS_StrictPropertyStub, /* set property */
- JS_EnumerateStandardClasses, /* enumerate */
- JS_ResolveStub, /* resolve */
- JS_ConvertStub, /* convert */
-@@ -517,7 +517,7 @@ void Script::initGlobalObject()
- };
-
- /* create the global object here */
-- glob = JS_NewObject(cx, &global_class, NULL, NULL);
-+ glob = JS_NewCompartmentAndGlobalObject(cx, &global_class, NULL);
- if (! glob)
- throw _Exception(_("Scripting: could not initialize glboal class"));
-
-@@ -539,12 +539,12 @@ void Script::defineFunctions(JSFunctionS
- throw _Exception(_("Scripting: JS_DefineFunctions failed"));
- }
-
--JSScript *Script::_load(zmm::String scriptPath)
-+JSObject *Script::_load(zmm::String scriptPath)
- {
- if (glob == NULL)
- initGlobalObject();
-
-- JSScript *scr;
-+ JSObject *scr;
-
- String scriptText = read_text_file(scriptPath);
-
-@@ -571,14 +571,11 @@ JSScript *Script::_load(zmm::String scri
-
- void Script::load(zmm::String scriptPath)
- {
-- if (script)
-- JS_DestroyScript(cx, script);
--
- script = _load((scriptPath));
- }
-
-
--void Script::_execute(JSScript *scr)
-+void Script::_execute(JSObject *scr)
- {
- jsval ret_val;
-
-@@ -662,7 +659,7 @@ Ref<CdsObject> Script::jsObject2cdsObjec
- JSObject *js_meta = getObjectProperty(js, _("meta"));
- if (js_meta)
- {
-- JS_AddNamedRoot(cx, &js_meta, "meta");
-+ JS_AddNamedObjectRoot(cx, &js_meta, "meta");
- /// \todo: only metadata enumerated in MT_KEYS is taken
- for (int i = 0; i < M_MAX; i++)
- {
-@@ -687,7 +684,7 @@ Ref<CdsObject> Script::jsObject2cdsObjec
- }
- }
- }
-- JS_RemoveRoot(cx, &js_meta);
-+ JS_RemoveObjectRoot(cx, &js_meta);
- }
-
- // stuff that has not been exported to js
-diff -up mediatomb-0.12.1-back/src/scripting/script.h.tonewjs mediatomb-0.12.1-back/src/scripting/script.h
---- mediatomb-0.12.1-back/src/scripting/script.h.tonewjs 2011-04-18 12:56:14.000000000 +0200
-+++ mediatomb-0.12.1-back/src/scripting/script.h 2011-04-18 12:56:51.000000000 +0200
-@@ -66,8 +66,8 @@ public:
- JSRuntime *rt;
- JSContext *cx;
- JSObject *glob;
-- JSScript *script;
-- JSScript *common_script;
-+ JSObject *script;
-+ JSObject *common_script;
-
- public:
- Script(zmm::Ref<Runtime> runtime);
-@@ -115,8 +115,8 @@ private:
- JSObject *common_root;
-
- void initGlobalObject();
-- JSScript *_load(zmm::String scriptPath);
-- void _execute(JSScript *scr);
-+ JSObject *_load(zmm::String scriptPath);
-+ void _execute(JSObject *scr);
- zmm::Ref<StringConverter> _p2i;
- zmm::Ref<StringConverter> _j2i;
- zmm::Ref<StringConverter> _f2i;
---- mediatomb-0.12.1/configure.tonewjs 2011-07-04 20:20:00.290227110 +1200
-+++ mediatomb-0.12.1/configure 2011-07-04 20:20:28.186894644 +1200
-@@ -23784,14 +23784,14 @@ if test "x$ac_cv_lib_smjs_JS_NewObject"
-
- else
-
-- LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs $ADD_PTHREAD_CFLAGS"
-- { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5
--$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; }
--if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then
-+ LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs185 $ADD_PTHREAD_CFLAGS"
-+ { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5
-+$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; }
-+if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lmozjs $LIBS"
-+LIBS="-lmozjs185 $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -23835,12 +23835,12 @@ $as_echo "$ac_try_echo") >&5
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_mozjs_JS_NewObject=yes
-+ ac_cv_lib_mozjs185_JS_NewObject=yes
- else
- $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_mozjs_JS_NewObject=no
-+ ac_cv_lib_mozjs185_JS_NewObject=no
- fi
-
- rm -rf conftest.dSYM
-@@ -23848,12 +23848,12 @@ rm -f core conftest.err conftest.$ac_obj
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5
--$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; }
--if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5
-+$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; }
-+if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then
-
-- JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs"
-- MOZLIB=mozjs
-+ JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs185"
-+ MOZLIB=mozjs185
-
- else
-
-@@ -24020,13 +24020,13 @@ if test "x$ac_cv_lib_smjs_JS_NewObject"
- else
-
- unset ac_cv_lib_smjs_JS_NewObject
-- { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5
--$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; }
--if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then
-+ { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5
-+$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; }
-+if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lmozjs $LIBS"
-+LIBS="-lmozjs185 $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -24070,12 +24070,12 @@ $as_echo "$ac_try_echo") >&5
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_mozjs_JS_NewObject=yes
-+ ac_cv_lib_mozjs185_JS_NewObject=yes
- else
- $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_mozjs_JS_NewObject=no
-+ ac_cv_lib_mozjs185_JS_NewObject=no
- fi
-
- rm -rf conftest.dSYM
-@@ -24083,12 +24083,12 @@ rm -f core conftest.err conftest.$ac_obj
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5
--$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; }
--if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5
-+$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; }
-+if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then
-
-- MOZLIB=mozjs
-- JS_LIBS="-lmozjs"
-+ MOZLIB=mozjs185
-+ JS_LIBS="-lmozjs185"
-
- else
-
-@@ -24239,15 +24239,15 @@ if test "x$ac_cv_lib_smjs_JS_NewObject"
-
- else
-
-- LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs"
-- unset ac_cv_lib_mozjs_JS_NewObject
-- { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5
--$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; }
--if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then
-+ LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs185"
-+ unset ac_cv_lib_mozjs185_JS_NewObject
-+ { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5
-+$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; }
-+if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lmozjs $LIBS"
-+LIBS="-lmozjs185 $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -24291,12 +24291,12 @@ $as_echo "$ac_try_echo") >&5
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_mozjs_JS_NewObject=yes
-+ ac_cv_lib_mozjs185_JS_NewObject=yes
- else
- $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_mozjs_JS_NewObject=no
-+ ac_cv_lib_mozjs185_JS_NewObject=no
- fi
-
- rm -rf conftest.dSYM
-@@ -24304,12 +24304,12 @@ rm -f core conftest.err conftest.$ac_obj
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5
--$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; }
--if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5
-+$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; }
-+if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then
-
-- JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs"
-- MOZLIB=mozjs
-+ JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs185"
-+ MOZLIB=mozjs185
-
- else
-
diff --git a/community/ruby-atk/PKGBUILD b/community/ruby-atk/PKGBUILD
deleted file mode 100644
index 2787f8556..000000000
--- a/community/ruby-atk/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 53612 2011-08-07 01:11:19Z bfanella $
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
-# Contributor: kritoke <kritoke@nospam.gmail.com>
-
-pkgname=ruby-atk
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="Ruby bindings for atk."
-arch=('i686' 'x86_64')
-url="http://ruby-gnome2.sourceforge.jp"
-license=('LGPL')
-depends=('ruby-glib2')
-makedepends=('ruby-glib2' 'atk' 'ruby-pkgconfig')
-source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz)
-md5sums=('e9711eb5bd88debda90a920deb96d7d0')
-
-build() {
- cd "$srcdir/ruby-gtk2-$pkgver"
- ruby extconf.rb atk --topdir=$pkgdir
- make
-}
-package() {
- cd "$srcdir/ruby-gtk2-$pkgver"
- make DESTDIR="$pkgdir" install
-}
diff --git a/community/ruby-gdkpixbuf2/PKGBUILD b/community/ruby-gdkpixbuf2/PKGBUILD
deleted file mode 100644
index 7298e2339..000000000
--- a/community/ruby-gdkpixbuf2/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 53620 2011-08-07 02:18:34Z bfanella $
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
-# Contributor: kritoke <kritoke@nospam.gmail.com>
-
-pkgname=ruby-gdkpixbuf2
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="Ruby bindings for gdkpixbuf2."
-arch=('i686' 'x86_64')
-url="http://ruby-gnome2.sourceforge.jp"
-license=('LGPL')
-depends=('ruby-glib2' 'gtk2')
-makedepends=('ruby-glib2' 'ruby-pkgconfig')
-source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz)
-md5sums=('e9711eb5bd88debda90a920deb96d7d0')
-
-build() {
- cd "$srcdir/ruby-gtk2-$pkgver"
- ruby extconf.rb gdk_pixbuf2 --topdir=$pkgdir
- make
-}
-package() {
- cd "$srcdir/ruby-gtk2-$pkgver"
- mkdir -p $pkgdir/usr/lib/pkgconfig
- make DESTDIR="$pkgdir" install
-}
diff --git a/community/ruby-gio2/PKGBUILD b/community/ruby-gio2/PKGBUILD
deleted file mode 100644
index 297f60085..000000000
--- a/community/ruby-gio2/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 31087 2010-10-27 01:37:14Z bfanella $
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-
-pkgname=ruby-gio2
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="Ruby bindings for gio2."
-arch=('i686' 'x86_64')
-url="http://ruby-gnome2.sourceforge.jp"
-license=('LGPL')
-depends=('ruby-glib2')
-makedepends=('ruby-pkgconfig')
-source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz)
-md5sums=('e9711eb5bd88debda90a920deb96d7d0')
-
-build() {
- cd "$srcdir/ruby-gtk2-$pkgver"
- ruby extconf.rb gio2 --topdir=$pkgdir
- make
-}
-package() {
- cd "$srcdir/ruby-gtk2-$pkgver"
- make DESTDIR="$pkgdir" install
-}
diff --git a/community/ruby-glib2/PKGBUILD b/community/ruby-glib2/PKGBUILD
deleted file mode 100644
index fb2a1fac3..000000000
--- a/community/ruby-glib2/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 53576 2011-08-05 22:47:58Z bfanella $
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
-# Contributor: kritoke <kritoke@nospam.gmail.com>
-
-pkgname=ruby-glib2
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="Ruby bindings for glib2."
-arch=('i686' 'x86_64')
-url="http://ruby-gnome2.sourceforge.jp"
-license=('LGPL')
-depends=('ruby')
-makedepends=('ruby-pkgconfig')
-source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz)
-md5sums=('e9711eb5bd88debda90a920deb96d7d0')
-
-build() {
- cd "$srcdir/ruby-gtk2-$pkgver"
- ruby extconf.rb glib2 --topdir=$pkgdir
- make
-}
-package() {
- cd "$srcdir/ruby-gtk2-$pkgver"
- make DESTDIR="$pkgdir" install
-}
diff --git a/community/ruby-pango/PKGBUILD b/community/ruby-pango/PKGBUILD
deleted file mode 100644
index 1f20c7a3d..000000000
--- a/community/ruby-pango/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 53626 2011-08-07 02:29:56Z bfanella $
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
-# Contributor: kritoke <kritoke@nospam.gmail.com>
-
-pkgname=ruby-pango
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="Ruby bindings for pango."
-arch=('i686' 'x86_64')
-url="http://ruby-gnome2.sourceforge.jp"
-license=('LGPL')
-depends=('ruby-glib2' 'ruby-cairo')
-makedepends=('ruby-glib2' 'pango' 'ruby-pkgconfig' 'ruby-cairo')
-source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz)
-md5sums=('e9711eb5bd88debda90a920deb96d7d0')
-
-build() {
- cd "$srcdir/ruby-gtk2-$pkgver"
- ruby extconf.rb pango --topdir=$pkgdir
- make
-}
-package() {
- cd "$srcdir/ruby-gtk2-$pkgver"
- make DESTDIR="$pkgdir" install
-}
diff --git a/community/solfege/solfege.changelog b/community/solfege/solfege.changelog
deleted file mode 100644
index b42401c9c..000000000
--- a/community/solfege/solfege.changelog
+++ /dev/null
@@ -1,95 +0,0 @@
-2011-06-17 Ray Rashif <schiv@archlinux.org>
-
- * 3.20.0-1:
- Upstream release
- Added some optional dependencies
- Removed install file;
- timidity is now the default synthesizer
- users should be able to figure stuff out
- Removed desktop file;
- already included in upstream tarball
-
-2010-10-02 Ray Rashif <schiv@archlinux.org>
-
- * Version bump: 3.17.0
- workaround managed for build issue
-
-2010-09-23 Ray Rashif <schiv@archlinux.org>
-
- * Version bump: 3.16.4
- 3.17.0 does not build; upstream issue [1]
- rebuilt for python(2)
-
- [1] http://code.google.com/p/solfege/issues/detail?id=197
-
-2010-05-20 Ray Rashif <schiv@archlinux.org>
-
- * Version bump: 3.16.3
-
- * solfege.desktop: fixed categories for better fit
-
-2010-04-20 Ray Rashif <schiv@archlinux.org>
-
- * Version bump: 3.16.1
-
- * PKGBUILD: minor changes
-
- * solfege.install: added to remove any MIDI confusion
-
-2009-09-08 Corrado Primier <bardo@aur.archlinux.org>
-
- * Version bump: 3.15.2
-
- * PKGBUILD: fixed timidity++ dependency
-
-2009-07-15 Corrado Primier <bardo@aur.archlinux.org>
-
- * Version bump: 3.14.5
-
- * PKGBUILD: removed desktop-file-utils dependency since
- solfege.desktop does not declare any MimeType entry; added
- ghostscript, gnome-doc-utils, librsvg and lilypond makedepends
-
-2009-04-19 Corrado Primier <bardo@aur.archlinux.org>
-
- * Version bump: 3.14.2
-
- * PKGBUILD: removed old sed fix, added optdepends, moved texinfo to
- makedepends, added swig and libxslt to makedepends
-
- * solfege.install: removed
-
-2008-11-12 Corrado Primier <bardo@aur.archlinux.org>
-
- * Version bump: 3.12.0
-
- * PKGBUILD: added txt2man make dependency
-
-2008-06-15 Corrado Primier <bardo@aur.archlinux.org>
-
- * Version bump: 3.10.4
-
- * PKGBUILD: moved from $startdir to $srcdir/$pkgdir
-
- * solfege.install: removed unnecessary reference to the AUR
-
-2008-03-24 Corrado Primier <bardo@aur.archlinux.org>
-
- * Version bump: 3.10.3
-
- * PKGBUILD: moved desktop-file-utils to depends, added pkgconfig
- makedepend, added a sed fix to allow compilation of all files
-
- * ChangeLog: fixed file format
-
- * solfege.install: removed post_upgrade(), a few other small changes
-
-2007-10-20 Corrado Primier <bardo@aur.archlinux.org>
-
- * Version bump: 3.8.2
-
- * PKGBUILD: added desktop-file-utils to makedepends
-
- * solfege.install: added
-
- * solfege.desktop: added
diff --git a/core/glibc/glibc-2.13-dlclose-search-reset.patch b/core/glibc/glibc-2.13-dlclose-search-reset.patch
deleted file mode 100644
index 3ad8b418a..000000000
--- a/core/glibc/glibc-2.13-dlclose-search-reset.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 2f811bf88bed4a6c0dec8778847ba441736d509d Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Wed, 26 May 2010 18:28:59 +0200
-Subject: [PATCH] Fix scope handling during dl_close
-
----
- ChangeLog | 12 ++++++++++++
- elf/Makefile | 10 +++++++++-
- elf/dl-close.c | 7 +++++++
- elf/unload8.c | 33 +++++++++++++++++++++++++++++++++
- elf/unload8mod1.c | 7 +++++++
- elf/unload8mod1x.c | 1 +
- elf/unload8mod2.c | 7 +++++++
- elf/unload8mod3.c | 27 +++++++++++++++++++++++++++
- 8 files changed, 103 insertions(+), 1 deletions(-)
- create mode 100644 elf/unload8.c
- create mode 100644 elf/unload8mod1.c
- create mode 100644 elf/unload8mod1x.c
- create mode 100644 elf/unload8mod2.c
- create mode 100644 elf/unload8mod3.c
-
-diff --git a/elf/Makefile b/elf/Makefile
-index 59e835f..65b6deb 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -89,6 +89,7 @@ distribute := rtld-Rules \
- unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \
- unload6mod1.c unload6mod2.c unload6mod3.c \
- unload7mod1.c unload7mod2.c \
-+ unload8mod1.c unload8mod1x.c unload8mod2.c unload8mod3.c \
- tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \
- tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \
- tst-auditmod4a.c tst-auditmod4b.c \
-@@ -196,7 +197,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
- tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \
- tst-dlmodcount tst-dlopenrpath tst-deep1 \
- tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \
-- unload3 unload4 unload5 unload6 unload7 tst-global1 order2 \
-+ unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \
- tst-audit1 tst-audit2 \
- tst-stackguard1 tst-addr1 tst-thrlock \
- tst-unique1 tst-unique2
-@@ -247,6 +248,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
- unload4mod1 unload4mod2 unload4mod3 unload4mod4 \
- unload6mod1 unload6mod2 unload6mod3 \
- unload7mod1 unload7mod2 \
-+ unload8mod1 unload8mod1x unload8mod2 unload8mod3 \
- order2mod1 order2mod2 order2mod3 order2mod4 \
- tst-unique1mod1 tst-unique1mod2 \
- tst-unique2mod1 tst-unique2mod2
-@@ -522,6 +524,9 @@ $(objpfx)unload6mod2.so: $(libdl)
- $(objpfx)unload6mod3.so: $(libdl)
- $(objpfx)unload7mod1.so: $(libdl)
- $(objpfx)unload7mod2.so: $(objpfx)unload7mod1.so
-+$(objpfx)unload8mod1.so: $(objpfx)unload8mod2.so
-+$(objpfx)unload8mod2.so: $(objpfx)unload8mod3.so
-+$(objpfx)unload8mod3.so: $(libdl)
- $(objpfx)tst-initordera2.so: $(objpfx)tst-initordera1.so
- $(objpfx)tst-initorderb2.so: $(objpfx)tst-initorderb1.so $(objpfx)tst-initordera2.so
- $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb1.so
-@@ -823,6 +828,9 @@ $(objpfx)unload7: $(libdl)
- $(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so
- unload7-ENV = MALLOC_PERTURB_=85
-
-+$(objpfx)unload8: $(libdl)
-+$(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so
-+
- ifdef libdl
- $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a
- $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so
-diff --git a/elf/dl-close.c b/elf/dl-close.c
-index 700e765..f47d5f8 100644
---- a/elf/dl-close.c
-+++ b/elf/dl-close.c
-@@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map)
-
- imap->l_scope_max = new_size;
- }
-+ else if (new_list != NULL)
-+ {
-+ /* We didn't change the scope array, so reset the search
-+ list. */
-+ imap->l_searchlist.r_list = NULL;
-+ imap->l_searchlist.r_nlist = 0;
-+ }
-
- /* The loader is gone, so mark the object as not having one.
- Note: l_idx != IDX_STILL_USED -> object will be removed. */
-diff --git a/elf/unload8.c b/elf/unload8.c
-new file mode 100644
-index 0000000..f984a38
---- /dev/null
-+++ b/elf/unload8.c
-@@ -0,0 +1,33 @@
-+#include <dlfcn.h>
-+#include <stdio.h>
-+
-+int
-+main (void)
-+{
-+ void *h = dlopen ("$ORIGIN/unload8mod1.so", RTLD_LAZY);
-+ if (h == NULL)
-+ {
-+ puts ("dlopen unload8mod1.so failed");
-+ return 1;
-+ }
-+
-+ void *h2 = dlopen ("$ORIGIN/unload8mod1x.so", RTLD_LAZY);
-+ if (h2 == NULL)
-+ {
-+ puts ("dlopen unload8mod1x.so failed");
-+ return 1;
-+ }
-+ dlclose (h2);
-+
-+ int (*mod1) (void) = dlsym (h, "mod1");
-+ if (mod1 == NULL)
-+ {
-+ puts ("dlsym failed");
-+ return 1;
-+ }
-+
-+ mod1 ();
-+ dlclose (h);
-+
-+ return 0;
-+}
-diff --git a/elf/unload8mod1.c b/elf/unload8mod1.c
-new file mode 100644
-index 0000000..fe7e81c
---- /dev/null
-+++ b/elf/unload8mod1.c
-@@ -0,0 +1,7 @@
-+extern void mod2 (void);
-+
-+void
-+mod1 (void)
-+{
-+ mod2 ();
-+}
-diff --git a/elf/unload8mod1x.c b/elf/unload8mod1x.c
-new file mode 100644
-index 0000000..835b634
---- /dev/null
-+++ b/elf/unload8mod1x.c
-@@ -0,0 +1 @@
-+int mod1x;
-diff --git a/elf/unload8mod2.c b/elf/unload8mod2.c
-new file mode 100644
-index 0000000..2fd8b67
---- /dev/null
-+++ b/elf/unload8mod2.c
-@@ -0,0 +1,7 @@
-+extern void mod3 (void);
-+
-+void
-+mod2 (void)
-+{
-+ mod3 ();
-+}
-diff --git a/elf/unload8mod3.c b/elf/unload8mod3.c
-new file mode 100644
-index 0000000..d49e22b
---- /dev/null
-+++ b/elf/unload8mod3.c
-@@ -0,0 +1,27 @@
-+#include <dlfcn.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+void
-+mod3_fini2 (void)
-+{
-+}
-+
-+void
-+mod3_fini (void)
-+{
-+ mod3_fini2 ();
-+}
-+
-+void
-+mod3 (void)
-+{
-+ void *h = dlopen ("$ORIGIN/unload8mod2.so", RTLD_LAZY);
-+ if (h == NULL)
-+ {
-+ puts ("dlopen unload8mod2.so failed");
-+ exit (1);
-+ }
-+
-+ atexit (mod3_fini);
-+}
---
-1.7.3.4
-
diff --git a/core/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch b/core/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
deleted file mode 100644
index ef91116e5..000000000
--- a/core/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 032c0ee3ee28841d684950e33a77210118697566 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Thu, 1 Sep 2011 10:46:14 +0200
-Subject: [PATCH] Avoid assertion failure when first DNS answer was empty
-
----
- ChangeLog | 4 ++++
- resolv/res_query.c | 2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/resolv/res_query.c b/resolv/res_query.c
-index 2f7cfaa..2ded9fb 100644
---- a/resolv/res_query.c
-+++ b/resolv/res_query.c
-@@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp,
- && *resplen2 > (int) sizeof (HEADER))
- {
- /* Special case of partial answer. */
-- assert (hp != hp2);
-+ assert (n == 0 || hp != hp2);
- hp = hp2;
- }
- else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
---
-1.7.3.4
-
diff --git a/core/pcre/r661.diff b/core/pcre/r661.diff
deleted file mode 100644
index 7bed4ce2e..000000000
--- a/core/pcre/r661.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- code/trunk/pcre_compile.c 2011/08/02 11:00:40 654
-+++ code/trunk/pcre_compile.c 2011/08/21 09:00:54 661
-@@ -2295,8 +2295,13 @@
- A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not.
- It seems that the appearance of a nested POSIX class supersedes an apparent
- external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or
--a digit. Also, unescaped square brackets may also appear as part of class
--names. For example, [:a[:abc]b:] gives unknown class "[:abc]b:]"in Perl.
-+a digit.
-+
-+In Perl, unescaped square brackets may also appear as part of class names. For
-+example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for
-+[:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not
-+seem right at all. PCRE does not allow closing square brackets in POSIX class
-+names.
-
- Arguments:
- ptr pointer to the initial [
-@@ -2314,6 +2319,7 @@
- {
- if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
- ptr++;
-+ else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
- else
- {
- if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
diff --git a/core/udev/bluetooth.patch b/core/udev/bluetooth.patch
deleted file mode 100644
index 96f5d6901..000000000
--- a/core/udev/bluetooth.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7462d61442f606cc118722e0572ac8db48fa2540 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
-Date: Tue, 2 Aug 2011 10:56:33 +0200
-Subject: [PATCH] rules: input - fix detection of bluetooth hid devices in
- Xorg
-
-Commit c49df20758e0f22778cfc93b598f2929f4c86272 prevented udev from
-creating broken symlinks for bluetooth hid devices. Unfortunately,
-it also removed the ID_INPUT=1 and ID_INPUT_{KEY,MOUSE}=1 properties
-from those devices. Xorg relies on these properties for cold- and
-hotplugging of input devices.
-
-With this patch, udev still omits the broken symlinks, but also
-imports the input_id properties again.
----
- rules/rules.d/60-persistent-input.rules | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/rules/rules.d/60-persistent-input.rules b/rules/rules.d/60-persistent-input.rules
-index 65a6381..28d50d2 100644
---- a/rules/rules.d/60-persistent-input.rules
-+++ b/rules/rules.d/60-persistent-input.rules
-@@ -2,9 +2,9 @@
-
- ACTION=="remove", GOTO="persistent_input_end"
- SUBSYSTEM!="input", GOTO="persistent_input_end"
--SUBSYSTEMS=="bluetooth", GOTO="persistent_input_end"
-
- ENV{ID_INPUT}=="", IMPORT{program}="input_id %p"
-+SUBSYSTEMS=="bluetooth", GOTO="persistent_input_end"
- SUBSYSTEMS=="usb", ENV{ID_BUS}=="", IMPORT{program}="usb_id --export %p"
-
- # determine class name for persistent symlinks
---
-1.7.6
-
diff --git a/core/util-linux/agetty-typo.patch b/core/util-linux/agetty-typo.patch
deleted file mode 100644
index a333d6280..000000000
--- a/core/util-linux/agetty-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 89aed1c950376d828e1e0ddef94909a028e0517d Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Wed, 7 Sep 2011 07:37:03 +0200
-Subject: [PATCH] agetty: double equals sign typo in opentty()
-
-Reported-by: Francesco Cosoleto <cosoleto@gmail.com>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- term-utils/agetty.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/term-utils/agetty.c b/term-utils/agetty.c
-index 733be38..35bb389 100644
---- a/term-utils/agetty.c
-+++ b/term-utils/agetty.c
-@@ -985,7 +985,7 @@ static void open_tty(char *tty, struct termios *tp, struct options *op)
- * In case of a virtual console the ioctl TIOCMGET fails and
- * the error number will be set to EINVAL.
- */
-- if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno = EINVAL)) {
-+ if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno == EINVAL)) {
- op->flags |= F_VCONSOLE;
- if (!op->term)
- op->term = DEFAULT_VCTERM;
---
-1.7.6.1
-
diff --git a/core/util-linux/dmesg-non-printk.patch b/core/util-linux/dmesg-non-printk.patch
deleted file mode 100644
index ea2354420..000000000
--- a/core/util-linux/dmesg-non-printk.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 22f69825778f992ff98ed100252bf5e00a15d9d1 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Wed, 31 Aug 2011 12:28:39 +0200
-Subject: [PATCH] dmesg: fix for non-CONFIG_PRINTK_TIME kernels
-
- * dmesg(1) incorrectly assumes that lines like "<6>\n"
- are broken.
-
- * it's more robust to assume the end of the record is "\n<"
-
- * print \n for empty lines
-
-Reported-by: "Gabor Z. Papp" <gzp@papp.hu>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- sys-utils/dmesg.c | 16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
-index 6090f4e..8e7bb4b 100644
---- a/sys-utils/dmesg.c
-+++ b/sys-utils/dmesg.c
-@@ -442,12 +442,12 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec)
-
- if (!begin)
- begin = p;
-- if (*p == '\n')
-- end = p;
- if (i + 1 == rec->next_size) {
- end = p + 1;
- i++;
-- }
-+ } else if (*p == '\n' && *(p + 1) == '<')
-+ end = p;
-+
- if (begin && !*begin)
- begin = NULL; /* zero(s) at the end of the buffer? */
- if (!begin || !end)
-@@ -469,9 +469,6 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec)
- }
- }
-
-- if (end <= begin)
-- return -1; /* error */
--
- if (*begin == '[' && (*(begin + 1) == ' ' ||
- isdigit(*(begin + 1)))) {
- if (ctl->delta || ctl->ctime) {
-@@ -534,12 +531,15 @@ static void print_buffer(const char *buf, size_t size,
- }
-
- while (get_next_record(ctl, &rec) == 0) {
-- if (!rec.mesg_size)
-- continue;
-
- if (!accept_record(ctl, &rec))
- continue;
-
-+ if (!rec.mesg_size) {
-+ putchar('\n');
-+ continue;
-+ }
-+
- if (ctl->decode && rec.level >= 0 && rec.facility >= 0)
- printf("%-6s:%-6s: ", facility_names[rec.facility].name,
- level_names[rec.level].name);
---
-1.7.6.1
-
diff --git a/core/util-linux/dmesg-space.patch b/core/util-linux/dmesg-space.patch
deleted file mode 100644
index 2038888cc..000000000
--- a/core/util-linux/dmesg-space.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 31c9099a81d3a9c70fdceb198eebed678173d954 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Fri, 2 Sep 2011 14:42:04 +0200
-Subject: [PATCH] dmesg: remove extra space only after time stamp
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- sys-utils/dmesg.c | 5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
-index 8e7bb4b..b3713a0 100644
---- a/sys-utils/dmesg.c
-+++ b/sys-utils/dmesg.c
-@@ -480,11 +480,10 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec)
- break;
- }
- }
-+ if (begin < end && *begin == ' ')
-+ begin++;
- }
-
-- if (begin < end && *begin == ' ')
-- begin++;
--
- rec->mesg = begin;
- rec->mesg_size = end - begin;
-
---
-1.7.6.1
-
diff --git a/core/util-linux/dont-close-0.patch b/core/util-linux/dont-close-0.patch
deleted file mode 100644
index 75cfc5c5e..000000000
--- a/core/util-linux/dont-close-0.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3a18db62e661fbb307ad3a53c18afabc92d3c63e Mon Sep 17 00:00:00 2001
-From: Petr Uzel <petr.uzel@suse.cz>
-Date: Tue, 13 Sep 2011 11:08:46 +0200
-Subject: [PATCH 1/2] lib: do not attempt to close(0) in sysfs_deinit()
-
-If the 'open' fails we 'goto err' which runs 'sysfs_deinit()' on a 'cxt'
-which hasn't been fully initialised. The 'dir_fd' is still 0, so
-sysfs_deinit calls "close(0)".
-
-Addresses: https://bugzilla.novell.com/show_bug.cgi?id=714151
-Reported-by: Diego Ercolani <diego.ercolani@gmail.com>
-Analysed-by: Neil Brown <nfbrown@suse.com>
-Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
----
- lib/sysfs.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/lib/sysfs.c b/lib/sysfs.c
-index eec1f24..ebb3bb5 100644
---- a/lib/sysfs.c
-+++ b/lib/sysfs.c
-@@ -140,6 +140,7 @@ int sysfs_init(struct sysfs_cxt *cxt, dev_t devno, struct sysfs_cxt *parent)
- int fd, rc = 0;
-
- memset(cxt, 0, sizeof(*cxt));
-+ cxt->dir_fd = -1;
-
- if (!sysfs_devno_path(devno, path, sizeof(path)))
- goto err;
---
-1.7.6.1
-
diff --git a/core/util-linux/fix-remount.patch b/core/util-linux/fix-remount.patch
deleted file mode 100644
index 67149ab46..000000000
--- a/core/util-linux/fix-remount.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 277a6dd53569a409e05316a7bdaed0e78e326762 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Tue, 13 Sep 2011 22:59:39 +0200
-Subject: [PATCH 2/2] mount: check for target before source on remount
-
-Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=737091
-Reported-by: Eric Paris <eparis@redhat.com>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- mount/fstab.c | 9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/mount/fstab.c b/mount/fstab.c
-index 8d88f68..77bf81c 100644
---- a/mount/fstab.c
-+++ b/mount/fstab.c
-@@ -272,10 +272,15 @@ getmntfilebackward (const char *name, struct mntentchn *mcprev) {
- mc0 = mtab_head();
- if (!mcprev)
- mcprev = mc0;
-+
- for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev)
-- if (streq(mc->m.mnt_dir, name) ||
-- streq(mc->m.mnt_fsname, name))
-+ if (streq(mc->m.mnt_dir, name))
- return mc;
-+
-+ for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev)
-+ if (streq(mc->m.mnt_fsname, name))
-+ return mc;
-+
- return NULL;
- }
-
---
-1.7.6.1
-
diff --git a/core/util-linux/write-freopen.patch b/core/util-linux/write-freopen.patch
deleted file mode 100644
index a2014a107..000000000
--- a/core/util-linux/write-freopen.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b89fdd9c05a6e5f12ab56441389e5ee9d1d7f30f Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Tue, 6 Sep 2011 03:18:46 +0200
-Subject: [PATCH] write: fix path for freopen()
-
-Reported-by: xinglp <xinglp@gmail.com>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- term-utils/write.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/term-utils/write.c b/term-utils/write.c
-index a825f62..a70eb7b 100644
---- a/term-utils/write.c
-+++ b/term-utils/write.c
-@@ -322,7 +322,7 @@ void do_write(char *tty, char *mytty, uid_t myuid)
-
- if (strlen(tty) + 6 > sizeof(path))
- errx(EXIT_FAILURE, _("tty path %s too long"), tty);
-- printf(path, "/dev/%s", tty);
-+ snprintf(path, sizeof(path), "/dev/%s", tty);
- if ((freopen(path, "w", stdout)) == NULL)
- err(EXIT_FAILURE, "%s", path);
-
---
-1.7.6.1
-
diff --git a/extra/conky/current-power.patch b/extra/conky/current-power.patch
deleted file mode 100644
index 1e7cf5a23..000000000
--- a/extra/conky/current-power.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur old/src/linux.c new/src/linux.c
---- old/src/linux.c 2010-10-05 23:29:36.000000000 +0200
-+++ new/src/linux.c 2010-12-06 22:18:59.346667183 +0100
-@@ -1671,6 +1671,8 @@
- the tradition! */
- else if (strncmp(buf, "POWER_SUPPLY_CURRENT_NOW=", 25) == 0)
- sscanf(buf, "POWER_SUPPLY_CURRENT_NOW=%d", &present_rate);
-+ else if (strncmp(buf, "POWER_SUPPLY_POWER_NOW=", 23) == 0)
-+ sscanf(buf, "POWER_SUPPLY_POWER_NOW=%d", &present_rate);
- else if (strncmp(buf, "POWER_SUPPLY_ENERGY_NOW=", 24) == 0)
- sscanf(buf, "POWER_SUPPLY_ENERGY_NOW=%d", &remaining_capacity);
- else if (strncmp(buf, "POWER_SUPPLY_ENERGY_FULL=", 25) == 0)
diff --git a/extra/gdm/check-for-shell.patch b/extra/gdm/check-for-shell.patch
deleted file mode 100644
index f3ac9cf9a..000000000
--- a/extra/gdm/check-for-shell.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 64e6b10f98fe7226a2f41807268dae3afa80236d Mon Sep 17 00:00:00 2001
-From: György Balló <ballogy@freestart.hu>
-Date: Fri, 30 Sep 2011 21:48:40 +0000
-Subject: data: add back check for gnome-shell before running gdm-shell session
-
-Add back commit 4892c9447324f2248ce944f150abe3143f78eaa3
-
-This commit does a quick check to make sure gnome-shell is
-installed, and supports --gdm-mode. If either of those fail,
-then fall back to the old greeter.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=660409
----
-diff --git a/data/gdm-shell.session.in b/data/gdm-shell.session.in
-index 3d408c3..496cc10 100644
---- a/data/gdm-shell.session.in
-+++ b/data/gdm-shell.session.in
-@@ -1,5 +1,5 @@
- [GNOME Session]
- Name=Display Manager
- RequiredComponents=gnome-shell;gnome-settings-daemon;
--IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated
-+IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
- FallbackSession=gdm-fallback
---
-cgit v0.9.0.2
diff --git a/extra/gnome-settings-daemon/fix_color_crash.patch b/extra/gnome-settings-daemon/fix_color_crash.patch
deleted file mode 100644
index 24602100f..000000000
--- a/extra/gnome-settings-daemon/fix_color_crash.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From fd4c0057b8e3f72b30acb6f1c82688e29b31c0c0 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Mon, 03 Oct 2011 08:52:06 +0000
-Subject: color: Fix a crash if ~/.local is deleted at runtime
-
-Resolves https://bugzilla.gnome.org/show_bug.cgi?id=660664
----
-diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c
-index d325162..3dde406 100644
---- a/plugins/color/gcm-profile-store.c
-+++ b/plugins/color/gcm-profile-store.c
-@@ -254,6 +254,8 @@ gcm_profile_store_process_child (GcmProfileStore *profile_store,
-
- /* check we're not in a loop */
- helper = gcm_profile_store_find_directory (profile_store, path);
-+ if (helper == NULL)
-+ goto out;
- if (helper->depth > GCM_PROFILE_STORE_MAX_RECURSION_LEVELS) {
- g_warning ("recursing more than %i levels deep is insane",
- GCM_PROFILE_STORE_MAX_RECURSION_LEVELS);
---
-cgit v0.9.0.2
-From e3313eb16fd2cb25ab3fbc010837b910e525acf6 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Mon, 03 Oct 2011 10:02:56 +0000
-Subject: color: Simplify gcm_profile_store_mkdir_with_parents()
-
-No need to check for the path existing,
-g_file_make_directory_with_parents() will do that for us.
----
-(limited to 'plugins/color/gcm-profile-store.c')
-
-diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c
-index 3dde406..d705604 100644
---- a/plugins/color/gcm-profile-store.c
-+++ b/plugins/color/gcm-profile-store.c
-@@ -419,19 +419,12 @@ static gboolean
- gcm_profile_store_mkdir_with_parents (const gchar *filename, GError **error)
- {
- gboolean ret;
-- GFile *file = NULL;
-
- /* ensure destination exists */
-- ret = g_file_test (filename, G_FILE_TEST_EXISTS);
-- if (!ret) {
-- file = g_file_new_for_path (filename);
-- ret = g_file_make_directory_with_parents (file, NULL, error);
-- if (!ret)
-- goto out;
-- }
--out:
-- if (file != NULL)
-- g_object_unref (file);
-+ file = g_file_new_for_path (filename);
-+ ret = g_file_make_directory_with_parents (file, NULL, error);
-+ g_object_unref (file);
-+
- return ret;
- }
-
---
-cgit v0.9.0.2
-From a711ba99fd5a9bc7bf79dcdc763deed39440eb86 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Mon, 03 Oct 2011 10:38:36 +0000
-Subject: Make commit e3313eb16fd2cb25ab3fbc010837b910e525acf6 actually compile
-
----
-(limited to 'plugins/color/gcm-profile-store.c')
-
-diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c
-index d705604..0b3cfa0 100644
---- a/plugins/color/gcm-profile-store.c
-+++ b/plugins/color/gcm-profile-store.c
-@@ -419,6 +419,7 @@ static gboolean
- gcm_profile_store_mkdir_with_parents (const gchar *filename, GError **error)
- {
- gboolean ret;
-+ GFile *file;
-
- /* ensure destination exists */
- file = g_file_new_for_path (filename);
---
-cgit v0.9.0.2
-From 42fa1af884fda1590bc7af0f78e4fc70d0eb621b Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Mon, 03 Oct 2011 10:34:04 +0000
-Subject: color: Cancel any in-progress directory searching on plugin unload
-
----
-diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c
-index 0b3cfa0..bcb7adc 100644
---- a/plugins/color/gcm-profile-store.c
-+++ b/plugins/color/gcm-profile-store.c
-@@ -34,6 +34,7 @@ struct _GcmProfileStorePrivate
- {
- GPtrArray *filename_array;
- GPtrArray *directory_array;
-+ GCancellable *cancellable;
- };
-
- enum {
-@@ -326,7 +327,7 @@ gcm_profile_store_next_files_cb (GObject *source_object,
- g_file_enumerator_next_files_async (enumerator,
- 5,
- G_PRIORITY_LOW,
-- NULL,
-+ profile_store->priv->cancellable,
- gcm_profile_store_next_files_cb,
- user_data);
-
-@@ -343,6 +344,7 @@ gcm_profile_store_enumerate_children_cb (GObject *source_object,
- gchar *path = NULL;
- GError *error = NULL;
- GFileEnumerator *enumerator;
-+ GcmProfileStore *profile_store = GCM_PROFILE_STORE (user_data);
-
- enumerator = g_file_enumerate_children_finish (G_FILE (source_object),
- res,
-@@ -360,7 +362,7 @@ gcm_profile_store_enumerate_children_cb (GObject *source_object,
- g_file_enumerator_next_files_async (enumerator,
- 5,
- G_PRIORITY_LOW,
-- NULL,
-+ profile_store->priv->cancellable,
- gcm_profile_store_next_files_cb,
- user_data);
- g_object_unref (enumerator);
-@@ -407,7 +409,7 @@ gcm_profile_store_search_path (GcmProfileStore *profile_store, const gchar *path
- G_FILE_ATTRIBUTE_STANDARD_TYPE,
- G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
- G_PRIORITY_LOW,
-- NULL,
-+ profile_store->priv->cancellable,
- gcm_profile_store_enumerate_children_cb,
- profile_store);
- out:
-@@ -416,14 +418,16 @@ out:
- }
-
- static gboolean
--gcm_profile_store_mkdir_with_parents (const gchar *filename, GError **error)
-+gcm_profile_store_mkdir_with_parents (const gchar *filename,
-+ GCancellable *cancellable,
-+ GError **error)
- {
- gboolean ret;
- GFile *file;
-
- /* ensure destination exists */
- file = g_file_new_for_path (filename);
-- ret = g_file_make_directory_with_parents (file, NULL, error);
-+ ret = g_file_make_directory_with_parents (file, cancellable, error);
- g_object_unref (file);
-
- return ret;
-@@ -438,7 +442,9 @@ gcm_profile_store_search (GcmProfileStore *profile_store)
-
- /* get Linux per-user profiles */
- path = g_build_filename (g_get_user_data_dir (), "icc", NULL);
-- ret = gcm_profile_store_mkdir_with_parents (path, &error);
-+ ret = gcm_profile_store_mkdir_with_parents (path,
-+ profile_store->priv->cancellable,
-+ &error);
- if (!ret) {
- g_warning ("failed to create directory on startup: %s", error->message);
- g_error_free (error);
-@@ -480,6 +486,7 @@ static void
- gcm_profile_store_init (GcmProfileStore *profile_store)
- {
- profile_store->priv = GCM_PROFILE_STORE_GET_PRIVATE (profile_store);
-+ profile_store->priv->cancellable = g_cancellable_new ();
- profile_store->priv->filename_array = g_ptr_array_new_with_free_func (g_free);
- profile_store->priv->directory_array = g_ptr_array_new_with_free_func ((GDestroyNotify) gcm_profile_store_helper_free);
- }
-@@ -490,6 +497,8 @@ gcm_profile_store_finalize (GObject *object)
- GcmProfileStore *profile_store = GCM_PROFILE_STORE (object);
- GcmProfileStorePrivate *priv = profile_store->priv;
-
-+ g_cancellable_cancel (profile_store->priv->cancellable);
-+ g_object_unref (profile_store->priv->cancellable);
- g_ptr_array_unref (priv->filename_array);
- g_ptr_array_unref (priv->directory_array);
-
---
-cgit v0.9.0.2
diff --git a/extra/gnutls/addGNU-stack.diff b/extra/gnutls/addGNU-stack.diff
deleted file mode 100644
index 8324b5a58..000000000
--- a/extra/gnutls/addGNU-stack.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Prevent executable stack
-Author: Andreas Metzler <ametzler@debian.org>
-
---- gnutls28-3.0.4.orig/lib/accelerated/x86/asm/padlock-common.s
-+++ gnutls28-3.0.4/lib/accelerated/x86/asm/padlock-common.s
-@@ -38,3 +38,7 @@ is_padlock_nano:
- xorl %eax,%eax
- ret
- .size is_padlock_nano,.-is_padlock_nano
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/extra/gtk2/gtk2-dont-ellipsize-filters.diff b/extra/gtk2/gtk2-dont-ellipsize-filters.diff
deleted file mode 100644
index ff8dff6ef..000000000
--- a/extra/gtk2/gtk2-dont-ellipsize-filters.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
-index 2ee7903..37d9e8d 100644
---- a/gtk/gtkfilechooserdefault.c
-+++ b/gtk/gtkfilechooserdefault.c
-@@ -2322,23 +2322,9 @@ renderer_editing_canceled_cb (GtkCellRendererText *cell_renderer_text,
- static GtkWidget *
- filter_create (GtkFileChooserDefault *impl)
- {
-- GtkCellRenderer *cell;
-- GList *cells;
--
- impl->filter_combo = gtk_combo_box_text_new ();
- gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (impl->filter_combo), FALSE);
-
-- /* Get the combo's text renderer and set ellipsize parameters */
-- cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (impl->filter_combo));
-- g_assert (cells);
-- cell = cells->data;
--
-- g_object_set (G_OBJECT (cell),
-- "ellipsize", PANGO_ELLIPSIZE_END,
-- NULL);
--
-- g_list_free (cells);
--
- g_signal_connect (impl->filter_combo, "changed",
- G_CALLBACK (filter_combo_changed), impl);
-
diff --git a/extra/hplip/hplip-cups-1.5.0-compatibility.patch b/extra/hplip/hplip-cups-1.5.0-compatibility.patch
deleted file mode 100644
index a4039e6c9..000000000
--- a/extra/hplip/hplip-cups-1.5.0-compatibility.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- hplip-3.11.7~/prnt/hpps/hppsfilter.c 2011-07-24 18:58:05.000000000 +0000
-+++ hplip-3.11.7/prnt/hpps/hppsfilter.c 2011-08-09 20:51:54.150214165 +0000
-@@ -38,6 +38,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <cups/cups.h>
-+#include <cups/ppd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-
diff --git a/extra/htop/htop.c.patch b/extra/htop/htop.c.patch
deleted file mode 100644
index 41a2dd377..000000000
--- a/extra/htop/htop.c.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Roman Kosenko <madkite@gmail.com>
-Date: Thu, 10 Mar 2011 16:23:53 +0200
-Subject: [PATCH] Fix stupid bug with --sort-key
-
---- htop.c.old 2010-11-24 20:45:38.000000000 +0200
-+++ htop.c 2011-03-10 16:32:18.473716667 +0200
-@@ -282,7 +282,7 @@
- printVersionFlag();
- break;
- case 's':
-- if (strcmp(optarg, "help")) {
-+ if (!strcmp(optarg, "help")) {
- for (int j = 1; j < LAST_PROCESSFIELD; j++)
- printf ("%s\n", Process_fieldNames[j]);
- exit(0);
diff --git a/extra/pidgin/pidgin-2.10.0-silc-remote-crash-fix.diff b/extra/pidgin/pidgin-2.10.0-silc-remote-crash-fix.diff
deleted file mode 100644
index de4b126d0..000000000
--- a/extra/pidgin/pidgin-2.10.0-silc-remote-crash-fix.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-============================================================
---- libpurple/protocols/silc/ops.c 30ab18780af11a53b6564a44c4e8ebfc1a296d78
-+++ libpurple/protocols/silc/ops.c 80bd9a7d3faf9e5ef28438647159fe19847e9839
-@@ -408,9 +408,16 @@ silc_private_message(SilcClient client,
- }
-
- if (flags & SILC_MESSAGE_FLAG_UTF8) {
-- tmp = g_markup_escape_text((const char *)message, -1);
-+ const char *msg = (const char *)message;
-+ char *salvaged = NULL;
-+ if (!g_utf8_validate((const char *)message, -1, NULL)) {
-+ salvaged = purple_utf8_salvage((const char *)message);
-+ msg = salvaged;
-+ }
-+ tmp = g_markup_escape_text(msg, -1);
- /* Send to Purple */
- serv_got_im(gc, sender->nickname, tmp, 0, time(NULL));
-+ g_free(salvaged);
- g_free(tmp);
- }
- }
diff --git a/extra/pulseaudio/dont-require-dbus.patch b/extra/pulseaudio/dont-require-dbus.patch
deleted file mode 100644
index 915e3baec..000000000
--- a/extra/pulseaudio/dont-require-dbus.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-commit 6d58497dd1d68231af201cf2a07bb9881c4efd2f
-Author: Tanu Kaskinen <tanuk@iki.fi>
-Date: Thu Oct 6 23:28:37 2011 +0300
-
- daemon: Don't treat it as a fatal error if we can't connect to the session bus
-
- http://lists.freedesktop.org/archives/pulseaudio-discuss/2011-June/010276.html
-
-diff --git a/src/daemon/main.c b/src/daemon/main.c
-index e2e4a81..c32f7c7 100644
---- a/src/daemon/main.c
-+++ b/src/daemon/main.c
-@@ -1107,14 +1107,14 @@ int main(int argc, char *argv[]) {
-
- #ifdef HAVE_DBUS
- if (!conf->system_instance) {
-- if (!(server_lookup = pa_dbusobj_server_lookup_new(c)))
-- goto finish;
-- if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1")))
-- goto finish;
-+ if ((server_lookup = pa_dbusobj_server_lookup_new(c))) {
-+ if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1")))
-+ goto finish;
-+ }
- }
-
-- if (start_server && !(server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server")))
-- goto finish;
-+ if (start_server)
-+ server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server");
- #endif
-
- #ifdef HAVE_FORK
-diff --git a/src/daemon/server-lookup.c b/src/daemon/server-lookup.c
-index 45796e7..9bdc699 100644
---- a/src/daemon/server-lookup.c
-+++ b/src/daemon/server-lookup.c
-@@ -485,7 +485,7 @@ pa_dbusobj_server_lookup *pa_dbusobj_server_lookup_new(pa_core *c) {
- sl->path_registered = FALSE;
-
- if (!(sl->conn = pa_dbus_bus_get(c, DBUS_BUS_SESSION, &error)) || dbus_error_is_set(&error)) {
-- pa_log("Unable to contact D-Bus: %s: %s", error.name, error.message);
-+ pa_log_warn("Unable to contact D-Bus: %s: %s", error.name, error.message);
- goto fail;
- }
-
diff --git a/extra/pulseaudio/version-number.patch b/extra/pulseaudio/version-number.patch
deleted file mode 100644
index 473b252a9..000000000
--- a/extra/pulseaudio/version-number.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 7563e0bbb54fbac54e77f3a62d9761a70f3a559c
-Author: Colin Guthrie <colin@mageia.org>
-Date: Sat Oct 1 12:03:44 2011 +0100
-
- libpulse: Always return a three part version number in API calls.
-
- For both the headers and the library we should provide clean, three part
- strings as this has been what we've previously done in the past
- and some external systems apparently rely on this format. While it's not
- something we've officially commented on before, there is no real advantage
- to us to change it so let's not try to tidy things up too much
- considering some third party apps (e.g. Skype) seem to dislike a two
- part version string.
-
-diff --git a/src/pulse/context.c b/src/pulse/context.c
-index 25d04a1..af144aa 100644
---- a/src/pulse/context.c
-+++ b/src/pulse/context.c
-@@ -1281,7 +1281,7 @@ pa_operation* pa_context_set_name(pa_context *c, const char *name, pa_context_su
- }
-
- const char* pa_get_library_version(void) {
-- return PACKAGE_VERSION;
-+ return pa_get_headers_version();
- }
-
- const char* pa_context_get_server(pa_context *c) {
-diff --git a/src/pulse/version.h.in b/src/pulse/version.h.in
-index 7e00c5e..1be4c75 100644
---- a/src/pulse/version.h.in
-+++ b/src/pulse/version.h.in
-@@ -35,7 +35,7 @@ PA_C_DECL_BEGIN
- /** Return the version of the header files. Keep in mind that this is
- a macro and not a function, so it is impossible to get the pointer of
- it. */
--#define pa_get_headers_version() ("@PACKAGE_VERSION@")
-+#define pa_get_headers_version() ("@PA_MAJOR@.@PA_MINOR@.0")
-
- /** Return the version of the library the current application is
- * linked to. */
diff --git a/extra/silc-toolkit/PKGBUILD b/extra/silc-toolkit/PKGBUILD
deleted file mode 100644
index a74d067fa..000000000
--- a/extra/silc-toolkit/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Ionut Biru <ionut@archlinux.ro>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-
-pkgname=silc-toolkit
-pkgver=1.1.10
-pkgrel=1
-pkgdesc="Toolkit for Secure Internet Live Conferencing"
-url="http://www.silcnet.org"
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('glibc' 'perl' 'libidn')
-source=(http://www.silcnet.org/download/toolkit/sources/$pkgname-$pkgver.tar.bz2)
-options=(!libtool)
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr --with-etcdir=/etc/silc \
- --enable-ipv6 --with-perl=yes \
- --with-simdir=/usr/lib/silc/modules
-
- make || return 1
- make DESTDIR=$pkgdir install
-
- # remove the crapload of html docs (26MB!)
- rm -rf $pkgdir/usr/share/doc/$pkgname/toolkit
-}
-sha256sums=('a76cc364813b2d09dee7a9e99fda77db71b5bf752297176eb8de4fb0466eed76')
diff --git a/libre/initscripts/parabola-branding.patch b/libre/initscripts/parabola-branding.patch
deleted file mode 100644
index a309f9a4c..000000000
--- a/libre/initscripts/parabola-branding.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -auN initscripts-2011.02.1/PKGBUILD initscripts-2011.02.1-parabola//PKGBUILD
---- initscripts-2011.02.1/PKGBUILD 2011-02-01 15:34:45.000000000 -0300
-+++ initscripts-2011.02.1-parabola//PKGBUILD 2011-02-28 11:06:11.000000000 -0300
-@@ -1,9 +1,9 @@
- pkgname=initscripts-git
- pkgver=$(date +%s)
- pkgrel=$(git log --pretty=format:%h |head -n 1)
--pkgdesc="System initialization/bootup scripts"
-+pkgdesc="System initialization/bootup scripts, rebranded for Parabola"
- arch=('i686' 'x86_64')
--url="http://www.archlinux.org"
-+url="http://parabolagnulinux.org"
- license=('GPL')
- groups=('base')
- conflicts=('initscripts')
-diff -auN initscripts-2011.02.1/functions initscripts-2011.02.1-parabola//functions
---- initscripts-2011.02.1/functions 2011-02-01 15:34:45.000000000 -0300
-+++ initscripts-2011.02.1-parabola//functions 2011-02-28 11:13:46.000000000 -0300
-@@ -53,7 +53,7 @@
- if [[ $USECOLOR = YES || $USECOLOR = yes ]]; then
- C_MAIN="\033[1;37;40m" # main text
-
-- C_OTHER="\033[1;34;40m" # prefix & brackets
-+ C_OTHER="\033[0;35;40m" # prefix & brackets
- C_SEPARATOR="\033[1;30;40m" # separator
-
- C_BUSY="\033[0;36;40m" # busy
-diff -auN initscripts-2011.02.1/rc.conf initscripts-2011.02.1-parabola//rc.conf
---- initscripts-2011.02.1/rc.conf 2011-02-01 15:34:45.000000000 -0300
-+++ initscripts-2011.02.1-parabola//rc.conf 2011-02-28 11:06:37.000000000 -0300
-@@ -1,5 +1,5 @@
- #
--# /etc/rc.conf - Main Configuration for Arch Linux
-+# /etc/rc.conf - Main Configuration for Parabola GNU/Linux-Libre
- #
-
- # -----------------------------------------------------------------------
-diff -auN initscripts-2011.02.1/rc.sysinit initscripts-2011.02.1-parabola//rc.sysinit
---- initscripts-2011.02.1/rc.sysinit 2011-02-01 15:34:45.000000000 -0300
-+++ initscripts-2011.02.1-parabola//rc.sysinit 2011-02-28 11:08:29.000000000 -0300
-@@ -7,8 +7,9 @@
- . /etc/rc.d/functions
-
- echo " "
--printhl "Arch Linux\n"
--printhl "${C_H2}http://www.archlinux.org"
-+printhl "Parabola GNU/Linux-Libre\n"
-+printhl "${C_H2}http://parabolagnulinux.org\n"
-+printhl "You're booting into a libre version of Archlinux."
- printsep
-
- run_hook sysinit_start
diff --git a/libre/virtualbox/10-vboxdrv.rules b/libre/virtualbox/10-vboxdrv.rules
deleted file mode 100644
index a6cfe0a05..000000000
--- a/libre/virtualbox/10-vboxdrv.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" ENV{ACL_MANAGE}="1"
-SUBSYSTEM=="usb_device", ACTION=="add", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
-SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
-
diff --git a/libre/virtualbox/18-system-xorg.patch b/libre/virtualbox/18-system-xorg.patch
deleted file mode 100644
index baca4bc5b..000000000
--- a/libre/virtualbox/18-system-xorg.patch
+++ /dev/null
@@ -1,278 +0,0 @@
-Description: Build the X.Org driver only for the selected system X Server version.
-Author: Michael Meskes <meskes@debian.org>, Felix Geyer <debfx-pkg@fobos.de>
-
-diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
---- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
-+++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
-@@ -40,8 +40,8 @@ LIBRARIES += \
- VBoxGuestR3LibShared
- ifndef VBOX_ONLY_TESTSUITE
- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
-- LIBRARIES += \
-- VBoxGuestR3LibXFree86
-+# LIBRARIES += \
-+# VBoxGuestR3LibXFree86
- endif
- endif
- LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
-diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
---- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-@@ -63,16 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUESTDLL
- VBoxOGL_INCS = .
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGL_INCS += \
-- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
-- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
-- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
-- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
-- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
-- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
-- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
-- $(VBOX_PATH_X11_ROOT)/1.3/xorg \
-+ /usr/include/x11 \
-+ /usr/include/xorg \
-+ /usr/include/pixman-1 \
- $(VBOX_MESA_INCS) \
-- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
-+ /usr/include/drm \
-+ /usr/include/libdrm
- VBoxOGL_DEFS += VBOX_NO_NATIVEGL
- endif
-
-diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk
---- a/src/VBox/Additions/x11/Makefile.kmk
-+++ b/src/VBox/Additions/x11/Makefile.kmk
-@@ -17,6 +17,10 @@
- SUB_DEPTH = ../../../..
- include $(KBUILD_PATH)/subheader.kmk
-
-+ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110)
-+ XSERVER_VERSION := 17
-+endif
-+
- # Include sub-makefiles.
- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
- include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
-diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
---- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
-+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
-@@ -23,7 +23,6 @@ include $(KBUILD_PATH)/subheader.kmk
- # vboxmouse_drv
- #
- if1of ($(KBUILD_TARGET), linux)
-- SYSMODS += vboxmouse_drv
- vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
- vboxmouse_drv_DEFS.linux = linux
- vboxmouse_drv_DEFS.x86 += __i386__
-@@ -59,7 +58,6 @@ endif
- #
- # vboxmouse_drv_70
- #
--DLLS += vboxmouse_drv_70
- vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_70_DEFS = \
- XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE
-@@ -80,7 +78,6 @@ vboxmouse_drv_70_SOURCES = \
- #
- # vboxmouse_drv_71
- #
--DLLS += vboxmouse_drv_71
- vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS)
- vboxmouse_drv_71_INCS := \
-@@ -97,7 +94,6 @@ vboxmouse_drv_71_SOURCES = \
- #
- # vboxmouse_drv_13
- #
--DLLS += vboxmouse_drv_13
- vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_13_INCS := \
-@@ -112,7 +108,6 @@ vboxmouse_drv_13_SOURCES = \
- #
- # vboxmouse_drv_14
- #
--DLLS += vboxmouse_drv_14
- vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_14_INCS := \
-@@ -126,7 +121,6 @@ endif
- #
- # vboxmouse_drv_15
- #
--DLLS += vboxmouse_drv_15
- vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_15_INCS := \
-@@ -141,7 +135,6 @@ vboxmouse_drv_15_SOURCES = \
- #
- # vboxmouse_drv_16
- #
--DLLS += vboxmouse_drv_16
- vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_16_INCS := \
-@@ -157,7 +150,6 @@ vboxmouse_drv_16_SOURCES = \
- #
- # vboxmouse_drv_17
- #
--DLLS += vboxmouse_drv_17
- vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
-@@ -177,7 +169,6 @@ vboxmouse_drv_17_SOURCES = \
- #
- # vboxmouse_drv_18
- #
--DLLS += vboxmouse_drv_18
- vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
-@@ -197,7 +188,6 @@ vboxmouse_drv_18_SOURCES = \
- #
- # vboxmouse_drv_19
- #
--DLLS += vboxmouse_drv_19
- vboxmouse_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
-@@ -217,7 +207,6 @@ vboxmouse_drv_19_SOURCES = \
- #
- # vboxmouse_drv_110
- #
--DLLS += vboxmouse_drv_110
- vboxmouse_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
-@@ -234,6 +224,14 @@ vboxmouse_drv_110_SOURCES = \
- vboxmouse_15.c
-
-
-+vboxmouse_drv_$(XSERVER_VERSION)_NAME := vboxmouse_drv
-+vboxmouse_drv_$(XSERVER_VERSION)_INCS := \
-+ /usr/include/x11 \
-+ /usr/include/xorg \
-+ /usr/include/pixman-1
-+DLLS += vboxmouse_drv_$(XSERVER_VERSION)
-+
-+
- # Check the undefined symbols in the X.Org modules against lists of allowed
- # symbols. Not very elegant, but it will catch problems early.
- ifdef VBOX_WITH_TESTCASES
-diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
---- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-@@ -22,7 +22,6 @@ include $(KBUILD_PATH)/subheader.kmk
- # vboxvideo_drv
- #
- if1of ($(KBUILD_TARGET), linux)
-- SYSMODS += vboxvideo_drv
- endif # target linux
- vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
- vboxvideo_drv_DEFS.linux = linux
-@@ -89,7 +88,6 @@ endif # target linux
- # base keywords instead of using .solaris or .linux.
- # Also it is *important* to use := and not = when deriving a property.
- #
--DLLS += vboxvideo_drv_70
- vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
- if1of ($(KBUILD_TARGET), linux)
- vboxvideo_drv_70_CFLAGS += \
-@@ -112,7 +110,6 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_drv_SOURCES)
- #
- # vboxvideo_drv_71
- #
--DLLS += vboxvideo_drv_71
- vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS)
-@@ -127,7 +124,6 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_drv_SOURCES)
- #
- # vboxvideo_drv_13
- #
--DLLS += vboxvideo_drv_13
- vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13
-@@ -146,7 +142,6 @@ vboxvideo_drv_13_SOURCES = \
- #
- # vboxvideo_drv_14
- #
--DLLS += vboxvideo_drv_14
- vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS)
-@@ -165,7 +160,6 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_13_SOURCES)
- #
- # vboxvideo_drv_15
- #
--DLLS += vboxvideo_drv_15
- vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \
-@@ -192,7 +186,6 @@ endif
- #
- # vboxvideo_drv_16
- #
--DLLS += vboxvideo_drv_16
- vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS)
-@@ -212,7 +205,6 @@ vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES)
- #
- # vboxvideo_drv_17
- #
--DLLS += vboxvideo_drv_17
- vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
-@@ -239,7 +231,6 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
- #
- # vboxvideo_drv_18
- #
--DLLS += vboxvideo_drv_18
- vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS)
-@@ -266,7 +257,6 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES)
- #
- # vboxvideo_drv_19
- #
--DLLS += vboxvideo_drv_19
- vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS)
-@@ -293,7 +282,6 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES)
- #
- # vboxvideo_drv_110
- #
--DLLS += vboxvideo_drv_110
- vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_110_DEFS := $(vboxvideo_drv_15_DEFS)
-@@ -317,6 +306,23 @@ vboxvideo_drv_110_INCS = \
- vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES)
-
-
-+vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv
-+vboxvideo_drv_$(XSERVER_VERSION)_INCS := \
-+ /usr/include/xorg \
-+ /usr/include/x11 \
-+ /usr/include/pixman-1 \
-+ /usr/include/X11/dri \
-+ /usr/include/drm \
-+ /usr/include/libdrm
-+vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
-+DLLS += vboxvideo_drv_$(XSERVER_VERSION)
-+
-+# required for lenny backports
-+ifeq ($(XSERVER_VERSION),14)
-+ vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg
-+endif
-+
-+
- # Check the undefined symbols in the X.Org modules against lists of allowed
- # symbols. Not very elegant, but it will catch problems early.
- ifdef VBOX_WITH_TESTCASES
-
diff --git a/libre/virtualbox/60-vboxguest.rules b/libre/virtualbox/60-vboxguest.rules
deleted file mode 100644
index d64575709..000000000
--- a/libre/virtualbox/60-vboxguest.rules
+++ /dev/null
@@ -1,3 +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/LocalConfig.kmk b/libre/virtualbox/LocalConfig.kmk
deleted file mode 100644
index 97123a296..000000000
--- a/libre/virtualbox/LocalConfig.kmk
+++ /dev/null
@@ -1,20 +0,0 @@
-VBOX_WITH_ADDITION_DRIVERS =
-VBOX_WITH_INSTALLER = 1
-VBOX_WITH_LINUX_ADDITIONS = 1
-VBOX_WITH_X11_ADDITIONS = 1
-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/PKGBUILD b/libre/virtualbox/PKGBUILD
deleted file mode 100644
index bfd784c0d..000000000
--- a/libre/virtualbox/PKGBUILD
+++ /dev/null
@@ -1,212 +0,0 @@
-# $Id: PKGBUILD 56698 2011-10-10 18:23:45Z ibiru $
-# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Changes:
-# * Adapt to linux-libre
-# * virtualbox-{archlinux,parabola}-*
-# * Removed unfree user manual
-# * Package with --pkg "virtualbox-parabola-additions virtualbox-parabola-modules"
-# Based on
-#Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgbase=virtualbox
-pkgname=('virtualbox' 'virtualbox-parabola-additions' 'virtualbox-parabola-modules' 'virtualbox-sdk')
-pkgver=4.1.4
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://virtualbox.org'
-license=('GPL' 'custom')
-makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst'
-'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2'
-'xorg-server-devel' 'xf86driproto' 'libxcomposite' 'pkgconfig')
-[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
-source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
- virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch
- 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxbuild
- change_default_driver_dir.patch vbox-service.conf vbox-service.rc)
-_kernver=3.0-LIBRE
-options=(!distcc)
-
-build() {
- cd "$srcdir/VirtualBox-${pkgver}_OSE"
-
- patch -Np1 -i "$srcdir/virtualbox-4-makeself-check.patch"
- patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch"
- patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
- patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
-
- cp "$srcdir/LocalConfig.kmk" .
-
- ./configure --disable-docs \
- --enable-webservice \
- --enable-vde \
- --with-linux=/usr/src/linux-${_kernver}
- source ./env.sh
- kmk all
-
- export KERN_DIR=/usr/src/linux-${_kernver}
- make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
- make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src/vboxvideo"
- sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py"
-}
-
-package_virtualbox() {
- pkgdesc="Powerful x86 virtualization for enterprise as well as home use"
- depends=('libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng' 'linux-libre-headers' 'gcc' 'make')
- optdepends=('qt: for VirtualBox GUI'
- 'vde2: Virtual Distributed Ethernet support'
- 'virtualbox-sdk: developer kit')
-
- replaces=('virtualbox-ose')
- conflicts=('virtualbox-ose')
- install=virtualbox.install
-
- source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
-
- cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
- mkdir -p "$pkgdir"/usr/{bin,lib/virtualbox/components,lib/virtualbox/ExtensionPacks,share/virtualbox/nls}
-
- #Binaries and Wrapper with Launchers
- install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox"
-
- for i in VBoxHeadless vboxheadless VBoxManage vboxmanage VBoxSDL vboxsdl VirtualBox virtualbox vboxwebsrv VBoxBalloonCtrl vboxballoonctrl; do
- ln -sf VBox "$pkgdir/usr/bin/$i"
- done
- install -m 0755 VBoxTunctl "$pkgdir/usr/bin"
-
- #components
- install -m 0755 components/* -t "$pkgdir/usr/lib/virtualbox/components"
-
- #lib
- install -m 0755 *.so "$pkgdir/usr/lib/virtualbox"
- install -m 0644 *.gc *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
-
- #setuid root binaries
- install -m 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl -t "$pkgdir/usr/lib/virtualbox"
- #other binaries
- install -m 0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
-
- #language
- install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
-
- #useless scripts
- install -m 0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox"
-
- #icons
- install -D -m 0644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png"
-
- pushd icons
- for i in *; do
- install -d "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
- cp $i/* "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
- done
- popd
-
- #desktop
- install -D -m 0644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop"
- install -D -m 0644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml"
-
- #install configuration
- mkdir -p "$pkgdir/etc/vbox"
- echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg"
-
- #udev and licence
- install -D -m 0644 "$srcdir/VirtualBox-${pkgver}_OSE/COPYING" \
- "$pkgdir/usr/share/licenses/virtualbox/LICENSE"
- install -D -m 0644 "$srcdir/10-vboxdrv.rules" \
- "$pkgdir/lib/udev/rules.d/10-vboxdrv.rules"
-
- #sources for modules
- cp -r src ${pkgdir}/usr/lib/virtualbox
- #install compilation script
- install -D -m 755 "${srcdir}/vboxbuild" "${pkgdir}/usr/bin/vboxbuild"
-}
-
-package_virtualbox-sdk() {
- pkgdesc=" VirtualBox Software Developer Kit (SDK)"
- depends=('python2')
-
- mkdir -p "$pkgdir/usr/lib/virtualbox"
-
- source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
- cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-
- install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py"
- #python sdk
- pushd sdk/installer
- VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "${pkgdir}"
- popd
- rm -rf sdk/installer
- mv sdk "$pkgdir/usr/lib/virtualbox"
-}
-
-package_virtualbox-parabola-additions(){
- pkgdesc="Additions only for Parabola guests (userspace tools)"
- depends=("virtualbox-parabola-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr')
- replaces=('virtualbox-guest-additions' 'virtualbox-archlinux-additions')
- conflicts=('virtualbox-guest-additions' 'virtualbox-archlinux-additions')
- provides=("virtualbox-archlinux-additions=${pkgver}")
-
- source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
-
- cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
-
- install -d "$pkgdir"/{usr/bin,sbin}
- install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin"
- install -m755 mount.vboxsf "$pkgdir/sbin"
-
- install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
- "$pkgdir"/usr/bin/VBoxClient-all
- install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/vboxclient.desktop \
- "$pkgdir"/etc/xdg/autostart/vboxclient.desktop
- install -D vboxvideo_drv_111.so \
- "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so"
- install -d "$pkgdir/usr/lib/xorg/modules/dri"
- install -m755 VBoxOGL*.so "$pkgdir/usr/lib"
- ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so"
- install -m755 -D pam_vbox.so "$pkgdir/lib/security/pam_vbox.so"
-
- # install rc.d script
- install -D -m755 "${srcdir}/vbox-service.rc" "${pkgdir}/etc/rc.d/vbox-service"
-
- # install sample config
- install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service"
-}
-
-package_virtualbox-parabola-modules(){
- pkgdesc="Additions only for Parabola guests (kernel modules)"
- license=('GPL')
- install=virtualbox-parabola-modules.install
- depends=('linux-libre>=3.0' 'linux-libre<3.1')
- replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules')
- conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules')
- provides=("virtualbox-archlinux-modules=${pkgver}")
-
- source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
-
- cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
-
- install -D -m644 vboxguest.ko \
- "$pkgdir/lib/modules/$_kernver/misc/vboxguest.ko"
-
- install -D -m644 vboxsf.ko \
- "$pkgdir/lib/modules/$_kernver/misc/vboxsf.ko"
-
- install -D -m644 vboxvideo.ko \
- "$pkgdir/lib/modules/$_kernver/misc/vboxvideo.ko"
-
- install -D -m 0644 "$srcdir/60-vboxguest.rules" \
- "$pkgdir/lib/udev/rules.d/60-vboxguest.rules"
-
- sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-parabola-modules.install"
-}
-
-md5sums=('dc6e6801b3823332b6ca2e9915221aae'
- 'a9f22ccaacb207e0e1c5450fede82d06'
- 'b7cbcf89a30c712fed4435dea28d1703'
- 'cee0c968c923760181ae060eab1c2e58'
- '13ff08388a54fd48cc04523380f26af6'
- '47349d711ecb5fbc105a18f9f936953b'
- '0d91f80ce6a4985db8d2f8f65a61458e'
- '47d6ee4f673bf31babbb7b4edb61e547'
- '6df8eb5173c4f84faedb4962c4d5f0ef'
- 'b978dfdbff377e00ddecb24cb3218ed2'
- '2460dedb8bdce85f9d7e075742e94d24')
diff --git a/libre/virtualbox/change_default_driver_dir.patch b/libre/virtualbox/change_default_driver_dir.patch
deleted file mode 100644
index f6dc7e1a0..000000000
--- a/libre/virtualbox/change_default_driver_dir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
---- VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-07-19 15:11:37.903456612 +0000
-+++ VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-07-19 15:12:41.024021274 +0000
-@@ -36,13 +36,8 @@
- //#define DEBUG_DRI_CALLS
-
- //@todo this could be different...
--#ifdef RT_ARCH_AMD64
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri"
-+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
- # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--#else
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri"
--# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--#endif
-
- #ifdef DEBUG_DRI_CALLS
- #define SWDRI_SHOWNAME(pext, func) \
-
diff --git a/libre/virtualbox/vbox-service.conf b/libre/virtualbox/vbox-service.conf
deleted file mode 100644
index 31262af37..000000000
--- a/libre/virtualbox/vbox-service.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# VBoxService -h
-VBOX_SERVICE_OPTION=""
-
diff --git a/libre/virtualbox/vbox-service.rc b/libre/virtualbox/vbox-service.rc
deleted file mode 100644
index 381e3d751..000000000
--- a/libre/virtualbox/vbox-service.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/vbox-service
-
-name=VBoxService
-PID=$(pidof -o %PPID $name)
-
-case "$1" in
- start)
- stat_busy "Starting $name service"
- [[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \
- && { add_daemon $name; stat_done; } \
- || { stat_fail; exit 1; }
- ;;
- stop)
- stat_busy "Stopping $name service"
- [[ -n "$PID" ]] && kill $PID &>/dev/null \
- && { rm_daemon $name; stat_done; } \
- || { stat_fail; exit 1; }
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- status)
- stat_busy "Checking $name status";
- ck_status $name
- ;;
- *)
- echo "usage: $0 {start|stop|restart|status}"
- exit 1
-esac
-
-exit 0
-
-# vim:set ts=2 sw=2 ft=sh et:
-
diff --git a/libre/virtualbox/vboxbuild b/libre/virtualbox/vboxbuild
deleted file mode 100644
index 66f5812ab..000000000
--- a/libre/virtualbox/vboxbuild
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/vbox/vbox.cfg
-
-MODLIST=()
-LOG="/var/log/vbox-install.log"
->| "$LOG"
-
-if [[ $INSTALL_DIR ]]; then
- VBOXMANAGE=$INSTALL_DIR/VBoxManage
- BUILDVBOXDRV=$INSTALL_DIR/src/vboxdrv/build_in_tmp
- BUILDVBOXNETFLT=$INSTALL_DIR/src/vboxnetflt/build_in_tmp
- BUILDVBOXNETADP=$INSTALL_DIR/src/vboxnetadp/build_in_tmp
- BUILDVBOXPCI=$INSTALL_DIR/src/vboxpci/build_in_tmp
-else
- echo "error: missing vbox.cfg"
- exit 1
-fi
-
-if [[ -f /proc/modules ]]; then
- IFS=$'\n' read -r -d '' -a MODLIST < \
- <(grep -oE '^vbox(pci|netflt|netadp|drv)' /proc/modules)
-fi
-
-if (( ${#MODLIST[*]} )); then
- stat_busy "Unloading VirtualBox kernel modules"
- modprobe -ar "${MODLIST[@]}" && stat_done || stat_fail
-fi
-
-for kdir in /lib/modules/*; do
- if [[ ! -d $kdir/kernel ]]; then
- # found a stale kernel
- mods=("$kdir/misc/vbox"{drv,netadp,netflt,pci}.ko*)
- if (( ${#mods[@]} )); then
- stat_busy "Removing all old VirtualBox kernel modules"
- if rm -f "${mods[@]}" &&
- rmdir -p --ignore-fail-on-non-empty "$p/misc/" 2>/dev/null; then
- stat_done
- else
- stat_fail
- fi
- fi
- fi
-done
-
-# default to the currently running kernel
-if (( ! $# )); then
- set -- $(uname -r)
-fi
-
-for kernver; do
- export KERN_DIR=/lib/modules/$kernver/build
- if [[ ! -d $KERN_DIR ]]; then
- printf "error: \`%s' does not appear to be a valid kernel build directory.\n" \
- "$KERN_DIR"
- continue
- fi
-
- stat_busy "Recompiling VirtualBox kernel modules ($kernver)"
- for build in BUILDVBOX{DRV,NETFLT,NETADP,PCI}; do
- if ! ${!build} \
- --save-module-symvers /tmp/vboxdrv-Module.symvers \
- --no-print-directory install >> $LOG 2>&1; then
- echo "Look at $LOG to find out what went wrong"
- stat_fail
- continue
- fi
- done
- stat_done
-done
-
-if (( ${#MODLIST[*]} )); then
- stat_busy "Reloading VirtualBox kernel modules"
- modprobe -a "${MODLIST[@]}" && stat_done || stat_fail
-fi
-
-
diff --git a/libre/virtualbox/vboxdrv-reference.patch b/libre/virtualbox/vboxdrv-reference.patch
deleted file mode 100644
index 14e26d114..000000000
--- a/libre/virtualbox/vboxdrv-reference.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
---- VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-07-19 15:11:37.730121727 +0000
-+++ VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-07-19 19:02:15.658471139 +0000
-@@ -75,9 +75,8 @@
- "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
- "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
- "module by executing<br/><br/>"
-- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
-- "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS "
-- "package first. This package keeps track of Linux kernel changes and "
-+ " <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>"
-+ "as root. This package keeps track of Linux kernel changes and"
- "recompiles the vboxdrv kernel module if necessary."
- );
-
-@@ -92,7 +91,7 @@
- "The VirtualBox kernel modules do not match this version of "
- "VirtualBox. The installation of VirtualBox was apparently not "
- "successful. Executing<br/><br/>"
-- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
-+ " <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>"
- "may correct this. Make sure that you do not mix the "
- "OSE version and the PUEL version of VirtualBox."
- );
-diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh
---- VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-07-19 15:11:37.603453927 +0000
-+++ VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh 2011-07-19 19:02:15.658471139 +0000
-@@ -34,7 +34,7 @@
- available for the current kernel (`uname -r`) or it failed to
- load. Please recompile the kernel module and install it by
-
-- sudo /etc/init.d/vboxdrv setup
-+ sudo /usr/bin/vboxbuild
-
- You will not be able to start VMs until this problem is fixed.
- EOF
-@@ -42,7 +42,7 @@
- cat << EOF
- WARNING: The character device /dev/vboxdrv does not exist. Try
-
-- sudo /etc/init.d/vboxdrv restart
-+ sudo /usr/bin/vboxbuild
-
- and if that is not successful, try to re-install the package.
-
-
diff --git a/libre/virtualbox/virtualbox-4-makeself-check.patch b/libre/virtualbox/virtualbox-4-makeself-check.patch
deleted file mode 100644
index 57862b41e..000000000
--- a/libre/virtualbox/virtualbox-4-makeself-check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- VirtualBox-4.0.0_OSE/configure
-+++ VirtualBox-4.0.0_OSE/configure
-@@ -2527,7 +2527,6 @@
- check_compiler_h
- [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
- # tools/common/makeself*
-- [ $OSE -ge 1 ] && check_makeself
- fi
-
- [ -n "$SETUP_WINE" ] && setup_wine
-
diff --git a/libre/virtualbox/virtualbox-4-mkisofs-check.patch b/libre/virtualbox/virtualbox-4-mkisofs-check.patch
deleted file mode 100644
index d43962148..000000000
--- a/libre/virtualbox/virtualbox-4-mkisofs-check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- VirtualBox-4.0.0_OSE/configure
-+++ VirtualBox-4.0.0_OSE/configure
-@@ -2499,7 +2499,6 @@
- # don't check for yasm for the time beeing as 0.40 and 0.50 both have known bugs
- # [ "$OS" != "darwin" ] && check_yasm
- [ "$OS" != "darwin" ] && check_xsltproc
--[ "$OS" != "darwin" ] && check_mkisofs
-
- # the libraries
- [ "$OS" != "darwin" ] && check_pthread
-
diff --git a/libre/virtualbox/virtualbox-parabola-modules.install b/libre/virtualbox/virtualbox-parabola-modules.install
deleted file mode 100644
index 75d28784a..000000000
--- a/libre/virtualbox/virtualbox-parabola-modules.install
+++ /dev/null
@@ -1,25 +0,0 @@
-KERNEL_VERSION='3.0-LIBRE'
-
-post_install() {
- cat << EOM
-
-===> virtualbox-parabola-modules post-install message:
-===>
-===> You may want to load vboxguest, vboxsf and vboxvideo
-===>
-===> To load them automatically, add them
-===> to the MODULES array in /etc/rc.conf.
-
-EOM
-
- depmod -v $KERNEL_VERSION >/dev/null 2>&1
-}
-
-post_remove() {
- depmod -v $KERNEL_VERSION >/dev/null 2>&1
-}
-
-post_upgrade() {
- depmod -v $KERNEL_VERSION >/dev/null 2>&1
-}
-
diff --git a/libre/virtualbox/virtualbox.install b/libre/virtualbox/virtualbox.install
deleted file mode 100644
index 238b0561f..000000000
--- a/libre/virtualbox/virtualbox.install
+++ /dev/null
@@ -1,52 +0,0 @@
-utils() {
- if [ -x usr/bin/update-mime-database ]; then
- update-mime-database usr/share/mime > /dev/null 2>&1
- fi
-
- if [ -x usr/bin/xdg-icon-resource ]; then
- xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1
- fi
-
- if [ -x usr/bin/update-desktop-database ]; then
- usr/bin/update-desktop-database -q
- fi
-}
-
-post_install() {
- getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
- /bin/cat << EOF
-
-===> In order to run VirtualBox, you have to be in the 'vboxusers' group.
-===>
-===> If you want to be able to install guest additions, you have to install
-===> 'virtualbox-additions' package.
-===>
-===> You must load vboxdrv module before starting VirtualBox:
-===> # modprobe vboxdrv
-===>
-===> For networking you must load vboxnetflt or vboxnetadp.
-===>
-===> For PCI passthrough support load vboxpci module.
-===>
-===> To load it automatically, add vboxdrv module
-===> to the MODULES array in /etc/rc.conf.
-
-*** To compile the modules do /usr/bin/vboxbuild ***
-
-EOF
- utils
-}
-
-post_upgrade() {
- getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
- /bin/cat << EOF
-*** To recompile the modules do /usr/bin/vboxbuild ***
-EOF
- utils
-}
-
-post_remove() {
- groupdel vboxusers >/dev/null 2>&1 || true
- utils
-}
-
diff --git a/multilib-testing/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD
deleted file mode 100644
index 3ace6a666..000000000
--- a/multilib-testing/gcc-multilib/PKGBUILD
+++ /dev/null
@@ -1,303 +0,0 @@
-# $Id: PKGBUILD 57474 2011-10-28 11:14:40Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: libtool requires rebuilt with each new gcc version
-
-pkgbase='gcc-multilib'
-pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib')
-pkgver=4.6.2
-pkgrel=1
-#_snapshot=4.6-20110819
-_libstdcppmanver=20110814 # Note: check source directory name when updating this
-pkgdesc="The GNU Compiler Collection for multilib"
-arch=('x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-makedepends=('binutils-multilib>=2.21.1' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib'
- 'lib32-glibc>=2.14')
-checkdepends=('dejagnu')
-options=('!libtool' '!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
- #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
- ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
- gcc_pure64.patch
- gcc-hash-style-both.patch)
-md5sums=('028115c4fbfb6cfd75d6369f4a90d87e'
- 'ce920d2550ff7e042b9f091d27764d8f'
- '4030ee1c08dd1e843c0225b772360e76'
- '4df25b623799b148a0703eaeec8fdf3f')
-
-if [ -n "${_snapshot}" ]; then
- _basedir="${srcdir}/gcc-${_snapshot}"
-else
- _basedir="${srcdir}/gcc-${pkgver}"
-fi
-
-build() {
- cd ${_basedir}
-
- # Do not install libiberty
- sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
- # Do not run fixincludes
- sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
- patch -Np1 -i ${srcdir}/gcc_pure64.patch
- patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
-
- echo ${pkgver} > gcc/BASE-VER
-
- cd ${srcdir}
- mkdir gcc-build && cd gcc-build
-
- ${_basedir}/configure --prefix=/usr \
- --libdir=/usr/lib --libexecdir=/usr/lib \
- --mandir=/usr/share/man --infodir=/usr/share/info \
- --with-bugurl=https://bugs.archlinux.org/ \
- --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
- --enable-shared --enable-threads=posix \
- --with-system-zlib --enable-__cxa_atexit \
- --disable-libunwind-exceptions --enable-clocale=gnu \
- --enable-gnu-unique-object --enable-linker-build-id \
- --with-ppl --enable-cloog-backend=isl \
- --enable-lto --enable-gold --enable-ld=default \
- --enable-plugin --with-plugin-ld=ld.gold \
- --enable-multilib --disable-libssp --disable-libstdcxx-pch \
- --enable-checking=release
- make
-}
-
-check() {
- cd gcc-build
-
- # increase stack size to prevent test failures
- # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
- ulimit -s 32768
-
- # do not abort on error as some are "expected"
- make -k check || true
- ${_basedir}/contrib/test_summary
-}
-
-package_gcc-libs-multilib()
-{
- pkgdesc="Runtime libraries shipped by GCC for multilib"
- depends=('glibc>=2.14' "lib32-gcc-libs=$pkgver-$pkgrel")
- provides=("gcc-libs=$pkgver-$pkgrel")
- conflicts=('gcc-libs')
- install=gcc-libs.install
-
- cd gcc-build
- make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
- for lib in libmudflap libgomp libstdc++-v3/src; do
- make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
- done
- make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
- make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
-
- make -j1 DESTDIR=${pkgdir} install-target-libquadmath
- make -j1 DESTDIR=${pkgdir} install-target-libgfortran
- make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
- # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
- rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
-
- # remove stuff in lib32-gcc-libs
- rm -rf ${pkgdir}/usr/lib32
-
- # remove static libraries
- find ${pkgdir} -name *.a -delete
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_lib32-gcc-libs()
-{
- pkgdesc="Runtime libraries shipped by GCC (32-bit)"
- depends=('lib32-glibc>=2.14' "gcc-libs>=$pkgver")
-
- cd gcc-build
- make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared
- for lib in libmudflap libgomp libstdc++-v3/src; do
- make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
- done
-
- make -j1 DESTDIR=${pkgdir} install-target-libquadmath
- make -j1 DESTDIR=${pkgdir} install-target-libgfortran
- make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
- # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
- rm ${pkgdir}/usr/lib32/libgfortran.spec
-
- # remove stuff in gcc-libs-multilib
- rm -rf ${pkgdir}/usr/lib
- rm -rf ${pkgdir}/usr/share/info
-
- # remove static libraries
- find ${pkgdir} -name *.a -delete
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-multilib()
-{
- pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib"
- depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils-multilib>=2.21.1' 'libmpc' 'cloog' 'ppl')
- groups=('multilib-devel')
- provides=("gcc=$pkgver-$pkgrel")
- conflicts=('gcc')
- install=gcc.install
-
- cd gcc-build
-
- # unfortunately it is much, much easier to install the lot and clean-up the mess...
- make -j1 DESTDIR=${pkgdir} install
- rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
- rm $pkgdir/usr/lib{,32}/*.so*
- rm $pkgdir/usr/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
- rm $pkgdir/usr/lib{,32}/libgfortran.spec
- rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{{,32/}ada{include,lib},finclude,include/objc}
- rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
- rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,{,32/}libgfortranbegin.a}
- rm -r $pkgdir/usr/lib{,32}/go
- rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
- rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
- rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
- rm $pkgdir/usr/share/man/man3/ffi*
-
- # many packages require these symlinks
- install -dm755 ${pkgdir}/lib
- ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp
- ln -sf gcc ${pkgdir}/usr/bin/cc
- ln -sf g++ ${pkgdir}/usr/bin/c++
-
- # install gengtype for plugin support
- install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
- install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
-
- # POSIX conformance launcher scripts for c89 and c99
- cat > $pkgdir/usr/bin/c89 <<"EOF"
-#!/bin/sh
-fl="-std=c89"
-for opt; do
- case "$opt" in
- -ansi|-std=c89|-std=iso9899:1990) fl="";;
- -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
- exit 1;;
- esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
- cat > $pkgdir/usr/bin/c99 <<"EOF"
-#!/bin/sh
-fl="-std=c99"
-for opt; do
- case "$opt" in
- -std=c99|-std=iso9899:1999) fl="";;
- -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
- exit 1;;
- esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
- chmod 755 $pkgdir/usr/bin/c{8,9}9
-
- # install the libstdc++ man pages
- install -dm755 ${pkgdir}/usr/share/man/man3
- install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-fortran-multilib()
-{
- pkgdesc="Fortran front-end for GCC for multilib"
- depends=("gcc-multilib=$pkgver-$pkgrel")
- provides=("gcc-fortran=$pkgver-$pkgrel")
- conflicts=('gcc-fortran')
- install=gcc-fortran.install
-
- cd gcc-build
- make -j1 DESTDIR=${pkgdir} install-target-libquadmath
- make -j1 DESTDIR=$pkgdir install-target-libgfortran
- make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
- make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
- install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
-
- # remove libraries included in gcc-libs
- rm ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so*
- rm ${pkgdir}/usr/share/info/libquadmath.info
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-fortran-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-objc-multilib()
-{
- pkgdesc="Objective-C front-end for GCC for multilib"
- depends=("gcc-multilib=$pkgver-$pkgrel")
- provides=("gcc-objc=$pkgver-$pkgrel")
- conflicts=('gcc-objc')
-
- cd gcc-build
- make -j1 DESTDIR=$pkgdir install-target-libobjc
- install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
- install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-
- # remove libraries included in gcc-libs
- rm ${pkgdir}/usr/lib{,32}/libobjc.so*
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-objc-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-ada-multilib()
-{
- pkgdesc="Ada front-end for GCC (GNAT) for multilib"
- depends=("gcc-multilib=$pkgver-$pkgrel")
- provides=("gcc-ada=$pkgver-$pkgrel")
- conflicts=('gcc-ada')
- install=gcc-ada.install
-
- cd gcc-build/gcc
- make -j1 DESTDIR=$pkgdir ada.install-{common,info}
- install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
-
- cd ../$CHOST/32/libada
- make -j1 DESTDIR=${pkgdir} INSTALL="install" \
- INSTALL_DATA="install -m644" install-gnatlib
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-ada-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-go-multilib()
-{
- pkgdesc="Go front-end for GCC for multilib"
- depends=("gcc-multilib=$pkgver-$pkgrel")
- provides=("gcc-go=$pkgver-$pkgrel")
- conflicts=('gcc-go')
- install=gcc-go.install
-
- cd gcc-build
- make -j1 DESTDIR=$pkgdir install-target-libgo
- make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
- install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
-}
diff --git a/multilib-testing/gcc-multilib/gcc-ada.install b/multilib-testing/gcc-multilib/gcc-ada.install
deleted file mode 100644
index df0553a4f..000000000
--- a/multilib-testing/gcc-multilib/gcc-ada.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/multilib-testing/gcc-multilib/gcc-fortran.install b/multilib-testing/gcc-multilib/gcc-fortran.install
deleted file mode 100644
index b15d89a97..000000000
--- a/multilib-testing/gcc-multilib/gcc-fortran.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file="gfortran.info"
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
diff --git a/multilib-testing/gcc-multilib/gcc-go.install b/multilib-testing/gcc-multilib/gcc-go.install
deleted file mode 100644
index 7dc50dee5..000000000
--- a/multilib-testing/gcc-multilib/gcc-go.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gccgo.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch b/multilib-testing/gcc-multilib/gcc-hash-style-both.patch
deleted file mode 100644
index 8b59f4535..000000000
--- a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- gcc/config/alpha/linux-elf.h.orig 2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/alpha/linux-elf.h 2011-03-11 10:01:47.770000457 +1000
-@@ -41,7 +41,7 @@
-
- #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER
-
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \
-+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \
- %{O*:-O3} %{!O*:-O1} \
- %{shared:-shared} \
- %{!shared: \
---- gcc/config/i386/linux64.h.orig 2011-03-03 08:35:36.000000000 +1000
-+++ gcc/config/i386/linux64.h 2011-03-11 10:01:47.770000457 +1000
-@@ -78,7 +78,7 @@
- %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
-
- #undef LINK_SPEC
--#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
-+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
---- gcc/config/i386/linux.h.orig 2011-01-15 04:45:06.000000000 +1000
-+++ gcc/config/i386/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -104,7 +104,7 @@
- { "dynamic_linker", LINUX_DYNAMIC_LINKER }
-
- #undef LINK_SPEC
--#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
---- gcc/config/ia64/linux.h.orig 2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/ia64/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -64,7 +64,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
-
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC "--hash-style=both \
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
---- gcc/config/rs6000/linux64.h.orig 2011-02-11 03:30:10.000000000 +1000
-+++ gcc/config/rs6000/linux64.h 2011-03-11 10:03:34.280000457 +1000
-@@ -389,11 +389,11 @@
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
-
-
--#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
- -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
-
--#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
- -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
-
---- gcc/config/rs6000/sysv4.h.orig 2011-01-28 04:36:03.000000000 +1000
-+++ gcc/config/rs6000/sysv4.h 2011-03-11 10:01:47.773333792 +1000
-@@ -830,7 +830,7 @@
- #define LINUX_DYNAMIC_LINKER \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
-
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
- -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
-
---- gcc/config/s390/linux.h.orig 2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/s390/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -77,7 +77,7 @@
-
- #undef LINK_SPEC
- #define LINK_SPEC \
-- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
- %{shared:-shared} \
- %{!shared: \
- %{static:-static} \
---- gcc/config/sparc/linux64.h.orig 2011-02-17 23:57:21.000000000 +1000
-+++ gcc/config/sparc/linux64.h 2011-03-11 10:01:47.770000457 +1000
-@@ -113,7 +113,7 @@
- { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
- { "link_arch", LINK_ARCH_SPEC },
-
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-@@ -121,7 +121,7 @@
- %{static:-static}} \
- "
-
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-@@ -193,7 +193,7 @@
- #else /* !SPARC_BI_ARCH */
-
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
---- gcc/config/sparc/linux.h.orig 2011-01-27 06:30:12.000000000 +1000
-+++ gcc/config/sparc/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -74,7 +74,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
- %{!mno-relax:%{!r:-relax}} \
- %{!shared: \
- %{!static: \
diff --git a/multilib-testing/gcc-multilib/gcc-libs.install b/multilib-testing/gcc-multilib/gcc-libs.install
deleted file mode 100644
index 23553b8f0..000000000
--- a/multilib-testing/gcc-multilib/gcc-libs.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-filelist=(libgomp.info libquadmath.info)
-
-post_upgrade() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/multilib-testing/gcc-multilib/gcc.install b/multilib-testing/gcc-multilib/gcc.install
deleted file mode 100644
index 3407a5e1f..000000000
--- a/multilib-testing/gcc-multilib/gcc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/multilib-testing/gcc-multilib/gcc_pure64.patch b/multilib-testing/gcc-multilib/gcc_pure64.patch
deleted file mode 100644
index 8c0baf8e2..000000000
--- a/multilib-testing/gcc-multilib/gcc_pure64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
---- gcc-4.2.0.orig/gcc/config/i386/linux64.h 2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/linux64.h 2007-05-18 17:04:05.000000000 -0400
-@@ -49,8 +49,8 @@
- When the -shared link option is used a final link is not being
- done. */
-
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
-
- #undef LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
---- gcc-4.2.0.orig/gcc/config/i386/t-linux64 2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/t-linux64 2007-05-18 17:04:36.000000000 -0400
-@@ -6,7 +6,7 @@
-
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
-
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD
deleted file mode 100644
index 883de6480..000000000
--- a/multilib-testing/lib32-glibc/PKGBUILD
+++ /dev/null
@@ -1,167 +0,0 @@
-# $Id: PKGBUILD 57274 2011-10-25 08:56:21Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: valgrind requires rebuild with each new glibc version
-
-_pkgbasename=glibc
-pkgname=lib32-$_pkgbasename
-pkgver=2.14.1
-pkgrel=1
-_glibcdate=20111025
-pkgdesc="GNU C Library for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/libc"
-license=('GPL' 'LGPL')
-depends=("glibc>=$pkgver")
-makedepends=('gcc-multilib>=4.6')
-options=('!strip' '!emptydirs')
-source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcdate}.tar.xz
- glibc-2.10-dont-build-timezone.patch
- glibc-2.10-bz4781.patch
- glibc-__i686.patch
- glibc-2.12.1-static-shared-getpagesize.patch
- glibc-2.12.2-ignore-origin-of-privileged-program.patch
- glibc-2.13-futex.patch
- glibc-2.14-libdl-crash.patch
- glibc-2.14-revert-4768ae77.patch
- glibc-2.14-reexport-rpc-interface.patch
- glibc-2.14-reinstall-nis-rpc-headers.patch
- lib32-glibc.conf)
-md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1'
- '4dadb9203b69a3210d53514bb46f41c3'
- '0c5540efc51c0b93996c51b57a8540ae'
- '40cd342e21f71f5e49e32622b25acc52'
- 'a3ac6f318d680347bb6e2805d42b73b2'
- 'b042647ea7d6f22ad319e12e796bd13e'
- '7d0154b7e17ea218c9fa953599d24cc4'
- '6970bcfeb3bf88913436d5112d16f588'
- '7da8c554a3b591c7401d7023b1928afc'
- 'c5de2a946215d647c8af5432ec4b0da0'
- '55febbb72139ac7b65757df085024b83'
- 'a8f4549c716cd37244fbf1ed059497f8')
-
-build() {
- cd ${srcdir}/glibc
-
- # timezone data is in separate package (tzdata)
- patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch
-
- # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
- patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch
-
- # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411
- # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
- patch -Np1 -i ${srcdir}/glibc-__i686.patch
-
- # http://sourceware.org/bugzilla/show_bug.cgi?id=11929
- # using Fedora "fix" as patch in that bug report causes breakages...
- patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch
-
- # http://www.exploit-db.com/exploits/15274/
- # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
-
- # http://sourceware.org/bugzilla/show_bug.cgi?id=12403
- patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch
-
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...)
- # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
- patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
-
- # Revert commit causing issues with crappy DNS servers...
- # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER!
- # Note that both these patches do not fix the issue completely:
- # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch
-
- # re-export RPC interface until libtirpc is ready as a replacement
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
-
- cd ${srcdir}
- mkdir glibc-build
- cd glibc-build
-
- export CC="gcc -m32"
-
- # Hack to fix NPTL issues with Xen, only required on 32bit platforms
- export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
-
- echo "slibdir=/lib32" >> configparms
-
- # remove hardening options from CFLAGS for building libraries
- CFLAGS=${CFLAGS/-fstack-protector/}
- CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
-
- ${srcdir}/glibc/configure --prefix=/usr \
- --libdir=/usr/lib32 --libexecdir=/usr/lib32 \
- --with-headers=/usr/include \
- --enable-add-ons=nptl,libidn \
- --enable-kernel=2.6.27 \
- --with-tls --with-__thread \
- --enable-bind-now --without-gd \
- --without-cvs --disable-profile \
- --enable-multi-arch i686-unknown-linux-gnu
-
- # build libraries with hardening disabled
- echo "build-programs=no" >> configparms
- make
-
- # re-enable hardening for programs
- sed -i "s#=no#=yes#" configparms
- echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
- echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
- make
-
- # remove harding in preparation to run test-suite
- sed -i '2,4d' configparms
-}
-
-check() {
- cd ${srcdir}/glibc-build
-
- # some errors are expected - manually check log files
- make -k check || true
-}
-
-package() {
- cd ${srcdir}/glibc-build
- make install_root=${pkgdir} install
-
- rm -rf ${pkgdir}/{etc,sbin,usr/{bin,sbin,share}}
-
- # We need one 32 bit specific header file
- find ${pkgdir}/usr/include -type f -not -name stubs-32.h -delete
-
- # manually strip files as stripping libpthread-*.so and libthread_db.so
- # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks
- # valgrind on x86_64
-
- cd $pkgdir
- strip $STRIP_BINARIES usr/lib32/getconf/*
-
- strip $STRIP_STATIC usr/lib32/*.a \
- lib32/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so
-
- strip $STRIP_SHARED lib32/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \
- lib32/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
- lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
- lib32/{libmemusage,libpcprofile,libSegFault}.so \
- usr/lib32/{pt_chown,{audit,gconv}/*.so}
-
- # Dynamic linker
- mkdir ${pkgdir}/lib
- ln -s ../lib32/ld-linux.so.2 ${pkgdir}/lib/
-
- # Add lib32 paths to the default library search path
- install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf"
-
- # Symlink /usr/lib32/locale to /usr/lib/locale
- ln -s ../lib/locale "$pkgdir/usr/lib32/locale"
-}
diff --git a/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch b/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch
deleted file mode 100644
index cf1a97a18..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-23 13:27:46.000000000 +1000
-@@ -120,9 +120,6 @@
- ret
-
- L(thread_start):
-- cfi_startproc;
-- /* Clearing frame pointer is insufficient, use CFI. */
-- cfi_undefined (eip);
- /* Note: %esi is zero. */
- movl %esi,%ebp /* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@
- jmp L(haspid)
- .previous
- #endif
-- cfi_endproc;
-
- cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-23 13:27:46.000000000 +1000
-@@ -89,9 +89,6 @@
- ret
-
- L(thread_start):
-- cfi_startproc;
-- /* Clearing frame pointer is insufficient, use CFI. */
-- cfi_undefined (rip);
- /* Clear the frame pointer. The ABI suggests this be done, to mark
- the outermost frame obviously. */
- xorl %ebp, %ebp
-@@ -116,7 +113,6 @@
- /* Call exit with return value from function call. */
- movq %rax, %rdi
- call HIDDEN_JUMPTARGET (_exit)
-- cfi_endproc;
-
- cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
diff --git a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch b/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch
deleted file mode 100644
index d3abeff17..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-timezone data has been split into the package sys-libs/timezone-data
-
---- glibc-2.4/Makeconfig
-+++ glibc-2.4/Makeconfig
-@@ -931,7 +931,7 @@
- stdlib stdio-common libio malloc string wcsmbs time dirent \
- grp pwd posix io termios resource misc socket sysvipc gmon \
- gnulib iconv iconvdata wctype manual shadow gshadow po argp \
-- crypt nss localedata timezone rt conform debug \
-+ crypt nss localedata rt conform debug \
- $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
-
- ifndef avoid-generated
diff --git a/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch b/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch
deleted file mode 100644
index e84754279..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c
-+++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c
-@@ -28,7 +28,7 @@
- int
- __getpagesize ()
- {
--#ifdef __ASSUME_AT_PAGESIZE
-+#if 0 && defined __ASSUME_AT_PAGESIZE
- assert (GLRO(dl_pagesize) != 0);
- return GLRO(dl_pagesize);
- #else
diff --git a/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
deleted file mode 100644
index ce089b49c..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Thu, 9 Dec 2010 15:00:59 +0100
-Subject: [PATCH 1/1] Ignore origin of privileged program
-
----
- ChangeLog | 5 +++++
- elf/dl-object.c | 3 +++
- 2 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/elf/dl-object.c b/elf/dl-object.c
-index 22a1635..7674d49 100644
---- a/elf/dl-object.c
-+++ b/elf/dl-object.c
-@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type,
- out:
- new->l_origin = origin;
- }
-+ else if (INTUSE(__libc_enable_secure) && type == lt_executable)
-+ /* The origin of a privileged program cannot be trusted. */
-+ new->l_origin = (char *) -1;
-
- return new;
- }
---
-1.7.2
diff --git a/multilib-testing/lib32-glibc/glibc-2.13-futex.patch b/multilib-testing/lib32-glibc/glibc-2.13-futex.patch
deleted file mode 100644
index 9b9c3ac45..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.13-futex.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
-+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
-@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock:
- cfi_restore(%r12)
- retq
-
--#ifdef __ASSUME_PRIVATE_FUTEX
-+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
- cfi_adjust_cfa_offset(16)
- cfi_rel_offset(%r12, 8)
- cfi_rel_offset(%r13, 0)
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
-+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
-@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock:
-
- 7: movq %rdx, %rax
-
--#ifndef __ASSUME_PRIVATE_FUTEX
-+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME
- addq $16, %rsp
- cfi_adjust_cfa_offset(-16)
- popq %r14
-@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock:
- cfi_restore(%r12)
- retq
-
--#ifdef __ASSUME_PRIVATE_FUTEX
-+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
- cfi_adjust_cfa_offset(16)
- cfi_rel_offset(%r12, 8)
- cfi_rel_offset(%r13, 0)
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch b/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch
deleted file mode 100644
index 6c9d2718e..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/elf/dl-close.c b/elf/dl-close.c
-index 73b2a2f..9bd91e3 100644
---- a/elf/dl-close.c
-+++ b/elf/dl-close.c
-@@ -1,5 +1,5 @@
- /* Close a shared object opened by `_dl_open'.
-- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
- if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
- || dl_close_state != not_pending)
- {
-- if (map->l_direct_opencount == 0)
-- {
-- if (map->l_type == lt_loaded)
-- dl_close_state = rerun;
-- else if (map->l_type == lt_library)
-- {
-- struct link_map **oldp = map->l_initfini;
-- map->l_initfini = map->l_orig_initfini;
-- _dl_scope_free (oldp);
-- }
-- }
-+ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
-+ dl_close_state = rerun;
-
- /* There are still references to this object. Do nothing more. */
- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
-diff --git a/elf/dl-deps.c b/elf/dl-deps.c
-index 9e30594..3890d00 100644
---- a/elf/dl-deps.c
-+++ b/elf/dl-deps.c
-@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
- nneeded * sizeof needed[0]);
- atomic_write_barrier ();
- l->l_initfini = l_initfini;
-+ l->l_free_initfini = 1;
- }
-
- /* If we have no auxiliary objects just go on to the next map. */
-@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
- l_initfini[nlist] = NULL;
- atomic_write_barrier ();
- map->l_initfini = l_initfini;
-+ map->l_free_initfini = 1;
- if (l_reldeps != NULL)
- {
- atomic_write_barrier ();
-@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING"));
- _dl_scope_free (old_l_reldeps);
- }
- if (old_l_initfini != NULL)
-- map->l_orig_initfini = old_l_initfini;
-+ _dl_scope_free (old_l_initfini);
-
-diff --git a/elf/dl-libc.c b/elf/dl-libc.c
-index 7be9483..a13fce3 100644
---- a/elf/dl-libc.c
-+++ b/elf/dl-libc.c
-@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
-
- for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
- {
-- /* Remove all additional names added to the objects. */
- for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
- {
- struct libname_list *lnp = l->l_libname->next;
-
- l->l_libname->next = NULL;
-
-+ /* Remove all additional names added to the objects. */
- while (lnp != NULL)
- {
- struct libname_list *old = lnp;
-@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem)
- if (! old->dont_free)
- free (old);
- }
-+
-+ /* Free the initfini dependency list. */
-+ if (l->l_free_initfini)
-+ free (l->l_initfini);
- }
-
- if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 4a9109e..617e30e 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- lnp->dont_free = 1;
- lnp = lnp->next;
- }
-+ l->l_free_initfini = 0;
-
- if (l != &GL(dl_rtld_map))
- _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
-diff --git a/include/link.h b/include/link.h
-index e877104..051b99a 100644
---- a/include/link.h
-+++ b/include/link.h
-@@ -1,6 +1,6 @@
- /* Data structure for communication from the run-time dynamic linker for
- loaded ELF shared objects.
-- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -192,6 +192,9 @@ struct link_map
- during LD_TRACE_PRELINKING=1
- contains any DT_SYMBOLIC
- libraries. */
-+ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
-+ freed, ie. not allocated with
-+ the dummy malloc in ld.so. */
-
- /* Collected information about own RPATH directories. */
- struct r_search_path_struct l_rpath_dirs;
-@@ -240,9 +243,6 @@ struct link_map
-
- /* List of object in order of the init and fini calls. */
- struct link_map **l_initfini;
-- /* The init and fini list generated at startup, saved when the
-- object is also loaded dynamically. */
-- struct link_map **l_orig_initfini;
-
- /* List of the dependencies introduced through symbol binding. */
- struct link_map_reldeps
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch b/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch
deleted file mode 100644
index e2beea881..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/include/libc-symbols.h b/include/libc-symbols.h
-index 67e1ca2..5e7cca5 100644
---- a/include/libc-symbols.h
-+++ b/include/libc-symbols.h
-@@ -635,7 +635,7 @@ for linking")
- # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
- # define libc_hidden_def(name) hidden_def (name)
- # define libc_hidden_weak(name) hidden_weak (name)
--# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
-+# define libc_hidden_nolink(name, version) hidden_def (name)
- # define libc_hidden_ver(local, name) hidden_ver (local, name)
- # define libc_hidden_data_def(name) hidden_data_def (name)
- # define libc_hidden_data_weak(name) hidden_data_weak (name)
-diff --git a/sunrpc/Makefile b/sunrpc/Makefile
-index 5134ce9..40c73d1 100644
---- a/sunrpc/Makefile
-+++ b/sunrpc/Makefile
-@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
- des_crypt.h)
- headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
- $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
--headers = rpc/netdb.h
-+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
- install-others = $(inst_sysconfdir)/rpc
- generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
- $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
deleted file mode 100644
index eb0fd822d..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Tue, 17 May 2011 17:42:30 +0200
-Subject: [PATCH] Reinstall NIS RPC headers
-
----
- nis/Makefile | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/nis/Makefile b/nis/Makefile
-index b5c9609..d2934d9 100644
---- a/nis/Makefile
-+++ b/nis/Makefile
-@@ -23,9 +23,9 @@ subdir := nis
-
- aux := nis_hash
-
-+headers := $(wildcard rpcsvc/*.[hx])
- distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \
-- nisplus-parser.h nis_xdr.h nss \
-- $(wildcard rpcsvc/*.[hx])
-+ nisplus-parser.h nis_xdr.h nss
-
- # These are the databases available for the nis (and perhaps later nisplus)
- # service. This must be a superset of the services in nss.
---
-1.7.5.4
-
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch b/multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch
deleted file mode 100644
index 11f087cb7..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
---- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000
-+++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000
-@@ -549,7 +549,7 @@
- ns, ansp, ansp2, nansp2, resplen2);
- if (n < 0)
- return (-1);
-- if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+ if (n == 0)
- goto next_ns;
- } else {
- /* Use datagrams. */
-@@ -559,7 +559,7 @@
- ansp2, nansp2, resplen2);
- if (n < 0)
- return (-1);
-- if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+ if (n == 0)
- goto next_ns;
- if (v_circuit)
- // XXX Check whether both requests failed or
-@@ -1275,14 +1275,10 @@
- (*thisresplenp > *thisanssizp)
- ? *thisanssizp : *thisresplenp);
-
-- if (recvresp1 || (buf2 != NULL && recvresp2)) {
-- *resplen2 = 0;
-+ if (recvresp1 || (buf2 != NULL && recvresp2))
- return resplen;
-- }
- if (buf2 != NULL)
- {
-- /* No data from the first reply. */
-- resplen = 0;
- /* We are waiting for a possible second reply. */
- if (hp->id == anhp->id)
- recvresp1 = 1;
diff --git a/multilib-testing/lib32-glibc/glibc-__i686.patch b/multilib-testing/lib32-glibc/glibc-__i686.patch
deleted file mode 100644
index 28d5dd424..000000000
--- a/multilib-testing/lib32-glibc/glibc-__i686.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile
---- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000
-+++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000
-@@ -1,6 +1,7 @@
- # The mpn functions need a #define for asm syntax flavor.
--# Every i386 port in use uses gas syntax (I think).
--asm-CPPFLAGS += -DGAS_SYNTAX
-+# Every i386 port in use uses gas syntax (I think). Don't replace
-+# __i686 in __i686.get_pc_thunk.bx.
-+asm-CPPFLAGS += -DGAS_SYNTAX -U __i686
-
- # The i386 `long double' is a distinct type we support.
- long-double-fcts = yes
diff --git a/multilib-testing/lib32-glibc/lib32-glibc.conf b/multilib-testing/lib32-glibc/lib32-glibc.conf
deleted file mode 100644
index a1c8c4199..000000000
--- a/multilib-testing/lib32-glibc/lib32-glibc.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-/lib32
-/usr/lib32
diff --git a/multilib-testing/libtool-multilib/PKGBUILD b/multilib-testing/libtool-multilib/PKGBUILD
deleted file mode 100644
index e733861f9..000000000
--- a/multilib-testing/libtool-multilib/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 57473 2011-10-28 11:13:37Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-# NOTE: requires rebuild with each new gcc version
-
-pkgbase=libtool-multilib
-pkgname=(libtool-multilib lib32-libltdl)
-pkgver=2.4.2
-pkgrel=2
-pkgdesc="A generic library support script for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/libtool"
-license=('GPL')
-_gccver=4.6.2
-makedepends=("gcc-multilib=$_gccver")
-options=('!libtool')
-source=(ftp://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz{,.sig})
-md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
- '1e6ba57420c82c663c85e745d11c7eed')
-
-build() {
- cd "$srcdir"
-
- rm -rf libtool-64 libtool-32
- mv libtool-$pkgver libtool-64
- cp -a libtool-64 libtool-32
-
- msg2 "Building libtool-64..."
- cd "$srcdir/libtool-64"
- ./configure --prefix=/usr
- make
-
- msg2 "Building libtool-32..."
- export CC="gcc -m32"
- export CXX="g++ -m32"
-
- cd "$srcdir/libtool-32"
- ./configure --prefix=/usr --libdir=/usr/lib32
- make
-}
-
-check() {
- cd "$srcdir/libtool-64"
- make check
- cd "$srcdir/libtool-32"
- make check
-}
-
-package_libtool-multilib() {
- depends=('sh' "libltdl=$pkgver" 'tar' "gcc-multilib=$_gccver" "lib32-libltdl=$pkgver")
- groups=('multilib-devel')
- install=libtool.install
- provides=("libtool=$pkgver-$pkgrel")
- conflicts=(libtool)
-
- cd "$srcdir/libtool-64"
- make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
- install-data-local
- rm -rf ${pkgdir}/usr/share/libtool/libltdl/
-}
-
-package_lib32-libltdl() {
- pkgdesc="A system independent dlopen wrapper for GNU libtool (32-bit)"
- depends=(lib32-glibc libltdl)
- replaces=(lib32-libtool)
- provides=("lib32-libtool=$pkgver-$pkgrel")
- conflicts=(lib32-libtool)
-
- cd "$srcdir/libtool-32"
- make DESTDIR="$pkgdir" install-libLTLIBRARIES
-}
diff --git a/multilib-testing/libtool-multilib/libtool.install b/multilib-testing/libtool-multilib/libtool.install
deleted file mode 100644
index 424c8cb88..000000000
--- a/multilib-testing/libtool-multilib/libtool.install
+++ /dev/null
@@ -1,22 +0,0 @@
-infodir=/usr/share/info
-filelist=(libtool.info libtool.info-1 libtool.info-2)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib/lib32-glibc/glibc-2.13-dlclose-search-reset.patch b/multilib/lib32-glibc/glibc-2.13-dlclose-search-reset.patch
deleted file mode 100644
index 3ad8b418a..000000000
--- a/multilib/lib32-glibc/glibc-2.13-dlclose-search-reset.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 2f811bf88bed4a6c0dec8778847ba441736d509d Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Wed, 26 May 2010 18:28:59 +0200
-Subject: [PATCH] Fix scope handling during dl_close
-
----
- ChangeLog | 12 ++++++++++++
- elf/Makefile | 10 +++++++++-
- elf/dl-close.c | 7 +++++++
- elf/unload8.c | 33 +++++++++++++++++++++++++++++++++
- elf/unload8mod1.c | 7 +++++++
- elf/unload8mod1x.c | 1 +
- elf/unload8mod2.c | 7 +++++++
- elf/unload8mod3.c | 27 +++++++++++++++++++++++++++
- 8 files changed, 103 insertions(+), 1 deletions(-)
- create mode 100644 elf/unload8.c
- create mode 100644 elf/unload8mod1.c
- create mode 100644 elf/unload8mod1x.c
- create mode 100644 elf/unload8mod2.c
- create mode 100644 elf/unload8mod3.c
-
-diff --git a/elf/Makefile b/elf/Makefile
-index 59e835f..65b6deb 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -89,6 +89,7 @@ distribute := rtld-Rules \
- unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \
- unload6mod1.c unload6mod2.c unload6mod3.c \
- unload7mod1.c unload7mod2.c \
-+ unload8mod1.c unload8mod1x.c unload8mod2.c unload8mod3.c \
- tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \
- tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \
- tst-auditmod4a.c tst-auditmod4b.c \
-@@ -196,7 +197,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
- tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \
- tst-dlmodcount tst-dlopenrpath tst-deep1 \
- tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \
-- unload3 unload4 unload5 unload6 unload7 tst-global1 order2 \
-+ unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \
- tst-audit1 tst-audit2 \
- tst-stackguard1 tst-addr1 tst-thrlock \
- tst-unique1 tst-unique2
-@@ -247,6 +248,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
- unload4mod1 unload4mod2 unload4mod3 unload4mod4 \
- unload6mod1 unload6mod2 unload6mod3 \
- unload7mod1 unload7mod2 \
-+ unload8mod1 unload8mod1x unload8mod2 unload8mod3 \
- order2mod1 order2mod2 order2mod3 order2mod4 \
- tst-unique1mod1 tst-unique1mod2 \
- tst-unique2mod1 tst-unique2mod2
-@@ -522,6 +524,9 @@ $(objpfx)unload6mod2.so: $(libdl)
- $(objpfx)unload6mod3.so: $(libdl)
- $(objpfx)unload7mod1.so: $(libdl)
- $(objpfx)unload7mod2.so: $(objpfx)unload7mod1.so
-+$(objpfx)unload8mod1.so: $(objpfx)unload8mod2.so
-+$(objpfx)unload8mod2.so: $(objpfx)unload8mod3.so
-+$(objpfx)unload8mod3.so: $(libdl)
- $(objpfx)tst-initordera2.so: $(objpfx)tst-initordera1.so
- $(objpfx)tst-initorderb2.so: $(objpfx)tst-initorderb1.so $(objpfx)tst-initordera2.so
- $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb1.so
-@@ -823,6 +828,9 @@ $(objpfx)unload7: $(libdl)
- $(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so
- unload7-ENV = MALLOC_PERTURB_=85
-
-+$(objpfx)unload8: $(libdl)
-+$(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so
-+
- ifdef libdl
- $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a
- $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so
-diff --git a/elf/dl-close.c b/elf/dl-close.c
-index 700e765..f47d5f8 100644
---- a/elf/dl-close.c
-+++ b/elf/dl-close.c
-@@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map)
-
- imap->l_scope_max = new_size;
- }
-+ else if (new_list != NULL)
-+ {
-+ /* We didn't change the scope array, so reset the search
-+ list. */
-+ imap->l_searchlist.r_list = NULL;
-+ imap->l_searchlist.r_nlist = 0;
-+ }
-
- /* The loader is gone, so mark the object as not having one.
- Note: l_idx != IDX_STILL_USED -> object will be removed. */
-diff --git a/elf/unload8.c b/elf/unload8.c
-new file mode 100644
-index 0000000..f984a38
---- /dev/null
-+++ b/elf/unload8.c
-@@ -0,0 +1,33 @@
-+#include <dlfcn.h>
-+#include <stdio.h>
-+
-+int
-+main (void)
-+{
-+ void *h = dlopen ("$ORIGIN/unload8mod1.so", RTLD_LAZY);
-+ if (h == NULL)
-+ {
-+ puts ("dlopen unload8mod1.so failed");
-+ return 1;
-+ }
-+
-+ void *h2 = dlopen ("$ORIGIN/unload8mod1x.so", RTLD_LAZY);
-+ if (h2 == NULL)
-+ {
-+ puts ("dlopen unload8mod1x.so failed");
-+ return 1;
-+ }
-+ dlclose (h2);
-+
-+ int (*mod1) (void) = dlsym (h, "mod1");
-+ if (mod1 == NULL)
-+ {
-+ puts ("dlsym failed");
-+ return 1;
-+ }
-+
-+ mod1 ();
-+ dlclose (h);
-+
-+ return 0;
-+}
-diff --git a/elf/unload8mod1.c b/elf/unload8mod1.c
-new file mode 100644
-index 0000000..fe7e81c
---- /dev/null
-+++ b/elf/unload8mod1.c
-@@ -0,0 +1,7 @@
-+extern void mod2 (void);
-+
-+void
-+mod1 (void)
-+{
-+ mod2 ();
-+}
-diff --git a/elf/unload8mod1x.c b/elf/unload8mod1x.c
-new file mode 100644
-index 0000000..835b634
---- /dev/null
-+++ b/elf/unload8mod1x.c
-@@ -0,0 +1 @@
-+int mod1x;
-diff --git a/elf/unload8mod2.c b/elf/unload8mod2.c
-new file mode 100644
-index 0000000..2fd8b67
---- /dev/null
-+++ b/elf/unload8mod2.c
-@@ -0,0 +1,7 @@
-+extern void mod3 (void);
-+
-+void
-+mod2 (void)
-+{
-+ mod3 ();
-+}
-diff --git a/elf/unload8mod3.c b/elf/unload8mod3.c
-new file mode 100644
-index 0000000..d49e22b
---- /dev/null
-+++ b/elf/unload8mod3.c
-@@ -0,0 +1,27 @@
-+#include <dlfcn.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+void
-+mod3_fini2 (void)
-+{
-+}
-+
-+void
-+mod3_fini (void)
-+{
-+ mod3_fini2 ();
-+}
-+
-+void
-+mod3 (void)
-+{
-+ void *h = dlopen ("$ORIGIN/unload8mod2.so", RTLD_LAZY);
-+ if (h == NULL)
-+ {
-+ puts ("dlopen unload8mod2.so failed");
-+ exit (1);
-+ }
-+
-+ atexit (mod3_fini);
-+}
---
-1.7.3.4
-
diff --git a/multilib/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch b/multilib/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
deleted file mode 100644
index ef91116e5..000000000
--- a/multilib/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 032c0ee3ee28841d684950e33a77210118697566 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Thu, 1 Sep 2011 10:46:14 +0200
-Subject: [PATCH] Avoid assertion failure when first DNS answer was empty
-
----
- ChangeLog | 4 ++++
- resolv/res_query.c | 2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/resolv/res_query.c b/resolv/res_query.c
-index 2f7cfaa..2ded9fb 100644
---- a/resolv/res_query.c
-+++ b/resolv/res_query.c
-@@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp,
- && *resplen2 > (int) sizeof (HEADER))
- {
- /* Special case of partial answer. */
-- assert (hp != hp2);
-+ assert (n == 0 || hp != hp2);
- hp = hp2;
- }
- else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
---
-1.7.3.4
-
diff --git a/multilib/lib32-libpulse/version-number.patch b/multilib/lib32-libpulse/version-number.patch
deleted file mode 100644
index 473b252a9..000000000
--- a/multilib/lib32-libpulse/version-number.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 7563e0bbb54fbac54e77f3a62d9761a70f3a559c
-Author: Colin Guthrie <colin@mageia.org>
-Date: Sat Oct 1 12:03:44 2011 +0100
-
- libpulse: Always return a three part version number in API calls.
-
- For both the headers and the library we should provide clean, three part
- strings as this has been what we've previously done in the past
- and some external systems apparently rely on this format. While it's not
- something we've officially commented on before, there is no real advantage
- to us to change it so let's not try to tidy things up too much
- considering some third party apps (e.g. Skype) seem to dislike a two
- part version string.
-
-diff --git a/src/pulse/context.c b/src/pulse/context.c
-index 25d04a1..af144aa 100644
---- a/src/pulse/context.c
-+++ b/src/pulse/context.c
-@@ -1281,7 +1281,7 @@ pa_operation* pa_context_set_name(pa_context *c, const char *name, pa_context_su
- }
-
- const char* pa_get_library_version(void) {
-- return PACKAGE_VERSION;
-+ return pa_get_headers_version();
- }
-
- const char* pa_context_get_server(pa_context *c) {
-diff --git a/src/pulse/version.h.in b/src/pulse/version.h.in
-index 7e00c5e..1be4c75 100644
---- a/src/pulse/version.h.in
-+++ b/src/pulse/version.h.in
-@@ -35,7 +35,7 @@ PA_C_DECL_BEGIN
- /** Return the version of the header files. Keep in mind that this is
- a macro and not a function, so it is impossible to get the pointer of
- it. */
--#define pa_get_headers_version() ("@PACKAGE_VERSION@")
-+#define pa_get_headers_version() ("@PA_MAJOR@.@PA_MINOR@.0")
-
- /** Return the version of the library the current application is
- * linked to. */
diff --git a/staging/arora/PKGBUILD b/staging/arora/PKGBUILD
deleted file mode 100644
index b35b9afc7..000000000
--- a/staging/arora/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 141024 2011-10-21 22:01:26Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=arora
-pkgver=0.11.0
-pkgrel=3
-pkgdesc='Lightweight cross-platform Web browser'
-url='http://www.arora-browser.org'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('qtwebkit' 'desktop-file-utils')
-source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('480cfd7482cccbb7ece866fa10afe9acace29b31')
-
-install=install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- qmake PREFIX="/usr" "CONFIG-=debug" -r
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/staging/arora/install b/staging/arora/install
deleted file mode 100644
index 6c87527e2..000000000
--- a/staging/arora/install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kadu/PKGBUILD b/staging/kadu/PKGBUILD
deleted file mode 100644
index 9f3f341ab..000000000
--- a/staging/kadu/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 57137 2011-10-22 11:15:09Z bpiotrowski $
-# Maintainer: Mateusz Herych
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-
-pkgname=kadu
-pkgver=0.10.1
-pkgrel=2
-pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client"
-arch=('i686' 'x86_64')
-url="http://www.kadu.net/"
-license=('GPL')
-depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit')
-makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl')
-source=(http://www.kadu.net/download/stable/$pkgname-$pkgver.tar.bz2)
-md5sums=('6211a9a9e02d645268cbf055892601a0')
-
-build() {
- cd $srcdir/kadu-$pkgver
- cmake . -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd $srcdir/kadu-$pkgver
- make DESTDIR=$pkgdir install
- rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig}
- rm -rf $pkgdir/usr/share/kadu/{HISTORY,README}
-}
diff --git a/staging/kdelibs/kdelibs-nepomuk-unicode.diff b/staging/kdelibs/kdelibs-nepomuk-unicode.diff
deleted file mode 100644
index 1c85d6fc9..000000000
--- a/staging/kdelibs/kdelibs-nepomuk-unicode.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/nepomuk/query/querybuilderdata_p.h b/nepomuk/query/querybuilderdata_p.h
-index 055482e..3880e13 100644
---- a/nepomuk/query/querybuilderdata_p.h
-+++ b/nepomuk/query/querybuilderdata_p.h
-@@ -32,6 +32,28 @@
- #include "query_p.h"
- #include "groupterm_p.h"
-
-+namespace {
-+/// A hack to avoid passing extended chars to the bif:search_excerpts method which cannot handle
-+/// utf8 chars which use more than one char, ie. wide chars.
-+/// Thus, we simply truncate each term at the first wide char.
-+QStringList stripExtendedCharsHack(const QStringList& terms) {
-+ QStringList newTerms;
-+ foreach(const QString& term, terms) {
-+ int i = 0;
-+ while(i < term.length()) {
-+ if(term[i].unicode() > 0x7f) {
-+ break;
-+ }
-+ ++i;
-+ }
-+ if(i > 0) {
-+ newTerms.append(term.left(i));
-+ }
-+ }
-+ return newTerms;
-+}
-+}
-+
- namespace Nepomuk {
- namespace Query {
- class QueryBuilderData
-@@ -246,16 +268,23 @@ namespace Nepomuk {
- for( QHash<QString, QStringList>::const_iterator it = m_fullTextSearchTerms.constBegin();
- it != m_fullTextSearchTerms.constEnd(); ++it ) {
- const QString& varName = it.key();
-- const QStringList& terms = it.value();
-- // bif:search_excerpt wants a vector of all search terms
-- excerptParts
-- << QString::fromLatin1("bif:search_excerpt(bif:vector(bif:charset_recode('%1', '_WIDE_', 'UTF-8')), %2)")
-- .arg( terms.join(QLatin1String("','")),
-- varName );
-+ const QStringList terms = stripExtendedCharsHack(it.value());
-+ if(terms.count()) {
-+ // bif:search_excerpt wants a vector of all search terms
-+ excerptParts
-+ << QString::fromLatin1("bif:search_excerpt(bif:vector('%1'), %2)")
-+ .arg( terms.join(QLatin1String("','")),
-+ varName );
-+ }
- }
-
-- return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
-- .arg(excerptParts.join(QLatin1String(",")));
-+ if(excerptParts.count()) {
-+ return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
-+ .arg(excerptParts.join(QLatin1String(",")));
-+ }
-+ else {
-+ return QString();
-+ }
- }
- else {
- return QString(); \ No newline at end of file
diff --git a/staging/pyqt/PKGBUILD b/staging/pyqt/PKGBUILD
deleted file mode 100644
index 1db03621b..000000000
--- a/staging/pyqt/PKGBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# $Id: PKGBUILD 141026 2011-10-22 00:02:45Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
-
-pkgbase=pyqt
-pkgname=('pyqt' 'python2-pyqt')
-pkgver=4.8.5
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://riverbankcomputing.co.uk/software/pyqt/intro"
-license=('GPL')
-makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
- 'python-opengl' 'qt-assistant-compat' 'qtwebkit')
-source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('0e4264bb912edfbda319bb236ac84407')
-
-build() {
- cd "${srcdir}"
- cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
-
- cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
- python configure.py \
- --confirm-license \
- --qsci-api
-
- # Thanks Gerardo for the rpath fix
- find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
- make
-
- ### Python2 version ###
- cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
- python2 configure.py \
- --confirm-license \
- -v /usr/share/sip \
- --qsci-api
-
- # Thanks Gerardo for the rpath fix
- find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
- make
-}
-
-package_pyqt(){
- pkgdesc="A set of Python bindings for the Qt toolkit"
- depends=('qt' 'python-sip' 'qtwebkit')
- optdepends=('phonon: enable audio and video in PyQt applications'
- 'qscintilla: QScintilla API'
- 'qt-assistant-compat: add PyQt online help in Qt Assistant')
- replaces=('python-qt')
- provides=('python-qt')
-
- cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
- # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
- make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-}
-
-package_python2-pyqt(){
- pkgdesc="PyQt: A set of Python2 bindings for the Qt toolkit"
- depends=('pyqt' 'python2-sip' 'dbus-python')
- optdepends=('phonon: enable audio and video in PyQt applications'
- 'python-opengl: enable OpenGL 3D graphics in PyQt applications'
- 'qscintilla: QScintilla API'
- 'qt-assistant-compat: add PyQt online help in Qt Assistant')
- replaces=('python2-qt')
- provides=('python2-qt')
-
- cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
- # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
- make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
- # Provided by pyqt
- rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4}
- rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so
- rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api
-}
diff --git a/staging/qt/PKGBUILD b/staging/qt/PKGBUILD
deleted file mode 100644
index b0ae67199..000000000
--- a/staging/qt/PKGBUILD
+++ /dev/null
@@ -1,128 +0,0 @@
-# $Id: PKGBUILD 141017 2011-10-21 19:27:55Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=qt
-pkgname=('qt' 'qt-private-headers')
-pkgver=4.8.0rc1
-_pkgver=4.8.0-rc1
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL')
-makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
- 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
- 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs'
- 'mysql' 'unixodbc' 'cups' 'gtk2')
-options=('!libtool')
-_pkgfqn="${pkgbase}-everywhere-opensource-src-4.8.0"
-source=("http://get.qt.nokia.com/qt/source/${pkgbase}-everywhere-opensource-src-${_pkgver}.tar.gz"
- 'assistant.desktop' 'designer.desktop' 'linguist.desktop'
- 'qtconfig.desktop')
-md5sums=('3e003b671384df8d1cb77dd6cc804934'
- 'fc211414130ab2764132e7370f8e5caa'
- '85179f5e0437514f8639957e1d8baf62'
- 'f11852b97583610f3dbb669ebc3e21bc'
- '6b771c8a81dd90b45e8a79afa0e5bbfd')
-
-build() {
- cd "${srcdir}"/${_pkgfqn}
-
- export QT4DIR="${srcdir}"/${_pkgfqn}
- export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-
- sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/g++-base.conf
- sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
- sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
-
- ./configure -confirm-license -opensource \
- -prefix /usr \
- -docdir /usr/share/doc/qt \
- -plugindir /usr/lib/qt/plugins \
- -importdir /usr/lib/qt/imports \
- -datadir /usr/share/qt \
- -translationdir /usr/share/qt/translations \
- -sysconfdir /etc \
- -examplesdir /usr/share/doc/qt/examples \
- -demosdir /usr/share/doc/qt/demos \
- -plugin-sql-{psql,mysql,sqlite,odbc} \
- -system-sqlite \
- -no-phonon \
- -no-phonon-backend \
- -no-webkit \
- -no-declarative-debug \
- -graphicssystem raster \
- -openssl-linked \
- -nomake demos \
- -nomake examples \
- -nomake docs \
- -silent \
- -no-rpath \
- -optimized-qmake \
- -reduce-relocations \
- -dbus-linked \
- -no-openvg
- make
-}
-
-package_qt() {
- pkgdesc='A cross-platform application and UI framework'
- depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
- 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
- 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
- optdepends=('postgresql-libs: PostgreSQL driver'
- 'libmysqlclient: MySQL driver'
- 'unixodbc: ODBC driver'
- 'libxinerama: Xinerama support'
- 'libxcursor: Xcursor support'
- 'libxfixes: Xfixes support')
- install='qt.install'
-
- cd "${srcdir}"/${_pkgfqn}
- make INSTALL_ROOT="${pkgdir}" install
-
- # install missing icons and desktop files
- for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
- size=$(echo $(basename ${icon}) | cut -d- -f2)
- install -p -D -m644 ${icon} \
- "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png"
- done
- install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png \
- "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png"
- install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png \
- "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png"
- install -p -D -m644 tools/designer/src/designer/images/designer.png \
- "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png"
- install -d "${pkgdir}/usr/share/applications"
- install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \
- "${pkgdir}/usr/share/applications/"
-
- # install license addition
- install -D -m644 LGPL_EXCEPTION.txt \
- ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt
-
- # Fix wrong path in pkgconfig files
- find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \
- -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
-
- # Fix wrong path in prl files
- find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-}
-
-package_qt-private-headers(){
- pkgdesc="Qt private headers for development"
- depends=("qt=${pkgver}")
-
- install -d "${pkgdir}"/usr/include/{QtCore,QtDeclarative,QtGui,QtScript}
- install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script}
-
- for i in QtCore QtDeclarative QtGui QtScript; do
- cp -r "${srcdir}"/${_pkgfqn}/include/${i}/private/ \
- "${pkgdir}"/usr/include/${i}/
- done
-
- for i in corelib declarative gui script; do
- cp -r "${srcdir}"/${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/
- done
-}
diff --git a/staging/qt/assistant.desktop b/staging/qt/assistant.desktop
deleted file mode 100644
index a9e98c44b..000000000
--- a/staging/qt/assistant.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt Assistant
-Comment=Shows Qt documentation and examples
-Exec=/usr/bin/assistant
-Icon=assistant
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Documentation;
diff --git a/staging/qt/designer.desktop b/staging/qt/designer.desktop
deleted file mode 100644
index 9b7b6e9aa..000000000
--- a/staging/qt/designer.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Qt Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt applications
-Exec=/usr/bin/designer
-Icon=designer
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
diff --git a/staging/qt/linguist.desktop b/staging/qt/linguist.desktop
deleted file mode 100644
index 8cbe86599..000000000
--- a/staging/qt/linguist.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt Linguist
-Comment=Add translations to Qt applications
-Exec=/usr/bin/linguist
-Icon=linguist
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
diff --git a/staging/qt/qt.install b/staging/qt/qt.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/staging/qt/qt.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/qt/qtconfig.desktop b/staging/qt/qtconfig.desktop
deleted file mode 100644
index 46dcf9e3d..000000000
--- a/staging/qt/qtconfig.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt Config
-Comment=Configure Qt behavior, styles, fonts
-Exec=/usr/bin/qtconfig
-Icon=qtlogo
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Settings;
-NoDisplay=true
diff --git a/staging/qtwebkit/PKGBUILD b/staging/qtwebkit/PKGBUILD
deleted file mode 100644
index 0ee2a4afa..000000000
--- a/staging/qtwebkit/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 141018 2011-10-21 19:29:38Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=qtwebkit
-pkgver=2.2.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://trac.webkit.org/wiki/QtWebKit'
-pkgdesc='An open source web browser engine (Qt port)'
-license=('LGPL2.1' 'GPL3')
-depends=('qt' 'gperf' 'bison' 'phonon')
-makedepends=('python2' 'mesa' 'chrpath')
-source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz"
- 'python2-path.patch')
-sha1sums=('3582f3a8b593140af004a19479f5ec19693b3df7'
- 'b0ef3d5596171e3900a685df9bcfac3068ad6330')
-
-build() {
- cd "${srcdir}"/QtWebKit-${pkgver}
-
- patch -p1 -i "${srcdir}"/python2-path.patch
-
- cd Tools/Scripts
- ./build-webkit --qt \
- --prefix=/usr \
- --makeargs="${MAKEFLAGS}" \
- --release
-}
-
-package() {
- cd "${srcdir}"/QtWebKit-${pkgver}
- make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
-
- # Fix RPATH
- chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/qt/imports/QtWebKit/libqmlwebkitplugin.so
-}
diff --git a/staging/qtwebkit/python2-path.patch b/staging/qtwebkit/python2-path.patch
deleted file mode 100644
index 2e270e6fc..000000000
--- a/staging/qtwebkit/python2-path.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro~ 2011-10-20 22:39:56.044519075 +0000
-+++ QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro 2011-10-20 22:41:21.302047082 +0000
-@@ -88,5 +88,5 @@
- retgen.output = $$JSC_GENERATED_SOURCES_DIR/RegExpJitTables.h
- retgen.wkScript = $$PWD/create_regex_tables
- retgen.input = retgen.wkScript
--retgen.commands = python $$retgen.wkScript > ${QMAKE_FILE_OUT}
-+retgen.commands = python2 $$retgen.wkScript > ${QMAKE_FILE_OUT}
- addExtraCompiler(retgen)
---- QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri~ 2011-10-20 22:44:23.827225580 +0000
-+++ QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri 2011-10-20 22:44:38.550707819 +0000
-@@ -640,7 +640,7 @@
- inspectorJSON.output = $${WC_GENERATED_SOURCES_DIR}/Inspector.idl
- inspectorJSON.input = INSPECTOR_JSON
- inspectorJSON.wkScript = $$PWD/inspector/generate-inspector-idl
--inspectorJSON.commands = python $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json
-+inspectorJSON.commands = python2 $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json
- inspectorJSON.depends = $$PWD/inspector/generate-inspector-idl
- inspectorJSON.wkAddOutputToSources = false
- addExtraCompiler(inspectorJSON)
-@@ -723,7 +723,7 @@
- entities.output = $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp
- entities.input = HTML_ENTITIES
- entities.wkScript = $$PWD/html/parser/create-html-entity-table
--entities.commands = python $$entities.wkScript -o $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES
-+entities.commands = python2 $$entities.wkScript -o $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES
- entities.clean = ${QMAKE_FILE_OUT}
- entities.depends = $$PWD/html/parser/create-html-entity-table
- addExtraCompiler(entities)
diff --git a/staging/sip/PKGBUILD b/staging/sip/PKGBUILD
deleted file mode 100644
index 45dd8e751..000000000
--- a/staging/sip/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 141364 2011-10-30 02:28:27Z andrea $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
-
-pkgbase=sip
-pkgname=('sip' 'python2-sip')
-pkgver=4.13
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.riverbankcomputing.com/software/sip/"
-license=('custom:"sip"')
-makedepends=('python' 'python2')
-source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('21b4e2cad56e4156df2220143264b8ff')
-
-build() {
- cd "${srcdir}"
- cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- python configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
- make
-
- ### Python2 version ###
- cd "${srcdir}/python2-${pkgbase}-${pkgver}"
- python2 configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
- make
-}
-
-package_sip() {
- pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries"
- depends=('python')
- replaces=('python-sip')
- provides=('python-sip')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_python2-sip() {
- pkgdesc="A tool that makes it easy to create Python2 bindings for C and C++ libraries"
- depends=('sip' 'python2')
-
- cd "${srcdir}/python2-${pkgbase}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
- # Provided by sip
- rm "${pkgdir}/usr/bin/sip"
-}
diff --git a/testing/aisleriot/PKGBUILD b/testing/aisleriot/PKGBUILD
deleted file mode 100644
index e52e2410f..000000000
--- a/testing/aisleriot/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 140600 2011-10-17 12:27:47Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=aisleriot
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="GNOME Solitaire card games"
-arch=(i686 x86_64)
-license=(GPL)
-url="http://www.gnome.org"
-groups=('gnome-extra')
-depends=(libsm gconf guile libcanberra librsvg hicolor-icon-theme dconf)
-makedepends=(gnome-doc-utils intltool itstool)
-options=('!emptydirs' '!libtool')
-install=aisleriot.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('86bbc131daf97d14f1587216d3e4c73db35126dddf393bfef4f7a67822f96529')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain aisleriot ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/aisleriot/aisleriot.install b/testing/aisleriot/aisleriot.install
deleted file mode 100644
index 713506dba..000000000
--- a/testing/aisleriot/aisleriot.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- usr/sbin/gconfpkg --install aisleriot
-}
-
-pre_upgrade() {
- pre_remove
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall aisleriot
-}
-
-post_remove() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
-}
diff --git a/testing/anjuta/PKGBUILD b/testing/anjuta/PKGBUILD
deleted file mode 100644
index a8d8fcc35..000000000
--- a/testing/anjuta/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 140802 2011-10-19 14:21:48Z ibiru $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Harley Laue <losinggeneration@yahoo.com>
-
-pkgname=anjuta
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="GNOME Integrated Development Environment (IDE)"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'hicolor-icon-theme' 'vala' 'python2' 'shared-mime-info' 'desktop-file-utils')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
-url="http://anjuta.sourceforge.net/"
-install=anjuta.install
-source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-options=('!libtool' '!emptydirs')
-sha256sums=('1e59aed63312e293c55f2934c4766411e9908fa512dd86e1422e3d906fe75613')
-
-build() {
- cd "${srcdir}/anjuta-${pkgver}"
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-scrollkeeper
- make
-}
-
-package(){
- cd "${srcdir}/anjuta-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- sed -i "1s|#!/usr/bin/python$|&2|" \
- $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py
-}
diff --git a/testing/anjuta/anjuta.install b/testing/anjuta/anjuta.install
deleted file mode 100644
index c6fcfec11..000000000
--- a/testing/anjuta/anjuta.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- gtk-update-icon-cache -q -t -f usr/share/icons/gnome
- update-mime-database usr/share/mime > /dev/null
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.90.0) < 0 )); then
- usr/sbin/gconfpkg --uninstall anjuta
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/at-spi2-atk/PKGBUILD b/testing/at-spi2-atk/PKGBUILD
deleted file mode 100644
index e51cc71b4..000000000
--- a/testing/at-spi2-atk/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 140726 2011-10-18 14:45:19Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=at-spi2-atk
-pkgver=2.2.1
-pkgrel=1
-pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('at-spi2-core' 'libx11' 'atk' 'dconf')
-makedepends=('intltool')
-install=at-spi2-atk.install
-options=('!libtool')
-source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('6677def34b16c9a28d6ad96473ea56a3c0e13aa968e584df004cd44c8691ea1a')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- sed -i -e '/AC_PATH_XTRA/d' configure.ac
- autoreconf --force --install
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --disable-schemas-compile
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/at-spi2-atk/at-spi2-atk.install b/testing/at-spi2-atk/at-spi2-atk.install
deleted file mode 100644
index 2ef26aaa9..000000000
--- a/testing/at-spi2-atk/at-spi2-atk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/testing/at-spi2-core/PKGBUILD b/testing/at-spi2-core/PKGBUILD
deleted file mode 100644
index 348a1e8a0..000000000
--- a/testing/at-spi2-core/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 140724 2011-10-18 14:42:00Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=at-spi2-core
-pkgver=2.2.1
-pkgrel=1
-pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('dbus-core' 'glib2' 'libxtst')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('2a4129420decca3657e163a4dbb1a3cb28acafe32ea1292417fdd81084d48fac')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- sed -i -e '/AC_PATH_XTRA/d' configure.ac
- autoreconf --force --install
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/at-spi2-core --disable-xevie
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/caribou/PKGBUILD b/testing/caribou/PKGBUILD
deleted file mode 100644
index 79b0ed9e8..000000000
--- a/testing/caribou/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 140734 2011-10-18 15:16:20Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Adam Hani Schakaki <krzd@krzd.net>
-
-pkgname=caribou
-pkgver=0.4.1
-pkgrel=1
-pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard."
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Caribou"
-license=('LGPL')
-depends=('at-spi2-atk' 'pyatspi' 'dbus-python' 'python2-gobject' 'gtk3' 'libxklavier' 'libgee' 'clutter' 'dconf')
-makedepends=('gnome-doc-utils' 'intltool')
-install=caribou.install
-options=(!libtool !emptydirs)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz)
-sha256sums=('d4d2328e0eadbf037f7e0ec146e835097fe56cb2b940985655e649c5556e4ed1')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- sed -i s'|#!/usr/bin/python|#!/usr/bin/python2|'g tools/{fix_gir,make_schema}.py
- export PYTHON=/usr/bin/python2
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/caribou \
- --disable-gtk2-module \
- --disable-static \
- --disable-schemas-compile
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/caribou/caribou.install b/testing/caribou/caribou.install
deleted file mode 100644
index 22ca274a5..000000000
--- a/testing/caribou/caribou.install
+++ /dev/null
@@ -1,13 +0,0 @@
-pkgname=caribou
-
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/testing/cheese/PKGBUILD b/testing/cheese/PKGBUILD
deleted file mode 100644
index 61a1e5054..000000000
--- a/testing/cheese/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 140710 2011-10-18 13:35:55Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=cheese
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gnome-desktop' 'gtk3' 'libcanberra' 'librsvg' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gstreamer0.10-bad' 'clutter-gst'
- 'clutter-gtk' 'mx' 'libgee' 'gnome-video-effects' 'hicolor-icon-theme' 'dconf')
-makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool' 'gobject-introspection')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org/projects/cheese/"
-install=cheese.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('0abc54aeaf1cec931b8a6e148f40341be4b2bc0e9a1164eba4fef7989499059c')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-scrollkeeper \
- --disable-static --disable-schemas-compile
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/cheese/cheese.install b/testing/cheese/cheese.install
deleted file mode 100644
index c042fba42..000000000
--- a/testing/cheese/cheese.install
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgname=cheese
-
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then
- usr/sbin/gconfpkg --uninstall $pkgname
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/testing/clutter/PKGBUILD b/testing/clutter/PKGBUILD
deleted file mode 100644
index f64daa4e7..000000000
--- a/testing/clutter/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 140607 2011-10-17 12:48:01Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=clutter
-pkgver=1.8.2
-pkgrel=1
-pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
-arch=('i686' 'x86_64')
-url="http://clutter-project.org/"
-options=('!libtool')
-license=('LGPL')
-depends=('cogl>=1.8.0' 'mesa' 'json-glib' 'atk' 'libxi')
-makedepends=('gobject-introspection' 'mesa')
-source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('dc899f26448f31cb31e72d80650b8c8ae05acacd5b5d5a44798eabaca0ddfa2f')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --enable-introspection
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/cogl/PKGBUILD b/testing/cogl/PKGBUILD
deleted file mode 100644
index 4fdf7ebe5..000000000
--- a/testing/cogl/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 140619 2011-10-17 14:45:25Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=cogl
-pkgver=1.8.2
-pkgrel=1
-pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
-arch=('i686' 'x86_64')
-url="http://www.clutter-project.org/"
-license=('GPL2')
-depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango')
-makedepends=('mesa' 'gobject-introspection')
-options=(!libtool)
-source=(http://download.gnome.org/sources/$pkgname/1.8/$pkgname-$pkgver.tar.xz)
-sha256sums=('ec26fd90c4ba5643875b5f3a04b4ab14b24f0d618ba3d239d61e773c3e3ca8c7')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/conky/PKGBUILD b/testing/conky/PKGBUILD
deleted file mode 100644
index bef408f4b..000000000
--- a/testing/conky/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 141103 2011-10-24 00:41:06Z bisson $
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: James Rayner <james@archlinux.org>
-# Contributor: Partha Chowdhury <kira.laucas@gmail.com>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=conky
-pkgver=1.8.2git20111024
-pkgrel=1
-pkgdesc='Lightweight system monitor for X'
-url='http://conky.sourceforge.net/'
-license=('BSD' 'GPL')
-arch=('i686' 'x86_64')
-options=('!emptydirs')
-makedepends=('pkg-config' 'docbook2x')
-depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2')
-backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('490f5ffb431bffee71f7bf32f94cf611ae4f0646')
-
-# git clone git://git.omp.am/conky.git; cd conky; git archive --prefix=${pkgname}-${pkgver}/ origin/1.8.2 | xz > ../${pkgname}-${pkgver}.tar.xz
-
-replaces=('torsmo')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- sh autogen.sh
-
- CPPFLAGS="$CXXFLAGS" LIBS="$LDFLAGS" ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --enable-ibm \
- --enable-curl \
- --enable-rss \
- --enable-weather-xoap \
- --enable-imlib2 \
- --disable-lua \
- --enable-wlan \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/conky/PKGBUILD.cmake b/testing/conky/PKGBUILD.cmake
deleted file mode 100644
index 7f980868f..000000000
--- a/testing/conky/PKGBUILD.cmake
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: James Rayner <james@archlinux.org>
-# Contributor: Partha Chowdhury <kira.laucas@gmail.com>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=conky
-pkgver=1.8.2git20111021
-pkgrel=1
-pkgdesc='Lightweight system monitor for X'
-url='http://conky.sourceforge.net/'
-license=('BSD' 'GPL')
-arch=('i686' 'x86_64')
-makedepends=('pkg-config' 'cmake' 'git' 'docbook2x')
-depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'libxdamage' 'imlib2' 'lua')
-
-replaces=('torsmo')
-
-build() {
- cd "${srcdir}"
-
- cd conky && { git pull origin; cd ..; } || git clone git://git.omp.am/conky.git
- rm -fr build; mkdir build; cd build
-
- cmake \
- -D CMAKE_BUILD_TYPE:STRING="Release" \
- -D MAINTAINER_MODE:BOOL=ON \
- -D BUILD_CURL:BOOL=ON \
- -D BUILD_IMLIB2:BOOL=ON \
- -D BUILD_LUA_IMLIB2:BOOL=OFF \
- -D BUILD_MYSQL:BOOL=OFF \
- -D BUILD_RSS:BOOL=ON \
- -D BUILD_WEATHER_METAR:BOOL=ON \
- -D BUILD_WEATHER_XOAP:BOOL=ON \
- -D BUILD_WLAN:BOOL=ON \
- -D CMAKE_INSTALL_PREFIX:PATH=/usr \
- ../conky
-
- make
-}
-
-package() {
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}" install
- install -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 ../conky/{COPYING,LICENSE}* "${pkgdir}/usr/share/licenses/${pkgname}"
-}
diff --git a/testing/empathy/PKGBUILD b/testing/empathy/PKGBUILD
deleted file mode 100644
index de63b7027..000000000
--- a/testing/empathy/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 140627 2011-10-17 15:19:40Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=empathy
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="A GNOME instant messaging client using the Telepathy framework."
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Empathy"
-license=('GPL2')
-depends=('libpulse' 'clutter-gtk' 'clutter-gst' 'telepathy-mission-control' 'telepathy-logger' 'telepathy-farsight' 'telepathy-farstream' 'folks' 'gnome-keyring'
-'libcanberra' 'iso-codes' 'networkmanager')
-makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto')
-optdepends=('telepathy-gabble: XMPP/Jabber support'
- 'telepathy-butterfly: MSN support'
- 'telepathy-idle: IRC support'
- 'telepathy-salut: Link-local XMPP support'
- 'telepathy-sofiasip: SIP support'
- 'telepathy-haze: libpurple support')
-options=('!libtool')
-groups=('gnome-extra')
-install=empathy.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d50e9b0e31df0e8d137c120c61c5aeaaad06fb24bb208d105b186a01b3f1de0a')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/empathy \
- --disable-static \
- --disable-scrollkeeper \
- --disable-schemas-compile
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/empathy/empathy.install b/testing/empathy/empathy.install
deleted file mode 100644
index c3f7abf13..000000000
--- a/testing/empathy/empathy.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- echo "To use Empathy you need to install at least one Telepathy connection manager."
-}
-
-post_upgrade() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_remove() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/eog/PKGBUILD b/testing/eog/PKGBUILD
deleted file mode 100644
index 4d5d24726..000000000
--- a/testing/eog/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 140706 2011-10-18 13:24:03Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=eog
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="Eye of Gnome: An image viewing and cataloging program"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gnome-desktop' 'libexif' 'lcms2' 'desktop-file-utils' 'exempi' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf')
-makedepends=('gtk-doc' 'intltool')
-install=eog.install
-groups=('gnome-extra')
-options=('!emptydirs' '!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('ae20715790796061e51132804f5925c5a61a1e615527c7c746cd8b76a8f97c89')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-scrollkeeper
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- # remove it from Xfce menu that ships its own thingy
- echo "NotShowIn=XFCE" >> ${pkgdir}/usr/share/applications/eog.desktop
-}
diff --git a/testing/eog/eog.install b/testing/eog/eog.install
deleted file mode 100644
index 284b24b18..000000000
--- a/testing/eog/eog.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.90.0) < 0 )); then
- usr/sbin/gconfpkg --uninstall eog
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/epiphany/PKGBUILD b/testing/epiphany/PKGBUILD
deleted file mode 100644
index 514415f54..000000000
--- a/testing/epiphany/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 140730 2011-10-18 14:50:34Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=epiphany
-pkgver=3.2.1
-pkgrel=1
-install=epiphany.install
-pkgdesc="A GNOME web browser based on the WebKit rendering engine."
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libsoup-gnome' 'libnotify' 'gsettings-desktop-schemas' 'libwebkit3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils'
- 'hicolor-icon-theme' 'seed')
-makedepends=('intltool' 'gnome-doc-utils' 'startup-notification')
-options=('!libtool' '!emptydirs')
-groups=('gnome')
-url="http://www.gnome.org/projects/epiphany/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('5ade10d9becce1ca43c30d755fda477c5595a1c0514047f07f7d4b817a2154fe')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-scrollkeeper \
- --enable-seed
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/epiphany/epiphany.install b/testing/epiphany/epiphany.install
deleted file mode 100644
index 00b1abb96..000000000
--- a/testing/epiphany/epiphany.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
-
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if [ -f usr/share/gconf/schemas/epiphany.schemas ]; then
- usr/sbin/gconfpkg --uninstall epiphany
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/erlang/PKGBUILD b/testing/erlang/PKGBUILD
deleted file mode 100644
index b9da3fc65..000000000
--- a/testing/erlang/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id: PKGBUILD 140452 2011-10-14 19:44:00Z ibiru $
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com>
-
-pkgname=erlang
-pkgver=R14B04
-pkgrel=1
-pkgdesc="A small concurrent functional programming language developed by Ericsson."
-arch=(i686 x86_64)
-url="http://www.erlang.org/index.html"
-license=('custom')
-depends=('ncurses' 'glibc')
-makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc' 'mesa')
-optdepends=('wxgtk: for wx support' 'unixodbc: database')
-
-options=('!makeflags')
-source=(http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz
- http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz)
-
-build() {
- cd "$srcdir/otp_src_${pkgver/./-}"
- ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk)
- ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < lib/erl_interface/vsn.mk)
-
- sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure
-
- CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support --enable-threads -enable-native-libs
- make
- make INSTALL_PREFIX="$pkgdir" install
-
-# fix prefix
- cd "$pkgdir"
- for i in usr/lib/erlang/bin/erl \
- usr/lib/erlang/bin/start \
- usr/lib/erlang/erts-${ERTSVERSION}/bin/erl \
- usr/lib/erlang/erts-${ERTSVERSION}/bin/start \
- usr/lib/erlang/releases/RELEASES ;do
- sed -i "s#$pkgdir##" $i
- done
-
-# fix symlinks
- cd "$pkgdir/usr/lib/erlang/bin"
- ln -sf ../erts-${ERTSVERSION}/bin/epmd
-
- cd "$pkgdir/usr/bin"
- for file in *; do
- ln -sfv ../lib/erlang/bin/$file
- done
-
- ln -s ../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call "$pkgdir/usr/bin/erl_call"
-
-# install documentation
- install -d "$pkgdir/usr/share/doc/erlang"
- install -D -m644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang"
- cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang"
-
- install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
-
-}
-md5sums=('4b469729f103f52702bfb1fb24529dc0'
- 'f31e72518daae4007f595c0b224dd59f')
diff --git a/testing/evince/PKGBUILD b/testing/evince/PKGBUILD
deleted file mode 100644
index cd2a3c121..000000000
--- a/testing/evince/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 140637 2011-10-17 16:54:07Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evince
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="Simply a document viewer"
-url="http://projects.gnome.org/evince/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas')
-makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection')
-optdepends=('texlive-bin: DVI support')
-groups=('gnome-extra')
-install=evince.install
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --libexecdir=/usr/lib/evince \
- --disable-static --enable-nautilus \
- --enable-pdf --enable-tiff \
- --enable-djvu --enable-dvi \
- --enable-t1lib --enable-comics \
- --disable-scrollkeeper --disable-schemas-compile \
- --enable-introspection
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/evince/evince.install b/testing/evince/evince.install
deleted file mode 100644
index 9643a9ba0..000000000
--- a/testing/evince/evince.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.90.0) < 0 )); then
- usr/sbin/gconfpkg --uninstall evince
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/evolution-data-server/PKGBUILD b/testing/evolution-data-server/PKGBUILD
deleted file mode 100644
index c17e13a81..000000000
--- a/testing/evolution-data-server/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 140535 2011-10-16 19:32:36Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution-data-server
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="Centralized access to appointments and contacts"
-arch=('i686' 'x86_64')
-depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
-makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala')
-options=('!libtool')
-url="http://www.gnome.org"
-license=('GPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('0091e41e87d589a984c6d089919fece2d28101df5b37e4b2d8615efdf60a09c3')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --with-openldap=yes \
- --libexecdir=/usr/lib/evolution-data-server \
- --with-krb5=/usr --with-libdb=/usr \
- --enable-vala-bindings
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/evolution-exchange/PKGBUILD b/testing/evolution-exchange/PKGBUILD
deleted file mode 100644
index eb765238b..000000000
--- a/testing/evolution-exchange/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 140539 2011-10-16 20:16:23Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution-exchange
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="Ximian Connector Exchange plugin for Evolution"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.ximian.com"
-depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
-makedepends=('intltool' 'evolution')
-options=('!libtool' '!emptydirs')
-install=evolution-exchange.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d9bebd1ab252e8568409fb1c50ba5a8f0c8236a8abf72ba697c95f9134d4cd9c')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib/evolution --disable-static \
- --with-libdb=/usr --with-krb5=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-exchange-3.2 ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/evolution-exchange/evolution-exchange.install b/testing/evolution-exchange/evolution-exchange.install
deleted file mode 100644
index 1179887f9..000000000
--- a/testing/evolution-exchange/evolution-exchange.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=evolution-exchange
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/evolution-groupwise/PKGBUILD b/testing/evolution-groupwise/PKGBUILD
deleted file mode 100644
index 772d7d280..000000000
--- a/testing/evolution-groupwise/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 140541 2011-10-16 20:19:02Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=evolution-groupwise
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="GroupWise connector for evolution"
-arch=(i686 x86_64)
-url="http://projects.gnome.org/evolution/"
-license=(LGPL)
-depends=('evolution-data-server' 'gtkhtml4')
-makedepends=(intltool evolution)
-optdepends=('evolution: evolution plugin')
-options=(!libtool)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('3a5a1590b92144e465b09abc0fdaefc6d6bf9a5465d0b07e01171ddfef4aebbf')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --disable-static
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-}
-
diff --git a/testing/evolution/PKGBUILD b/testing/evolution/PKGBUILD
deleted file mode 100644
index b4a733a75..000000000
--- a/testing/evolution/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 140537 2011-10-16 20:03:37Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="Manage your email, contacts and schedule"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'gstreamer0.10' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils' 'networkmanager')
-optdepends=('bogofilter: possible junk filter plugin'
- 'spamassassin: possible junk filter plugin')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-install=evolution.install
-url=http://www.gnome.org/projects/evolution/
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('244d4fcf57d59b3fe0bcedddc65da5f508b253cb64159e6ddb2bddedf8d7e19a')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib \
- --disable-scrollkeeper \
- --enable-nss=yes \
- --with-openldap=yes \
- --enable-smime=yes \
- --with-krb5=/usr \
- --disable-image-inline
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
- make
- make -C plugins/tnef-attachments
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
- make -C plugins/tnef-attachments DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-3.2 ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/evolution/evolution.install b/testing/evolution/evolution.install
deleted file mode 100644
index a2c3aaa54..000000000
--- a/testing/evolution/evolution.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=evolution
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/folks/PKGBUILD b/testing/folks/PKGBUILD
deleted file mode 100644
index 9fb6f52af..000000000
--- a/testing/folks/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 140756 2011-10-18 17:59:10Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=folks
-pkgver=0.6.4.1
-pkgrel=1
-pkgdesc="Library to aggregates people into metacontacts"
-arch=(i686 x86_64)
-url="http://telepathy.freedesktop.org/wiki/Folks"
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb')
-makedepends=('gobject-introspection' 'vala' 'intltool')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('b6cd5e982f4496cbe6370ca31cc85dcdeb6efccc95c1d940e654f8226cd95578')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gcc/PKGBUILD b/testing/gcc/PKGBUILD
deleted file mode 100644
index dfe8b0e92..000000000
--- a/testing/gcc/PKGBUILD
+++ /dev/null
@@ -1,254 +0,0 @@
-# $Id: PKGBUILD 141273 2011-10-28 00:55:51Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: libtool requires rebuilt with each new gcc version
-
-pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
-pkgver=4.6.2
-pkgrel=1
-#_snapshot=4.6-20110819
-_libstdcppmanver=20110814 # Note: check source directory name when updating this
-pkgdesc="The GNU Compiler Collection"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-makedepends=('binutils>=2.21-9' 'libmpc' 'cloog' 'ppl' 'gcc-ada')
-checkdepends=('dejagnu')
-options=('!libtool' '!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
- #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
- ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
- gcc_pure64.patch
- gcc-hash-style-both.patch)
-md5sums=('028115c4fbfb6cfd75d6369f4a90d87e'
- 'ce920d2550ff7e042b9f091d27764d8f'
- '4030ee1c08dd1e843c0225b772360e76'
- '4df25b623799b148a0703eaeec8fdf3f')
-
-if [ -n "${_snapshot}" ]; then
- _basedir="${srcdir}/gcc-${_snapshot}"
-else
- _basedir="${srcdir}/gcc-${pkgver}"
-fi
-
-build() {
- cd ${_basedir}
-
- # Do not install libiberty
- sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
- # Do not run fixincludes
- sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
- if [ "${CARCH}" = "x86_64" ]; then
- patch -Np1 -i ${srcdir}/gcc_pure64.patch
- fi
- patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
-
- echo ${pkgver} > gcc/BASE-VER
-
- cd ${srcdir}
- mkdir gcc-build && cd gcc-build
-
- ${_basedir}/configure --prefix=/usr \
- --libdir=/usr/lib --libexecdir=/usr/lib \
- --mandir=/usr/share/man --infodir=/usr/share/info \
- --with-bugurl=https://bugs.archlinux.org/ \
- --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
- --enable-shared --enable-threads=posix \
- --with-system-zlib --enable-__cxa_atexit \
- --disable-libunwind-exceptions --enable-clocale=gnu \
- --enable-gnu-unique-object --enable-linker-build-id \
- --with-ppl --enable-cloog-backend=isl \
- --enable-lto --enable-gold --enable-ld=default \
- --enable-plugin --with-plugin-ld=ld.gold \
- --disable-multilib --disable-libssp --disable-libstdcxx-pch \
- --enable-checking=release
- make
-}
-
-check() {
- cd gcc-build
-
- # increase stack size to prevent test failures
- # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
- ulimit -s 32768
-
- # do not abort on error as some are "expected"
- make -k check || true
- ${_basedir}/contrib/test_summary
-}
-
-package_gcc-libs()
-{
- pkgdesc="Runtime libraries shipped by GCC"
- groups=('base')
- depends=('glibc>=2.14')
- install=gcc-libs.install
-
- cd gcc-build
- make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
- for lib in libmudflap libgomp libstdc++-v3/src; do
- make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
- done
- make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
- make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
-
- make -j1 DESTDIR=${pkgdir} install-target-libquadmath
- make -j1 DESTDIR=${pkgdir} install-target-libgfortran
- make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
- # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
- rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
-
- # remove static libraries
- find ${pkgdir} -name *.a -delete
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc()
-{
- pkgdesc="The GNU Compiler Collection - C and C++ frontends"
- depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.21.1' 'libmpc' 'cloog' 'ppl')
- groups=('base-devel')
- install=gcc.install
-
- cd gcc-build
-
- # unfortunately it is much, much easier to install the lot and clean-up the mess...
- make -j1 DESTDIR=${pkgdir} install
- rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
- rm $pkgdir/usr/lib/*.so*
- rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
- rm $pkgdir/usr/lib/libgfortran.spec
- rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
- rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
- rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a}
- rm -r $pkgdir/usr/lib/go
- rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
- rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
- rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
- rm $pkgdir/usr/share/man/man3/ffi*
-
- # many packages require these symlinks
- install -dm755 ${pkgdir}/lib
- ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp
- ln -sf gcc ${pkgdir}/usr/bin/cc
- ln -sf g++ ${pkgdir}/usr/bin/c++
-
- # install gengtype for plugin support
- install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
- install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
-
- # POSIX conformance launcher scripts for c89 and c99
- cat > $pkgdir/usr/bin/c89 <<"EOF"
-#!/bin/sh
-fl="-std=c89"
-for opt; do
- case "$opt" in
- -ansi|-std=c89|-std=iso9899:1990) fl="";;
- -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
- exit 1;;
- esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
- cat > $pkgdir/usr/bin/c99 <<"EOF"
-#!/bin/sh
-fl="-std=c99"
-for opt; do
- case "$opt" in
- -std=c99|-std=iso9899:1999) fl="";;
- -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
- exit 1;;
- esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
- chmod 755 $pkgdir/usr/bin/c{8,9}9
-
- # install the libstdc++ man pages
- install -dm755 ${pkgdir}/usr/share/man/man3
- install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-fortran()
-{
- pkgdesc="Fortran front-end for GCC"
- depends=("gcc=$pkgver-$pkgrel")
- install=gcc-fortran.install
-
- cd gcc-build
- make -j1 DESTDIR=${pkgdir} install-target-libquadmath
- make -j1 DESTDIR=$pkgdir install-target-libgfortran
- make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
- make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
- install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
-
- # remove libraries included in gcc-libs
- rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so*
- rm ${pkgdir}/usr/share/info/libquadmath.info
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-objc()
-{
- pkgdesc="Objective-C front-end for GCC"
- depends=("gcc=$pkgver-$pkgrel")
-
- cd gcc-build
- make -j1 DESTDIR=$pkgdir install-target-libobjc
- install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
- install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-
- # remove libraries included in gcc-libs
- rm ${pkgdir}/usr/lib/libobjc.so*
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-ada()
-{
- pkgdesc="Ada front-end for GCC (GNAT)"
- depends=("gcc=$pkgver-$pkgrel")
- install=gcc-ada.install
-
- cd gcc-build/gcc
- make -j1 DESTDIR=$pkgdir ada.install-{common,info}
- install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-go()
-{
- pkgdesc="Go front-end for GCC"
- depends=("gcc=$pkgver-$pkgrel")
- install=gcc-go.install
-
- cd gcc-build
- make -j1 DESTDIR=$pkgdir install-target-libgo
- make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
- install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
-}
diff --git a/testing/gcc/gcc-ada.install b/testing/gcc/gcc-ada.install
deleted file mode 100644
index df0553a4f..000000000
--- a/testing/gcc/gcc-ada.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/testing/gcc/gcc-fortran.install b/testing/gcc/gcc-fortran.install
deleted file mode 100644
index b15d89a97..000000000
--- a/testing/gcc/gcc-fortran.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file="gfortran.info"
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
diff --git a/testing/gcc/gcc-go.install b/testing/gcc/gcc-go.install
deleted file mode 100644
index 7dc50dee5..000000000
--- a/testing/gcc/gcc-go.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gccgo.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/testing/gcc/gcc-hash-style-both.patch b/testing/gcc/gcc-hash-style-both.patch
deleted file mode 100644
index 8b59f4535..000000000
--- a/testing/gcc/gcc-hash-style-both.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- gcc/config/alpha/linux-elf.h.orig 2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/alpha/linux-elf.h 2011-03-11 10:01:47.770000457 +1000
-@@ -41,7 +41,7 @@
-
- #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER
-
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \
-+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \
- %{O*:-O3} %{!O*:-O1} \
- %{shared:-shared} \
- %{!shared: \
---- gcc/config/i386/linux64.h.orig 2011-03-03 08:35:36.000000000 +1000
-+++ gcc/config/i386/linux64.h 2011-03-11 10:01:47.770000457 +1000
-@@ -78,7 +78,7 @@
- %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
-
- #undef LINK_SPEC
--#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
-+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
---- gcc/config/i386/linux.h.orig 2011-01-15 04:45:06.000000000 +1000
-+++ gcc/config/i386/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -104,7 +104,7 @@
- { "dynamic_linker", LINUX_DYNAMIC_LINKER }
-
- #undef LINK_SPEC
--#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
---- gcc/config/ia64/linux.h.orig 2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/ia64/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -64,7 +64,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
-
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC "--hash-style=both \
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
---- gcc/config/rs6000/linux64.h.orig 2011-02-11 03:30:10.000000000 +1000
-+++ gcc/config/rs6000/linux64.h 2011-03-11 10:03:34.280000457 +1000
-@@ -389,11 +389,11 @@
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
-
-
--#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
- -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
-
--#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
- -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
-
---- gcc/config/rs6000/sysv4.h.orig 2011-01-28 04:36:03.000000000 +1000
-+++ gcc/config/rs6000/sysv4.h 2011-03-11 10:01:47.773333792 +1000
-@@ -830,7 +830,7 @@
- #define LINUX_DYNAMIC_LINKER \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
-
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
- -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
-
---- gcc/config/s390/linux.h.orig 2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/s390/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -77,7 +77,7 @@
-
- #undef LINK_SPEC
- #define LINK_SPEC \
-- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
- %{shared:-shared} \
- %{!shared: \
- %{static:-static} \
---- gcc/config/sparc/linux64.h.orig 2011-02-17 23:57:21.000000000 +1000
-+++ gcc/config/sparc/linux64.h 2011-03-11 10:01:47.770000457 +1000
-@@ -113,7 +113,7 @@
- { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
- { "link_arch", LINK_ARCH_SPEC },
-
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-@@ -121,7 +121,7 @@
- %{static:-static}} \
- "
-
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-@@ -193,7 +193,7 @@
- #else /* !SPARC_BI_ARCH */
-
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
---- gcc/config/sparc/linux.h.orig 2011-01-27 06:30:12.000000000 +1000
-+++ gcc/config/sparc/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -74,7 +74,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
- %{!mno-relax:%{!r:-relax}} \
- %{!shared: \
- %{!static: \
diff --git a/testing/gcc/gcc-libs.install b/testing/gcc/gcc-libs.install
deleted file mode 100644
index 23553b8f0..000000000
--- a/testing/gcc/gcc-libs.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-filelist=(libgomp.info libquadmath.info)
-
-post_upgrade() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/testing/gcc/gcc.install b/testing/gcc/gcc.install
deleted file mode 100644
index 3407a5e1f..000000000
--- a/testing/gcc/gcc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/testing/gcc/gcc_pure64.patch b/testing/gcc/gcc_pure64.patch
deleted file mode 100644
index 8c0baf8e2..000000000
--- a/testing/gcc/gcc_pure64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
---- gcc-4.2.0.orig/gcc/config/i386/linux64.h 2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/linux64.h 2007-05-18 17:04:05.000000000 -0400
-@@ -49,8 +49,8 @@
- When the -shared link option is used a final link is not being
- done. */
-
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
-
- #undef LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
---- gcc-4.2.0.orig/gcc/config/i386/t-linux64 2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/t-linux64 2007-05-18 17:04:36.000000000 -0400
-@@ -6,7 +6,7 @@
-
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
-
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/testing/gdm/PKGBUILD b/testing/gdm/PKGBUILD
deleted file mode 100644
index 03c4713e4..000000000
--- a/testing/gdm/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 140814 2011-10-19 17:08:25Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gdm
-pkgver=3.2.1.1
-pkgrel=1
-pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org"
-backup=('etc/pam.d/gdm-autologin' 'etc/pam.d/gdm-fingerprint' 'etc/pam.d/gdm' 'etc/pam.d/gdm-password'
- 'etc/pam.d/gdm-smartcard' 'etc/pam.d/gdm-welcome' 'etc/gdm/custom.conf')
-groups=('gnome-extra')
-options=('!libtool')
-depends=('libcanberra' 'libxklavier' 'gnome-session' 'gnome-settings-daemon' 'metacity' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss')
-makedepends=('intltool' 'gnome-doc-utils' 'xorg-server' 'gobject-introspection')
-optdepends=('gnome-shell: new login interface')
-install=gdm.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz
- fix_external_program_directories.patch
- gdm-vt-allocation-hack.patch
- gdm
- gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam)
-sha256sums=('85a1383f93870fb5d47a938cc2e04b6f0d74cb611a2b5d94d9651b78a5ccffbd'
- '2014ae3a6077546f7c07e80a6acc8a1c80c6765ad319ec389f52500c5a4fb363'
- '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
- '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
- 'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d'
- '5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e'
- 'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
- '92aded0804bad8a609fd150448ad4a2edb8166c17cb4e2b581559e80603bbb6c'
- 'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd'
- '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/fix_external_program_directories.patch"
- patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch"
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/gdm \
- --localstatedir=/var \
- --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \
- --disable-scrollkeeper \
- --disable-static \
- --without-tcp-wrappers
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gdm ${pkgdir}/etc/gconf/schemas/*.schemas
-
- for i in gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam;do
- install -m644 "${srcdir}/${i}" "${pkgdir}/etc/pam.d/${i%.pam}"
- done
-
- install -Dm755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/gdm"
-
- chmod 1770 "${pkgdir}/var/log/gdm"
- chmod 700 "${pkgdir}/var/lib/gdm/.config/dconf"
- rm -rf "${pkgdir}/var/run" "${pkgdir}/var/gdm" "${pkgdir}/etc/gconf"
-}
diff --git a/testing/gdm/fix_external_program_directories.patch b/testing/gdm/fix_external_program_directories.patch
deleted file mode 100644
index 997ea5405..000000000
--- a/testing/gdm/fix_external_program_directories.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Nur gdm-3.2.0.orig/daemon/gdm-server.c gdm-3.2.0/daemon/gdm-server.c
---- gdm-3.2.0.orig/daemon/gdm-server.c 2011-10-02 01:13:37.772372528 +0000
-+++ gdm-3.2.0/daemon/gdm-server.c 2011-10-02 01:14:58.036444496 +0000
-@@ -131,7 +131,7 @@
- g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
-
- error = NULL;
-- command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s",
-+ command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s",
- server->priv->display_name);
-
- g_debug ("GdmServer: Running helper %s", command);
-diff -Nur gdm-3.2.0.orig/data/gdm-shell.session.in gdm-3.2.0/data/gdm-shell.session.in
---- gdm-3.2.0.orig/data/gdm-shell.session.in 2011-10-02 01:17:01.394246573 +0000
-+++ gdm-3.2.0/data/gdm-shell.session.in 2011-10-02 01:16:22.210552560 +0000
-@@ -1,5 +1,5 @@
- [GNOME Session]
- Name=Display Manager
- RequiredComponents=gnome-shell;gnome-settings-daemon;
--IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
-+IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && /usr/lib/gnome-session/gnome-session-check-accelerated'
- FallbackSession=gdm-fallback
-diff -Nur gdm-3.2.0.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.2.0/gui/simple-chooser/gdm-chooser-session.c
---- gdm-3.2.0.orig/gui/simple-chooser/gdm-chooser-session.c 2011-10-02 01:13:37.775705892 +0000
-+++ gdm-3.2.0/gui/simple-chooser/gdm-chooser-session.c 2011-10-02 01:14:58.036444496 +0000
-@@ -131,7 +131,7 @@
- ret = FALSE;
-
- error = NULL;
-- g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error);
-+ g_spawn_command_line_async ("/usr/lib/gnome-settings-daemon/gnome-settings-daemon", &error);
- if (error != NULL) {
- g_warning ("Error starting settings daemon: %s", error->message);
- g_error_free (error);
diff --git a/testing/gdm/gdm b/testing/gdm/gdm
deleted file mode 100755
index c3e635a6d..000000000
--- a/testing/gdm/gdm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Starting GDM"
- /usr/sbin/gdm &
- if [ $? -gt 0 ]; then
- stat_fail
- else
-
- add_daemon gdm
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping GDM"
- [ -f /var/run/gdm.pid ] && kill `cat /var/run/gdm.pid` &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon gdm
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 2
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/gdm/gdm-autologin.pam b/testing/gdm/gdm-autologin.pam
deleted file mode 100644
index c77c78917..000000000
--- a/testing/gdm/gdm-autologin.pam
+++ /dev/null
@@ -1,18 +0,0 @@
-#%PAM-1.0
-auth requisite pam_nologin.so
-auth required pam_env.so
-
-auth requisite pam_permit.so
-
-auth sufficient pam_succeed_if.so uid >= 1000 quiet
-auth required pam_deny.so
-
-account required pam_unix.so
-
-password required pam_deny.so
-
-session required pam_loginuid.so
--session optional pam_systemd.so
-session optional pam_keyinit.so revoke
-session required pam_limits.so
-session required pam_unix.so
diff --git a/testing/gdm/gdm-fingerprint.pam b/testing/gdm/gdm-fingerprint.pam
deleted file mode 100644
index 5b74bf6d6..000000000
--- a/testing/gdm/gdm-fingerprint.pam
+++ /dev/null
@@ -1,18 +0,0 @@
-#%PAM-1.0
-auth requisite pam_nologin.so
-auth required pam_env.so
-
-auth requisite pam_fprintd.so
-
-auth sufficient pam_succeed_if.so uid >= 1000 quiet
-auth required pam_deny.so
-
-account required pam_unix.so
-
-password required pam_deny.so
-
-session required pam_loginuid.so
--session optional pam_systemd.so
-session optional pam_keyinit.so revoke
-session required pam_limits.so
-session required pam_unix.so
diff --git a/testing/gdm/gdm-password.pam b/testing/gdm/gdm-password.pam
deleted file mode 100644
index aa4d4dd47..000000000
--- a/testing/gdm/gdm-password.pam
+++ /dev/null
@@ -1,20 +0,0 @@
-#%PAM-1.0
-auth requisite pam_nologin.so
-auth required pam_env.so
-
-auth requisite pam_unix.so nullok
-auth optional pam_gnome_keyring.so
-
-auth sufficient pam_succeed_if.so uid >= 1000 quiet
-auth required pam_deny.so
-
-account required pam_unix.so
-
-password required pam_unix.so
-
-session required pam_loginuid.so
--session optional pam_systemd.so
-session optional pam_keyinit.so force revoke
-session required pam_limits.so
-session required pam_unix.so
-session optional pam_gnome_keyring.so auto_start
diff --git a/testing/gdm/gdm-smartcard.pam b/testing/gdm/gdm-smartcard.pam
deleted file mode 100644
index baacb8bed..000000000
--- a/testing/gdm/gdm-smartcard.pam
+++ /dev/null
@@ -1,18 +0,0 @@
-#%PAM-1.0
-auth requisite pam_nologin.so
-auth required pam_env.so
-
-auth requisite pam_pkcs11.so wait_for_card card_only
-
-auth sufficient pam_succeed_if.so uid >= 1000 quiet
-auth required pam_deny.so
-
-account required pam_unix.so
-
-password required pam_pkcs11.so
-
-session required pam_loginuid.so
--session optional pam_systemd.so
-session optional pam_keyinit.so revoke
-session required pam_limits.so
-session required pam_unix.so
diff --git a/testing/gdm/gdm-vt-allocation-hack.patch b/testing/gdm/gdm-vt-allocation-hack.patch
deleted file mode 100644
index 56fa5a151..000000000
--- a/testing/gdm/gdm-vt-allocation-hack.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
-index 39def47..03488fd 100644
---- a/daemon/gdm-server.c
-+++ b/daemon/gdm-server.c
-@@ -33,6 +33,8 @@
- #include <grp.h>
- #include <signal.h>
- #include <sys/resource.h>
-+#include <sys/ioctl.h>
-+#include <sys/vt.h>
-
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -150,6 +152,92 @@ _gdm_server_query_ck_for_display_device (GdmServer *server)
- return out;
- }
-
-+#ifndef O_NOCTTY
-+# define O_NOCTTY 0
-+#endif
-+
-+static int
-+open_vt (int vtno)
-+{
-+ char *vtname;
-+ int fd;
-+
-+ vtname = g_strdup_printf ("/dev/tty%d", vtno);
-+
-+ do {
-+ errno = 0;
-+ fd = open (vtname, O_RDWR | O_NOCTTY, 0);
-+ } while (errno == EINTR);
-+
-+ g_free (vtname);
-+ return fd;
-+}
-+
-+static gint
-+find_first_probably_free_vt (void)
-+{
-+ int fd, fdv;
-+ int vtno;
-+ unsigned short vtmask;
-+ struct vt_stat vtstat;
-+ guint v_state;
-+
-+ fdv = -1;
-+
-+ do {
-+ errno = 0;
-+ fd = open ("/dev/console", O_WRONLY | O_NOCTTY, 0);
-+ } while (errno == EINTR);
-+
-+ if (fd >= 0) {
-+ if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) {
-+ v_state = vtstat.v_state;
-+ } else {
-+ close (fd);
-+ v_state = 0;
-+ fd = -1;
-+ }
-+ } else {
-+ v_state = 0;
-+ }
-+
-+ if (fd < 0) {
-+ do {
-+ errno = 0;
-+ fd = open ("/dev/console", O_RDONLY | O_NOCTTY, 0);
-+ } while (errno == EINTR);
-+
-+ if (fd >= 0) {
-+ if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0)
-+ v_state = vtstat.v_state;
-+ }
-+ }
-+
-+ for (vtno = 7, vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) {
-+ /* Is this console in use? */
-+ if (v_state & vtmask)
-+ continue;
-+
-+ /* No, try to open it */
-+ fdv = open_vt (vtno);
-+ if (fdv >= 0)
-+ break;
-+
-+ /* If we're here, kernel indicated that the console was free,
-+ * but we failed to open it. Just go on to higher VTs. */
-+ }
-+
-+ if (fdv >= 0)
-+ close (fdv);
-+ else
-+ vtno = -1;
-+
-+ if (fd >= 0)
-+ close (fd);
-+
-+ return vtno;
-+}
-+
- char *
- gdm_server_get_display_device (GdmServer *server)
- {
-@@ -310,6 +398,11 @@ gdm_server_resolve_command_line (GdmServer *server,
-
- if (vtarg != NULL && ! gotvtarg) {
- argv[len++] = g_strdup (vtarg);
-+ } else if (!query_in_arglist && !gotvtarg) {
-+ gint vtnum = find_first_probably_free_vt ();
-+
-+ if (vtnum > 0)
-+ argv [len++] = g_strdup_printf ("vt%d", vtnum);
- }
-
- argv[len++] = NULL;
diff --git a/testing/gdm/gdm-welcome.pam b/testing/gdm/gdm-welcome.pam
deleted file mode 100644
index cc3811c19..000000000
--- a/testing/gdm/gdm-welcome.pam
+++ /dev/null
@@ -1,12 +0,0 @@
-#%PAM-1.0
-auth required pam_env.so
-auth required pam_permit.so
-
-account required pam_nologin.so
-account required pam_unix.so
-
-password required pam_deny.so
-
-session required pam_loginuid.so
--session optional pam_systemd.so
-session optional pam_keyinit.so force revoke
diff --git a/testing/gdm/gdm.install b/testing/gdm/gdm.install
deleted file mode 100644
index fda42d319..000000000
--- a/testing/gdm/gdm.install
+++ /dev/null
@@ -1,31 +0,0 @@
-pkgname=gdm
-
-post_install() {
- getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm
- getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
- passwd -l gdm > /dev/null
- chown -R gdm:gdm /var/lib/gdm > /dev/null
-
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- gconfpkg --install ${pkgname}
- glib-compile-schemas usr/share/glib-2.0/schemas
- dconf update
-}
-
-pre_remove() {
- if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
- gconfpkg --uninstall ${pkgname}
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- dconf update
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- getent passwd gdm >/dev/null 2>&1 && userdel gdm
- getent group gdm >/dev/null 2>&1 && groupdel gdm
-}
diff --git a/testing/gdm/gdm.pam b/testing/gdm/gdm.pam
deleted file mode 100644
index 655299cb7..000000000
--- a/testing/gdm/gdm.pam
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth requisite pam_nologin.so
-auth required pam_env.so
-auth required pam_unix.so
-auth optional pam_gnome_keyring.so
-account required pam_unix.so
-session required pam_limits.so
-session required pam_unix.so
-session optional pam_gnome_keyring.so auto_start
-password required pam_unix.so
diff --git a/testing/gedit/PKGBUILD b/testing/gedit/PKGBUILD
deleted file mode 100644
index aabf27889..000000000
--- a/testing/gedit/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 140543 2011-10-16 20:26:14Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gedit
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="A text editor for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'python2-gobject' 'dconf')
-makedepends=('gnome-doc-utils' 'intltool')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=gedit.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('bdde2dae05bf08e67088c441eac3456d6861b5076d5f00d4c381291ef4c85651')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
- --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib --disable-scrollkeeper \
- --disable-updater --disable-schemas-compile \
- --enable-python
- make
-}
-
-package(){
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gedit/gedit.install b/testing/gedit/gedit.install
deleted file mode 100644
index 9d88a1341..000000000
--- a/testing/gedit/gedit.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
-}
-
-pre_upgrade() {
- if [ -f usr/share/gconf/schemas/gedit.schemas ]; then
- usr/sbin/gconfpkg --uninstall gedit
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/testing/glib-networking/PKGBUILD b/testing/glib-networking/PKGBUILD
deleted file mode 100644
index da3209ed2..000000000
--- a/testing/glib-networking/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 140714 2011-10-18 13:43:46Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=glib-networking
-pkgver=2.30.1
-pkgrel=1
-pkgdesc="Network-related giomodules for glib"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libproxy' 'gnutls' 'libgcrypt' 'ca-certificates' 'gsettings-desktop-schemas')
-makedepends=('intltool')
-options=('!libtool')
-install=glib-networking.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('5acc7e76cb66734379d9ad983985c671af12591b84e93cd698fe8ea25d29f7d3')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure \
- --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/glib-networking --disable-static
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/glib-networking/glib-networking.install b/testing/glib-networking/glib-networking.install
deleted file mode 100644
index 595f1c75b..000000000
--- a/testing/glib-networking/glib-networking.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- usr/bin/gio-querymodules usr/lib/gio/modules
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/glib2/PKGBUILD b/testing/glib2/PKGBUILD
deleted file mode 100644
index 6548be4af..000000000
--- a/testing/glib2/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 140483 2011-10-15 14:04:54Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=glib2
-pkgver=2.30.1
-pkgrel=1
-pkgdesc="Common C routines used by GTK+ and other libs"
-url="http://www.gtk.org/"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('pcre' 'libffi')
-makedepends=('pkgconfig' 'python2')
-optdepends=('python2: for gdbus-codegen')
-options=('!libtool' '!docs' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz
- glib2.sh
- glib2.csh)
-sha256sums=('82fde222ea33a0faac88e9b50f5b1f7fcfc235c861a9371e8fe47ec12c1e27f9'
- '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
- '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3')
-
-build() {
- cd "${srcdir}/glib-${pkgver}"
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --with-pcre=system \
- --disable-fam
- make
-}
-
-package() {
- cd "${srcdir}/glib-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -d "${pkgdir}/etc/profile.d"
- install -m755 "${srcdir}/glib2.sh" "${pkgdir}/etc/profile.d/"
- install -m755 "${srcdir}/glib2.csh" "${pkgdir}/etc/profile.d/"
-
- for _i in "${pkgdir}/etc/bash_completion.d/"*; do
- chmod -x "${_i}"
- done
- sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen
-}
diff --git a/testing/glib2/glib2.csh b/testing/glib2/glib2.csh
deleted file mode 100644
index 7aa3a2ffa..000000000
--- a/testing/glib2/glib2.csh
+++ /dev/null
@@ -1 +0,0 @@
-setenv G_BROKEN_FILENAMES 1
diff --git a/testing/glib2/glib2.sh b/testing/glib2/glib2.sh
deleted file mode 100644
index 96a056e1e..000000000
--- a/testing/glib2/glib2.sh
+++ /dev/null
@@ -1 +0,0 @@
-export G_BROKEN_FILENAMES=1
diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD
deleted file mode 100644
index 87c5cd135..000000000
--- a/testing/glibc/PKGBUILD
+++ /dev/null
@@ -1,204 +0,0 @@
-# $Id: PKGBUILD 141158 2011-10-25 05:08:15Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: valgrind requires rebuilt with each major glibc version
-
-pkgname=glibc
-pkgver=2.14.1
-pkgrel=1
-_glibcdate=20111025
-pkgdesc="GNU C Library"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/libc"
-license=('GPL' 'LGPL')
-groups=('base')
-depends=('linux-api-headers>=3.0' 'tzdata')
-makedepends=('gcc>=4.6')
-backup=(etc/gai.conf
- etc/locale.gen
- etc/nscd.conf)
-options=('!strip')
-install=glibc.install
-source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz
- glibc-2.10-dont-build-timezone.patch
- glibc-2.10-bz4781.patch
- glibc-__i686.patch
- glibc-2.12.1-static-shared-getpagesize.patch
- glibc-2.12.2-ignore-origin-of-privileged-program.patch
- glibc-2.13-futex.patch
- glibc-2.14-libdl-crash.patch
- glibc-2.14-revert-4768ae77.patch
- glibc-2.14-reexport-rpc-interface.patch
- glibc-2.14-reinstall-nis-rpc-headers.patch
- nscd
- locale.gen.txt
- locale-gen)
-md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1'
- '4dadb9203b69a3210d53514bb46f41c3'
- '0c5540efc51c0b93996c51b57a8540ae'
- '40cd342e21f71f5e49e32622b25acc52'
- 'a3ac6f318d680347bb6e2805d42b73b2'
- 'b042647ea7d6f22ad319e12e796bd13e'
- '7d0154b7e17ea218c9fa953599d24cc4'
- '6970bcfeb3bf88913436d5112d16f588'
- '7da8c554a3b591c7401d7023b1928afc'
- 'c5de2a946215d647c8af5432ec4b0da0'
- '55febbb72139ac7b65757df085024b83'
- 'b587ee3a70c9b3713099295609afde49'
- '07ac979b6ab5eeb778d55f041529d623'
- '476e9113489f93b348b21e144b6a8fcf')
-
-
-mksource() {
- git clone git://sourceware.org/git/glibc.git
- pushd glibc
- git checkout -b glibc-2.14-arch origin/release/2.14/master
- popd
- tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/*
-}
-
-build() {
- cd ${srcdir}/glibc
-
- # timezone data is in separate package (tzdata)
- patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch
-
- # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
- patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch
-
- # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411
- # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
- patch -Np1 -i ${srcdir}/glibc-__i686.patch
-
- # http://sourceware.org/bugzilla/show_bug.cgi?id=11929
- # using Fedora "fix" as patch in that bug report causes breakages...
- patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch
-
- # http://www.exploit-db.com/exploits/15274/
- # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
-
- # http://sourceware.org/bugzilla/show_bug.cgi?id=12403
- patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch
-
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...)
- # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
- patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
-
- # Revert commit causing issues with crappy DNS servers...
- # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER!
- # Note that both these patches do not fix the issue completely:
- # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch
-
- # re-export RPC interface until libtirpc is ready as a replacement
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
-
- install -dm755 ${pkgdir}/etc
- touch ${pkgdir}/etc/ld.so.conf
-
- cd ${srcdir}
- mkdir glibc-build
- cd glibc-build
-
- if [[ ${CARCH} = "i686" ]]; then
- # Hack to fix NPTL issues with Xen, only required on 32bit platforms
- export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
- fi
-
- echo "slibdir=/lib" >> configparms
-
- # remove hardening options from CFLAGS for building libraries
- CFLAGS=${CFLAGS/-fstack-protector/}
- CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
-
- ${srcdir}/glibc/configure --prefix=/usr \
- --libdir=/usr/lib --libexecdir=/usr/lib \
- --with-headers=/usr/include \
- --enable-add-ons=nptl,libidn \
- --enable-kernel=2.6.27 \
- --with-tls --with-__thread \
- --enable-bind-now --without-gd \
- --without-cvs --disable-profile \
- --enable-multi-arch
-
- # build libraries with hardening disabled
- echo "build-programs=no" >> configparms
- make
-
- # re-enable hardening for programs
- sed -i "s#=no#=yes#" configparms
- echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
- echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
- make
-
- # remove harding in preparation to run test-suite
- sed -i '2,4d' configparms
-}
-
-check() {
- cd ${srcdir}/glibc-build
-
- # some errors are expected - manually check log files
- make -k check || true
-}
-
-package() {
- cd ${srcdir}/glibc-build
- make install_root=${pkgdir} install
-
- rm -f ${pkgdir}/etc/ld.so.{cache,conf}
-
- install -dm755 ${pkgdir}/etc/rc.d
- install -dm755 ${pkgdir}/usr/sbin
- install -dm755 ${pkgdir}/usr/lib/locale
- install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
- install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd
- install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin
- install -m644 ${srcdir}/glibc/posix/gai.conf ${pkgdir}/etc/gai.conf
-
- sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf
-
- # create /etc/locale.gen
- install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
- sed -i "s|/| |g" ${srcdir}/glibc/localedata/SUPPORTED
- sed -i 's|\\| |g' ${srcdir}/glibc/localedata/SUPPORTED
- sed -i "s|SUPPORTED-LOCALES=||" ${srcdir}/glibc/localedata/SUPPORTED
- cat ${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
- sed -i "s|^|#|g" ${pkgdir}/etc/locale.gen
-
- if [[ ${CARCH} = "x86_64" ]]; then
- # fix for the linker
- sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd
- # Comply with multilib binaries, they look for the linker in /lib64
- mkdir ${pkgdir}/lib64
- cd ${pkgdir}/lib64
- ln -v -s ../lib/ld* .
- fi
-
- # manually strip files as stripping libpthread-*.so and libthread_db.so
- # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks
- # valgrind on x86_64
-
- cd $pkgdir
- strip $STRIP_BINARIES sbin/{ldconfig,sln} \
- usr/bin/{gencat,getconf,getent,iconv,locale} \
- usr/bin/{localedef,pcprofiledump,rpcgen,sprof} \
- usr/lib/getconf/* \
- usr/sbin/{iconvconfig,nscd}
- [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4
-
- strip $STRIP_STATIC usr/lib/*.a \
- lib/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so
-
- strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \
- lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
- lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
- lib/{libmemusage,libpcprofile,libSegFault}.so \
- usr/lib/{pt_chown,{audit,gconv}/*.so}
-}
diff --git a/testing/glibc/glibc-2.10-bz4781.patch b/testing/glibc/glibc-2.10-bz4781.patch
deleted file mode 100644
index cf1a97a18..000000000
--- a/testing/glibc/glibc-2.10-bz4781.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-23 13:27:46.000000000 +1000
-@@ -120,9 +120,6 @@
- ret
-
- L(thread_start):
-- cfi_startproc;
-- /* Clearing frame pointer is insufficient, use CFI. */
-- cfi_undefined (eip);
- /* Note: %esi is zero. */
- movl %esi,%ebp /* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@
- jmp L(haspid)
- .previous
- #endif
-- cfi_endproc;
-
- cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-23 13:27:46.000000000 +1000
-@@ -89,9 +89,6 @@
- ret
-
- L(thread_start):
-- cfi_startproc;
-- /* Clearing frame pointer is insufficient, use CFI. */
-- cfi_undefined (rip);
- /* Clear the frame pointer. The ABI suggests this be done, to mark
- the outermost frame obviously. */
- xorl %ebp, %ebp
-@@ -116,7 +113,6 @@
- /* Call exit with return value from function call. */
- movq %rax, %rdi
- call HIDDEN_JUMPTARGET (_exit)
-- cfi_endproc;
-
- cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
diff --git a/testing/glibc/glibc-2.10-dont-build-timezone.patch b/testing/glibc/glibc-2.10-dont-build-timezone.patch
deleted file mode 100644
index d3abeff17..000000000
--- a/testing/glibc/glibc-2.10-dont-build-timezone.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-timezone data has been split into the package sys-libs/timezone-data
-
---- glibc-2.4/Makeconfig
-+++ glibc-2.4/Makeconfig
-@@ -931,7 +931,7 @@
- stdlib stdio-common libio malloc string wcsmbs time dirent \
- grp pwd posix io termios resource misc socket sysvipc gmon \
- gnulib iconv iconvdata wctype manual shadow gshadow po argp \
-- crypt nss localedata timezone rt conform debug \
-+ crypt nss localedata rt conform debug \
- $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
-
- ifndef avoid-generated
diff --git a/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch b/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch
deleted file mode 100644
index e84754279..000000000
--- a/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c
-+++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c
-@@ -28,7 +28,7 @@
- int
- __getpagesize ()
- {
--#ifdef __ASSUME_AT_PAGESIZE
-+#if 0 && defined __ASSUME_AT_PAGESIZE
- assert (GLRO(dl_pagesize) != 0);
- return GLRO(dl_pagesize);
- #else
diff --git a/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
deleted file mode 100644
index ce089b49c..000000000
--- a/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Thu, 9 Dec 2010 15:00:59 +0100
-Subject: [PATCH 1/1] Ignore origin of privileged program
-
----
- ChangeLog | 5 +++++
- elf/dl-object.c | 3 +++
- 2 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/elf/dl-object.c b/elf/dl-object.c
-index 22a1635..7674d49 100644
---- a/elf/dl-object.c
-+++ b/elf/dl-object.c
-@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type,
- out:
- new->l_origin = origin;
- }
-+ else if (INTUSE(__libc_enable_secure) && type == lt_executable)
-+ /* The origin of a privileged program cannot be trusted. */
-+ new->l_origin = (char *) -1;
-
- return new;
- }
---
-1.7.2
diff --git a/testing/glibc/glibc-2.13-futex.patch b/testing/glibc/glibc-2.13-futex.patch
deleted file mode 100644
index 9b9c3ac45..000000000
--- a/testing/glibc/glibc-2.13-futex.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
-+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
-@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock:
- cfi_restore(%r12)
- retq
-
--#ifdef __ASSUME_PRIVATE_FUTEX
-+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
- cfi_adjust_cfa_offset(16)
- cfi_rel_offset(%r12, 8)
- cfi_rel_offset(%r13, 0)
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
-+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
-@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock:
-
- 7: movq %rdx, %rax
-
--#ifndef __ASSUME_PRIVATE_FUTEX
-+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME
- addq $16, %rsp
- cfi_adjust_cfa_offset(-16)
- popq %r14
-@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock:
- cfi_restore(%r12)
- retq
-
--#ifdef __ASSUME_PRIVATE_FUTEX
-+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
- cfi_adjust_cfa_offset(16)
- cfi_rel_offset(%r12, 8)
- cfi_rel_offset(%r13, 0)
diff --git a/testing/glibc/glibc-2.14-libdl-crash.patch b/testing/glibc/glibc-2.14-libdl-crash.patch
deleted file mode 100644
index 6c9d2718e..000000000
--- a/testing/glibc/glibc-2.14-libdl-crash.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/elf/dl-close.c b/elf/dl-close.c
-index 73b2a2f..9bd91e3 100644
---- a/elf/dl-close.c
-+++ b/elf/dl-close.c
-@@ -1,5 +1,5 @@
- /* Close a shared object opened by `_dl_open'.
-- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
- if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
- || dl_close_state != not_pending)
- {
-- if (map->l_direct_opencount == 0)
-- {
-- if (map->l_type == lt_loaded)
-- dl_close_state = rerun;
-- else if (map->l_type == lt_library)
-- {
-- struct link_map **oldp = map->l_initfini;
-- map->l_initfini = map->l_orig_initfini;
-- _dl_scope_free (oldp);
-- }
-- }
-+ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
-+ dl_close_state = rerun;
-
- /* There are still references to this object. Do nothing more. */
- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
-diff --git a/elf/dl-deps.c b/elf/dl-deps.c
-index 9e30594..3890d00 100644
---- a/elf/dl-deps.c
-+++ b/elf/dl-deps.c
-@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
- nneeded * sizeof needed[0]);
- atomic_write_barrier ();
- l->l_initfini = l_initfini;
-+ l->l_free_initfini = 1;
- }
-
- /* If we have no auxiliary objects just go on to the next map. */
-@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
- l_initfini[nlist] = NULL;
- atomic_write_barrier ();
- map->l_initfini = l_initfini;
-+ map->l_free_initfini = 1;
- if (l_reldeps != NULL)
- {
- atomic_write_barrier ();
-@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING"));
- _dl_scope_free (old_l_reldeps);
- }
- if (old_l_initfini != NULL)
-- map->l_orig_initfini = old_l_initfini;
-+ _dl_scope_free (old_l_initfini);
-
-diff --git a/elf/dl-libc.c b/elf/dl-libc.c
-index 7be9483..a13fce3 100644
---- a/elf/dl-libc.c
-+++ b/elf/dl-libc.c
-@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
-
- for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
- {
-- /* Remove all additional names added to the objects. */
- for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
- {
- struct libname_list *lnp = l->l_libname->next;
-
- l->l_libname->next = NULL;
-
-+ /* Remove all additional names added to the objects. */
- while (lnp != NULL)
- {
- struct libname_list *old = lnp;
-@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem)
- if (! old->dont_free)
- free (old);
- }
-+
-+ /* Free the initfini dependency list. */
-+ if (l->l_free_initfini)
-+ free (l->l_initfini);
- }
-
- if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 4a9109e..617e30e 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- lnp->dont_free = 1;
- lnp = lnp->next;
- }
-+ l->l_free_initfini = 0;
-
- if (l != &GL(dl_rtld_map))
- _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
-diff --git a/include/link.h b/include/link.h
-index e877104..051b99a 100644
---- a/include/link.h
-+++ b/include/link.h
-@@ -1,6 +1,6 @@
- /* Data structure for communication from the run-time dynamic linker for
- loaded ELF shared objects.
-- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -192,6 +192,9 @@ struct link_map
- during LD_TRACE_PRELINKING=1
- contains any DT_SYMBOLIC
- libraries. */
-+ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
-+ freed, ie. not allocated with
-+ the dummy malloc in ld.so. */
-
- /* Collected information about own RPATH directories. */
- struct r_search_path_struct l_rpath_dirs;
-@@ -240,9 +243,6 @@ struct link_map
-
- /* List of object in order of the init and fini calls. */
- struct link_map **l_initfini;
-- /* The init and fini list generated at startup, saved when the
-- object is also loaded dynamically. */
-- struct link_map **l_orig_initfini;
-
- /* List of the dependencies introduced through symbol binding. */
- struct link_map_reldeps
diff --git a/testing/glibc/glibc-2.14-reexport-rpc-interface.patch b/testing/glibc/glibc-2.14-reexport-rpc-interface.patch
deleted file mode 100644
index e2beea881..000000000
--- a/testing/glibc/glibc-2.14-reexport-rpc-interface.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/include/libc-symbols.h b/include/libc-symbols.h
-index 67e1ca2..5e7cca5 100644
---- a/include/libc-symbols.h
-+++ b/include/libc-symbols.h
-@@ -635,7 +635,7 @@ for linking")
- # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
- # define libc_hidden_def(name) hidden_def (name)
- # define libc_hidden_weak(name) hidden_weak (name)
--# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
-+# define libc_hidden_nolink(name, version) hidden_def (name)
- # define libc_hidden_ver(local, name) hidden_ver (local, name)
- # define libc_hidden_data_def(name) hidden_data_def (name)
- # define libc_hidden_data_weak(name) hidden_data_weak (name)
-diff --git a/sunrpc/Makefile b/sunrpc/Makefile
-index 5134ce9..40c73d1 100644
---- a/sunrpc/Makefile
-+++ b/sunrpc/Makefile
-@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
- des_crypt.h)
- headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
- $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
--headers = rpc/netdb.h
-+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
- install-others = $(inst_sysconfdir)/rpc
- generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
- $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
diff --git a/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
deleted file mode 100644
index eb0fd822d..000000000
--- a/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Tue, 17 May 2011 17:42:30 +0200
-Subject: [PATCH] Reinstall NIS RPC headers
-
----
- nis/Makefile | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/nis/Makefile b/nis/Makefile
-index b5c9609..d2934d9 100644
---- a/nis/Makefile
-+++ b/nis/Makefile
-@@ -23,9 +23,9 @@ subdir := nis
-
- aux := nis_hash
-
-+headers := $(wildcard rpcsvc/*.[hx])
- distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \
-- nisplus-parser.h nis_xdr.h nss \
-- $(wildcard rpcsvc/*.[hx])
-+ nisplus-parser.h nis_xdr.h nss
-
- # These are the databases available for the nis (and perhaps later nisplus)
- # service. This must be a superset of the services in nss.
---
-1.7.5.4
-
diff --git a/testing/glibc/glibc-2.14-revert-4768ae77.patch b/testing/glibc/glibc-2.14-revert-4768ae77.patch
deleted file mode 100644
index 11f087cb7..000000000
--- a/testing/glibc/glibc-2.14-revert-4768ae77.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
---- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000
-+++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000
-@@ -549,7 +549,7 @@
- ns, ansp, ansp2, nansp2, resplen2);
- if (n < 0)
- return (-1);
-- if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+ if (n == 0)
- goto next_ns;
- } else {
- /* Use datagrams. */
-@@ -559,7 +559,7 @@
- ansp2, nansp2, resplen2);
- if (n < 0)
- return (-1);
-- if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+ if (n == 0)
- goto next_ns;
- if (v_circuit)
- // XXX Check whether both requests failed or
-@@ -1275,14 +1275,10 @@
- (*thisresplenp > *thisanssizp)
- ? *thisanssizp : *thisresplenp);
-
-- if (recvresp1 || (buf2 != NULL && recvresp2)) {
-- *resplen2 = 0;
-+ if (recvresp1 || (buf2 != NULL && recvresp2))
- return resplen;
-- }
- if (buf2 != NULL)
- {
-- /* No data from the first reply. */
-- resplen = 0;
- /* We are waiting for a possible second reply. */
- if (hp->id == anhp->id)
- recvresp1 = 1;
diff --git a/testing/glibc/glibc-__i686.patch b/testing/glibc/glibc-__i686.patch
deleted file mode 100644
index 28d5dd424..000000000
--- a/testing/glibc/glibc-__i686.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile
---- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000
-+++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000
-@@ -1,6 +1,7 @@
- # The mpn functions need a #define for asm syntax flavor.
--# Every i386 port in use uses gas syntax (I think).
--asm-CPPFLAGS += -DGAS_SYNTAX
-+# Every i386 port in use uses gas syntax (I think). Don't replace
-+# __i686 in __i686.get_pc_thunk.bx.
-+asm-CPPFLAGS += -DGAS_SYNTAX -U __i686
-
- # The i386 `long double' is a distinct type we support.
- long-double-fcts = yes
diff --git a/testing/glibc/glibc.install b/testing/glibc/glibc.install
deleted file mode 100644
index 7f85ade96..000000000
--- a/testing/glibc/glibc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11})
-
-post_upgrade() {
- sbin/ldconfig -r .
- [ -x sbin/init ] && sbin/init u
- usr/sbin/locale-gen
-
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/testing/glibc/locale-gen b/testing/glibc/locale-gen
deleted file mode 100755
index 5aff344c4..000000000
--- a/testing/glibc/locale-gen
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-set -e
-
-LOCALEGEN=/etc/locale.gen
-LOCALES=/usr/share/i18n/locales
-if [ -n "$POSIXLY_CORRECT" ]; then
- unset POSIXLY_CORRECT
-fi
-
-
-[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0;
-
-# Remove all old locale dir and locale-archive before generating new
-# locale data.
-rm -rf /usr/lib/locale/* || true
-
-umask 022
-
-is_entry_ok() {
- if [ -n "$locale" -a -n "$charset" ] ; then
- true
- else
- echo "error: Bad entry '$locale $charset'"
- false
- fi
-}
-
-echo "Generating locales..."
-while read locale charset; do \
- case $locale in \#*) continue;; "") continue;; esac; \
- is_entry_ok || continue
- echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \
- echo -n ".$charset"; \
- echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \
- echo -n '...'; \
- if [ -f $LOCALES/$locale ]; then input=$locale; else \
- input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \
- localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \
- echo ' done'; \
-done < $LOCALEGEN
-echo "Generation complete."
diff --git a/testing/glibc/locale.gen.txt b/testing/glibc/locale.gen.txt
deleted file mode 100644
index ccdd81734..000000000
--- a/testing/glibc/locale.gen.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# Configuration file for locale-gen
-#
-# lists of locales that are to be generated by the locale-gen command.
-#
-# Each line is of the form:
-#
-# <locale> <charset>
-#
-# where <locale> is one of the locales given in /usr/share/i18n/locales
-# and <charset> is one of the character sets listed in /usr/share/i18n/charmaps
-#
-# Examples:
-# en_US ISO-8859-1
-# en_US.UTF-8 UTF-8
-# de_DE ISO-8859-1
-# de_DE@euro ISO-8859-15
-#
-# The locale-gen command will generate all the locales,
-# placing them in /usr/lib/locale.
-#
-# A list of supported locales is included in this file.
-# Uncomment the ones you need.
-#
diff --git a/testing/glibc/nscd b/testing/glibc/nscd
deleted file mode 100755
index 8b14f2a3f..000000000
--- a/testing/glibc/nscd
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/nscd`
-case "$1" in
- start)
- stat_busy "Starting nscd"
- # create necessary directories if they don't already exist
- mkdir -p /var/run/nscd /var/db/nscd 2>/dev/null
- # remove stale files
- rm -f /var/db/nscd/* /var/run/nscd/* 2>/dev/null
- [ -z "$PID" ] && /usr/sbin/nscd
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon nscd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping nscd"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon nscd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/gnome-applets/PKGBUILD b/testing/gnome-applets/PKGBUILD
deleted file mode 100644
index f3a788d52..000000000
--- a/testing/gnome-applets/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 140708 2011-10-18 13:30:12Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-applets
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="GNOME Applets"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gnome-panel' 'libgtop' 'gucharmap' 'libnotify' 'cpufrequtils')
-makedepends=('gnome-doc-utils' 'intltool' 'gnome-settings-daemon' 'networkmanager' 'gnome-common')
-options=(!emptydirs)
-url="http://www.gnome.org"
-groups=(gnome)
-install=gnome-applets.install
-source=(http://download.gnome.org/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('cba1dff05bf2aad57f0df2ea746a9bf1c3483a0388a70bf501f61d95b1017dc1')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
- --sysconfdir=/etc --libexecdir=/usr/lib/gnome-applets \
- --localstatedir=/var --disable-static \
- --disable-scrollkeeper --disable-schemas-install \
- --without-hal
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-applets-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-applets/gnome-applets.install b/testing/gnome-applets/gnome-applets.install
deleted file mode 100644
index dd9c34269..000000000
--- a/testing/gnome-applets/gnome-applets.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=gnome-applets
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules b/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules
deleted file mode 100644
index a76c1e73c..000000000
--- a/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules
+++ /dev/null
@@ -1,11 +0,0 @@
-# Get access to /dev/rfkill for users
-# See https://bugzilla.redhat.com/show_bug.cgi?id=514798
-#
-# Updated for udev >= 154
-# http://bugs.debian.org/582188
-# https://bugzilla.redhat.com/show_bug.cgi?id=588660
-
-ENV{ACL_MANAGE}=="0", GOTO="gnome_bluetooth_end"
-ACTION!="add|change", GOTO="gnome_bluetooth_end"
-KERNEL=="rfkill", TAG+="udev-acl"
-LABEL="gnome_bluetooth_end"
diff --git a/testing/gnome-bluetooth/PKGBUILD b/testing/gnome-bluetooth/PKGBUILD
deleted file mode 100644
index 1a76041ff..000000000
--- a/testing/gnome-bluetooth/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 140617 2011-10-17 13:37:28Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=gnome-bluetooth
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="The GNOME Bluetooth Subsystem"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/GnomeBluetooth"
-license=('GPL' 'LGPL')
-depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-install=gnome-bluetooth.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
- 61-gnome-bluetooth-rfkill.rules)
-sha256sums=('f67abc26e2a8003b5e3b58e1541ed3955e0ea05a08bfaa8d5dc4b2133d948df0'
- 'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-desktop-update \
- --disable-icon-update \
- --disable-schemas-compile
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -m644 -D "${srcdir}/61-gnome-bluetooth-rfkill.rules" \
- "${pkgdir}/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules"
- install -d ${pkgdir}/etc/ld.so.conf.d
- echo "/usr/lib/gnome-bluetooth" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
-}
diff --git a/testing/gnome-bluetooth/gnome-bluetooth.install b/testing/gnome-bluetooth/gnome-bluetooth.install
deleted file mode 100644
index 927142ee0..000000000
--- a/testing/gnome-bluetooth/gnome-bluetooth.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/testing/gnome-color-manager/PKGBUILD b/testing/gnome-color-manager/PKGBUILD
deleted file mode 100644
index d8d97e614..000000000
--- a/testing/gnome-color-manager/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 140598 2011-10-17 12:23:54Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=gnome-color-manager
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="Color profile manager for the GNOME desktop"
-arch=(i686 x86_64)
-url="http://projects.gnome.org/gnome-color-manager/"
-license=(GPL2)
-depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk' 'mash')
-makedepends=('intltool' 'gtk-doc')
-install=gnome-color-manager.install
-options=('!libtool' '!emptydirs')
-groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('bc4651b58a4dc4b812803e8f81520488e6b452969028f04987cb463b8e218436')
-
-build(){
- cd "$srcdir/$pkgname-$pkgver"
-
- # man pages need docbook-sgml, which we don't have
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib/gnome-color-manager \
- --disable-static --disable-man-pages
-
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-color-manager/gnome-color-manager.install b/testing/gnome-color-manager/gnome-color-manager.install
deleted file mode 100644
index 04fda0ddc..000000000
--- a/testing/gnome-color-manager/gnome-color-manager.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.90.0) < 0 )); then
- usr/sbin/gconfpkg --uninstall gnome-color-manager
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/gnome-contacts/PKGBUILD b/testing/gnome-contacts/PKGBUILD
deleted file mode 100644
index b32ca34f8..000000000
--- a/testing/gnome-contacts/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 140748 2011-10-18 15:40:08Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-contacts
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="Contacts Manager for GNOME"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL2')
-groups=(gnome-extra)
-depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop')
-makedepends=('intltool' 'vala')
-install=
-source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('31c277a3db145c2353fffe33e613fb634e76fa5caf382e8f307a05e74a6a6eb9')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-control-center/PKGBUILD b/testing/gnome-control-center/PKGBUILD
deleted file mode 100644
index dba6b22ef..000000000
--- a/testing/gnome-control-center/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 140631 2011-10-17 15:32:06Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-control-center
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="The Control Center for GNOME"
-arch=('i686' 'x86_64')
-depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'gnome-online-accounts' 'network-manager-applet')
-optdepends=('mesa-demos: provides glxinfo for graphics information'
- 'apg: adds password generation for user accounts'
- 'gnome-color-manager: for color management tasks')
-makedepends=('gnome-doc-utils' 'intltool')
-url="http://www.gnome.org"
-groups=('gnome')
-install=gnome-control-center.install
-license=('GPL')
-options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('bf354ea096ee7501cbdf53c42386355f19975b4206995e6110c180e7cb74a088')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --disable-scrollkeeper --disable-update-mimedb
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=656229
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-}
-
diff --git a/testing/gnome-control-center/gnome-control-center.install b/testing/gnome-control-center/gnome-control-center.install
deleted file mode 100644
index eb703319f..000000000
--- a/testing/gnome-control-center/gnome-control-center.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=gnome-control-center
-
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
- usr/sbin/gconfpkg --uninstall ${pkgname}
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/testing/gnome-desktop/PKGBUILD b/testing/gnome-desktop/PKGBUILD
deleted file mode 100644
index 53611d625..000000000
--- a/testing/gnome-desktop/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 140521 2011-10-16 14:59:31Z heftig $
-# Maintainer: Jan de Groot <jan@archlinux.org>
-
-pkgname=gnome-desktop
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="Library with common API for various GNOME modules"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-depends=('gsettings-desktop-schemas' 'startup-notification' 'gtk3')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('4cb00d22360f9ae4bc3fb79efe7868fd54fcbfcd4f7050c71fc97699ec3a86a2')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --with-gnome-distributor="Arch Linux" \
- --disable-scrollkeeper
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-documents/PKGBUILD b/testing/gnome-documents/PKGBUILD
deleted file mode 100644
index c7abe7b61..000000000
--- a/testing/gnome-documents/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 140635 2011-10-17 15:38:21Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=gnome-documents
-pkgver=0.2.1
-pkgrel=1
-pkgdesc="Documents Manager for GNOME"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL')
-groups=('gnome-extra')
-depends=('clutter-gtk' 'evince' 'gobject-introspection' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata' 'tracker')
-makedepends=('intltool' 'vala')
-optdepends=('unoconv: Support for Libreoffice document types')
-options=('!libtool')
-install=gnome-documents.install
-source=(http://download.gnome.org/sources/$pkgname/0.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('f04356d6620a3fa47cfdb4b72c80ac3748ca229fe24b57ccf229536afa934f52')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib/gnome-documents
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-documents/gnome-documents.install b/testing/gnome-documents/gnome-documents.install
deleted file mode 100644
index 95114273e..000000000
--- a/testing/gnome-documents/gnome-documents.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/gnome-games/PKGBUILD b/testing/gnome-games/PKGBUILD
deleted file mode 100644
index 9771eaf68..000000000
--- a/testing/gnome-games/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 140750 2011-10-18 16:34:31Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-games
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="Some Games for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libsm' 'gconf' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
-options=('!emptydirs' '!libtool')
-install=gnome-games.install
-url="http://www.gnome.org"
-groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('b40fe59537fd58af1bd8163897684883b730ee0f0257d23b493b13e21d105a3b')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-scrollkeeper \
- --disable-static \
- --with-scores-user=root --with-scores-group=games \
- --enable-introspection=yes
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
- # Remove all scores, we generate them from postinstall
- rm -rf "${pkgdir}/var"
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-games ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-
- sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' ${pkgdir}/usr/bin/gnome-sudoku
-}
diff --git a/testing/gnome-games/gnome-games.install b/testing/gnome-games/gnome-games.install
deleted file mode 100644
index 1f67c2e01..000000000
--- a/testing/gnome-games/gnome-games.install
+++ /dev/null
@@ -1,153 +0,0 @@
-pkgname=gnome-games
-scores=(glines.Large.scores
- glines.Medium.scores
- glines.Small.scores
- gnibbles.1.0.scores
- gnibbles.1.1.scores
- gnibbles.2.0.scores
- gnibbles.2.1.scores
- gnibbles.3.0.scores
- gnibbles.3.1.scores
- gnibbles.4.0.scores
- gnibbles.4.1.scores
- gnobots2.classic_robots-safe.scores
- gnobots2.classic_robots-super-safe.scores
- gnobots2.classic_robots.scores
- gnobots2.nightmare-safe.scores
- gnobots2.nightmare-super-safe.scores
- gnobots2.nightmare.scores
- gnobots2.robots2-safe.scores
- gnobots2.robots2-super-safe.scores
- gnobots2.robots2.scores
- gnobots2.robots2_easy-safe.scores
- gnobots2.robots2_easy-super-safe.scores
- gnobots2.robots2_easy.scores
- gnobots2.robots_with_safe_teleport-safe.scores
- gnobots2.robots_with_safe_teleport-super-safe.scores
- gnobots2.robots_with_safe_teleport.scores
- gnomine.Custom.scores
- gnomine.Large.scores
- gnomine.Medium.scores
- gnomine.Small.scores
- gnotravex.2x2.scores
- gnotravex.3x3.scores
- gnotravex.4x4.scores
- gnotravex.5x5.scores
- gnotravex.6x6.scores
- gnotski.1.scores
- gnotski.10.scores
- gnotski.11.scores
- gnotski.12.scores
- gnotski.13.scores
- gnotski.14.scores
- gnotski.15.scores
- gnotski.16.scores
- gnotski.17.scores
- gnotski.18.scores
- gnotski.19.scores
- gnotski.2.scores
- gnotski.20.scores
- gnotski.21.scores
- gnotski.22.scores
- gnotski.23.scores
- gnotski.24.scores
- gnotski.25.scores
- gnotski.26.scores
- gnotski.27.scores
- gnotski.28.scores
- gnotski.29.scores
- gnotski.3.scores
- gnotski.30.scores
- gnotski.31.scores
- gnotski.32.scores
- gnotski.33.scores
- gnotski.34.scores
- gnotski.35.scores
- gnotski.36.scores
- gnotski.37.scores
- gnotski.4.scores
- gnotski.5.scores
- gnotski.6.scores
- gnotski.7.scores
- gnotski.8.scores
- gnotski.9.scores
- gtali.Colors.scores
- gtali.Regular.scores
- mahjongg.bridges.scores
- mahjongg.cloud.scores
- mahjongg.confounding.scores
- mahjongg.difficult.scores
- mahjongg.dragon.scores
- mahjongg.easy.scores
- mahjongg.pyramid.scores
- mahjongg.tictactoe.scores
- mahjongg.ziggurat.scores
- swell-foop.Large.scores
- swell-foop.Medium.scores
- swell-foop.Small.scores
- quadrapassel.scores)
-
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- usr/sbin/gconfpkg --install ${pkgname}
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
- for sz in Large Medium Small; do
- if [ -e "opt/gnome/var/games/same-gnome.${sz}.scores" ]; then
- mv "opt/gnome/var/games/same-gnome.${sz}.scores" \
- "var/games/swell-foop.${sz}.scores"
- elif [ -e "var/games/same-gnome.${sz}.scores" ]; then
- mv "var/games/same-gnome.${sz}.scores" \
- "var/games/swell-foop.${sz}.scores"
- fi
- done
- if [ -e "opt/gnome/var/games/gnometris.scores" ]; then
- mv "opt/gnome/var/games/gnometris.scores" \
- "var/games/quadrapassel.scores"
- elif [ -e "var/games/gnometris.scores" ]; then
- mv "var/games/gnometris.scores" \
- "var/games/quadrapassel.scores"
- fi
-
- for score in "${scores[@]}" ; do
- if [ -e "var/games/${score}" ]; then
- continue
- fi
- if [ -e "opt/gnome/var/games/${score}" ]; then
- mv "opt/gnome/var/games/${score}" var/games/
- else
- touch "var/games/${score}"
- fi
- chown root:games "var/games/${score}"
- chmod 664 "var/games/${score}"
- done
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-
- if [ -f usr/share/ggz/gnect-client.dsc ]; then
- ggz-config -r -m usr/share/ggz/gnect-client.dsc >& /dev/null
- ggz-config -r -m usr/share/ggz/gnibbles-client.dsc >& /dev/null
- ggz-config -r -m usr/share/ggz/iagno-client.dsc >& /dev/null
- fi
-}
-
-post_remove() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
-
- for score in "${scores[@]}" ; do
- rm -f "var/games/${score}"
- done
-}
diff --git a/testing/gnome-keyring/PKGBUILD b/testing/gnome-keyring/PKGBUILD
deleted file mode 100644
index 6a53ef70f..000000000
--- a/testing/gnome-keyring/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-#$Id: PKGBUILD 140713 2011-10-18 13:40:35Z ibiru $
-# Maintainer: Jan De Groot <jgc@archlinux.org>
-
-pkgname=gnome-keyring
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="GNOME Password Management daemon"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('gtk3' 'dconf' 'libgcrypt' 'libcap-ng' 'p11-kit' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'python2')
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=gnome-keyring.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('49872dad0c22e495f65be226d6effa053605df9cdc7cb06781aa37d3ff36b8a9')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --libexecdir=/usr/lib/gnome-keyring \
- --with-pam-dir=/lib/security --with-root-certs=/etc/ssl/certs \
- --disable-schemas-compile --disable-update-mime
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-keyring/gnome-keyring.install b/testing/gnome-keyring/gnome-keyring.install
deleted file mode 100644
index 37d76c56a..000000000
--- a/testing/gnome-keyring/gnome-keyring.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- update-mime-database usr/share/mime 1> /dev/null
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- update-desktop-database -q
- setcap cap_ipc_lock=ep usr/bin/gnome-keyring-daemon
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/testing/gnome-online-accounts/PKGBUILD b/testing/gnome-online-accounts/PKGBUILD
deleted file mode 100644
index 59690613a..000000000
--- a/testing/gnome-online-accounts/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 140651 2011-10-17 18:33:53Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-online-accounts
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="GNOME service to access online accounts"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL')
-depends=('libwebkit3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme')
-makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
-options=(!libtool)
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('549c210c358fd05598a00cb7a8d8f5b0fd6e18f7cb321c3c1641fb18f1312234')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-online-accounts/gnome-online-accounts.install b/testing/gnome-online-accounts/gnome-online-accounts.install
deleted file mode 100644
index 2e02b7952..000000000
--- a/testing/gnome-online-accounts/gnome-online-accounts.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install () {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/gnome-panel/PKGBUILD b/testing/gnome-panel/PKGBUILD
deleted file mode 100644
index 44e3c3efd..000000000
--- a/testing/gnome-panel/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 140527 2011-10-16 15:11:02Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-panel
-pkgver=3.2.1
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL')
-pkgdesc="The GNOME Panel"
-url="http://www.gnome.org"
-depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm' 'dconf' 'telepathy-glib')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra')
-install=gnome-panel.install
-groups=('gnome')
-replaces=('gnome-panel-bonobo')
-provides=("gnome-panel-bonobo=${pkgver}")
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('ae5ed578f9f54ad763bf5e46fd5431cdbc06fa2eefea03b390c90a3ffb18870d')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --libexecdir=/usr/lib/gnome-panel \
- --disable-scrollkeeper \
- --disable-schemas-compile
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-panel-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-panel/gnome-panel.install b/testing/gnome-panel/gnome-panel.install
deleted file mode 100644
index e3175df5e..000000000
--- a/testing/gnome-panel/gnome-panel.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=gnome-panel
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- pre_remove
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/gnome-power-manager/PKGBUILD b/testing/gnome-power-manager/PKGBUILD
deleted file mode 100644
index 0fa540c65..000000000
--- a/testing/gnome-power-manager/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 140596 2011-10-17 12:20:23Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-power-manager
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="Power management tools."
-arch=(i686 x86_64)
-url="http://www.gnome.org/projects/gnome-power-manager/"
-license=('GPL')
-depends=('gtk3' 'upower' 'dconf' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils')
-options=(!emptydirs)
-install=gnome-power-manager.install
-groups=(gnome-extra)
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('11bc604dd237e28eb08a67e6d507c3edebb96a43a3483390bd0c8100a206dbdb')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib/gnome-power-manager \
- --disable-scrollkeeper \
- --disable-schemas-compile
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-power-manager/gnome-power-manager.install b/testing/gnome-power-manager/gnome-power-manager.install
deleted file mode 100644
index 4666938db..000000000
--- a/testing/gnome-power-manager/gnome-power-manager.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.91.92) < 0 )); then
- usr/sbin/gconfpkg --uninstall gnome-power-manager
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/gnome-session/PKGBUILD b/testing/gnome-session/PKGBUILD
deleted file mode 100644
index e3360ce13..000000000
--- a/testing/gnome-session/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 140525 2011-10-16 15:06:19Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-session
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="The GNOME Session Handler"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('upower' 'gtk3' 'gconf' 'json-glib' 'startup-notification' 'hicolor-icon-theme' 'libxtst' 'polkit-gnome' 'libgl' 'gsettings-desktop-schemas' 'consolekit' 'libsm' 'dconf')
-makedepends=('intltool' 'mesa' 'xtrans')
-options=('!emptydirs')
-install=gnome-session.install
-url="http://www.gnome.org"
-groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('a87dcf57fec83cc8fad4e7b84542c5005a70a2107d184f247f0b112f07a043b3')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --libexecdir=/usr/lib/gnome-session \
- --disable-schemas-compile
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-session/gnome-session.install b/testing/gnome-session/gnome-session.install
deleted file mode 100644
index 74cf4ed22..000000000
--- a/testing/gnome-session/gnome-session.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.91.91.3-3) < 0 )); then
- usr/sbin/gconfpkg --uninstall gnome-session
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/gnome-settings-daemon/PKGBUILD b/testing/gnome-settings-daemon/PKGBUILD
deleted file mode 100644
index 0e268879e..000000000
--- a/testing/gnome-settings-daemon/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 140621 2011-10-17 14:55:58Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-settings-daemon
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="The GNOME Settings daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme' 'libcanberra-pulse' 'gsettings-desktop-schemas' 'nss' 'gconf' 'dconf' 'pulseaudio' 'pulseaudio-alsa' 'upower')
-makedepends=('intltool' 'gtk-doc' 'gnome-desktop')
-options=('!emptydirs' '!libtool')
-install=gnome-settings-daemon.install
-url="http://www.gnome.org"
-groups=('gnome')
-replaces=(gnome-settings-daemon-pulse)
-conflicts=(gnome-settings-daemon-pulse)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('1015b8a12483e91ddc67e891b66207a70339a341a051507aad9a6a15fbfcb78d')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib/gnome-settings-daemon --disable-static --enable-pulse \
- --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids
- #https://bugzilla.gnome.org/show_bug.cgi?id=656231
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-settings-daemon/gnome-settings-daemon.install b/testing/gnome-settings-daemon/gnome-settings-daemon.install
deleted file mode 100644
index 483fb9450..000000000
--- a/testing/gnome-settings-daemon/gnome-settings-daemon.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.90.0) < 0 )); then
- usr/sbin/gconfpkg --uninstall gnome-settings-daemon
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/gnome-shell/PKGBUILD b/testing/gnome-shell/PKGBUILD
deleted file mode 100644
index 4bce0b41e..000000000
--- a/testing/gnome-shell/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 140742 2011-10-18 15:33:56Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Flamelab <panosfilip@gmail.com
-
-pkgname=gnome-shell
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="The next generation GNOME Shell"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/GnomeShell"
-license=('GPL2')
-depends=('mutter' 'gjs' 'libcroco' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'libpulse' 'folks' 'telepathy-logger' 'networkmanager' 'caribou' 'nautilus' 'telepathy-mission-control')
-makedepends=('intltool' 'gnome-doc-utils')
-optdepends=('network-manager-applet: shell integration for networkmanager')
-options=('!libtool' '!emptydirs')
-install=gnome-shell.install
-groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('ac05e3133bd279c84812d8d3d8e362f8b33563cdc3e7a6aefa9c0b1c2aeab0eb')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/gnome-shell \
- --localstatedir=/var --disable-static \
- --disable-schemas-compile
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-shell ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-shell/gnome-shell.install b/testing/gnome-shell/gnome-shell.install
deleted file mode 100644
index a07105c24..000000000
--- a/testing/gnome-shell/gnome-shell.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=gnome-shell
-
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/testing/gnome-system-monitor/PKGBUILD b/testing/gnome-system-monitor/PKGBUILD
deleted file mode 100644
index 49f2b16f8..000000000
--- a/testing/gnome-system-monitor/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 140736 2011-10-18 15:19:34Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-system-monitor
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="A system monitor for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme')
-makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool')
-options=(!emptydirs)
-url="http://www.gnome.org"
-groups=('gnome-extra')
-install=gnome-system-monitor.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('f9ecca05609c0ff346727e0f24e32ba5284aea47dfe958e2b6d4a7912e5c1180')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-scrollkeeper
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-system-monitor/gnome-system-monitor.install b/testing/gnome-system-monitor/gnome-system-monitor.install
deleted file mode 100644
index e2957a570..000000000
--- a/testing/gnome-system-monitor/gnome-system-monitor.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=gnome-system-monitor
-
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
- if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
- usr/sbin/gconfpkg --uninstall ${pkgname}
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/testing/gnome-terminal/PKGBUILD b/testing/gnome-terminal/PKGBUILD
deleted file mode 100644
index 185140261..000000000
--- a/testing/gnome-terminal/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 140609 2011-10-17 12:53:24Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-terminal
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="The GNOME Terminal Emulator"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gconf' 'vte3' 'gsettings-desktop-schemas' 'libsm')
-makedepends=('gnome-doc-utils' 'intltool' 'gtk2')
-options=('!emptydirs')
-url="http://www.gnome.org"
-groups=('gnome')
-install=gnome-terminal.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('c36a6bce466447526cb73779ee8e861f079e86cef68a50f7c8fbed540d5f373e')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-scrollkeeper
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-terminal ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-terminal/gnome-terminal.install b/testing/gnome-terminal/gnome-terminal.install
deleted file mode 100644
index 04c2b3c2c..000000000
--- a/testing/gnome-terminal/gnome-terminal.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=gnome-terminal
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/gnome-themes-standard/PKGBUILD b/testing/gnome-themes-standard/PKGBUILD
deleted file mode 100644
index 121ce3398..000000000
--- a/testing/gnome-themes-standard/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 140722 2011-10-18 14:39:05Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=gnome-themes-standard
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="Default themes for the GNOME desktop"
-arch=('i686' 'x86_64')
-url="http://abattis.org/cantarell/"
-license=('GPL2')
-depends=('cantarell-fonts' 'gtk3' 'gtk-engines' 'librsvg')
-makedepends=('intltool')
-groups=('gnome')
-replaces=('gnome-themes')
-conflicts=('gnome-themes')
-source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-${pkgver}.tar.xz)
-sha256sums=('ab9e7f6001f4f18420df6a66407ace4340ee815b31e571bc55de7983370e26f3')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-user-share/PKGBUILD b/testing/gnome-user-share/PKGBUILD
deleted file mode 100644
index 6467f24c9..000000000
--- a/testing/gnome-user-share/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 140629 2011-10-17 15:25:55Z ibiru $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=gnome-user-share
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="Easy to use user-level file sharing for GNOME."
-arch=('i686' 'x86_64')
-url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/"
-license=('GPL')
-depends=('mod_dnssd' 'gconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra' 'libunique3')
-makedepends=('intltool' 'gnome-doc-utils' 'nautilus')
-options=('!emptydirs' '!libtool')
-install=gnome-user-share.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('9d1188c316e536ad6f84b595f118040474f8b9017acd492e80bce30d0c5d54ea')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/gnome-user-share \
- --localstatedir=/var
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas --domain gnome-user-share ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-user-share/gnome-user-share.install b/testing/gnome-user-share/gnome-user-share.install
deleted file mode 100644
index 3cc1b5286..000000000
--- a/testing/gnome-user-share/gnome-user-share.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=gnome-user-share
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/gnome-utils/PKGBUILD b/testing/gnome-utils/PKGBUILD
deleted file mode 100644
index c9b7d60e9..000000000
--- a/testing/gnome-utils/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 140623 2011-10-17 15:11:03Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-utils
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="Common GNOME utilities for viewing disk usage, logs and fonts, taking screenshots, managing dictionaries and searching files"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('libgtop' 'libcanberra' 'libsm' 'gconf' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils' 'dconf')
-makedepends=('gnome-doc-utils' 'pkgconfig' 'intltool')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-groups=('gnome-extra')
-install=gnome-utils.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('3ac1942dbf4d9d394e2fcc5f30a4480b1b1e5d44ee0c2d4f61689f4a221ba328')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/gnome-utils \
- --localstatedir=/var --disable-static \
- --disable-scrollkeeper \
- --disable-schemas-compile \
- --disable-schemas-install
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-utils-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-
- # remove it also from Xfce menu that ships its own thingy
- sed -i -e "s/NotShowIn\=KDE\;/NotShowIn\=KDE\;XFCE\;/" ${pkgdir}/usr/share/applications/gnome-dictionary.desktop
- sed -i -e "s/NotShowIn\=KDE\;/NotShowIn\=KDE\;XFCE\;/" ${pkgdir}/usr/share/applications/gnome-screenshot.desktop
-}
diff --git a/testing/gnome-utils/gnome-utils.install b/testing/gnome-utils/gnome-utils.install
deleted file mode 100644
index a04bda405..000000000
--- a/testing/gnome-utils/gnome-utils.install
+++ /dev/null
@@ -1,26 +0,0 @@
-pkgname=gnome-utils
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- update-desktop-database -q
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- update-desktop-database -q
-}
diff --git a/testing/gtk2/PKGBUILD b/testing/gtk2/PKGBUILD
deleted file mode 100644
index 9e6102502..000000000
--- a/testing/gtk2/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 140694 2011-10-18 06:32:41Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gtk2
-pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.7
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
- 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection')
-options=('!libtool' '!docs')
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz
- xid-collision-debug.patch)
-sha256sums=('1fdc7605501bd2932ef9a3c4c3c9a406e505f18667aea9e73af650da28fff994'
- 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
-
-build() {
- cd "${srcdir}/gtk+-${pkgver}"
- patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
-
- CXX=/bin/false ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-xinput=yes
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package_gtk2() {
- pkgdesc="GTK+ is a multi-platform toolkit (v2)"
- install=gtk2.install
- depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
- backup=(etc/gtk-2.0/gtkrc)
-
- cd "${srcdir}/gtk+-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
- sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
- echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc"
- #split this out to use with gtk3 too
- rm ${pkgdir}/usr/bin/gtk-update-icon-cache
-}
-package_gtk-update-icon-cache() {
- pkgdesc="The GTK+ update icon cache tool"
- depends=('gdk-pixbuf2')
-
- cd "${srcdir}/gtk+-${pkgver}/gtk"
-
- install -D -m755 gtk-update-icon-cache ${pkgdir}/usr/bin/gtk-update-icon-cache
-}
diff --git a/testing/gtk2/gtk2.install b/testing/gtk2/gtk2.install
deleted file mode 100644
index 4e2b72f1b..000000000
--- a/testing/gtk2/gtk2.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
- usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
-}
-
-pre_upgrade() {
- pre_remove
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- rm -f etc/gtk-2.0/gtk.immodules &>/dev/null
- rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
-}
diff --git a/testing/gtk2/xid-collision-debug.patch b/testing/gtk2/xid-collision-debug.patch
deleted file mode 100644
index d61238c3b..000000000
--- a/testing/gtk2/xid-collision-debug.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gtk+-2.18.3/gdk/x11/gdkxid.c 2009-06-19 04:59:18.000000000 +0200
-+++ gtk+-2.18.3/gdk/x11/gdkxid.c.new 2009-07-22 11:30:12.000000000 +0200
-@@ -56,10 +56,10 @@
- if (!display_x11->xid_ht)
- display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
- (GEqualFunc) gdk_xid_equal);
--
-+/*
- if (g_hash_table_lookup (display_x11->xid_ht, xid))
- g_warning ("XID collision, trouble ahead");
--
-+*/
- g_hash_table_insert (display_x11->xid_ht, xid, data);
- }
-
diff --git a/testing/gtk3/PKGBUILD b/testing/gtk3/PKGBUILD
deleted file mode 100644
index 0cad4b6e2..000000000
--- a/testing/gtk3/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 140485 2011-10-15 14:42:15Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtk3
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="GTK+ is a multi-platform toolkit (v3)"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-install=gtk3.install
-depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord')
-makedepends=('gobject-introspection')
-options=('!libtool' '!docs')
-backup=(etc/gtk-3.0/settings.ini)
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-${pkgver}.tar.xz
- settings.ini)
-sha256sums=('f1989f183700cd5f46681cfabc2253e2f526b19b56e4b631dcee2594dddb0ef3'
- 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
-
-build() {
- cd "${srcdir}/gtk+-${pkgver}"
- CXX=/bin/false ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --enable-gtk2-dependency \
- --disable-schemas-compile
- #https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package() {
- cd "${srcdir}/gtk+-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 "${srcdir}/settings.ini" "${pkgdir}/etc/gtk-3.0/settings.ini"
-}
diff --git a/testing/gtk3/gtk3.install b/testing/gtk3/gtk3.install
deleted file mode 100644
index cd8965d1f..000000000
--- a/testing/gtk3/gtk3.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- usr/bin/gtk-query-immodules-3.0 --update-cache
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- rm -f usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
-post_remove() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/testing/gtk3/settings.ini b/testing/gtk3/settings.ini
deleted file mode 100644
index 039000d38..000000000
--- a/testing/gtk3/settings.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Settings]
-gtk-fallback-icon-theme = gnome
diff --git a/testing/gtkhtml4/PKGBUILD b/testing/gtkhtml4/PKGBUILD
deleted file mode 100644
index 62258440a..000000000
--- a/testing/gtkhtml4/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 140533 2011-10-16 19:26:34Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtkhtml4
-_pkgbasename=gtkhtml
-pkgver=4.2.1
-pkgrel=1
-pkgdesc="A lightweight HTML renderer/editor widget for GTK3"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtk3' 'enchant' 'iso-codes' 'gnome-icon-theme' 'libsoup')
-makedepends=('intltool')
-url="http://www.gnome.org"
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz)
-sha256sums=('e72fb264bae45f2a340818c645248c29eaa2acf3d2bb3c2316ae296a0d438558')
-
-build() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/gtkhtml4 \
- --localstatedir=/var --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gtksourceview3/PKGBUILD b/testing/gtksourceview3/PKGBUILD
deleted file mode 100644
index bb7ed7b17..000000000
--- a/testing/gtksourceview3/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 140529 2011-10-16 16:21:18Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtksourceview3
-_pkgbasename=gtksourceview
-pkgver=3.2.2
-pkgrel=1
-pkgdesc="A text widget adding syntax highlighting and more to GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk3' 'libxml2')
-makedepends=('intltool' 'pkgconfig' 'gobject-introspection')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-${pkgver}.tar.xz)
-sha256sums=('52447d85b57b1413e699a4a27a8c4ba7df737347e9f5b4c5406e6393ca02982c')
-
-build() {
- cd "${srcdir}/$_pkgbasename-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/$_pkgbasename-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gucharmap/PKGBUILD b/testing/gucharmap/PKGBUILD
deleted file mode 100644
index 2c2b77bc7..000000000
--- a/testing/gucharmap/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 140613 2011-10-17 13:17:00Z heftig $
-# Maintainer: Jan De Groot <jgc@archlinux.org>
-
-pkgname=gucharmap
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="Gnome Unicode Charmap"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org"
-depends=('gconf' 'hicolor-icon-theme')
-makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-install=gucharmap.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('b06f376e5baaa41f0236d659bd6d03e3b38759198257a60affb6ddb2e111beff')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --disable-scrollkeeper --enable-introspection
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gucharmap ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gucharmap/gucharmap.install b/testing/gucharmap/gucharmap.install
deleted file mode 100644
index 4de3253f6..000000000
--- a/testing/gucharmap/gucharmap.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=gucharmap
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/gvfs/PKGBUILD b/testing/gvfs/PKGBUILD
deleted file mode 100644
index a378f78d0..000000000
--- a/testing/gvfs/PKGBUILD
+++ /dev/null
@@ -1,113 +0,0 @@
-# $Id: PKGBUILD 140615 2011-10-17 13:34:14Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gvfs
-pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.10.1
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' 'libarchive' 'libgdu' 'pkgconfig' 'intltool' 'libimobiledevice' 'avahi' 'dconf')
-url="http://www.gnome.org"
-options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
-sha256sums=('cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288')
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --libexecdir=/usr/lib/gvfs \
- --with-bash-completion-dir=/etc/bash_completion.d
- make
-}
-
-package_gvfs() {
- pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
- depends=('libsoup-gnome' 'libgdu' 'libcdio' 'fuse' 'libarchive' 'avahi' 'dconf')
- optdepends=('gvfs-afc: AFC (mobile devices) support'
- 'gvfs-smb: SMB/CIFS (Windows client) support'
- 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
- 'gvfs-obexftp: ObexFTP (bluetooth) support'
- 'gvfs-afp: Apple Filing Protocol (AFP) support')
- install=gvfs.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- sed -e 's/^am__append_3/#am__append_3/' \
- -e 's/^am__append_4/#am__append_4/' \
- -i monitor/Makefile
- make DESTDIR="${pkgdir}" install
-
- cd "${pkgdir}"
- rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}
- rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount
- rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
- rm usr/share/GConf/gsettings/gvfs-smb.convert
-}
-
-package_gvfs-smb() {
- pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
- depends=("gvfs=${pkgver}" 'smbclient' 'libgnome-keyring')
- install=gvfs-smb.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
- install -m755 -d "${pkgdir}/usr/lib/gvfs"
- install -m755 -d "${pkgdir}/usr/share/gvfs/mounts"
-
- install -m755 .libs/gvfsd-smb{,-browse} "${pkgdir}/usr/lib/gvfs/"
- install -m644 smb{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/"
-
- install -Dm644 org.gnome.system.smb.gschema.xml \
- "${pkgdir}/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml"
- install -Dm644 gvfs-smb.convert \
- "${pkgdir}/usr/share/GConf/gsettings/gvfs-smb.convert"
-}
-
-package_gvfs-afc() {
- pkgdesc="AFC (mobile devices) backend for gvfs"
- depends=("gvfs=${pkgver}" 'libimobiledevice')
- install=gvfs-module.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
- install -D .libs/gvfsd-afc "${pkgdir}/usr/lib/gvfs/gvfsd-afc"
- install -Dm644 afc.mount "${pkgdir}/usr/share/gvfs/mounts/afc.mount"
-
- cd "${srcdir}/${pkgbase}-${pkgver}/monitor/afc"
- make DESTDIR="${pkgdir}" install
-}
-
-package_gvfs-gphoto2() {
- pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs"
- depends=("gvfs=${pkgver}" 'dbus-core' 'libgphoto2' 'udev')
- install=gvfs-module.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
- install -D .libs/gvfsd-gphoto2 "${pkgdir}/usr/lib/gvfs/gvfsd-gphoto2"
- install -Dm644 gphoto2.mount "${pkgdir}/usr/share/gvfs/mounts/gphoto2.mount"
-
- cd "${srcdir}/${pkgbase}-${pkgver}/monitor/gphoto2"
- make DESTDIR="${pkgdir}" install
-}
-
-package_gvfs-obexftp() {
- pkgdesc="ObexFTP (bluetooth) backend for gvfs"
- depends=("gvfs=${pkgver}" 'dbus-glib' 'bluez' 'obex-data-server')
- install=gvfs-module.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
- install -D .libs/gvfsd-obexftp "${pkgdir}/usr/lib/gvfs/gvfsd-obexftp"
- install -Dm644 obexftp.mount "${pkgdir}/usr/share/gvfs/mounts/obexftp.mount"
-}
-
-package_gvfs-afp() {
- pkgdesc="Apple Filing Protocol (AFP) backend for gvfs"
- depends=("gvfs=${pkgver}")
- install=gvfs-module.install
- install -m755 -d "${pkgdir}/usr/lib/gvfs"
- install -m755 -d "${pkgdir}/usr/share/gvfs/mounts"
-
- cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
- install -m755 .libs/gvfsd-afp{,-browse} "${pkgdir}/usr/lib/gvfs/"
- install -m644 afp{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/"
-
-}
diff --git a/testing/gvfs/gvfs-module.install b/testing/gvfs/gvfs-module.install
deleted file mode 100644
index 09d1f11ec..000000000
--- a/testing/gvfs/gvfs-module.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
- killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
- post_install
-}
diff --git a/testing/gvfs/gvfs-smb.install b/testing/gvfs/gvfs-smb.install
deleted file mode 100644
index 0b8783c7b..000000000
--- a/testing/gvfs/gvfs-smb.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/testing/gvfs/gvfs.install b/testing/gvfs/gvfs.install
deleted file mode 100644
index 9458b1513..000000000
--- a/testing/gvfs/gvfs.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
- usr/bin/gio-querymodules usr/lib/gio/modules
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- usr/bin/gio-querymodules usr/lib/gio/modules
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/testing/hplip/PKGBUILD b/testing/hplip/PKGBUILD
deleted file mode 100644
index b94467fd7..000000000
--- a/testing/hplip/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 140428 2011-10-14 05:01:01Z eric $
-# Maintainer : Rémy Oudompheng <remy@archlinux.org>
-# Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
-
-pkgname=hplip
-pkgver=3.11.10
-pkgrel=1
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com"
-license=('GPL')
-depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
- 'net-snmp>=5.7.1')
-makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
-optdepends=('cups: for printing support'
- 'dbus-python: for dbus support'
- 'sane: for scanner support'
- 'python-imaging: for commandline scanning support'
- 'python-notify: for Desktop notification support'
- 'rpcbind: for network support'
- 'python2-qt: for running hp-toolbox'
- 'python2-gobject2: for running hp-toolbox'
- 'hplip-plugin: binary blobs for specific devices')
-replaces=('hpijs')
-options=('!libtool')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('6143f30f3b6905ef22105176a3b80db0'
- '396bbd8c5cc92aa8295e5bcb508692f3')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- export PYTHON=python2
- find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
- # fix sysfs rules
- sed -i -e "s|SYSFS|ATTR|g" \
- -e "s|sysfs|attr|g" \
- data/rules/56-hpmud_support.rules
-
- ./configure --prefix=/usr \
- --enable-qt4 \
- --enable-foomatic-rip-hplip-install \
- --enable-foomatic-ppd-install \
- --enable-hpcups-install \
- --enable-cups-drv-install \
- --enable-hpijs-install \
- --enable-foomatic-drv-install \
- --enable-pp-build \
- --enable-udev-acl-rules
-
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install
- # remove config provided by sane and autostart of hp-daemon
- rm -rf "$pkgdir"/etc/{sane.d,xdg}
-}
diff --git a/testing/hplip/hplip.install b/testing/hplip/hplip.install
deleted file mode 100644
index cb0eaf8e8..000000000
--- a/testing/hplip/hplip.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
- cat << EOF
-
-NOTE
-----
-# If you want to use this driver with sane:
-# echo "hpaio" >> /etc/sane.d/dll.conf
-
-EOF
-}
diff --git a/testing/icedtea-web-java7/PKGBUILD b/testing/icedtea-web-java7/PKGBUILD
deleted file mode 100644
index 5aa4b468f..000000000
--- a/testing/icedtea-web-java7/PKGBUILD
+++ /dev/null
@@ -1,97 +0,0 @@
-# $Id: PKGBUILD 136836 2011-09-02 07:59:01Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=icedtea-web-java7
-pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
-pkgver=1.1.3
-#_date=20110925
-#pkgrel=0.${_date}.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://icedtea.classpath.org/wiki/IcedTea-Web"
-license=('GPL2')
-makedepends=('jdk7-openjdk' 'zip' 'xulrunner')
-source=(#ftp://ftp.archlinux.org/other/$pkgname/${pkgbase}-${_date}.tar.xz
- http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
- #http://icedtea.classpath.org/download/source/${pkgname}-${pkgver}.tar.gz
-md5sums=('0e2e653c7436d81edcbc1d4255571ab6')
-sha1sums=('5c8d8fbbdc9db0b7113a6cced751c428b4d3ea37')
-
-_javaver=7
-_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-mksource() {
- mkdir /tmp/${pkgbase}-${_date}
- pushd /tmp/${pkgbase}-${_date}
- hg clone http://icedtea.classpath.org/hg/icedtea-web ${pkgbase}-${_date}
- rm -rf ${pkgbase}-${_date}/.hg*
- tar -cvJf /tmp/${pkgbase}-${_date}/${pkgbase}-${_date}.tar.xz *
- popd
-}
-
-build() {
- cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
-
- #. /etc/profile.d/jre.sh
- . /etc/profile.d/jre7-openjdk.sh
- #. /etc/profile.d/jdk.sh
- . /etc/profile.d/jdk7-openjdk.sh
-
- autoreconf --force --install
-
- ./configure --prefix=${_jvmdir} \
- --datarootdir=/usr/share \
- --with-jdk-home=${_jvmdir}
- make
-}
-
-check() {
- cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
- make -k check
-}
-
-
-package_icedtea-web-java7() {
-
- pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
- depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils')
- install=${pkgname}.install
-
- cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
- # possible make target (see bottom of Makefile.am: install-exec-local install-data-local
- make DESTDIR="${pkgdir}" install-exec-local install-data-local
-
- # Install desktop files.
- install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
- install -m644 javaws.png ${pkgdir}/usr/share/pixmaps
- install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications
- # remove splitted doc files
- rm -rf ${pkgdir}/usr/share/doc
-
- # link binaries into /usr/bin + jre/bin
- install -m755 -d ${pkgdir}/usr/bin
- install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin
- pushd ${pkgdir}/${_jvmdir}/bin
- for file in *; do
- ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin
- ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin
- done
- popd
-
- # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml
- install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
- ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
-}
-
-package_icedtea-web-java7-doc() {
-
- pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
-
- cd "${srcdir}"/icedtea-web* #${pkgbase}-${_date}"
-# install -m755 -d ${pkgdir}/${_jvmdir}/jre/lib
- make DESTDIR="${pkgdir}" install-data-local
- # remove javaws about and man page
- rm -rf ${pkgdir}/usr/lib
- rm -rf ${pkgdir}/usr/share/man
- rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems
-}
diff --git a/testing/icedtea-web-java7/icedtea-web-java7.install b/testing/icedtea-web-java7/icedtea-web-java7.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/testing/icedtea-web-java7/icedtea-web-java7.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- update-desktop-database -q
-}
-
-post_remove() {
- update-desktop-database -q
-}
diff --git a/testing/java7-openjdk/PKGBUILD b/testing/java7-openjdk/PKGBUILD
deleted file mode 100644
index 219c5588f..000000000
--- a/testing/java7-openjdk/PKGBUILD
+++ /dev/null
@@ -1,264 +0,0 @@
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Guillaume ALAUX <guillaume@archlinux.org>
-
-pkgname=('jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src')
-pkgbase=java7-openjdk
-_java_ver=7
-_openjdk_build=b147
-_openjdk_date=27_jun_2011
-_icedtea_ver=2.0
-_date=20110922
-
-# check "${srcdir}/icedtea7"/Makefile.am
-_CORBA_CHANGESET=4d9e4fb8af09
-_HOTSPOT_CHANGESET=b28ae681bae0
-_JAXP_CHANGESET=948e734135ea
-_JAXWS_CHANGESET=a2ebfdc9db7e
-_JDK_CHANGESET=2054526dd141
-_LANGTOOLS_CHANGESET=9b85f1265346
-_OPENJDK_CHANGESET=0a76e5390e68
-
-pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://icedtea.classpath.org"
-license=('custom')
-makedepends=('libcups' 'libxp' 'libxtst' 'libxi' 'libxt' 'libxslt' 'freetype2' #'eclipse-ecj' only for bootstrapping
- 'alsa-lib' 'xalan-java' 'glib2' 'gtk2' 'apache-ant>=1.6.5' 'giflib'
- 'libjpeg>=6b' 'zlib' 'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'lcms2')
-source=( #ftp://ftp.archlinux.org/other/$pkgname/icedtea7-${_date}-hg.tar.xz
- http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
- http://icedtea.classpath.org/hg/icedtea7-forest/archive/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz
- http://icedtea.classpath.org/hg/icedtea7-forest/corba/archive/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz
- http://icedtea.classpath.org/hg/icedtea7-forest/jaxp/archive/${_JAXP_CHANGESET}.tar.gz # jaxp.tar.gz
- http://icedtea.classpath.org/hg/icedtea7-forest/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz # jaxws.tar.gz
- http://icedtea.classpath.org/hg/icedtea7-forest/jdk/archive/${_JDK_CHANGESET}.tar.gz # jdk.tar.gz
- http://icedtea.classpath.org/hg/icedtea7-forest/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz
- http://icedtea.classpath.org/hg/icedtea7-forest/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz # hotspot.tar.gz
- fontconfig-paths.diff
- fix_corba_cmds_path.diff
- openjdk7_fix_jdk_cmds_path.diff
- openjdk7_nonreparenting-wm.diff
- jdk7-openjdk.profile
- jdk7-openjdk.profile.csh
- jre7-openjdk.profile
- jre7-openjdk.profile.csh
- jconsole.desktop
- policytool.desktop)
-
-#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip
-
-noextract=("${_OPENJDK_CHANGESET}.tar.gz"
- "${_CORBA_CHANGESET}.tar.gz"
- "${_JAXP_CHANGESET}.tar.gz"
- "${_JAXWS_CHANGESET}.tar.gz"
- "${_JDK_CHANGESET}.tar.gz"
- "${_LANGTOOLS_CHANGESET}.tar.gz"
- "${_HOTSPOT_CHANGESET}.tar.gz")
-md5sums=('752721a037a625001fad7a5fc2013f60'
- 'ffb12013564794e9abbffbbbd0c58502'
- '8f8d222d0a6d363d06b40576da5f1ea2'
- '4abf34372e34cccd74ad337e487ed790'
- 'f2f40590a83889b8aa1d4631b705092d'
- 'd3beed0118bbd93d4651af762eb748c7'
- 'c8617700b4bd6cd5de1257bc36509bed'
- 'f10b711b0c784df8707808d9d0f52abd'
- 'ee1afda124d5927345014ab382ef581e'
- 'f7e7a212e50abb56a6ef1a2b1bd27405'
- 'c195c4865b84d9e2e0fd71ac6d88eadb'
- '203640d6e79e41b0065e016818c17ccd'
- 'fe39da48a62b1fdd8fc24de0e0c4b525'
- 'cdabafad0ec413d9a983888bf445a443'
- '612b0fec7e0943c37a6de77c43622007'
- '62443459da0cb28181feb260dc0e5ce7'
- '8e346f19a69b11b8dc4fcd8ea9d9d8f1'
- 'b6357228d29836504a90abe006d86e56')
-
-# source PKGBUILD && mksource
-#makedepends+=('mercurial')
-mksource() {
- mkdir /tmp/icedtea7-${_date}
- pushd /tmp/icedtea7-${_date}
- hg -v clone http://icedtea.classpath.org/hg/icedtea7
- rm -rf icedtea7/.hg*
- tar -cvJf /tmp/icedtea7-${_date}/icedtea7-${_date}-hg.tar.xz *
- popd
-}
-
-build() {
- cd "${srcdir}/icedtea-${_icedtea_ver}"
-
- unset JAVA_HOME
- unset CLASSPATH
- # default is to build with first found java-environment found in our repos - is jdk7-openjdk
- [ -f /etc/profile.d/jdk7-openjdk.sh ] && . /etc/profile.d/jdk7-openjdk.sh
-
- unset MAKEFLAGS
- export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
- export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
-
- . /etc/profile.d/apache-ant.sh
-
- cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches
- export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff"
-
- # Bootstrap IcedTea with ecj and a GNU Classpath-based JDK:
-# autoreconf --force --install
-
- ./configure \
- --disable-bootstrap \
- --with-parallel-jobs="${MAKEFLAGS/-j}" \
- --disable-tests \
- --with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-${CARCH} \
- --with-jdk-home=${JAVA_HOME} \
- --with-openjdk-src-zip=${srcdir}/${_OPENJDK_CHANGESET}.tar.gz \
- --with-hotspot-src-zip=${srcdir}/${_HOTSPOT_CHANGESET}.tar.gz \
- --with-corba-src-zip=${srcdir}/${_CORBA_CHANGESET}.tar.gz \
- --with-jaxp-src-zip=${srcdir}/${_JAXP_CHANGESET}.tar.gz \
- --with-jaxws-src-zip=${srcdir}/${_JAXWS_CHANGESET}.tar.gz \
- --with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \
- --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \
- --enable-pulse-java \
-# --with-rhino #--help
-
- #--with-jaxp-drop-zip=${srcdir}/jaxp145_01.zip \
- #--with-jaf-drop-zip=${srcdir}/jdk7-jaf-2010_08_19.zip \
- #--with-jaxws-drop-zip=${srcdir}/jdk7-jaxws2_2_4-b03-2011_05_27.zip \
-
-
-# --enable-systemtap Enable inclusion of SystemTap trace support
-# --enable-nss Enable inclusion of NSS security provider
-# --with-abs-install-dir The absolute path where the j2sdk-image dir will be installed
-
- make
-}
-
-check() {
- cd "${srcdir}/icedtea-${_icedtea_ver}"
- make -k check
-}
-
-package_jre7-openjdk() {
- pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - runtime environment"
- depends=('gcc-libs' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst'
- 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng')
- optdepends=('icedtea-web-java7: web browser plugin + Java Web Start'
- 'alsa-lib: for sound'
- 'giflib: for gif format support')
- provides=('java-runtime=7')
- conflicts=('java-runtime')
-# replaces=('openjdk6') # once we remove openjdk6 pkg from the repos
- backup=(etc/profile.d/jre7-openjdk.sh)
- install=jre7-openjdk.install
-
- _jvmdir=/usr/lib/jvm/java-7-openjdk
-
- cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre"
-
- install -d -m755 ${pkgdir}/${_jvmdir}/jre/
- cp -a bin lib ${pkgdir}/${_jvmdir}/jre
-
- mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.properties.src \
- ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.properties.src
- mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.bfc \
- ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.bfc
- rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.bfc
- rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.properties.src
-
- # Install man pages
- pushd ../../j2re-image/man
- install -m755 -d ${pkgdir}/usr/share/man/{,ja/}man1/
- install -m644 man1/*.1 ${pkgdir}/usr/share/man/man1
- install -m644 ja_JP.UTF-8/man1/*.1 ${pkgdir}/usr/share/man/ja/man1
- popd
-
- # Install icons and menu entries
- for s in 16 24 32 48 ; do
- install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/
- install -m644 ../../../openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
- ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png
- done
-
- # Link binaries into /usr/bin
- pushd ${pkgdir}/${_jvmdir}/jre/bin
- install -m755 -d ${pkgdir}/usr/bin/
- for file in *; do
- ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin
- done
- popd
-
- # Link JKS keystore from ca-certificates-java
- rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts
- ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts"
-
- # Set some variables
- install -m755 -d ${pkgdir}/etc/profile.d/
- install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/${pkgname}.sh
- install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/${pkgname}.csh
-
- # Install license
- install -m755 -d ${pkgdir}/usr/share/licenses/${pkgbase}/
- install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \
- ${pkgdir}/usr/share/licenses/${pkgbase}
-}
-
-package_jdk7-openjdk() {
- pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - SDK"
- depends=('jre7-openjdk')
- provides=('java-environment=7')
- conflicts=('java-environment')
- # replaces=('openjdk6')
- backup=(etc/profile.d/jdk7-openjdk.sh)
-
- _jvmdir=/usr/lib/jvm/java-7-openjdk
-
- cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
-
- # Main files
- install -m755 -d ${pkgdir}/${_jvmdir}/
-
- cp -a demo include lib sample ${pkgdir}/${_jvmdir}
-
- # 'bin' files
- pushd bin
- install -m755 -d ${pkgdir}/${_jvmdir}/bin/ \
- ${pkgdir}/usr/bin/ \
- ${pkgdir}/usr/share/man/{,ja/}man1/
-
- # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page
- for b in $(ls | grep -v java-rmi.cgi); do
- if [ -e ../jre/bin/${b} ]; then
- # Provide a link of the jre binary in the jdk/bin/ directory
- ln -s ../jre/bin/${b} ${pkgdir}/${_jvmdir}/bin/${b}
- else
- # Copy binary to jdk/bin/
- install -m755 ${b} ${pkgdir}/${_jvmdir}/bin/${b}
- # Copy man page
- install -m644 ../man/man1/${b}.1 ${pkgdir}/usr/share/man/man1/${b}.1
- install -m644 ../man/ja/man1/${b}.1 ${pkgdir}/usr/share/man/ja/man1/${b}.1
- # Link from /bin/
- ln -s ${_jvmdir}/bin/${b} ${pkgdir}/usr/bin/${b}
- fi
- done
- popd
-
- # Handling 'java-rmi.cgi' separately
- install -m755 -D bin/java-rmi.cgi ${pkgdir}/${_jvmdir}/bin/java-rmi.cgi
-
- # Desktop files
- install -m755 -d ${pkgdir}/usr/share/applications/
- install -m644 ${srcdir}/{jconsole,policytool}.desktop ${pkgdir}/usr/share/applications/
-
- # Set some variables
- install -m755 -d ${pkgdir}/etc/profile.d/
- install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/${pkgname}.sh
- install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/${pkgname}.csh
-}
-
-package_openjdk7-src() {
- pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources"
-
- install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \
- ${pkgdir}/${_jvmdir}/src.zip
-}
diff --git a/testing/java7-openjdk/fix_corba_cmds_path.diff b/testing/java7-openjdk/fix_corba_cmds_path.diff
deleted file mode 100644
index 842657880..000000000
--- a/testing/java7-openjdk/fix_corba_cmds_path.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- openjdk/corba/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:26:12.000000000 +0300
-+++ openjdk/corba/make/common/shared/Defs-utils.gmk 2008-04-14 15:35:13.000000000 +0300
-@@ -86,10 +86,10 @@
- CHMOD = $(UTILS_COMMAND_PATH)chmod
- CMP = $(UTILS_USR_BIN_PATH)cmp
- COMM = $(UTILS_USR_BIN_PATH)comm
--COMPRESS = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS = $(UTILS_COMMAND_PATH)compress
- CP = $(UTILS_COMMAND_PATH)cp
- CPIO = $(UTILS_COMMAND_PATH)cpio
--CUT = $(UTILS_USR_BIN_PATH)cut
-+CUT = $(UTILS_COMMAND_PATH)cut
- DATE = $(UTILS_COMMAND_PATH)date
- DF = $(UTILS_COMMAND_PATH)df
- DIFF = $(UTILS_USR_BIN_PATH)diff
-@@ -136,7 +136,7 @@
- TAR = $(UTILS_COMMAND_PATH)tar
- TEST = $(UTILS_USR_BIN_PATH)test
- TOUCH = $(UTILS_COMMAND_PATH)touch
--TR = $(UTILS_USR_BIN_PATH)tr
-+TR = $(UTILS_COMMAND_PATH)tr
- TRUE = $(UTILS_COMMAND_PATH)true
- UNAME = $(UTILS_COMMAND_PATH)uname
- UNIQ = $(UTILS_USR_BIN_PATH)uniq
-@@ -186,7 +186,7 @@
- # others have it in /usr/bin.
- SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
- $(wildcard $(UTILS_USR_BIN_PATH)sort))
-- NAWK = $(USRBIN_PATH)gawk
-+ NAWK = $(UTILS_COMMAND_PATH)gawk
- # Intrinsic unix command, with backslash-escaped character interpretation
- ECHO = /bin/echo -e
- # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/testing/java7-openjdk/fontconfig-paths.diff b/testing/java7-openjdk/fontconfig-paths.diff
deleted file mode 100644
index fa08db629..000000000
--- a/testing/java7-openjdk/fontconfig-paths.diff
+++ /dev/null
@@ -1,134 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties 2009-05-29 22:45:23.024341869 +0000
-+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new 2009-05-29 22:55:13.681366890 +0000
-@@ -275,73 +275,61 @@
-
- # Font File Names
-
--filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
--filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
--filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf
--filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf
--
--filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
--filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf
--filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf
--filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf
--
--filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf
--filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf
--filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf
--filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf
--
--filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf
--
--filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf
--filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf
--filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf
--filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf
--filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf
--filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf
--filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf
--filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf
--filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf
--filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf
--filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf
--filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf
--filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf
--
--filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf
--filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf
--filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf
--filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf
--#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf
--filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf
--filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf
--filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf
--filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf
--filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf
--
--filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf
--filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf
--filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf
--filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf
--filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf
--filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf
--filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf
--filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf
--filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf
--filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf
--filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf
--filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf
--
--# AWT X11 font paths
--awtfontpath.latin-1=/usr/share/fonts/X11/Type1
--awtfontpath.umingcn=/usr/share/fonts/truetype/arphic
--awtfontpath.uminghk=/usr/share/fonts/truetype/arphic
--awtfontpath.umingtw=/usr/share/fonts/truetype/arphic
--awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic
--awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy
--awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi
--awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami
--awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic
--awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk
--awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts
-+filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf
-+filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf
-+filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf
-+filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf
-+
-+filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf
-+filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf
-+filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf
-+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf
-+
-+filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf
-+filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf
-+filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf
-+filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf
-+
-+filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf
-+
-+filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf
-+filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf
-+filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf
-+filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf
-+filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf
-+filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf
-+filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf
-+filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf
-+filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf
-+filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf
-+filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf
-+filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf
-+filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf
-+
-+filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf
-+filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf
-+filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf
-+filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf
-+#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf
-+filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf
-+filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf
-+filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf
-+filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf
-+filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf
-+
-+filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf
-+filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf
-+filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf
-+filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf
-+filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf
-+filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf
-+filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf
-+filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf
-+filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf
-+filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf
-+filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf
-+filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf
-+
diff --git a/testing/java7-openjdk/jconsole.desktop b/testing/java7-openjdk/jconsole.desktop
deleted file mode 100644
index ffbdd42ad..000000000
--- a/testing/java7-openjdk/jconsole.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=OpenJDK Monitoring & Management Console
-Comment=Monitor and manage OpenJDK applications
-Exec=/usr/bin/jconsole
-Icon=java
-Terminal=false
-Type=Application
-StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Monitor;Java;
-Version=1.0
diff --git a/testing/java7-openjdk/jdk7-openjdk.profile b/testing/java7-openjdk/jdk7-openjdk.profile
deleted file mode 100644
index c69fdb9b3..000000000
--- a/testing/java7-openjdk/jdk7-openjdk.profile
+++ /dev/null
@@ -1,6 +0,0 @@
-export J2SDKDIR=/usr/lib/jvm/java-7-openjdk
-export J2REDIR=$J2SDKDIR/jre
-export JAVA_HOME=/usr/lib/jvm/java-7-openjdk
-
-# For non-reparenting window managers, enable '_JAVA_AWT_WM_NONREPARENTING'
-# in /etc/profile.d/jre7-openjdk.sh
diff --git a/testing/java7-openjdk/jdk7-openjdk.profile.csh b/testing/java7-openjdk/jdk7-openjdk.profile.csh
deleted file mode 100644
index cc7dc8ab1..000000000
--- a/testing/java7-openjdk/jdk7-openjdk.profile.csh
+++ /dev/null
@@ -1 +0,0 @@
-setenv J2SDKDIR "/usr/lib/jvm/java-7-openjdk"
diff --git a/testing/java7-openjdk/jre7-openjdk.install b/testing/java7-openjdk/jre7-openjdk.install
deleted file mode 100644
index 8e3ff0ee0..000000000
--- a/testing/java7-openjdk/jre7-openjdk.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
- if [ ! -f /etc/ssl/certs/java/cacerts ]; then
- /usr/sbin/init-jks-keystore
- fi
- echo "when you use a non-reparenting window manager"
- echo "set _JAVA_AWT_WM_NONREPARENTING=1 in"
- echo "/etc/profile.d/jre7-openjdk.sh"
-# update-desktop-database -q
-}
-
-post_upgrade() {
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
- if [ ! -f /etc/ssl/certs/java/cacerts ]; then
- /usr/sbin/init-jks-keystore
- fi
-# update-desktop-database -q
-}
-
-
-post_remove() {
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-# update-desktop-database -q
-}
diff --git a/testing/java7-openjdk/jre7-openjdk.profile b/testing/java7-openjdk/jre7-openjdk.profile
deleted file mode 100644
index c86ce857a..000000000
--- a/testing/java7-openjdk/jre7-openjdk.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-export J2REDIR=/usr/lib/jvm/java-7-openjdk/jre
-export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk/jre}
-
-# enable this for non-reparenting window managers
-#export _JAVA_AWT_WM_NONREPARENTING=1
diff --git a/testing/java7-openjdk/jre7-openjdk.profile.csh b/testing/java7-openjdk/jre7-openjdk.profile.csh
deleted file mode 100644
index a9aed27d1..000000000
--- a/testing/java7-openjdk/jre7-openjdk.profile.csh
+++ /dev/null
@@ -1,5 +0,0 @@
-setenv J2REDIR "/usr/lib/jvm/java-7-openjdk/jre"
-setenv JAVA_HOME "/usr/lib/jvm/java-7-openjdk/jre"
-
-# enable this for non-reparenting window managers
-#setenv _JAVA_AWT_WM_NONREPARENTING 1
diff --git a/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff
deleted file mode 100644
index c68bd4441..000000000
--- a/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2011-08-06 15:46:01.000000000 +0200
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-08-06 15:59:26.000000000 +0200
-@@ -91,10 +91,10 @@
- CHMOD = $(UTILS_COMMAND_PATH)chmod
- CMP = $(UTILS_USR_BIN_PATH)cmp
- COMM = $(UTILS_USR_BIN_PATH)comm
--COMPRESS = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS = $(UTILS_COMMAND_PATH)compress
- CP = $(UTILS_COMMAND_PATH)cp
- CPIO = $(UTILS_COMMAND_PATH)cpio
--CUT = $(UTILS_USR_BIN_PATH)cut
-+CUT = $(UTILS_COMMAND_PATH)cut
- DATE = $(UTILS_COMMAND_PATH)date
- DF = $(UTILS_COMMAND_PATH)df
- DIFF = $(UTILS_USR_BIN_PATH)diff
-@@ -141,7 +141,7 @@
- TAR = $(UTILS_COMMAND_PATH)tar
- TEST = $(UTILS_USR_BIN_PATH)test
- TOUCH = $(UTILS_COMMAND_PATH)touch
--TR = $(UTILS_USR_BIN_PATH)tr
-+TR = $(UTILS_COMMAND_PATH)tr
- TRUE = $(UTILS_COMMAND_PATH)true
- UNAME = $(UTILS_COMMAND_PATH)uname
- UNIQ = $(UTILS_USR_BIN_PATH)uniq
diff --git a/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff b/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff
deleted file mode 100644
index ba1a588e1..000000000
--- a/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff
+++ /dev/null
@@ -1,58 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig 2011-08-07 18:45:05.000000000 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2011-08-07 18:45:54.000000000 +0200
-@@ -102,7 +102,8 @@
- METACITY_WM = 11,
- COMPIZ_WM = 12,
- LG3D_WM = 13,
-- MUTTER_WM = 14;
-+ MUTTER_WM = 14,
-+ OTHER_NONREPARENTING_WM = 15;
- public String toString() {
- switch (WMID) {
- case NO_WM:
-@@ -576,7 +577,7 @@
- // TODO: according to wikipedia, compiz is now reparenting. This should
- // probably be updated.
- static boolean isNonReparentingWM() {
-- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM);
-+ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
- }
-
- /*
-@@ -762,9 +763,17 @@
- * supports WIN or _NET wm spec.
- */
- else if (l_net_protocol.active()) {
-- awt_wmgr = XWM.OTHER_WM;
-+ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-+ } else {
-+ awt_wmgr = XWM.OTHER_WM;
-+ }
- } else if (win.active()) {
-- awt_wmgr = XWM.OTHER_WM;
-+ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-+ } else {
-+ awt_wmgr = XWM.OTHER_WM;
-+ }
- }
- /*
- * Check for legacy WMs.
-@@ -775,6 +784,8 @@
- awt_wmgr = XWM.MOTIF_WM;
- } else if (isOpenLook()) {
- awt_wmgr = XWM.OPENLOOK_WM;
-+ } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
- } else {
- awt_wmgr = XWM.OTHER_WM;
- }
-@@ -1289,6 +1300,7 @@
- res = new Insets(28, 6, 6, 6);
- break;
- case NO_WM:
-+ case OTHER_NONREPARENTING_WM:
- case LG3D_WM:
- res = zeroInsets;
- break;
diff --git a/testing/java7-openjdk/policytool.desktop b/testing/java7-openjdk/policytool.desktop
deleted file mode 100644
index 702b44a6f..000000000
--- a/testing/java7-openjdk/policytool.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=OpenJDK Policy Tool
-Comment=Manage OpenJDK policy files
-Exec=/usr/bin/policytool
-Icon=java
-Terminal=false
-Type=Application
-StartupWMClass=sun-security-tools-PolicyTool
-Categories=Development;Java;
-Version=1.0
diff --git a/testing/kbd/PKGBUILD b/testing/kbd/PKGBUILD
deleted file mode 100644
index ebc08f967..000000000
--- a/testing/kbd/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 139865 2011-10-05 14:29:41Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=kbd
-pkgver=1.15.3
-pkgrel=2
-pkgdesc="Keytable files and keyboard utilities"
-arch=('i686' 'x86_64')
-url="ftp://ftp.altlinux.org/pub/people/legion/kbd/"
-license=('GPL')
-depends=('glibc')
-source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
- fix-es.po.patch)
-md5sums=('8143e179a0f3c25646ce5085e8777200'
- '4ded3edb50fb7a3277bae6a870cee812')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ../fix-es.po.patch
- # rename keymap files with the same names
- # this is needed because when only name of keymap is specified
- # loadkeys loads the first keymap it can find, which is bad (see FS#13837)
- # this should be removed when upstream adopts the change
- mv data/keymaps/i386/qwertz/cz{,-qwertz}.map
- mv data/keymaps/i386/olpc/es{,-olpc}.map
- mv data/keymaps/i386/olpc/pt{,-olpc}.map
- mv data/keymaps/i386/dvorak/no{,-dvorak}.map
- mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
- mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
-
- ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
- make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
-
- # this is needed because initscripts call /bin/loadkeys
- # remove this when next versions of kbd
- # and initscripts with /usr/bin/loadkeys usage will be released
- mkdir ${pkgdir}/bin
- ln -s /usr/bin/loadkeys ${pkgdir}/bin/loadkeys
-}
diff --git a/testing/kbd/fix-es.po.patch b/testing/kbd/fix-es.po.patch
deleted file mode 100644
index 578f0a7b7..000000000
--- a/testing/kbd/fix-es.po.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kbd-1.15.3/po/es.old 2011-05-14 23:12:49.000000000 +0200
-+++ kbd-1.15.3/po/es.po 2011-05-15 21:07:02.120669404 +0200
-@@ -1363,7 +1363,7 @@
- #: src/setfont.c:682
- #, c-format
- msgid "Saved %d-char %dx%d font file on %s\n"
--msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n"
-+msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n"
-
- #: src/setkeycodes.c:21
- #, c-format
diff --git a/testing/krb5/PKGBUILD b/testing/krb5/PKGBUILD
deleted file mode 100644
index 7228df9e7..000000000
--- a/testing/krb5/PKGBUILD
+++ /dev/null
@@ -1,91 +0,0 @@
-# $Id: PKGBUILD 140774 2011-10-19 02:08:36Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-
-pkgname=krb5
-pkgver=1.9.1
-pkgrel=5
-pkgdesc="The Kerberos network authentication system"
-arch=('i686' 'x86_64')
-url="http://web.mit.edu/kerberos/"
-license=('custom')
-depends=('e2fsprogs' 'libldap' 'keyutils')
-makedepends=('perl')
-provides=('heimdal')
-replaces=('heimdal')
-conflicts=('heimdal')
-backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
-source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar
- krb5-kadmind
- krb5-kdc
- krb5-1.9.1-config-script.patch
- krb5-1.9.1-canonicalize-fallback.patch
- krb5-1.9.1-2011-006.patch)
-sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066'
- '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
- '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
- '7342410760cf44bfa01bb99bb4c49e12496cb46f'
- '238c268fa6cb42fc7324ab54db9abda5cd77f833'
- '0b0016b0e341dcf720f67925b0d451b328e02583')
-options=('!emptydirs')
-
-build() {
- tar zxvf ${pkgname}-${pkgver}.tar.gz
- cd "${srcdir}/${pkgname}-${pkgver}/src"
-
- # - Make krb5-config suppress CFLAGS output when called with --libs
- # cf https://bugzilla.redhat.com/show_bug.cgi?id=544391
- #
- # - Omit extra libraries because their interfaces are not exposed to applications
- # by libkrb5, unless do_deps is set to 1, which indicates that the caller
- # wants the whole list.
- #
- # Patch from upstream :
- # http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236
- patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch
-
- # FS#25515
- patch -Np2 -i ${srcdir}/krb5-1.9.1-canonicalize-fallback.patch
-
- # FS#25384
- sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4
-
- # KDC denial of service vulnerabilities
- # http://web.mit.edu/kerberos/advisories/MITKRB5-SA-2011-006.txt
- patch -Np2 -i ${srcdir}/krb5-1.9.1-2011-006.patch
-
- export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
- export CPPFLAGS+=" -I/usr/include/et"
- ./configure --prefix=/usr \
- --mandir=/usr/share/man \
- --localstatedir=/var/lib \
- --enable-shared \
- --with-system-et \
- --with-system-ss \
- --disable-rpath \
- --without-tcl \
- --enable-dns-for-realm \
- --with-ldap
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}/src"
- make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" install
-
- # Sample KDC config file
- install -dm 755 "${pkgdir}"/var/lib/krb5kdc
- install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf
-
- # Default configuration file
- install -dm 755 "${pkgdir}"/etc
- install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf
-
- install -dm 755 "${pkgdir}"/etc/rc.d
- install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d
- install -m 755 ../../krb5-kadmind "${pkgdir}"/etc/rc.d
-
- install -dm 755 "${pkgdir}"/usr/share/aclocal
- install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal
-
- install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/krb5/krb5-1.9.1-2011-006.patch b/testing/krb5/krb5-1.9.1-2011-006.patch
deleted file mode 100644
index 05a22caf5..000000000
--- a/testing/krb5/krb5-1.9.1-2011-006.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/src/plugins/kdb/db2/lockout.c b/src/plugins/kdb/db2/lockout.c
-index b473611..50c60b7 100644
---- a/src/plugins/kdb/db2/lockout.c
-+++ b/src/plugins/kdb/db2/lockout.c
-@@ -169,6 +169,9 @@ krb5_db2_lockout_audit(krb5_context context,
- return 0;
- }
-
-+ if (entry == NULL)
-+ return 0;
-+
- if (!db_ctx->disable_lockout) {
- code = lookup_lockout_policy(context, entry, &max_fail,
- &failcnt_interval, &lockout_duration);
-@@ -176,6 +179,15 @@ krb5_db2_lockout_audit(krb5_context context,
- return code;
- }
-
-+ /*
-+ * Don't continue to modify the DB for an already locked account.
-+ * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and
-+ * this check is unneeded, but in rare cases, we can fail with an
-+ * integrity error or preauth failure before a policy check.)
-+ */
-+ if (locked_check_p(context, stamp, max_fail, lockout_duration, entry))
-+ return 0;
-+
- /* Only mark the authentication as successful if the entry
- * required preauthentication, otherwise we have no idea. */
- if (status == 0 && (entry->attributes & KRB5_KDB_REQUIRES_PRE_AUTH)) {
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-index 552e39a..c2f44ab 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-@@ -105,6 +105,7 @@ krb5_ldap_get_principal(krb5_context context, krb5_const_principal searchfor,
- CHECK_LDAP_HANDLE(ldap_context);
-
- if (is_principal_in_realm(ldap_context, searchfor) != 0) {
-+ st = KRB5_KDB_NOENTRY;
- krb5_set_error_message (context, st, "Principal does not belong to realm");
- goto cleanup;
- }
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
-index a218dc7..fd164dd 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
-@@ -165,6 +165,9 @@ krb5_ldap_lockout_audit(krb5_context context,
- return 0;
- }
-
-+ if (entry == NULL)
-+ return 0;
-+
- if (!ldap_context->disable_lockout) {
- code = lookup_lockout_policy(context, entry, &max_fail,
- &failcnt_interval,
-@@ -173,9 +176,16 @@ krb5_ldap_lockout_audit(krb5_context context,
- return code;
- }
-
-- entry->mask = 0;
-+ /*
-+ * Don't continue to modify the DB for an already locked account.
-+ * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and
-+ * this check is unneeded, but in rare cases, we can fail with an
-+ * integrity error or preauth failure before a policy check.)
-+ */
-+ if (locked_check_p(context, stamp, max_fail, lockout_duration, entry))
-+ return 0;
-
-- assert (!locked_check_p(context, stamp, max_fail, lockout_duration, entry));
-+ entry->mask = 0;
-
- /* Only mark the authentication as successful if the entry
- * required preauthentication, otherwise we have no idea. */
diff --git a/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch b/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch
deleted file mode 100644
index e5a38498f..000000000
--- a/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Naur krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c krb5-1.9.1/src/lib/krb5/krb/get_creds.c
---- krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c 2011-02-09 16:55:36.000000000 -0500
-+++ krb5-1.9.1/src/lib/krb5/krb/get_creds.c 2011-09-26 18:42:01.465190278 -0400
-@@ -470,13 +470,10 @@
-
- /***** STATE_REFERRALS *****/
-
--/*
-- * Possibly retry a request in the fallback realm after a referral request
-- * failure in the local realm. Expects ctx->reply_code to be set to the error
-- * from a referral request.
-- */
-+/* Possibly try a non-referral request after a referral request failure.
-+ * Expects ctx->reply_code to be set to the error from a referral request. */
- static krb5_error_code
--try_fallback_realm(krb5_context context, krb5_tkt_creds_context ctx)
-+try_fallback(krb5_context context, krb5_tkt_creds_context ctx)
- {
- krb5_error_code code;
- char **hrealms;
-@@ -485,9 +482,10 @@
- if (ctx->referral_count > 1)
- return ctx->reply_code;
-
-- /* Only fall back if the original request used the referral realm. */
-+ /* If the request used a specified realm, make a non-referral request to
-+ * that realm (in case it's a KDC which rejects KDC_OPT_CANONICALIZE). */
- if (!krb5_is_referral_realm(&ctx->req_server->realm))
-- return ctx->reply_code;
-+ return begin_non_referral(context, ctx);
-
- if (ctx->server->length < 2) {
- /* We need a type/host format principal to find a fallback realm. */
-@@ -500,10 +498,10 @@
- if (code != 0)
- return code;
-
-- /* Give up if the fallback realm isn't any different. */
-+ /* If the fallback realm isn't any different, use the existing TGT. */
- if (data_eq_string(ctx->server->realm, hrealms[0])) {
- krb5_free_host_realm(context, hrealms);
-- return ctx->reply_code;
-+ return begin_non_referral(context, ctx);
- }
-
- /* Rewrite server->realm to be the fallback realm. */
-@@ -540,9 +538,9 @@
- krb5_error_code code;
- const krb5_data *referral_realm;
-
-- /* Possibly retry with the fallback realm on error. */
-+ /* Possibly try a non-referral fallback request on error. */
- if (ctx->reply_code != 0)
-- return try_fallback_realm(context, ctx);
-+ return try_fallback(context, ctx);
-
- if (krb5_principal_compare(context, ctx->reply_creds->server,
- ctx->server)) {
diff --git a/testing/krb5/krb5-1.9.1-config-script.patch b/testing/krb5/krb5-1.9.1-config-script.patch
deleted file mode 100644
index a72a75edf..000000000
--- a/testing/krb5/krb5-1.9.1-config-script.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur krb5-1.9.1.ori/src/krb5-config.in krb5-1.9.1/src/krb5-config.in
---- krb5-1.9.1.ori/src/krb5-config.in 2010-01-19 13:44:57.000000000 -0500
-+++ krb5-1.9.1/src/krb5-config.in 2011-09-26 18:27:09.018487087 -0400
-@@ -186,7 +186,7 @@
- -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
- -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
- -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
-- -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
-+ -e 's#\$(CFLAGS)##'`
-
- if test $library = 'kdb'; then
- lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB"
-@@ -214,9 +214,13 @@
- fi
-
- if test $library = 'krb5'; then
-- lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB"
-+ lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err"
- fi
-
-+ # If we ever support a flag to generate output suitable for static
-+ # linking, we would output "-lkrb5support $GEN_LIB $LIBS $DL_LIB"
-+ # here.
-+
- echo $lib_flags
- fi
-
diff --git a/testing/krb5/krb5-kadmind b/testing/krb5/krb5-kadmind
deleted file mode 100644
index 04df0dcff..000000000
--- a/testing/krb5/krb5-kadmind
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/kadmind`
-case "$1" in
- start)
- stat_busy "Starting Kerberos Admin Daemon"
- if [ -z "$PID" ]; then
- /usr/sbin/kadmind
- fi
- if [ ! -z "$PID" -o $? -gt 0 ]; then
- stat_fail
- else
- add_daemon krb5-kadmind
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Kerberos Admin Daemon"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon krb5-kadmind
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
- ;;
-esac
-exit 0
diff --git a/testing/krb5/krb5-kdc b/testing/krb5/krb5-kdc
deleted file mode 100644
index 05a03411e..000000000
--- a/testing/krb5/krb5-kdc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/krb5kdc`
-case "$1" in
- start)
- stat_busy "Starting Kerberos Authentication"
- if [ -z "$PID" ]; then
- /usr/sbin/krb5kdc
- fi
- if [ ! -z "$PID" -o $? -gt 0 ]; then
- stat_fail
- else
- add_daemon krb5-kdc
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Kerberos Authentication"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon krb5-kdc
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
- ;;
-esac
-exit 0
diff --git a/testing/libarchive/PKGBUILD b/testing/libarchive/PKGBUILD
deleted file mode 100644
index 236ae0f44..000000000
--- a/testing/libarchive/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 140820 2011-10-19 19:30:28Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-pkgname=libarchive
-pkgver=2.8.5
-pkgrel=2
-pkgdesc="library that can create and read several streaming archive formats"
-arch=('i686' 'x86_64')
-url="http://libarchive.googlecode.com/"
-license=('BSD')
-depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
-source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz"
- release-2.8-fixes.patch)
-md5sums=('9caf51dcf6213e9c9f5a1c27448b9c90'
- '14dbbf2d31d68d8eedb93ec5531f3b0c')
-sha256sums=('13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d'
- 'fcadc5ac3020a9fab5922d343baca28f067cc051e9b6f59e480349ba5b0a5060')
-
-# keep an upgrade path for older installations
-PKGEXT='.pkg.tar.gz'
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -Np0 < ../release-2.8-fixes.patch
- ./configure --prefix=/usr --without-xml2
- make
-}
-
-check() {
- cd "$srcdir/$pkgname-$pkgver"
- make check
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-
- install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
-}
diff --git a/testing/libarchive/release-2.8-fixes.patch b/testing/libarchive/release-2.8-fixes.patch
deleted file mode 100644
index c21eeaa7b..000000000
--- a/testing/libarchive/release-2.8-fixes.patch
+++ /dev/null
@@ -1,234 +0,0 @@
-Index: build/cmake/config.h.in
-===================================================================
---- build/cmake/config.h.in (revision 3670)
-+++ build/cmake/config.h.in (revision 3737)
-@@ -1,5 +1,8 @@
- /* config.h. Generated from config.h.cmake by cmake configure */
-
-+/* Define ZLIB_WINAPI if zlib was built on Visual Studio. */
-+#cmakedefine ZLIB_WINAPI 1
-+
- /* MD5 via ARCHIVE_HASH_MD5_LIBC supported. */
- #cmakedefine ARCHIVE_HASH_MD5_LIBC
-
-Index: libarchive/archive_read_support_format_all.c
-===================================================================
---- libarchive/archive_read_support_format_all.c (revision 3670)
-+++ libarchive/archive_read_support_format_all.c (revision 3737)
-@@ -1,5 +1,5 @@
- /*-
-- * Copyright (c) 2003-2007 Tim Kientzle
-+ * Copyright (c) 2003-2011 Tim Kientzle
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
-@@ -39,5 +39,13 @@
- archive_read_support_format_tar(a);
- archive_read_support_format_xar(a);
- archive_read_support_format_zip(a);
-+
-+ /* Note: We always return ARCHIVE_OK here, even if some of the
-+ * above return ARCHIVE_WARN. The intent here is to enable
-+ * "as much as possible." Clients who need specific
-+ * compression should enable those individually so they can
-+ * verify the level of support. */
-+ /* Clear any warning messages set by the above functions. */
-+ archive_clear_error(a);
- return (ARCHIVE_OK);
- }
-Index: libarchive/archive_write_disk.c
-===================================================================
---- libarchive/archive_write_disk.c (revision 3670)
-+++ libarchive/archive_write_disk.c (revision 3737)
-@@ -1513,6 +1513,22 @@
- }
-
- #if defined(_WIN32) || defined(__CYGWIN__)
-+static int
-+guidword(const char *p, int n)
-+{
-+ int i;
-+
-+ for (i = 0; i < n; i++) {
-+ if ((*p >= '0' && *p <= '9') ||
-+ (*p >= 'a' && *p <= 'f') ||
-+ (*p >= 'A' && *p <= 'F'))
-+ p++;
-+ else
-+ return (-1);
-+ }
-+ return (0);
-+}
-+
- /*
- * 1. Convert a path separator from '\' to '/' .
- * We shouldn't check multi-byte character directly because some
-@@ -1521,26 +1537,92 @@
- * 2. Replace unusable characters in Windows with underscore('_').
- * See also : http://msdn.microsoft.com/en-us/library/aa365247.aspx
- */
--static void
-+static int
- cleanup_pathname_win(struct archive_write_disk *a)
- {
- wchar_t wc;
- char *p;
- size_t alen, l;
-
-- alen = 0;
-- l = 0;
-- for (p = a->name; *p != '\0'; p++) {
-- ++alen;
-- if (*p == '\\')
-- l = 1;
-+ p = a->name;
-+ /* Skip leading "\\.\" or "\\?\" or "\\?\UNC\" or
-+ * "\\?\Volume{GUID}\"
-+ * (absolute path prefixes used by Windows API) */
-+ if ((p[0] == '\\' || p[0] == '/') && (p[1] == '\\' || p[1] == '/' ) &&
-+ (p[2] == '.' || p[2] == '?') && (p[3] == '\\' || p[3] == '/'))
-+ {
-+ /* A path begin with "\\?\UNC\" */
-+ if (p[2] == '?' &&
-+ (p[4] == 'U' || p[4] == 'u') &&
-+ (p[5] == 'N' || p[5] == 'n') &&
-+ (p[6] == 'C' || p[6] == 'c') &&
-+ (p[7] == '\\' || p[7] == '/'))
-+ p += 8;
-+ /* A path begin with "\\?\Volume{GUID}\" */
-+ else if (p[2] == '?' &&
-+ (p[4] == 'V' || p[4] == 'v') &&
-+ (p[5] == 'O' || p[5] == 'o') &&
-+ (p[6] == 'L' || p[6] == 'l') &&
-+ (p[7] == 'U' || p[7] == 'u') &&
-+ (p[8] == 'M' || p[8] == 'm') &&
-+ (p[9] == 'E' || p[9] == 'e') &&
-+ p[10] == '{') {
-+ if (guidword(p+11, 8) == 0 && p[19] == '-' &&
-+ guidword(p+20, 4) == 0 && p[24] == '-' &&
-+ guidword(p+25, 4) == 0 && p[29] == '-' &&
-+ guidword(p+30, 4) == 0 && p[34] == '-' &&
-+ guidword(p+35, 12) == 0 && p[47] == '}' &&
-+ (p[48] == '\\' || p[48] == '/'))
-+ p += 49;
-+ else
-+ p += 4;
-+ /* A path begin with "\\.\PhysicalDriveX" */
-+ } else if (p[2] == '.' &&
-+ (p[4] == 'P' || p[4] == 'p') &&
-+ (p[5] == 'H' || p[5] == 'h') &&
-+ (p[6] == 'Y' || p[6] == 'y') &&
-+ (p[7] == 'S' || p[7] == 's') &&
-+ (p[8] == 'I' || p[8] == 'i') &&
-+ (p[9] == 'C' || p[9] == 'c') &&
-+ (p[9] == 'A' || p[9] == 'a') &&
-+ (p[9] == 'L' || p[9] == 'l') &&
-+ (p[9] == 'D' || p[9] == 'd') &&
-+ (p[9] == 'R' || p[9] == 'r') &&
-+ (p[9] == 'I' || p[9] == 'i') &&
-+ (p[9] == 'V' || p[9] == 'v') &&
-+ (p[9] == 'E' || p[9] == 'e') &&
-+ (p[10] >= '0' && p[10] <= '9') &&
-+ p[11] == '\0') {
-+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
-+ "Path is a physical drive name");
-+ return (ARCHIVE_FAILED);
-+ } else
-+ p += 4;
-+ }
-+
-+ /* Skip leading drive letter from archives created
-+ * on Windows. */
-+ if (((p[0] >= 'a' && p[0] <= 'z') ||
-+ (p[0] >= 'A' && p[0] <= 'Z')) &&
-+ p[1] == ':') {
-+ if (p[2] == '\0') {
-+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
-+ "Path is a drive name");
-+ return (ARCHIVE_FAILED);
-+ }
-+ if (p[2] == '\\' || p[2] == '/')
-+ p += 3;
-+ }
-+
-+ for (; *p != '\0'; p++) {
- /* Rewrite the path name if its character is a unusable. */
- if (*p == ':' || *p == '*' || *p == '?' || *p == '"' ||
- *p == '<' || *p == '>' || *p == '|')
- *p = '_';
- }
-- if (alen == 0 || l == 0)
-- return;
-+ alen = p - a->name;
-+ if (alen == 0 || strchr(a->name, '\\') == NULL)
-+ return (ARCHIVE_OK);
- /*
- * Convert path separator.
- */
-@@ -1560,6 +1642,7 @@
- p += l;
- alen -= l;
- }
-+ return (ARCHIVE_OK);
- }
- #endif
-
-@@ -1583,7 +1666,8 @@
- }
-
- #if defined(_WIN32) || defined(__CYGWIN__)
-- cleanup_pathname_win(a);
-+ if (cleanup_pathname_win(a) != ARCHIVE_OK)
-+ return (ARCHIVE_FAILED);
- #endif
- /* Skip leading '/'. */
- if (*src == '/')
-Index: libarchive/archive_util.c
-===================================================================
---- libarchive/archive_util.c (revision 3670)
-+++ libarchive/archive_util.c (revision 3737)
-@@ -155,6 +155,7 @@
- {
- archive_string_empty(&a->error_string);
- a->error = NULL;
-+ a->archive_error_number = 0;
- }
-
- void
-Index: libarchive/archive_read_extract.c
-===================================================================
---- libarchive/archive_read_extract.c (revision 3670)
-+++ libarchive/archive_read_extract.c (revision 3737)
-@@ -108,7 +108,7 @@
- if (r != ARCHIVE_OK)
- /* If _write_header failed, copy the error. */
- archive_copy_error(&a->archive, ad);
-- else if (archive_entry_size(entry) > 0)
-+ else if (!archive_entry_size_is_set(entry) || archive_entry_size(entry) > 0)
- /* Otherwise, pour data into the entry. */
- r = copy_data(_a, ad);
- r2 = archive_write_finish_entry(ad);
-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt (revision 3670)
-+++ CMakeLists.txt (revision 3737)
-@@ -154,6 +154,13 @@
- SET(HAVE_ZLIB_H 1)
- INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
- LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
-+ IF(WIN32 AND NOT CYGWIN)
-+ SET(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
-+ SET(CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES})
-+ CHECK_C_SOURCE_Runs(
-+ "#ifndef ZLIB_WINAPI\n#define ZLIB_WINAPI\n#endif\n#include <zlib.h>\nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }"
-+ ZLIB_WINAPI)
-+ ENDIF(WIN32 AND NOT CYGWIN)
- ENDIF(ZLIB_FOUND)
- MARK_AS_ADVANCED(CLEAR ZLIB_INCLUDE_DIR)
- MARK_AS_ADVANCED(CLEAR ZLIB_LIBRARY)
-
-Property changes on: .
-___________________________________________________________________
-Modified: svn:mergeinfo
- Merged /trunk:r1989,3247,3722
-
diff --git a/testing/libevent/PKGBUILD b/testing/libevent/PKGBUILD
deleted file mode 100644
index 32aabc8c9..000000000
--- a/testing/libevent/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 140766 2011-10-18 20:07:58Z eric $
-# Maintainer:
-# Contributor: Judd <jvinet@zeroflux.org>
-
-pkgname=libevent
-pkgver=2.0.15
-pkgrel=1
-pkgdesc="An event notification library"
-arch=('i686' 'x86_64')
-url="http://www.monkey.org/~provos/libevent/"
-license=('GPL2')
-depends=('openssl')
-optdepends=('python2: to use event_rpcgen.py')
-options=('!libtool')
-source=(https://github.com/downloads/libevent/libevent/libevent-$pkgver-stable.tar.gz{,.asc})
-md5sums=('2643abe7ba242df15c08b2cc14ec8759'
- '56e52e1b6bba54102d278da59af4495e')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}-stable"
- sed -i 's#python#python2#' event_rpcgen.py
- ./configure --prefix=/usr --sysconfdir=/etc
- make
-}
-
-check() {
- cd "${srcdir}/${pkgname}-${pkgver}-stable"
- make check
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}-stable"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libsoup/PKGBUILD b/testing/libsoup/PKGBUILD
deleted file mode 100644
index 8922e905d..000000000
--- a/testing/libsoup/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 140716 2011-10-18 14:22:05Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libsoup
-pkgname=('libsoup' 'libsoup-gnome')
-pkgver=2.36.1
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
-options=('!libtool' '!emptydirs')
-sha256sums=('73722407ff5fa7fcff2dae384aa04d85e7900c0e3fed46389f1289a1409e1f65')
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static
- make
-}
-
-package_libsoup() {
- pkgdesc="GNOME HTTP Library - base library"
- depends=('glib2' 'libxml2' 'glib-networking')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- rm -f "${pkgdir}"/usr/lib/libsoup-gnome-2.4.*
- rm -f "${pkgdir}/usr/lib/pkgconfig/libsoup-gnome-2.4.pc"
- rm -rf "${pkgdir}/usr/include/libsoup-gnome-2.4"
- rm -f "${pkgdir}/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib"
-}
-
-package_libsoup-gnome() {
- pkgdesc="GNOME HTTP Library - GNOME libraries"
- depends=("libsoup=${pkgver}" 'libgnome-keyring')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- rm -f "${pkgdir}"/usr/lib/libsoup-2.4.*
- rm -f "${pkgdir}/usr/lib/pkgconfig/libsoup-2.4.pc"
- rm -rf "${pkgdir}/usr/include/libsoup-2.4"
- rm -rf "${pkgdir}/usr/share"
- rm -f "${pkgdir}/usr/lib/girepository-1.0/Soup-2.4.typelib"
-}
diff --git a/testing/libtool/PKGBUILD b/testing/libtool/PKGBUILD
deleted file mode 100644
index 5d21df0e2..000000000
--- a/testing/libtool/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 141275 2011-10-28 01:34:31Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-# NOTE: requires rebuilt with each new gcc version
-
-pkgname=('libtool' 'libltdl')
-pkgver=2.4.2
-pkgrel=2
-pkgdesc="A generic library support script"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/libtool"
-license=('GPL')
-options=('!libtool')
-source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
- '1e6ba57420c82c663c85e745d11c7eed')
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-check() {
- cd ${srcdir}/${pkgbase}-${pkgver}
- make check
-}
-
-package_libtool() {
- depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.6.2')
- groups=('base-devel')
- install=libtool.install
-
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
- install-data-local
- rm -rf ${pkgdir}/usr/share/libtool/libltdl/
-}
-
-package_libltdl() {
- pkgdesc="A system independent dlopen wrapper for GNU libtool"
-
- cd ${srcdir}/${pkgbase}-${pkgver}
- make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \
- install-ltdlincludeHEADERS install-data-local
- rm -rf ${pkgdir}/usr/share/{aclocal,libtool/config}
-}
diff --git a/testing/libtool/libtool.install b/testing/libtool/libtool.install
deleted file mode 100644
index 73cf56422..000000000
--- a/testing/libtool/libtool.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(libtool.info libtool.info-1 libtool.info-2)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/testing/libwnck3/PKGBUILD b/testing/libwnck3/PKGBUILD
deleted file mode 100644
index 04895a136..000000000
--- a/testing/libwnck3/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 140524 2011-10-16 15:04:26Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=libwnck3
-_pkgbasename=libwnck
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="Window Navigator Construction Kit (GTK+3)"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('gtk3' 'startup-notification' 'libxres')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-url="http://www.gnome.org/"
-source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz)
-sha256sums=('eaba586d8e092770e45ab8a3073eb57b5386e1ea7512b5424fa558906f26a3da')
-
-build() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/llvm/PKGBUILD b/testing/llvm/PKGBUILD
deleted file mode 100644
index 8420cdb6d..000000000
--- a/testing/llvm/PKGBUILD
+++ /dev/null
@@ -1,231 +0,0 @@
-# $Id: PKGBUILD 141302 2011-10-28 15:04:01Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Sebastian Nowicki <sebnow@gmail.com>
-# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
-# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk>
-# Contributor: Roberto Alsina <ralsina@kde.org>
-# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-
-pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
-pkgver=2.9
-_gcc_ver=4.6.2
-pkgrel=7
-arch=('i686' 'x86_64')
-url="http://llvm.org/"
-license=('custom:University of Illinois/NCSA Open Source License')
-makedepends=('gcc-libs' 'libffi' 'python2' 'ocaml' "gcc=$_gcc_ver")
-source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.tgz
- http://llvm.org/releases/$pkgver/clang-$pkgver.tgz
- ftp://ftp.archlinux.org/other/community/clang/gcc-headers-4.5.2.tar.xz
- clang-plugin-loader-registry.patch
- cindexer-clang-path.patch
- clang-toolchains-gcc-versions.patch
- clang-pure64.patch
- enable-lto.patch
- bug-9869-operator-h-c++0x.patch)
-sha256sums=('661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779'
- '70c41f3f782a71cbaa7bc8d6ea29fce4263ad3e8558dfecc6dc11cdef17909df'
- '12cf0bfb128cd8bd2a308c3c03cf0e607aa47bd87d9a58b422b96bd387e476c1'
- 'a0a4494f2a692789670be37fd390906dcaa37b1824f740bdaaea21182f2f3a9c'
- '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92'
- '7c05788c02697f0cd05f7c74fe65b460530c0748851313eb950c5d4d17a8115a'
- '5bba4964d0d832c9e97308beb45244ff6ed4e16ed3f9f771babe571f1b82fa33'
- '1a308679edf3078b8f0c33c94d4e6d0c0db6d3baad91babce08bf5370aa052ef'
- '1c37346b0f412556dc979fd510585f3e20d2d45319ec095dbdec37a582d590c7')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # At the present, clang must reside inside the LLVM source code tree to build
- # See http://llvm.org/bugs/show_bug.cgi?id=4840
- rm -rf tools/clang
- cp -r "$srcdir/clang-$pkgver" tools/clang
-
- # Fix symbolic links from OCaml bindings to LLVM libraries
- sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml
-
- # Fix installation directories, ./configure doesn't seem to set them right
- sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \
- -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib/llvm:' \
- -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
- Makefile.config.in
-
- # Fix insecure rpath (http://bugs.archlinux.org/task/14017)
- sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
-
- # Get the correct list of symbols to export
- # See http://lists.cs.uiuc.edu/pipermail/cfe-dev/2010-April/008559.html
- patch -Np1 -i "$srcdir/clang-plugin-loader-registry.patch"
-
- # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799)
- patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch"
-
- # Add GCC 4.6.1 to GccVersions (FS#23631)
- patch -d tools/clang -Np1 -i "$srcdir/clang-toolchains-gcc-versions.patch"
-
- if [[ $CARCH == x86_64 ]]; then
- # Adjust lib paths
- patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch"
- fi
-
- # Make -flto work
- # Use gold instead of default linker, and always use the plugin
- patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch"
-
- # Fix upstream bug #9869:
- # Operator.h incompatibility with GCC 4.6 in C++0x mode
- patch -Np2 -i "$srcdir/bug-9869-operator-h-c++0x.patch"
-
- # Apply strip option to configure
- _optimized_switch="enable"
- [[ $(check_option strip) == n ]] && _optimized_switch="disable"
-
- # Include location of libffi headers in CPPFLAGS
- export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)"
-
- # TODO: Uncomment when clang works with GCC 4.6+
- #_cxx_headers="/usr/include/c++/$_gcc_ver"
- #if [[ ! -d $_cxx_headers ]]; then
- # error "Couldn't find the C++ headers, PKGBUILD needs fixing!"
- # return 1
- #fi
- _cxx_headers="/usr/include/c++/clang-$pkgver"
-
- _32bit_headers=""
- if [[ $CARCH == x86_64 ]]; then
- # Important for multilib
- _32bit_headers="32"
- fi
-
- ./configure \
- --prefix=/usr \
- --libdir=/usr/lib/llvm \
- --sysconfdir=/etc \
- --enable-shared \
- --enable-libffi \
- --enable-targets=all \
- --disable-expensive-checks \
- --disable-debug-runtime \
- --disable-assertions \
- --with-binutils-include=/usr/include \
- --with-cxx-include-root=$_cxx_headers \
- --with-cxx-include-arch=$CHOST \
- --with-cxx-include-32bit-dir=$_32bit_headers \
- --$_optimized_switch-optimized
-
- make REQUIRES_RTTI=1
-}
-
-package_llvm() {
- pkgdesc="Low Level Virtual Machine"
- depends=('perl' 'libffi')
-
- cd "$srcdir/$pkgname-$pkgver"
-
- # We move the clang directory out of the tree so it won't get installed and
- # then we bring it back in for the clang package
- mv tools/clang "$srcdir"
- # -j1 is due to race conditions during the installation of the OCaml bindings
- make -j1 DESTDIR="$pkgdir" install
- mv "$srcdir/clang" tools
-
- # OCaml bindings go to a separate package
- rm -rf "$srcdir"/{ocaml,ocamldoc}
- mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir"
-
- # Remove duplicate files installed by the OCaml bindings
- rm "$pkgdir"/usr/{lib/llvm/libllvm*,share/doc/llvm/ocamldoc.tar.gz}
-
- # Fix permissions of static libs
- chmod -x "$pkgdir"/usr/lib/llvm/*.a
-
- # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487)
- sed -i 's:\(ABS_RUN_DIR/lib\):\1/llvm:' "$pkgdir/usr/bin/llvm-config"
-
- # Get rid of example Hello transformation
- rm "$pkgdir"/usr/lib/llvm/*LLVMHello.*
-
- # Symlink the gold plugin where clang expects it
- ln -s llvm/LLVMgold.so "$pkgdir/usr/lib/LLVMgold.so"
-
- # Add ld.so.conf.d entry
- install -d "$pkgdir/etc/ld.so.conf.d"
- echo /usr/lib/llvm >"$pkgdir/etc/ld.so.conf.d/llvm.conf"
-
- install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_llvm-ocaml() {
- pkgdesc="OCaml bindings for LLVM"
- depends=("llvm=$pkgver-$pkgrel" 'ocaml')
-
- cd "$srcdir/llvm-$pkgver"
-
- install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm}
- cp -r "$srcdir/ocaml" "$pkgdir/usr/lib"
- cp -r "$srcdir/ocamldoc" "$pkgdir/usr/share/doc/llvm"
-
- # Remove execute bit from static libraries
- chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a
-
- install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/llvm-ocaml/LICENSE"
-}
-
-package_clang() {
- pkgdesc="C language family frontend for LLVM"
- url="http://clang.llvm.org/"
- # It looks like clang still needs GCC to assemble and link object files
- # See http://old.nabble.com/%22clang--v%22-shows-a-GCC-call-td28378453.html
- depends=("llvm=$pkgver-$pkgrel" "gcc=$_gcc_ver")
-
- # Fix installation path for clang docs
- sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \
- "$srcdir/llvm-$pkgver/Makefile.config"
-
- cd "$srcdir/llvm-$pkgver/tools/clang"
- make DESTDIR="$pkgdir" install
-
- # Fix permissions of static libs
- chmod -x "$pkgdir"/usr/lib/llvm/*.a
-
- # Revert the path change in case we want to do a repackage later
- sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \
- "$srcdir/llvm-$pkgver/Makefile.config"
-
- # Install old libstdc++ headers. Contains combined headers from
- # gcc 4.5.2-6-i686 and gcc-multilib-4.5.2-6-x86_64
- install -d "$pkgdir/usr/include/c++"
- cp -rd "$srcdir/gcc-headers-4.5.2" "$pkgdir/usr/include/c++/clang-$pkgver"
-
- install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE"
-}
-
-package_clang-analyzer() {
- pkgdesc="A source code analysis framework"
- url="http://clang-analyzer.llvm.org/"
- depends=("clang=$pkgver-$pkgrel" 'python2')
-
- cd "$srcdir/llvm-$pkgver/tools/clang"
-
- install -d "$pkgdir"/usr/{bin,lib/clang-analyzer}
- for _tool in scan-{build,view}; do
- cp -r tools/$_tool "$pkgdir/usr/lib/clang-analyzer/"
- ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/"
- done
-
- # Use Python 2
- sed -i 's/env python$/&2/' \
- "$pkgdir/usr/lib/clang-analyzer/scan-view/scan-view" \
- "$pkgdir/usr/lib/clang-analyzer/scan-build/set-xcode-analyzer"
-
- # Compile Python scripts
- python2 -m compileall "$pkgdir/usr/lib/clang-analyzer"
- python2 -O -m compileall "$pkgdir/usr/lib/clang-analyzer"
-
- install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang-analyzer/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/llvm/bug-9869-operator-h-c++0x.patch b/testing/llvm/bug-9869-operator-h-c++0x.patch
deleted file mode 100644
index b95d7d772..000000000
--- a/testing/llvm/bug-9869-operator-h-c++0x.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- llvm/trunk/include/llvm/Operator.h 2011/02/07 16:40:21 125006
-+++ llvm/trunk/include/llvm/Operator.h 2011/05/08 01:59:22 131062
-@@ -186,28 +186,46 @@
- };
-
- class AddOperator
-- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {};
-+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {
-+ ~AddOperator(); // DO NOT IMPLEMENT
-+};
- class SubOperator
-- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {};
-+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {
-+ ~SubOperator(); // DO NOT IMPLEMENT
-+};
- class MulOperator
-- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {};
-+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {
-+ ~MulOperator(); // DO NOT IMPLEMENT
-+};
- class ShlOperator
-- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {};
-+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {
-+ ~ShlOperator(); // DO NOT IMPLEMENT
-+};
-
-
- class SDivOperator
-- : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {};
-+ : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {
-+ ~SDivOperator(); // DO NOT IMPLEMENT
-+};
- class UDivOperator
-- : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {};
-+ : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {
-+ ~UDivOperator(); // DO NOT IMPLEMENT
-+};
- class AShrOperator
-- : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {};
-+ : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {
-+ ~AShrOperator(); // DO NOT IMPLEMENT
-+};
- class LShrOperator
-- : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {};
-+ : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {
-+ ~LShrOperator(); // DO NOT IMPLEMENT
-+};
-
-
-
- class GEPOperator
- : public ConcreteOperator<Operator, Instruction::GetElementPtr> {
-+ ~GEPOperator(); // DO NOT IMPLEMENT
-+
- enum {
- IsInBounds = (1 << 0)
- };
diff --git a/testing/llvm/cindexer-clang-path.patch b/testing/llvm/cindexer-clang-path.patch
deleted file mode 100644
index ddaab690e..000000000
--- a/testing/llvm/cindexer-clang-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/libclang/CIndexer.cpp.orig 2011-04-07 13:08:24.000000000 +0300
-+++ tools/libclang/CIndexer.cpp 2011-04-07 13:11:52.224884642 +0300
-@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP
-
- // We now have the CIndex directory, locate clang relative to it.
- LibClangPath.eraseComponent();
-+ LibClangPath.eraseComponent();
- #endif
-
- LibClangPath.appendComponent("clang");
diff --git a/testing/llvm/clang-plugin-loader-registry.patch b/testing/llvm/clang-plugin-loader-registry.patch
deleted file mode 100644
index f46eb9fce..000000000
--- a/testing/llvm/clang-plugin-loader-registry.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map
---- llvm-2.7.orig/autoconf/ExportMap.map 2010-02-25 00:33:41.000000000 +0200
-+++ llvm-2.7/autoconf/ExportMap.map 2010-05-10 14:14:22.000000000 +0300
-@@ -2,6 +2,7 @@
- global: main;
- __progname;
- environ;
-+ _ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE;
-
- local: *;
- };
diff --git a/testing/llvm/clang-pure64.patch b/testing/llvm/clang-pure64.patch
deleted file mode 100644
index da6178519..000000000
--- a/testing/llvm/clang-pure64.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: lib/Driver/Tools.cpp
-===================================================================
---- lib/Driver/Tools.cpp (revision 123373)
-+++ lib/Driver/Tools.cpp (working copy)
-@@ -3306,7 +3306,7 @@
- else if (ToolChain.getArch() == llvm::Triple::arm)
- CmdArgs.push_back("/lib/ld-linux.so.3");
- else
-- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
-+ CmdArgs.push_back("/lib/ld-linux-x86-64.so.2");
- }
-
- CmdArgs.push_back("-o");
-Index: lib/Driver/ToolChains.cpp
-===================================================================
---- lib/Driver/ToolChains.cpp (revision 123373)
-+++ lib/Driver/ToolChains.cpp (working copy)
-@@ -1317,18 +1317,10 @@
- if (Arch == llvm::Triple::x86)
- Suffix64 = "/64";
-
-- std::string Lib32 = "lib";
--
-- bool Exists;
-- if (!llvm::sys::fs::exists("/lib32", Exists) && Exists)
-- Lib32 = "lib32";
--
-+ std::string Lib32 = "lib32";
- std::string Lib64 = "lib";
-- bool Symlink;
-- if (!llvm::sys::fs::exists("/lib64", Exists) && Exists &&
-- (llvm::sys::fs::is_symlink("/lib64", Symlink) || !Symlink))
-- Lib64 = "lib64";
-
-+ bool Exists;
- std::string GccTriple = "";
- if (Arch == llvm::Triple::arm) {
- if (!llvm::sys::fs::exists("/usr/lib/gcc/arm-linux-gnueabi", Exists) &&
diff --git a/testing/llvm/clang-toolchains-gcc-versions.patch b/testing/llvm/clang-toolchains-gcc-versions.patch
deleted file mode 100644
index 7624842a8..000000000
--- a/testing/llvm/clang-toolchains-gcc-versions.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr clang-2.9.orig/lib/Driver/ToolChains.cpp clang-2.9/lib/Driver/ToolChains.cpp
---- clang-2.9.orig/lib/Driver/ToolChains.cpp 2011-03-21 23:29:27.000000000 +0200
-+++ clang-2.9/lib/Driver/ToolChains.cpp 2011-04-08 00:03:34.000000000 +0300
-@@ -1449,7 +1449,7 @@ Linux::Linux(const HostInfo &Host, const
- GccTriple = "i586-suse-linux";
- }
-
-- const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
-+ const char* GccVersions[] = {"4.6.2", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
- "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2",
- "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1",
- "4.2"};
diff --git a/testing/llvm/enable-lto.patch b/testing/llvm/enable-lto.patch
deleted file mode 100644
index 40d93104a..000000000
--- a/testing/llvm/enable-lto.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: lib/Driver/ToolChains.cpp
-===================================================================
---- lib/Driver/ToolChains.cpp (revision 123373)
-+++ lib/Driver/ToolChains.cpp (working copy)
-@@ -1398,11 +1398,11 @@
- Lib = Lib64;
- }
-
-- llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld");
-+ llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld.gold");
- if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists)
- Linker = LinkerPath.str();
- else
-- Linker = GetProgramPath("ld");
-+ Linker = GetProgramPath("ld.gold");
-
- LinuxDistro Distro = DetectLinuxDistro(Arch);
-
-Index: lib/Driver/Tools.cpp
-===================================================================
---- lib/Driver/Tools.cpp (revision 123373)
-+++ lib/Driver/Tools.cpp (working copy)
-@@ -3412,11 +3412,11 @@
- }
- }
-
-- if (Args.hasArg(options::OPT_use_gold_plugin)) {
-+ // if (Args.hasArg(options::OPT_use_gold_plugin)) {
- CmdArgs.push_back("-plugin");
- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so";
- CmdArgs.push_back(Args.MakeArgString(Plugin));
-- }
-+ // }
-
- C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs));
- }
diff --git a/testing/mkinitcpio-busybox/PKGBUILD b/testing/mkinitcpio-busybox/PKGBUILD
deleted file mode 100644
index 4861c2f33..000000000
--- a/testing/mkinitcpio-busybox/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 141095 2011-10-23 18:50:38Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=mkinitcpio-busybox
-pkgver=1.19.2
-pkgrel=1
-pkgdesc="base initramfs tools"
-arch=('i686' 'x86_64')
-url="http://www.busybox.net/"
-license=('GPL')
-depends=('glibc')
-options=('!buildflags')
-source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2"
- 'config')
-sha256sums=('ea7ec9b6df70b8c528f4a2b6300e9913431c7223308fb08dfafa7508d75a0cb9'
- '21ae2cd21e33ba1ef9500a9b14273579fc554bf995cfd7907fb3fe94fc162cf8')
-
-build() {
- cd "$srcdir/busybox-$pkgver"
-
- local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing"
-
- sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \
- "$srcdir/config" > .config
-
- make
-}
-
-package() {
- install -Dm755 "$srcdir/busybox-$pkgver/busybox" "$pkgdir/lib/initcpio/busybox"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/mkinitcpio-busybox/config b/testing/mkinitcpio-busybox/config
deleted file mode 100644
index 86160a203..000000000
--- a/testing/mkinitcpio-busybox/config
+++ /dev/null
@@ -1,1013 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Busybox version: 1.19.2
-# Sun Oct 16 15:24:19 2011
-#
-CONFIG_HAVE_DOT_CONFIG=y
-
-#
-# Busybox Settings
-#
-
-#
-# General Configuration
-#
-# CONFIG_DESKTOP is not set
-# CONFIG_EXTRA_COMPAT is not set
-# CONFIG_INCLUDE_SUSv2 is not set
-# CONFIG_USE_PORTABLE_CODE is not set
-CONFIG_PLATFORM_LINUX=y
-CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-CONFIG_SHOW_USAGE=y
-# CONFIG_FEATURE_VERBOSE_USAGE is not set
-# CONFIG_FEATURE_COMPRESS_USAGE is not set
-CONFIG_FEATURE_INSTALLER=y
-# CONFIG_INSTALL_NO_USR is not set
-# CONFIG_LOCALE_SUPPORT is not set
-CONFIG_UNICODE_SUPPORT=y
-# CONFIG_UNICODE_USING_LOCALE is not set
-# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
-CONFIG_SUBST_WCHAR=63
-CONFIG_LAST_SUPPORTED_WCHAR=767
-# CONFIG_UNICODE_COMBINING_WCHARS is not set
-# CONFIG_UNICODE_WIDE_WCHARS is not set
-# CONFIG_UNICODE_BIDI_SUPPORT is not set
-# CONFIG_UNICODE_NEUTRAL_TABLE is not set
-# CONFIG_UNICODE_PRESERVE_BROKEN is not set
-CONFIG_LONG_OPTS=y
-CONFIG_FEATURE_DEVPTS=y
-# CONFIG_FEATURE_CLEAN_UP is not set
-# CONFIG_FEATURE_UTMP is not set
-# CONFIG_FEATURE_WTMP is not set
-# CONFIG_FEATURE_PIDFILE is not set
-CONFIG_FEATURE_SUID=y
-# CONFIG_FEATURE_SUID_CONFIG is not set
-# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-# CONFIG_SELINUX is not set
-# CONFIG_FEATURE_PREFER_APPLETS is not set
-CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox"
-CONFIG_FEATURE_SYSLOG=y
-CONFIG_FEATURE_HAVE_RPC=y
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-# CONFIG_PIE is not set
-# CONFIG_NOMMU is not set
-# CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_INDIVIDUAL is not set
-# CONFIG_FEATURE_SHARED_BUSYBOX is not set
-CONFIG_LFS=y
-CONFIG_CROSS_COMPILER_PREFIX=""
-CONFIG_EXTRA_CFLAGS=""
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_DEBUG_PESSIMIZE is not set
-# CONFIG_WERROR is not set
-CONFIG_NO_DEBUG_LIB=y
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
-
-#
-# Installation Options ("make install" behavior)
-#
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
-# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
-# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
-CONFIG_PREFIX="./_install"
-
-#
-# Busybox Library Tuning
-#
-# CONFIG_FEATURE_SYSTEMD is not set
-# CONFIG_FEATURE_RTMINMAX is not set
-CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SIZE_VS_SPEED=0
-CONFIG_FEATURE_FAST_TOP=y
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-# CONFIG_FEATURE_USE_TERMIOS is not set
-CONFIG_FEATURE_EDITING=y
-CONFIG_FEATURE_EDITING_MAX_LEN=1024
-# CONFIG_FEATURE_EDITING_VI is not set
-CONFIG_FEATURE_EDITING_HISTORY=15
-# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
-# CONFIG_FEATURE_REVERSE_SEARCH is not set
-CONFIG_FEATURE_TAB_COMPLETION=y
-# CONFIG_FEATURE_USERNAME_COMPLETION is not set
-CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
-# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
-CONFIG_FEATURE_NON_POSIX_CP=y
-CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
-CONFIG_FEATURE_COPYBUF_KB=4
-CONFIG_FEATURE_SKIP_ROOTFS=y
-CONFIG_MONOTONIC_SYSCALL=y
-CONFIG_IOCTL_HEX2STR_ERROR=y
-# CONFIG_FEATURE_HWIB is not set
-
-#
-# Applets
-#
-
-#
-# Archival Utilities
-#
-# CONFIG_FEATURE_SEAMLESS_XZ is not set
-# CONFIG_FEATURE_SEAMLESS_LZMA is not set
-# CONFIG_FEATURE_SEAMLESS_BZ2 is not set
-# CONFIG_FEATURE_SEAMLESS_GZ is not set
-# CONFIG_FEATURE_SEAMLESS_Z is not set
-# CONFIG_AR is not set
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
-# CONFIG_FEATURE_AR_CREATE is not set
-# CONFIG_BUNZIP2 is not set
-# CONFIG_BZIP2 is not set
-# CONFIG_CPIO is not set
-# CONFIG_FEATURE_CPIO_O is not set
-# CONFIG_FEATURE_CPIO_P is not set
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-# CONFIG_GUNZIP is not set
-# CONFIG_GZIP is not set
-# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
-# CONFIG_LZOP is not set
-# CONFIG_LZOP_COMPR_HIGH is not set
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-# CONFIG_TAR is not set
-# CONFIG_FEATURE_TAR_CREATE is not set
-# CONFIG_FEATURE_TAR_AUTODETECT is not set
-# CONFIG_FEATURE_TAR_FROM is not set
-# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
-# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
-# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set
-# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
-# CONFIG_FEATURE_TAR_TO_COMMAND is not set
-# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
-# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
-# CONFIG_FEATURE_TAR_SELINUX is not set
-# CONFIG_UNCOMPRESS is not set
-# CONFIG_UNLZMA is not set
-# CONFIG_FEATURE_LZMA_FAST is not set
-# CONFIG_LZMA is not set
-# CONFIG_UNXZ is not set
-# CONFIG_XZ is not set
-# CONFIG_UNZIP is not set
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-CONFIG_CAT=y
-# CONFIG_DATE is not set
-# CONFIG_FEATURE_DATE_ISOFMT is not set
-# CONFIG_FEATURE_DATE_NANO is not set
-# CONFIG_FEATURE_DATE_COMPAT is not set
-# CONFIG_ID is not set
-# CONFIG_GROUPS is not set
-CONFIG_TEST=y
-CONFIG_FEATURE_TEST_64=y
-CONFIG_TOUCH=y
-# CONFIG_TR is not set
-# CONFIG_FEATURE_TR_CLASSES is not set
-# CONFIG_FEATURE_TR_EQUIV is not set
-# CONFIG_BASE64 is not set
-# CONFIG_WHO is not set
-# CONFIG_USERS is not set
-# CONFIG_CAL is not set
-# CONFIG_CATV is not set
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
-CONFIG_CHROOT=y
-# CONFIG_CKSUM is not set
-# CONFIG_COMM is not set
-CONFIG_CP=y
-# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
-CONFIG_CUT=y
-CONFIG_DD=y
-# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
-# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
-# CONFIG_FEATURE_DD_IBS_OBS is not set
-CONFIG_DF=y
-# CONFIG_FEATURE_DF_FANCY is not set
-CONFIG_DIRNAME=y
-# CONFIG_DOS2UNIX is not set
-# CONFIG_UNIX2DOS is not set
-CONFIG_DU=y
-# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-CONFIG_ENV=y
-CONFIG_FEATURE_ENV_LONG_OPTIONS=y
-# CONFIG_EXPAND is not set
-# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
-CONFIG_EXPR=y
-CONFIG_EXPR_MATH_SUPPORT_64=y
-CONFIG_FALSE=y
-# CONFIG_FOLD is not set
-# CONFIG_FSYNC is not set
-CONFIG_HEAD=y
-CONFIG_FEATURE_FANCY_HEAD=y
-# CONFIG_HOSTID is not set
-CONFIG_INSTALL=y
-CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
-CONFIG_LN=y
-# CONFIG_LOGNAME is not set
-CONFIG_LS=y
-CONFIG_FEATURE_LS_FILETYPES=y
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
-CONFIG_FEATURE_LS_RECURSIVE=y
-CONFIG_FEATURE_LS_SORTFILES=y
-CONFIG_FEATURE_LS_TIMESTAMPS=y
-CONFIG_FEATURE_LS_USERNAME=y
-# CONFIG_FEATURE_LS_COLOR is not set
-# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
-CONFIG_MD5SUM=y
-CONFIG_MKDIR=y
-CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
-CONFIG_MKFIFO=y
-CONFIG_MKNOD=y
-CONFIG_MV=y
-CONFIG_FEATURE_MV_LONG_OPTIONS=y
-# CONFIG_NICE is not set
-# CONFIG_NOHUP is not set
-# CONFIG_OD is not set
-# CONFIG_PRINTENV is not set
-CONFIG_PRINTF=y
-CONFIG_PWD=y
-CONFIG_READLINK=y
-CONFIG_FEATURE_READLINK_FOLLOW=y
-# CONFIG_REALPATH is not set
-CONFIG_RM=y
-CONFIG_RMDIR=y
-CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
-CONFIG_SEQ=y
-CONFIG_SHA1SUM=y
-CONFIG_SHA256SUM=y
-CONFIG_SHA512SUM=y
-CONFIG_SLEEP=y
-CONFIG_FEATURE_FANCY_SLEEP=y
-CONFIG_FEATURE_FLOAT_SLEEP=y
-CONFIG_SORT=y
-# CONFIG_FEATURE_SORT_BIG is not set
-# CONFIG_SPLIT is not set
-# CONFIG_FEATURE_SPLIT_FANCY is not set
-CONFIG_STAT=y
-CONFIG_FEATURE_STAT_FORMAT=y
-# CONFIG_STTY is not set
-# CONFIG_SUM is not set
-# CONFIG_SYNC is not set
-CONFIG_TAC=y
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-# CONFIG_TEE is not set
-# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
-CONFIG_TRUE=y
-# CONFIG_TTY is not set
-CONFIG_UNAME=y
-# CONFIG_UNEXPAND is not set
-# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
-CONFIG_UNIQ=y
-# CONFIG_USLEEP is not set
-# CONFIG_UUDECODE is not set
-# CONFIG_UUENCODE is not set
-CONFIG_WC=y
-CONFIG_FEATURE_WC_LARGE=y
-# CONFIG_WHOAMI is not set
-CONFIG_YES=y
-
-#
-# Common options for cp and mv
-#
-# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
-
-#
-# Common options for ls, more and telnet
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
-# Common options for md5sum, sha1sum, sha256sum, sha512sum
-#
-CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-
-#
-# Console Utilities
-#
-# CONFIG_CHVT is not set
-# CONFIG_FGCONSOLE is not set
-# CONFIG_CLEAR is not set
-# CONFIG_DEALLOCVT is not set
-# CONFIG_DUMPKMAP is not set
-CONFIG_KBD_MODE=y
-CONFIG_LOADFONT=y
-CONFIG_LOADKMAP=y
-CONFIG_OPENVT=y
-# CONFIG_RESET is not set
-# CONFIG_RESIZE is not set
-# CONFIG_FEATURE_RESIZE_PRINT is not set
-# CONFIG_SETCONSOLE is not set
-# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
-CONFIG_SETFONT=y
-# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
-CONFIG_DEFAULT_SETFONT_DIR=""
-# CONFIG_SETKEYCODES is not set
-# CONFIG_SETLOGCONS is not set
-# CONFIG_SHOWKEY is not set
-
-#
-# Common options for loadfont and setfont
-#
-CONFIG_FEATURE_LOADFONT_PSF2=y
-CONFIG_FEATURE_LOADFONT_RAW=y
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-# CONFIG_PIPE_PROGRESS is not set
-# CONFIG_RUN_PARTS is not set
-# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
-# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
-# CONFIG_START_STOP_DAEMON is not set
-# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
-# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
-# CONFIG_WHICH is not set
-
-#
-# Editors
-#
-# CONFIG_PATCH is not set
-CONFIG_VI=y
-CONFIG_FEATURE_VI_MAX_LEN=4096
-CONFIG_FEATURE_VI_8BIT=y
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
-CONFIG_FEATURE_VI_READONLY=y
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-CONFIG_AWK=y
-# CONFIG_FEATURE_AWK_LIBM is not set
-# CONFIG_CMP is not set
-# CONFIG_DIFF is not set
-# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
-# CONFIG_FEATURE_DIFF_DIR is not set
-# CONFIG_ED is not set
-CONFIG_SED=y
-# CONFIG_FEATURE_ALLOW_EXEC is not set
-
-#
-# Finding Utilities
-#
-# CONFIG_FIND is not set
-# CONFIG_FEATURE_FIND_PRINT0 is not set
-# CONFIG_FEATURE_FIND_MTIME is not set
-# CONFIG_FEATURE_FIND_MMIN is not set
-# CONFIG_FEATURE_FIND_PERM is not set
-# CONFIG_FEATURE_FIND_TYPE is not set
-# CONFIG_FEATURE_FIND_XDEV is not set
-# CONFIG_FEATURE_FIND_MAXDEPTH is not set
-# CONFIG_FEATURE_FIND_NEWER is not set
-# CONFIG_FEATURE_FIND_INUM is not set
-# CONFIG_FEATURE_FIND_EXEC is not set
-# CONFIG_FEATURE_FIND_USER is not set
-# CONFIG_FEATURE_FIND_GROUP is not set
-# CONFIG_FEATURE_FIND_NOT is not set
-# CONFIG_FEATURE_FIND_DEPTH is not set
-# CONFIG_FEATURE_FIND_PAREN is not set
-# CONFIG_FEATURE_FIND_SIZE is not set
-# CONFIG_FEATURE_FIND_PRUNE is not set
-# CONFIG_FEATURE_FIND_DELETE is not set
-# CONFIG_FEATURE_FIND_PATH is not set
-# CONFIG_FEATURE_FIND_REGEX is not set
-# CONFIG_FEATURE_FIND_CONTEXT is not set
-# CONFIG_FEATURE_FIND_LINKS is not set
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set
-# CONFIG_FEATURE_GREP_CONTEXT is not set
-# CONFIG_XARGS is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
-
-#
-# Init Utilities
-#
-# CONFIG_BOOTCHARTD is not set
-# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
-# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
-CONFIG_HALT=y
-# CONFIG_FEATURE_CALL_TELINIT is not set
-CONFIG_TELINIT_PATH=""
-CONFIG_INIT=y
-# CONFIG_FEATURE_USE_INITTAB is not set
-# CONFIG_FEATURE_KILL_REMOVED is not set
-CONFIG_FEATURE_KILL_DELAY=0
-# CONFIG_FEATURE_INIT_SCTTY is not set
-# CONFIG_FEATURE_INIT_SYSLOG is not set
-# CONFIG_FEATURE_EXTRA_QUIET is not set
-# CONFIG_FEATURE_INIT_COREDUMPS is not set
-# CONFIG_FEATURE_INITRD is not set
-CONFIG_INIT_TERMINAL_TYPE=""
-# CONFIG_MESG is not set
-# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
-
-#
-# Login/Password Management Utilities
-#
-# CONFIG_ADD_SHELL is not set
-# CONFIG_REMOVE_SHELL is not set
-# CONFIG_FEATURE_SHADOWPASSWDS is not set
-# CONFIG_USE_BB_PWD_GRP is not set
-# CONFIG_USE_BB_SHADOW is not set
-# CONFIG_USE_BB_CRYPT is not set
-# CONFIG_USE_BB_CRYPT_SHA is not set
-# CONFIG_ADDUSER is not set
-# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
-# CONFIG_FEATURE_CHECK_NAMES is not set
-CONFIG_FIRST_SYSTEM_ID=0
-CONFIG_LAST_SYSTEM_ID=0
-# CONFIG_ADDGROUP is not set
-# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
-# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
-# CONFIG_DELUSER is not set
-# CONFIG_DELGROUP is not set
-# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
-# CONFIG_GETTY is not set
-# CONFIG_LOGIN is not set
-# CONFIG_PAM is not set
-# CONFIG_LOGIN_SCRIPTS is not set
-# CONFIG_FEATURE_NOLOGIN is not set
-# CONFIG_FEATURE_SECURETTY is not set
-# CONFIG_PASSWD is not set
-# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
-# CONFIG_CRYPTPW is not set
-# CONFIG_CHPASSWD is not set
-# CONFIG_SU is not set
-# CONFIG_FEATURE_SU_SYSLOG is not set
-# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
-# CONFIG_SULOGIN is not set
-# CONFIG_VLOCK is not set
-
-#
-# Linux Ext2 FS Progs
-#
-# CONFIG_CHATTR is not set
-# CONFIG_FSCK is not set
-# CONFIG_LSATTR is not set
-# CONFIG_TUNE2FS is not set
-
-#
-# Linux Module Utilities
-#
-CONFIG_MODINFO=y
-# CONFIG_MODPROBE_SMALL is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
-CONFIG_INSMOD=y
-CONFIG_RMMOD=y
-CONFIG_LSMOD=y
-CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
-# CONFIG_MODPROBE is not set
-# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
-# CONFIG_DEPMOD is not set
-
-#
-# Options common to multiple modutils
-#
-# CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-# CONFIG_FEATURE_MODUTILS_ALIAS is not set
-# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
-CONFIG_DEFAULT_MODULES_DIR=""
-CONFIG_DEFAULT_DEPMOD_FILE=""
-
-#
-# Linux System Utilities
-#
-# CONFIG_BLOCKDEV is not set
-# CONFIG_REV is not set
-# CONFIG_ACPID is not set
-# CONFIG_FEATURE_ACPID_COMPAT is not set
-# CONFIG_BLKID is not set
-# CONFIG_FEATURE_BLKID_TYPE is not set
-CONFIG_DMESG=y
-CONFIG_FEATURE_DMESG_PRETTY=y
-# CONFIG_FBSET is not set
-# CONFIG_FEATURE_FBSET_FANCY is not set
-# CONFIG_FEATURE_FBSET_READMODE is not set
-# CONFIG_FDFLUSH is not set
-# CONFIG_FDFORMAT is not set
-# CONFIG_FDISK is not set
-# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
-# CONFIG_FEATURE_FDISK_WRITABLE is not set
-# CONFIG_FEATURE_AIX_LABEL is not set
-# CONFIG_FEATURE_SGI_LABEL is not set
-# CONFIG_FEATURE_SUN_LABEL is not set
-# CONFIG_FEATURE_OSF_LABEL is not set
-# CONFIG_FEATURE_GPT_LABEL is not set
-# CONFIG_FEATURE_FDISK_ADVANCED is not set
-# CONFIG_FINDFS is not set
-# CONFIG_FLOCK is not set
-# CONFIG_FREERAMDISK is not set
-# CONFIG_FSCK_MINIX is not set
-# CONFIG_MKFS_EXT2 is not set
-# CONFIG_MKFS_MINIX is not set
-# CONFIG_FEATURE_MINIX2 is not set
-# CONFIG_MKFS_REISER is not set
-# CONFIG_MKFS_VFAT is not set
-CONFIG_GETOPT=y
-CONFIG_FEATURE_GETOPT_LONG=y
-CONFIG_HEXDUMP=y
-# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
-# CONFIG_HD is not set
-# CONFIG_HWCLOCK is not set
-# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
-# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
-# CONFIG_IPCRM is not set
-# CONFIG_IPCS is not set
-CONFIG_LOSETUP=y
-# CONFIG_LSPCI is not set
-# CONFIG_LSUSB is not set
-# CONFIG_MDEV is not set
-# CONFIG_FEATURE_MDEV_CONF is not set
-# CONFIG_FEATURE_MDEV_RENAME is not set
-# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
-# CONFIG_FEATURE_MDEV_EXEC is not set
-# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
-# CONFIG_MKSWAP is not set
-# CONFIG_FEATURE_MKSWAP_UUID is not set
-# CONFIG_MORE is not set
-CONFIG_MOUNT=y
-CONFIG_FEATURE_MOUNT_FAKE=y
-CONFIG_FEATURE_MOUNT_VERBOSE=y
-CONFIG_FEATURE_MOUNT_HELPERS=y
-CONFIG_FEATURE_MOUNT_LABEL=y
-CONFIG_FEATURE_MOUNT_NFS=y
-CONFIG_FEATURE_MOUNT_CIFS=y
-CONFIG_FEATURE_MOUNT_FLAGS=y
-CONFIG_FEATURE_MOUNT_FSTAB=y
-# CONFIG_PIVOT_ROOT is not set
-# CONFIG_RDATE is not set
-# CONFIG_RDEV is not set
-# CONFIG_READPROFILE is not set
-# CONFIG_RTCWAKE is not set
-# CONFIG_SCRIPT is not set
-# CONFIG_SCRIPTREPLAY is not set
-# CONFIG_SETARCH is not set
-# CONFIG_SWAPONOFF is not set
-# CONFIG_FEATURE_SWAPON_PRI is not set
-CONFIG_SWITCH_ROOT=y
-CONFIG_UMOUNT=y
-CONFIG_FEATURE_UMOUNT_ALL=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-CONFIG_VOLUMEID=y
-
-#
-# Filesystem/Volume identification
-#
-# CONFIG_FEATURE_VOLUMEID_EXT is not set
-# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
-# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
-# CONFIG_FEATURE_VOLUMEID_FAT is not set
-# CONFIG_FEATURE_VOLUMEID_HFS is not set
-# CONFIG_FEATURE_VOLUMEID_JFS is not set
-# CONFIG_FEATURE_VOLUMEID_XFS is not set
-# CONFIG_FEATURE_VOLUMEID_NTFS is not set
-# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
-# CONFIG_FEATURE_VOLUMEID_UDF is not set
-# CONFIG_FEATURE_VOLUMEID_LUKS is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
-# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
-# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
-# CONFIG_FEATURE_VOLUMEID_SYSV is not set
-# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_CONSPY is not set
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_MAXLINES=9999999
-CONFIG_FEATURE_LESS_BRACKETS=y
-CONFIG_FEATURE_LESS_FLAGS=y
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
-# CONFIG_FEATURE_LESS_WINCH is not set
-# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
-# CONFIG_FEATURE_LESS_DASHCMD is not set
-# CONFIG_FEATURE_LESS_LINENUMS is not set
-# CONFIG_NANDWRITE is not set
-# CONFIG_NANDDUMP is not set
-# CONFIG_SETSERIAL is not set
-# CONFIG_UBIATTACH is not set
-# CONFIG_UBIDETACH is not set
-# CONFIG_UBIMKVOL is not set
-# CONFIG_UBIRMVOL is not set
-# CONFIG_UBIRSVOL is not set
-# CONFIG_UBIUPDATEVOL is not set
-# CONFIG_ADJTIMEX is not set
-# CONFIG_BBCONFIG is not set
-# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
-# CONFIG_BEEP is not set
-CONFIG_FEATURE_BEEP_FREQ=0
-CONFIG_FEATURE_BEEP_LENGTH_MS=0
-# CONFIG_CHAT is not set
-# CONFIG_FEATURE_CHAT_NOFAIL is not set
-# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
-# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
-# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
-# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
-# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
-# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
-# CONFIG_CHRT is not set
-# CONFIG_CROND is not set
-# CONFIG_FEATURE_CROND_D is not set
-# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
-CONFIG_FEATURE_CROND_DIR=""
-# CONFIG_CRONTAB is not set
-# CONFIG_DC is not set
-# CONFIG_FEATURE_DC_LIBM is not set
-# CONFIG_DEVFSD is not set
-# CONFIG_DEVFSD_MODLOAD is not set
-# CONFIG_DEVFSD_FG_NP is not set
-# CONFIG_DEVFSD_VERBOSE is not set
-# CONFIG_FEATURE_DEVFS is not set
-# CONFIG_DEVMEM is not set
-# CONFIG_EJECT is not set
-# CONFIG_FEATURE_EJECT_SCSI is not set
-# CONFIG_FBSPLASH is not set
-# CONFIG_FLASHCP is not set
-# CONFIG_FLASH_LOCK is not set
-# CONFIG_FLASH_UNLOCK is not set
-# CONFIG_FLASH_ERASEALL is not set
-# CONFIG_IONICE is not set
-# CONFIG_INOTIFYD is not set
-# CONFIG_LAST is not set
-# CONFIG_FEATURE_LAST_SMALL is not set
-# CONFIG_FEATURE_LAST_FANCY is not set
-# CONFIG_HDPARM is not set
-# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
-# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
-# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
-# CONFIG_MAKEDEVS is not set
-# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
-# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
-# CONFIG_MAN is not set
-# CONFIG_MICROCOM is not set
-# CONFIG_MOUNTPOINT is not set
-# CONFIG_MT is not set
-# CONFIG_RAIDAUTORUN is not set
-# CONFIG_READAHEAD is not set
-# CONFIG_RFKILL is not set
-# CONFIG_RUNLEVEL is not set
-# CONFIG_RX is not set
-# CONFIG_SETSID is not set
-CONFIG_STRINGS=y
-# CONFIG_TASKSET is not set
-# CONFIG_FEATURE_TASKSET_FANCY is not set
-# CONFIG_TIME is not set
-# CONFIG_TIMEOUT is not set
-# CONFIG_TTYSIZE is not set
-# CONFIG_VOLNAME is not set
-# CONFIG_WALL is not set
-# CONFIG_WATCHDOG is not set
-
-#
-# Networking Utilities
-#
-# CONFIG_NAMEIF is not set
-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
-# CONFIG_NBDCLIENT is not set
-CONFIG_NC=y
-CONFIG_NC_SERVER=y
-CONFIG_NC_EXTRA=y
-# CONFIG_NC_110_COMPAT is not set
-CONFIG_PING=y
-CONFIG_PING6=y
-CONFIG_FEATURE_FANCY_PING=y
-# CONFIG_WHOIS is not set
-CONFIG_FEATURE_IPV6=y
-# CONFIG_FEATURE_UNIX_LOCAL is not set
-CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
-# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
-# CONFIG_ARP is not set
-# CONFIG_ARPING is not set
-# CONFIG_BRCTL is not set
-# CONFIG_FEATURE_BRCTL_FANCY is not set
-# CONFIG_FEATURE_BRCTL_SHOW is not set
-# CONFIG_DNSD is not set
-# CONFIG_ETHER_WAKE is not set
-# CONFIG_FAKEIDENTD is not set
-# CONFIG_FTPD is not set
-# CONFIG_FEATURE_FTP_WRITE is not set
-# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
-# CONFIG_FTPGET is not set
-# CONFIG_FTPPUT is not set
-# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
-# CONFIG_HOSTNAME is not set
-# CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_RANGES is not set
-# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
-# CONFIG_FEATURE_HTTPD_SETUID is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
-# CONFIG_FEATURE_HTTPD_PROXY is not set
-# CONFIG_FEATURE_HTTPD_GZIP is not set
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-CONFIG_FEATURE_IFCONFIG_SLIP=y
-CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
-CONFIG_FEATURE_IFCONFIG_HW=y
-CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
-# CONFIG_IFENSLAVE is not set
-# CONFIG_IFPLUGD is not set
-# CONFIG_IFUPDOWN is not set
-CONFIG_IFUPDOWN_IFSTATE_PATH=""
-# CONFIG_FEATURE_IFUPDOWN_IP is not set
-# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
-# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
-# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set
-# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
-# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
-# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
-# CONFIG_INETD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
-# CONFIG_FEATURE_INETD_RPC is not set
-CONFIG_IP=y
-CONFIG_FEATURE_IP_ADDRESS=y
-CONFIG_FEATURE_IP_LINK=y
-CONFIG_FEATURE_IP_ROUTE=y
-CONFIG_FEATURE_IP_TUNNEL=y
-CONFIG_FEATURE_IP_RULE=y
-CONFIG_FEATURE_IP_SHORT_FORMS=y
-# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
-CONFIG_IPADDR=y
-CONFIG_IPLINK=y
-CONFIG_IPROUTE=y
-CONFIG_IPTUNNEL=y
-CONFIG_IPRULE=y
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
-# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-CONFIG_NETSTAT=y
-CONFIG_FEATURE_NETSTAT_WIDE=y
-CONFIG_FEATURE_NETSTAT_PRG=y
-CONFIG_NSLOOKUP=y
-# CONFIG_NTPD is not set
-# CONFIG_FEATURE_NTPD_SERVER is not set
-# CONFIG_PSCAN is not set
-CONFIG_ROUTE=y
-# CONFIG_SLATTACH is not set
-# CONFIG_TCPSVD is not set
-CONFIG_TELNET=y
-# CONFIG_FEATURE_TELNET_TTYPE is not set
-# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
-# CONFIG_TELNETD is not set
-# CONFIG_FEATURE_TELNETD_STANDALONE is not set
-# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
-CONFIG_TFTP=y
-# CONFIG_TFTPD is not set
-
-#
-# Common options for tftp/tftpd
-#
-CONFIG_FEATURE_TFTP_GET=y
-# CONFIG_FEATURE_TFTP_PUT is not set
-# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
-# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
-# CONFIG_TFTP_DEBUG is not set
-# CONFIG_TRACEROUTE is not set
-# CONFIG_TRACEROUTE6 is not set
-# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
-# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-# CONFIG_TUNCTL is not set
-# CONFIG_FEATURE_TUNCTL_UG is not set
-# CONFIG_UDHCPD is not set
-# CONFIG_DHCPRELAY is not set
-# CONFIG_DUMPLEASES is not set
-# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
-# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
-CONFIG_DHCPD_LEASES_FILE=""
-# CONFIG_UDHCPC is not set
-# CONFIG_FEATURE_UDHCPC_ARPING is not set
-# CONFIG_FEATURE_UDHCP_PORT is not set
-CONFIG_UDHCP_DEBUG=0
-# CONFIG_FEATURE_UDHCP_RFC3397 is not set
-# CONFIG_FEATURE_UDHCP_8021Q is not set
-CONFIG_UDHCPC_DEFAULT_SCRIPT=""
-CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
-CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
-# CONFIG_UDPSVD is not set
-# CONFIG_VCONFIG is not set
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-CONFIG_FEATURE_WGET_TIMEOUT=y
-# CONFIG_ZCIP is not set
-
-#
-# Print Utilities
-#
-# CONFIG_LPD is not set
-# CONFIG_LPR is not set
-# CONFIG_LPQ is not set
-
-#
-# Mail Utilities
-#
-# CONFIG_MAKEMIME is not set
-CONFIG_FEATURE_MIME_CHARSET=""
-# CONFIG_POPMAILDIR is not set
-# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
-# CONFIG_REFORMIME is not set
-# CONFIG_FEATURE_REFORMIME_COMPAT is not set
-# CONFIG_SENDMAIL is not set
-
-#
-# Process Utilities
-#
-# CONFIG_IOSTAT is not set
-# CONFIG_MPSTAT is not set
-# CONFIG_NMETER is not set
-# CONFIG_PMAP is not set
-# CONFIG_POWERTOP is not set
-# CONFIG_PSTREE is not set
-# CONFIG_PWDX is not set
-# CONFIG_SMEMCAP is not set
-CONFIG_UPTIME=y
-# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
-CONFIG_FREE=y
-# CONFIG_FUSER is not set
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-# CONFIG_KILLALL5 is not set
-CONFIG_PGREP=y
-CONFIG_PIDOF=y
-CONFIG_FEATURE_PIDOF_SINGLE=y
-CONFIG_FEATURE_PIDOF_OMIT=y
-# CONFIG_PKILL is not set
-CONFIG_PS=y
-CONFIG_FEATURE_PS_WIDE=y
-# CONFIG_FEATURE_PS_TIME is not set
-# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
-# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
-# CONFIG_RENICE is not set
-# CONFIG_BB_SYSCTL is not set
-# CONFIG_TOP is not set
-# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
-# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
-# CONFIG_FEATURE_TOP_SMP_CPU is not set
-# CONFIG_FEATURE_TOP_DECIMALS is not set
-# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
-# CONFIG_FEATURE_TOPMEM is not set
-# CONFIG_FEATURE_SHOW_THREADS is not set
-# CONFIG_WATCH is not set
-
-#
-# Runit Utilities
-#
-# CONFIG_RUNSV is not set
-# CONFIG_RUNSVDIR is not set
-# CONFIG_FEATURE_RUNSVDIR_LOG is not set
-# CONFIG_SV is not set
-CONFIG_SV_DEFAULT_SERVICE_DIR=""
-# CONFIG_SVLOGD is not set
-# CONFIG_CHPST is not set
-# CONFIG_SETUIDGID is not set
-# CONFIG_ENVUIDGID is not set
-# CONFIG_ENVDIR is not set
-# CONFIG_SOFTLIMIT is not set
-# CONFIG_CHCON is not set
-# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
-# CONFIG_GETENFORCE is not set
-# CONFIG_GETSEBOOL is not set
-# CONFIG_LOAD_POLICY is not set
-# CONFIG_MATCHPATHCON is not set
-# CONFIG_RESTORECON is not set
-# CONFIG_RUNCON is not set
-# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
-# CONFIG_SELINUXENABLED is not set
-# CONFIG_SETENFORCE is not set
-# CONFIG_SETFILES is not set
-# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
-# CONFIG_SETSEBOOL is not set
-# CONFIG_SESTATUS is not set
-
-#
-# Shells
-#
-CONFIG_ASH=y
-CONFIG_ASH_BASH_COMPAT=y
-# CONFIG_ASH_IDLE_TIMEOUT is not set
-CONFIG_ASH_JOB_CONTROL=y
-CONFIG_ASH_ALIAS=y
-CONFIG_ASH_GETOPTS=y
-CONFIG_ASH_BUILTIN_ECHO=y
-CONFIG_ASH_BUILTIN_PRINTF=y
-CONFIG_ASH_BUILTIN_TEST=y
-CONFIG_ASH_CMDCMD=y
-# CONFIG_ASH_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-# CONFIG_ASH_RANDOM_SUPPORT is not set
-CONFIG_ASH_EXPAND_PRMT=y
-CONFIG_CTTYHACK=y
-# CONFIG_HUSH is not set
-# CONFIG_HUSH_BASH_COMPAT is not set
-# CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_HELP is not set
-# CONFIG_HUSH_INTERACTIVE is not set
-# CONFIG_HUSH_SAVEHISTORY is not set
-# CONFIG_HUSH_JOB is not set
-# CONFIG_HUSH_TICK is not set
-# CONFIG_HUSH_IF is not set
-# CONFIG_HUSH_LOOPS is not set
-# CONFIG_HUSH_CASE is not set
-# CONFIG_HUSH_FUNCTIONS is not set
-# CONFIG_HUSH_LOCAL is not set
-# CONFIG_HUSH_RANDOM_SUPPORT is not set
-# CONFIG_HUSH_EXPORT_N is not set
-# CONFIG_HUSH_MODE_X is not set
-# CONFIG_MSH is not set
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-# CONFIG_FEATURE_BASH_IS_ASH is not set
-# CONFIG_FEATURE_BASH_IS_HUSH is not set
-CONFIG_FEATURE_BASH_IS_NONE=y
-CONFIG_SH_MATH_SUPPORT=y
-# CONFIG_SH_MATH_SUPPORT_64 is not set
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
-# CONFIG_FEATURE_SH_STANDALONE is not set
-# CONFIG_FEATURE_SH_NOFORK is not set
-# CONFIG_FEATURE_SH_HISTFILESIZE is not set
-
-#
-# System Logging Utilities
-#
-# CONFIG_SYSLOGD is not set
-# CONFIG_FEATURE_ROTATE_LOGFILE is not set
-# CONFIG_FEATURE_REMOTE_LOG is not set
-# CONFIG_FEATURE_SYSLOGD_DUP is not set
-# CONFIG_FEATURE_SYSLOGD_CFG is not set
-CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
-# CONFIG_FEATURE_IPC_SYSLOG is not set
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
-# CONFIG_LOGREAD is not set
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-# CONFIG_KLOGD is not set
-# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
-# CONFIG_LOGGER is not set
diff --git a/testing/mousetweaks/PKGBUILD b/testing/mousetweaks/PKGBUILD
deleted file mode 100644
index 707fb70fa..000000000
--- a/testing/mousetweaks/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 2392 2008-06-01 19:38:25Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=mousetweaks
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="Mouse accessibility enhancements for the GNOME desktop"
-arch=(i686 x86_64)
-license=('GPL3' 'FDL')
-depends=('libxtst' 'gtk3' 'gsettings-desktop-schemas')
-makedepends=('gnome-doc-utils' 'intltool')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=mousetweaks.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('6c1ec6780c8dcaa1e3a6a462f7870c4c91574067a4936727a40b011d46d47734')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-scrollkeeper
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/mousetweaks/mousetweaks.install b/testing/mousetweaks/mousetweaks.install
deleted file mode 100644
index 1ae919322..000000000
--- a/testing/mousetweaks/mousetweaks.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.90.0) < 0 )); then
- usr/sbin/gconfpkg --uninstall mousetweaks
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/mutter/PKGBUILD b/testing/mutter/PKGBUILD
deleted file mode 100644
index fb414c89a..000000000
--- a/testing/mutter/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 140740 2011-10-18 15:24:55Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
-
-pkgname=mutter
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="A window manager for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'clutter' 'gobject-introspection')
-makedepends=('intltool' 'gnome-doc-utils')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-install=mutter.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d6135d5e6c0852f7dc996798e9455fc2e9cbe6d2672f3750fc9b8d27ab141294')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/mutter \
- --localstatedir=/var --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain mutter ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/mutter/mutter.install b/testing/mutter/mutter.install
deleted file mode 100644
index 199f12584..000000000
--- a/testing/mutter/mutter.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=mutter
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/nautilus/PKGBUILD b/testing/nautilus/PKGBUILD
deleted file mode 100644
index 1ba669de7..000000000
--- a/testing/nautilus/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 140720 2011-10-18 14:36:58Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=nautilus
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="GNOME file manager"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql' 'libnotify')
-makedepends=('intltool' 'gobject-introspection')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('c482d6e7babcc238304cf55586cdf7e2b2806025214a143ed355f0d89b33b154')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --libexecdir=/usr/lib/nautilus \
- --disable-nst-extension \
- --disable-update-mimedb \
- --disable-packagekit \
- --disable-schemas-compile
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/nautilus/nautilus.install b/testing/nautilus/nautilus.install
deleted file mode 100644
index 631e38649..000000000
--- a/testing/nautilus/nautilus.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- update-mime-database usr/share/mime > /dev/null
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.90.0) < 0 )); then
- usr/sbin/gconfpkg --uninstall nautilus
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/network-manager-applet/PKGBUILD b/testing/network-manager-applet/PKGBUILD
deleted file mode 100644
index 7563c6e9f..000000000
--- a/testing/network-manager-applet/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 141313 2011-10-29 08:09:08Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Arjan Timmerman <arjan@archlinux.org>
-# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
-# Contributor: Tor Krill <tor@krill.nu>
-# Contributor: Will Rea <sillywilly@gmail.com>
-
-pkgname=network-manager-applet
-pkgver=0.9.1.95
-pkgrel=1
-pkgdesc="GNOME frontends to NetWorkmanager"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' 'gnome-icon-theme' 'mobile-broadband-provider-info' 'gconf' 'iso-codes')
-makedepends=('intltool' 'gnome-bluetooth')
-optdepends=('gnome-bluetooth: for PAN/DUN support')
-options=('!libtool')
-install=network-manager-applet.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz)
-sha256sums=('6a0e1f72b5c9ad040451263f9b8723ac6a8dfb59772d8c8258cafc0d2b2390fc')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib/networkmanager \
- --disable-static \
- --disable-maintainer-mode
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain nm-applet ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-
- echo "AutostartCondition=GNOME3 unless-session gnome" >> "${pkgdir}/etc/xdg/autostart/nm-applet.desktop"
-}
diff --git a/testing/network-manager-applet/network-manager-applet.install b/testing/network-manager-applet/network-manager-applet.install
deleted file mode 100644
index 9922d12b2..000000000
--- a/testing/network-manager-applet/network-manager-applet.install
+++ /dev/null
@@ -1,18 +0,0 @@
-pkgname=network-manager-applet
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
- gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
diff --git a/testing/networkmanager-openconnect/PKGBUILD b/testing/networkmanager-openconnect/PKGBUILD
deleted file mode 100644
index fa7fb79d2..000000000
--- a/testing/networkmanager-openconnect/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141315 2011-10-29 08:15:30Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=networkmanager-openconnect
-pkgver=0.9.1.95
-pkgrel=1
-pkgdesc="NetworkManager VPN integration for openconnect"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'openconnect' 'gconf')
-makedepends=('intltool')
-optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-options=('!libtool')
-install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz)
-sha256sums=('3e48b04a5cfffb3c83bb7b1df77cb015b58e8335c975596a916c7caf1bb87102')
-
-build() {
- cd "${srcdir}/NetworkManager-openconnect-${pkgver}"
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/networkmanager \
- --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/NetworkManager-openconnect-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/networkmanager-openconnect/networkmanager-openconnect.install b/testing/networkmanager-openconnect/networkmanager-openconnect.install
deleted file mode 100644
index 7bd4d44f9..000000000
--- a/testing/networkmanager-openconnect/networkmanager-openconnect.install
+++ /dev/null
@@ -1,16 +0,0 @@
-pkgname=networkmanager-openconnect
-
-post_install() {
- getent group nm-openconnect >/dev/null 2>&1 || groupadd -g 104 nm-openconnect
- getent passwd nm-openconnect > /dev/null 2>&1 || useradd -u 104 -s /sbin/nologin -d / -M -c 'NetworkManager user for OpenConnect' -g nm-openconnect nm-openconnect
- passwd -l nm-openconnect > /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- getent passwd nm-openconnect >/dev/null 2>&1 && userdel nm-openconnect
- getent group nm-openconnect >/dev/null 2>&1 && groupdel nm-openconnect
-}
diff --git a/testing/networkmanager-openvpn/PKGBUILD b/testing/networkmanager-openvpn/PKGBUILD
deleted file mode 100644
index f9e7731d0..000000000
--- a/testing/networkmanager-openvpn/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141321 2011-10-29 08:27:53Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=networkmanager-openvpn
-pkgver=0.9.1.95
-pkgrel=1
-pkgdesc="NetworkManager VPN plugin for OpenVPN"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'openvpn' 'gtk3' 'libgnome-keyring')
-makedepends=('intltool')
-optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-install=networkmanager-openvpn.install
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz)
-sha256sums=('2c988bfcfe8bc011a26cd2e7f58ea528ef6d923d4af74d5c7633dd26d1bb792f')
-
-build() {
- cd "${srcdir}/NetworkManager-openvpn-${pkgver}"
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/networkmanager \
- --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/NetworkManager-openvpn-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/networkmanager-openvpn/networkmanager-openvpn.install b/testing/networkmanager-openvpn/networkmanager-openvpn.install
deleted file mode 100644
index 931c0517c..000000000
--- a/testing/networkmanager-openvpn/networkmanager-openvpn.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/testing/networkmanager-pptp/PKGBUILD b/testing/networkmanager-pptp/PKGBUILD
deleted file mode 100644
index 2a3f953fe..000000000
--- a/testing/networkmanager-pptp/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141319 2011-10-29 08:25:47Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=networkmanager-pptp
-pkgver=0.9.1.95
-pkgrel=1
-pkgdesc="NetworkManager VPN plugin for pptp "
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'pptpclient' 'gtk3' 'libgnome-keyring')
-makedepends=('intltool')
-optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-options=('!libtool')
-install=networkmanager-pptp.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz)
-sha256sums=('83d432e24f2a6a011068d725591f7a95175a5e68b5b1af398f67db657659ca10')
-
-build() {
- cd "${srcdir}/NetworkManager-pptp-${pkgver}"
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/networkmanager \
- --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/NetworkManager-pptp-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/networkmanager-pptp/networkmanager-pptp.install b/testing/networkmanager-pptp/networkmanager-pptp.install
deleted file mode 100644
index 931c0517c..000000000
--- a/testing/networkmanager-pptp/networkmanager-pptp.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/testing/networkmanager-vpnc/PKGBUILD b/testing/networkmanager-vpnc/PKGBUILD
deleted file mode 100644
index 53d3ebcf1..000000000
--- a/testing/networkmanager-vpnc/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141317 2011-10-29 08:17:45Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=networkmanager-vpnc
-pkgver=0.9.1.95
-pkgrel=1
-pkgdesc="NetworkManager VPN plugin for vpnc"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'vpnc' 'hicolor-icon-theme' 'gtk3' 'libgnome-keyring')
-makedepends=('intltool')
-optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-options=('!libtool')
-install=networkmanager-vpnc.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz)
-sha256sums=('92f8d701eef988b68462fd36f8fed0f974aee0b2f1c651d188b5ed67b701ea69')
-
-build() {
- cd "${srcdir}/NetworkManager-vpnc-${pkgver}"
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/networkmanager \
- --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/NetworkManager-vpnc-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/networkmanager-vpnc/networkmanager-vpnc.install b/testing/networkmanager-vpnc/networkmanager-vpnc.install
deleted file mode 100644
index 931c0517c..000000000
--- a/testing/networkmanager-vpnc/networkmanager-vpnc.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/testing/networkmanager/NetworkManager.conf b/testing/networkmanager/NetworkManager.conf
deleted file mode 100644
index c37b59680..000000000
--- a/testing/networkmanager/NetworkManager.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[main]
-plugins=keyfile
diff --git a/testing/networkmanager/PKGBUILD b/testing/networkmanager/PKGBUILD
deleted file mode 100644
index cd8069bcc..000000000
--- a/testing/networkmanager/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 141311 2011-10-29 07:53:28Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinxu.org>
-# Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org>
-# Contributor: Tor Krill <tor@krill.nu>
-# Contributor: Will Rea <sillywilly@gmail.com>
-# Contributor: Valentine Sinitsyn <e_val@inbox.ru>
-
-pkgname=networkmanager
-pkgver=0.9.1.95
-pkgrel=1
-pkgdesc="Network Management daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd')
-makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection')
-optdepends=('modemmanager: for modem management service'
- 'dhclient: alternative DHCP/DHCPv6 client'
- 'iptables: Connection sharing'
- 'dnsmasq: Connection sharing'
- 'bluez: Bluetooth support')
-options=('!libtool')
-backup=('etc/NetworkManager/NetworkManager.conf')
-install=networkmanager.install
-source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz
- NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('4702c25324fc6c0e860a9be9860b898ce444333d084b0d5b86b069bbd5fee468'
- '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
- '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
-
-build() {
- cd "${srcdir}/NetworkManager-${pkgver}"
-
- patch -Np1 -i "${srcdir}/disable_set_hostname.patch"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib/networkmanager \
- --with-crypto=nss \
- --with-distro=arch \
- --with-dhclient=/usr/sbin/dhclient \
- --with-dhcpcd=/sbin/dhcpcd \
- --with-iptables=/usr/sbin/iptables \
- --with-systemdsystemunitdir=/lib/systemd/system \
- --disable-static \
- --enable-more-warnings=no \
- --disable-wimax
-
- make
-}
-
-package() {
- cd "${srcdir}/NetworkManager-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/"
-
- rm -rf "${pkgdir}/var/run/"
-}
diff --git a/testing/networkmanager/disable_set_hostname.patch b/testing/networkmanager/disable_set_hostname.patch
deleted file mode 100644
index ee95dd0e1..000000000
--- a/testing/networkmanager/disable_set_hostname.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
---- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000
-+++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000
-@@ -302,6 +302,7 @@
- return;
- }
-
-+#if 0
- /* Try automatically determined hostname from the best device's IP config */
- if (!best4)
- best4 = get_best_ip4_device (policy->manager, &best_req4);
-@@ -356,6 +357,7 @@
- }
- }
-
-+#endif
- /* If no automatically-configured hostname, try using the hostname from
- * when NM started up.
- */
diff --git a/testing/networkmanager/networkmanager.install b/testing/networkmanager/networkmanager.install
deleted file mode 100644
index de40c17ed..000000000
--- a/testing/networkmanager/networkmanager.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_upgrade() {
- (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
-ATTENTION:
- /etc/NetworkManager/nm-system-settings.conf has been replaced
- by /etc/NetworkManager/NetworkManager.conf. Make sure you move
- any custom settings to the new config file.
-MSG
- true
-}
diff --git a/testing/notification-daemon/PKGBUILD b/testing/notification-daemon/PKGBUILD
deleted file mode 100644
index 9421f4d27..000000000
--- a/testing/notification-daemon/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 140649 2011-10-17 18:08:51Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Mark Rosenstand <mark@borkware.net>
-
-pkgname=notification-daemon
-pkgver=0.7.3
-pkgrel=1
-pkgdesc="Notification daemon for the desktop notifications framework"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.galago-project.org/specs/notification/"
-depends=('gtk3' 'libcanberra')
-groups=('gnome')
-makedepends=('pkgconfig' 'intltool')
-options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('c40931557c42cd12fdb04ab531fd7d5c5766641e76babdbff6079a6d88342704')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/notification-daemon-1.0 \
- --localstatedir=/var --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR=${pkgdir} install
-}
diff --git a/testing/notification-daemon/notification-daemon.install b/testing/notification-daemon/notification-daemon.install
deleted file mode 100644
index 8a1aa3433..000000000
--- a/testing/notification-daemon/notification-daemon.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=notification-daemon
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD
deleted file mode 100644
index 1b4bc3612..000000000
--- a/testing/openssh/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 140605 2011-10-17 12:35:05Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=openssh
-pkgver=5.9p1
-pkgrel=4
-pkgdesc='Free version of the SSH connectivity tools'
-arch=('i686' 'x86_64')
-license=('custom:BSD')
-url='http://www.openssh.org/portable.html'
-backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
-depends=('krb5' 'openssl' 'libedit')
-optdepends=('x11-ssh-askpass: input passphrase in X without a terminal')
-source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
- 'sshd.confd'
- 'sshd.pam'
- 'sshd')
-sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56'
- 'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
- '07fecd5880b1c4fdd8c94ddb2e89ddce88effdc1'
- '21fa88de6cc1c7912e71655f50896ba17991a1c2')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure \
- --prefix=/usr \
- --libexecdir=/usr/lib/ssh \
- --sysconfdir=/etc/ssh \
- --with-privsep-user=nobody \
- --with-md5-passwords \
- --with-pam \
- --with-mantype=man \
- --with-xauth=/usr/bin/xauth \
- --with-kerberos5=/usr \
- --with-ssl-engine \
- --with-libedit=/usr/lib \
- --disable-strip # stripping is done by makepkg
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd
- install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
- install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd
- install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
-
- rm "${pkgdir}"/usr/share/man/man1/slogin.1
- ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
-
- # additional contrib scripts that we like
- install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh
- install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
- install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1
-
- # PAM is a common, standard feature to have
- sed \
- -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \
- -e '/^#UsePAM no$/c UsePAM yes' \
- -i "${pkgdir}"/etc/ssh/sshd_config
-}
diff --git a/testing/openssh/sshd b/testing/openssh/sshd
deleted file mode 100755
index 1d68fb877..000000000
--- a/testing/openssh/sshd
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sshd
-
-PIDFILE=/var/run/sshd.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then
- PID=
- rm $PIDFILE 2>/dev/null
-fi
-
-case "$1" in
- start)
- stat_busy 'Starting Secure Shell Daemon'
- /usr/bin/ssh-keygen -A
- [[ -d /var/empty ]] || mkdir -p /var/empty
- [[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS
- if [[ $? -gt 0 ]]; then
- stat_fail
- else
- add_daemon sshd
- stat_done
- fi
- ;;
- stop)
- stat_busy 'Stopping Secure Shell Daemon'
- [[ ! -z $PID ]] && kill $PID &> /dev/null
- if [[ $? -gt 0 ]]; then
- stat_fail
- else
- rm_daemon sshd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/openssh/sshd.confd b/testing/openssh/sshd.confd
deleted file mode 100644
index 5ce7c0079..000000000
--- a/testing/openssh/sshd.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to sshd
-#
-SSHD_ARGS=""
diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam
deleted file mode 100644
index ff8829fe9..000000000
--- a/testing/openssh/sshd.pam
+++ /dev/null
@@ -1,11 +0,0 @@
-#%PAM-1.0
-#auth required pam_securetty.so #Disable remote root
-auth required pam_unix.so
-auth required pam_env.so
-account required pam_nologin.so
-account required pam_unix.so
-account required pam_time.so
-password required pam_unix.so
-session required pam_unix_session.so
-session required pam_limits.so
--session optional pam_ck_connector.so nox11
diff --git a/testing/pam/PKGBUILD b/testing/pam/PKGBUILD
deleted file mode 100644
index ef5d172da..000000000
--- a/testing/pam/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 141270 2011-10-27 19:34:15Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=pam
-pkgver=1.1.5
-pkgrel=1
-pkgdesc="PAM (Pluggable Authentication Modules) library"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.kernel.org/pub/linux/libs/pam/"
-depends=('glibc' 'db' 'cracklib' 'libtirpc')
-makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
-backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/pam.d/other etc/default/passwd etc/environment)
-source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2
- #http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2
- ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2
- other)
-options=('!libtool' '!emptydirs')
-md5sums=('927ee5585bdec5256c75117e9348aa47'
- 'e2788389a6c59224110a45fcff30e02b'
- '6e6c8719e5989d976a14610f340bd33a')
-
-build() {
- cd $srcdir/Linux-PAM-$pkgver
- ./configure --sysconfdir=/etc DESTDIR=$pkgdir --libdir=/lib
- make
-}
-
-package() {
- cd $srcdir/Linux-PAM-$pkgver
- make INSTALL=/bin/install DESTDIR=$pkgdir install
- install -D -m644 ../other $pkgdir/etc/pam.d/other
- # build pam_unix2 module
- # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2
- cd $srcdir/pam_unix2-2.6
- ./configure
- make
- make DESTDIR=$pkgdir install
- # add the realtime permissions for audio users
- sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf
- cat >>$pkgdir/etc/security/limits.conf <<_EOT
-* - rtprio 0
-* - nice 0
-@audio - rtprio 65
-@audio - nice -10
-@audio - memlock 40000
-_EOT
- # fix some missing symlinks from old pam for compatibility
- cd $pkgdir/lib/security
- ln -s pam_unix.so pam_unix_acct.so
- ln -s pam_unix.so pam_unix_auth.so
- ln -s pam_unix.so pam_unix_passwd.so
- ln -s pam_unix.so pam_unix_session.so
- # set unix_chkpwd uid
- chmod +s $pkgdir/sbin/unix_chkpwd
-}
-md5sums=('927ee5585bdec5256c75117e9348aa47'
- 'e2788389a6c59224110a45fcff30e02b'
- '6e6c8719e5989d976a14610f340bd33a')
diff --git a/testing/pam/other b/testing/pam/other
deleted file mode 100644
index 08498b423..000000000
--- a/testing/pam/other
+++ /dev/null
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth required pam_unix.so
-account required pam_unix.so
-password required pam_unix.so
-session required pam_unix.so
diff --git a/testing/pam/pam.install b/testing/pam/pam.install
deleted file mode 100644
index 9d4588084..000000000
--- a/testing/pam/pam.install
+++ /dev/null
@@ -1,12 +0,0 @@
-# arg 1: the new package version
-post_install() {
- # need to run this immediately -- pacman only runs it at the end of
- # all package installs
- /sbin/ldconfig -r .
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install $1
-}
diff --git a/testing/pcre/PKGBUILD b/testing/pcre/PKGBUILD
deleted file mode 100644
index 5d3886e46..000000000
--- a/testing/pcre/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 141047 2011-10-22 13:38:23Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-
-pkgname=pcre
-pkgver=8.20
-pkgrel=1
-pkgdesc="A library that implements Perl 5-style regular expressions"
-arch=('i686' 'x86_64')
-url="http://www.pcre.org/"
-license=('BSD')
-depends=('gcc-libs')
-options=('!libtool')
-source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('a1931c70e1273e3450d5036fe273d25c'
- '41c2dceac25c6ebf192ec128021be339')
-
-build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
-
- [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC"
- ./configure --prefix=/usr --enable-jit \
- --enable-utf8 --enable-unicode-properties
- make
-}
-
-check() {
- cd "${srcdir}"/${pkgname}-${pkgver}
- make check
-}
-
-package() {
- cd "${srcdir}"/${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-
- # grep uses pcre, so we need the libs in /lib
- install -dm755 "${pkgdir}"/lib
- mv "${pkgdir}"/usr/lib/libpcre.so.* "${pkgdir}"/lib/
- ln -sf /lib/libpcre.so.0 "${pkgdir}"/usr/lib/libpcre.so
-
- install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/polkit-gnome/PKGBUILD b/testing/polkit-gnome/PKGBUILD
deleted file mode 100644
index 00e0132e5..000000000
--- a/testing/polkit-gnome/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 140661 2011-10-17 19:27:15Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: onestep_ua <onestep@ukr.net>
-
-pkgname=polkit-gnome
-pkgver=0.104
-pkgrel=1
-pkgdesc="PolicyKit integration for the GNOME desktop"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/PolicyKit"
-license=('LGPL')
-depends=('polkit' 'gtk3')
-makedepends=('intltool' 'gobject-introspection')
-options=(!libtool)
-source=(http://download.gnome.org/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz
- polkit-gnome-authentication-agent-1.desktop)
-sha256sums=('5a59d47cbc87e3e5ac24e5e28b4fa9fc07d6d0096e53fa53d8e6b3fd06854d94'
- 'ad19e73ae8eba00a8f66bd9afd3e0e1fd7ca22f716e29b97f097d9c01711e0de')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --libexecdir=/usr/lib/polkit-gnome \
- --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -Dm644 "${srcdir}/polkit-gnome-authentication-agent-1.desktop" \
- "${pkgdir}/etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop"
-}
diff --git a/testing/polkit-gnome/polkit-gnome-authentication-agent-1.desktop b/testing/polkit-gnome/polkit-gnome-authentication-agent-1.desktop
deleted file mode 100644
index fc2acc28d..000000000
--- a/testing/polkit-gnome/polkit-gnome-authentication-agent-1.desktop
+++ /dev/null
@@ -1,88 +0,0 @@
-[Desktop Entry]
-Name=PolicyKit Authentication Agent
-Name[ar]=مدير الاستيثاق PolicyKit
-Name[be]=PolicyKit - аґент аўтэнтыфікацыі
-Name[bn_IN]=PolicyKit অনুমোদনের এজেন্ট
-Name[ca]=Agent d'autenticació del PolicyKit
-Name[cs]=Ověřovací agent PolicyKit
-Name[da]=Godkendelsesprogrammet PolicyKit
-Name[de]=Legitimationsdienst von PolicyKit
-Name[el]=Πράκτορας πιστοποίησης PolicyKit
-Name[en_GB]=PolicyKit Authentication Agent
-Name[es]=Agente de autenticación de PolicyKit
-Name[eu]=PolicyKit autentifikatzeko agentea
-Name[fi]=PolicytKit-tunnistautumisohjelma
-Name[fr]=Agent d'authentification de PolicyKit
-Name[gl]=Axente de autenticación PolicyKit
-Name[gu]=PolicyKit સત્તાધિકરણ એજન્ટ
-Name[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि
-Name[hu]=PolicyKit hitelesítési ügynök
-Name[it]=Agente di autenticazione per PolicyKit
-Name[ja]=PolicyKit 認証エージェント
-Name[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ
-Name[lt]=PolicyKit tapatybės nustatymo agentas
-Name[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന്‍ ഏജന്റ്
-Name[mr]=PolicyKit ऑथेंटीकेशन एजेंट
-Name[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ
-Name[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ
-Name[pl]=Agent uwierzytelniania PolicyKit
-Name[pt]=Agente de Autenticação PolicyKit
-Name[pt_BR]=Agente de autenticação PolicyKit
-Name[ro]=Agent de autentificare PolicyKit
-Name[sk]=Agent PolicyKit na overovanie totožnosti
-Name[sl]=PolicyKit program overjanja
-Name[sv]=Autentiseringsagent för PolicyKit
-Name[ta]=PolicyKit அங்கீகார முகவர்
-Name[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి
-Name[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit
-Name[uk]=Агент автентифікації PolicyKit
-Name[zh_CN]=PolicyKit 认证代理
-Name[zh_HK]=PolicyKit 驗證代理程式
-Name[zh_TW]=PolicyKit 驗證代理程式
-Comment=PolicyKit Authentication Agent
-Comment[ar]=مدير الاستيثاق PolicyKit
-Comment[be]=PolicyKit - аґент аўтэнтыфікацыі
-Comment[bn_IN]=PolicyKit অনুমোদনের এজেন্ট
-Comment[ca]=Agent d'autenticació del PolicyKit
-Comment[cs]=Ověřovací agent PolicyKit
-Comment[da]=Godkendelsesprogrammet PolicyKit
-Comment[de]=Legitimationsdienst von PolicyKit
-Comment[el]=Πράκτορας πιστοποίησης PolicyKit
-Comment[en_GB]=PolicyKit Authentication Agent
-Comment[es]=Agente de autenticación de PolicyKit
-Comment[eu]=PolicyKit autentifikatzeko agentea
-Comment[fi]=PolicytKit-tunnistautumisohjelma
-Comment[fr]=Agent d'authentification de PolicyKit
-Comment[gl]=Axente de autenticación PolicyKit
-Comment[gu]=PolicyKit સત્તાધિકરણ એજન્ટ
-Comment[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि
-Comment[hu]=PolicyKit hitelesítési ügynök
-Comment[it]=Agente di autenticazione per PolicyKit
-Comment[ja]=PolicyKit 認証エージェント
-Comment[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ
-Comment[lt]=PolicyKit tapatybės nustatymo agentas
-Comment[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന്‍ ഏജന്റ്
-Comment[mr]=PolicyKit ऑथेंटीकेशन एजेंट
-Comment[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ
-Comment[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ
-Comment[pl]=Agent uwierzytelniania PolicyKit
-Comment[pt]=Agente de Autenticação PolicyKit
-Comment[pt_BR]=Agente de autenticação PolicyKit
-Comment[ro]=Agent de autentificare PolicyKit
-Comment[sk]=Agent PolicyKit na overovanie totožnosti
-Comment[sl]=PolicyKit program overjanja
-Comment[sv]=Autentiseringsagent för PolicyKit
-Comment[ta]=PolicyKit அங்கீகார முகவர்
-Comment[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి
-Comment[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit
-Comment[uk]=Агент автентифікації PolicyKit
-Comment[zh_CN]=PolicyKit 认证代理
-Comment[zh_HK]=PolicyKit 驗證代理程式
-Comment[zh_TW]=PolicyKit 驗證代理程式
-Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-Terminal=false
-Type=Application
-Categories=
-NoDisplay=true
-NotShowIn=KDE;
-AutostartCondition=GNOME3 unless-session gnome
diff --git a/testing/postfix/PKGBUILD b/testing/postfix/PKGBUILD
deleted file mode 100644
index 78bbb256f..000000000
--- a/testing/postfix/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 141130 2011-10-24 13:49:51Z bisson $
-# Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=postfix
-pkgver=2.8.6
-pkgrel=1
-pkgdesc='Fast, easy to administer, secure mail server'
-url='http://www.postfix.org/'
-license=('custom')
-arch=('i686' 'x86_64')
-depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite3' 'libldap' 'db')
-backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
-source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \
- 'aliases.patch' \
- 'rc.d')
-sha1sums=('32613ad01cad10ae04aad626f9a69ac9126b3d28'
- '5fc3de6c7df1e5851a0a379e825148868808318b'
- '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
-
-provides=('smtp-server' 'smtp-forwarder')
-replaces=('postfix-mysql' 'postfix-pgsql')
-conflicts=('postfix-mysql' 'postfix-pgsql' 'smtp-server' 'smtp-forwarder')
-
-install=install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make makefiles DEBUG='' CCARGS=' \
- -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \
- -DHAS_LDAP \
- -DUSE_TLS \
- -DHAS_MYSQL -I/usr/include/mysql \
- -DHAS_PGSQL -I/usr/include/postgresql \
- -DHAS_SQLITE \
- ' AUXLIBS=' \
- -lsasl2 \
- -lldap -llber \
- -lssl -lcrypto \
- -lmysqlclient -lz -lm \
- -lpq \
- -lsqlite3 -lpthread \
- ' OPT="${CFLAGS} ${LDFLAGS}"
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- sh postfix-install -non-interactive \
- install_root="${pkgdir}" \
- daemon_directory="/usr/lib/${pkgname}" \
- sample_directory="/etc/${pkgname}/sample" \
- manpage_directory="/usr/share/man"
-
- install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
- cd "${pkgdir}"
- patch -p0 -i "${srcdir}"/aliases.patch
-}
diff --git a/testing/postfix/aliases.patch b/testing/postfix/aliases.patch
deleted file mode 100644
index 6767870b7..000000000
--- a/testing/postfix/aliases.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- etc/postfix/main.cf.orig 2010-12-13 20:18:22.000000000 +0100
-+++ etc/postfix/main.cf 2010-12-13 20:18:24.000000000 +0100
-@@ -382,6 +382,7 @@
- #alias_maps = hash:/etc/aliases
- #alias_maps = hash:/etc/aliases, nis:mail.aliases
- #alias_maps = netinfo:/aliases
-+alias_maps = hash:/etc/postfix/aliases
-
- # The alias_database parameter specifies the alias database(s) that
- # are built with "newaliases" or "sendmail -bi". This is a separate
-@@ -392,6 +393,7 @@
- #alias_database = dbm:/etc/mail/aliases
- #alias_database = hash:/etc/aliases
- #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
-+alias_database = $alias_maps
-
- # ADDRESS EXTENSIONS (e.g., user+foo)
- #
diff --git a/testing/postfix/install b/testing/postfix/install
deleted file mode 100644
index c276e0919..000000000
--- a/testing/postfix/install
+++ /dev/null
@@ -1,34 +0,0 @@
-post_install() {
- getent group postdrop &>/dev/null || groupadd -g 75 postdrop >/dev/null
- getent group postfix &>/dev/null || groupadd -g 73 postfix >/dev/null
- getent passwd postfix &>/dev/null || useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix >/dev/null
-
- cd var/spool/postfix
- chown postfix active bounce corrupt defer deferred flush hold incoming private public maildrop trace saved
- chgrp postdrop public maildrop
- cd ../../../usr/sbin
- chgrp postdrop postqueue postdrop
- chmod g+s postqueue postdrop
- cd ../..
- chown postfix var/lib/postfix
-
- newaliases
-}
-
-post_upgrade() {
- post_install
-
- if [ `vercmp $2 2.8.3` = -1 ]; then cat <<EOF
-
-==> You must now execute "/etc/rc.d/postfix reload" (or restart).
-==> This is needed because of an inter-daemon protocol change.
-
-EOF
- fi
-}
-
-pre_remove() {
- getent passwd postfix &>/dev/null && userdel postfix >/dev/null
- getent group postfix &>/dev/null && groupdel postfix >/dev/null
- getent group postdrop &>/dev/null && groupdel postdrop >/dev/null
-}
diff --git a/testing/postfix/rc.d b/testing/postfix/rc.d
deleted file mode 100755
index fa314bb84..000000000
--- a/testing/postfix/rc.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=postfix
-
-case "$1" in
-start)
- stat_busy "Starting $name daemon"
- /usr/sbin/postfix start &>/dev/null \
- && { add_daemon $name; stat_done; } \
- || { stat_fail; exit 1; }
- ;;
-stop)
- stat_busy "Stopping $name daemon"
- /usr/sbin/postfix stop &>/dev/null \
- && { rm_daemon $name; stat_done; } \
- || { stat_fail; exit 1; }
- ;;
-reload)
- stat_busy "Reloading $name daemon"
- /usr/sbin/postfix reload &>/dev/null \
- && { stat_done; } \
- || { stat_fail; exit 1; }
- ;;
-restart)
- $0 stop
- sleep 1
- $0 start
- ;;
-*)
- echo "usage: $0 {start|stop|restart|reload}"
- ;;
-esac
-exit 0
diff --git a/testing/qemu-kvm/65-kvm.rules b/testing/qemu-kvm/65-kvm.rules
deleted file mode 100644
index c2f7317aa..000000000
--- a/testing/qemu-kvm/65-kvm.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
diff --git a/testing/qemu-kvm/PKGBUILD b/testing/qemu-kvm/PKGBUILD
deleted file mode 100644
index 8097e54ac..000000000
--- a/testing/qemu-kvm/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 141124 2011-10-24 13:19:43Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=qemu-kvm
-pkgver=0.15.1
-pkgrel=1
-pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
-arch=(i686 x86_64)
-license=('GPL2' 'LGPL2.1')
-url="http://www.linux-kvm.org"
-depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng')
-makedepends=('texi2html' 'perl' 'python2')
-backup=('etc/qemu/target-x86_64.conf')
-install=qemu-kvm.install
-conflicts=('qemu')
-provides=('qemu')
-replaces=('kvm')
-source=(http://downloads.sourceforge.net/kvm/${pkgname}-${pkgver}.tar.gz
- 65-kvm.rules)
-options=(!strip)
-
-build()
-{
- cd ${srcdir}/${pkgname}-${pkgver}
- # fix esound building
- ./configure --prefix=/usr \
- --python=/usr/bin/python2 \
- --sysconfdir=/etc \
- --audio-drv-list=alsa,sdl,oss \
- --audio-card-list=ac97,sb16,es1370,hda \
- --enable-docs
- make
-}
-package()
-{
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
- # symbolic link for backwards compatibility
- ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/qemu-kvm
- # symbolic link for to qemu binary for emulator apps
- ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/qemu
- # symbolic link for to qemu binary for emulator apps
- ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/kvm
- # fix man page
- mv ${pkgdir}/usr/share/man/man1/qemu.1 \
- ${pkgdir}/usr/share/man/man1/qemu-kvm.1
- # install udev rules
- install -D -m644 ${srcdir}/65-kvm.rules \
- ${pkgdir}/lib/udev/rules.d/65-kvm.rules
- # strip scripts directory
- find ${pkgdir}/usr/bin -type f -perm -u+w 2>/dev/null | while read binary ; do
- case "$(file -bi "$binary")" in
- *application/x-executable*) # Binaries
- /usr/bin/strip $STRIP_BINARIES "$binary";;
- esac
- done
-}
-md5sums=('8800a7d6b3aa4a168ea7f78dc66c0320'
- 'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/testing/qemu-kvm/qemu-kvm.install b/testing/qemu-kvm/qemu-kvm.install
deleted file mode 100644
index 84aa773b9..000000000
--- a/testing/qemu-kvm/qemu-kvm.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
- groupadd kvm -f -g 78
- echo ">>> PLEASE READ FOR KVM USAGE!"
- echo ">>> Load the correct KVM module, you will need a KVM capable CPU!"
- echo ">>> Add yourself to the group 'kvm'."
- echo ">>> Use 'qemu-kvm -enable-kvm' to use KVM."
- echo ""
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- groupdel kvm
-}
diff --git a/testing/qemu/65-kvm.rules b/testing/qemu/65-kvm.rules
deleted file mode 100644
index c2f7317aa..000000000
--- a/testing/qemu/65-kvm.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
diff --git a/testing/qemu/PKGBUILD b/testing/qemu/PKGBUILD
deleted file mode 100644
index 478935151..000000000
--- a/testing/qemu/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 140817 2011-10-19 18:05:05Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=qemu
-pkgver=0.15.1
-pkgrel=1
-pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-url="http://wiki.qemu.org/Index.html"
-makedepends=('texi2html' 'perl' 'python2')
-depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl')
-backup=('etc/qemu/target-x86_64.conf')
-install=qemu.install
-source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz
- 65-kvm.rules)
-options=(!strip)
-
-build()
-{
- cd ${srcdir}/${pkgname}-${pkgver}
- sed -i -e 's/lib64/lib/g' x86_64.ld
- ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl \
- --python=/usr/bin/python2 \
- --audio-card-list=ac97,sb16,es1370,hda \
- --enable-docs
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
- install -D -m644 ${srcdir}/65-kvm.rules \
- ${pkgdir}/lib/udev/rules.d/65-kvm.rules
- # strip scripts directory
- find ${pkgdir}/usr/src/linux-${_kernver}/scripts -type f -perm -u+w 2>/dev/null | while read binary ; do
- case "$(file -bi "$binary")" in
- *application/x-executable*) # Binaries
- /usr/bin/strip $STRIP_BINARIES "$binary";;
- esac
- done
-
-}
-md5sums=('34f17737baaf1b3495c89cd6d4a607ed'
- 'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/testing/qemu/qemu.install b/testing/qemu/qemu.install
deleted file mode 100644
index e16ac027c..000000000
--- a/testing/qemu/qemu.install
+++ /dev/null
@@ -1,24 +0,0 @@
-# kvm: the new package version
-post_install() {
- #
- groupadd kvm -f -g 78
- echo ">>> PLEASE READ FOR KVM USAGE!"
- echo ">>> Load the correct KVM module, you will need a KVM capable CPU!"
- echo ">>> Add yourself to the group 'kvm'."
- echo ">>> Use 'qemu -enable-kvm' to use KVM."
- echo ""
- if [ "$(vercmp $2 0.11)" -lt 0 ]; then
- echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module"
- echo "is no longer supported and will be removed from the repositories. You"
- echo "can safely uninstall it from your system."
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- #
- groupdel kvm
-}
diff --git a/testing/samba/PKGBUILD b/testing/samba/PKGBUILD
deleted file mode 100644
index eee2e5398..000000000
--- a/testing/samba/PKGBUILD
+++ /dev/null
@@ -1,146 +0,0 @@
-# $Id: PKGBUILD 141126 2011-10-24 13:21:17Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-pkgbase=samba
-pkgname=('smbclient' 'samba')
-pkgver=3.6.1
-# We use the 'A' to fake out pacman's version comparators. Samba chooses
-# to append 'a','b',etc to their subsequent releases, which pamcan
-# misconstrues as alpha, beta, etc. Bad samba!
-_realver=3.6.1
-pkgrel=1
-arch=(i686 x86_64)
-url="http://www.samba.org"
-license=('GPL3')
-makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb')
-source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
- samba samba.logrotate
- swat.xinetd
- samba.pam
- samba.conf.d
- fix-ipv6-mount.patch)
-### UNINSTALL dmapi package before building!!!
-
-build() {
- cd ${srcdir}/${pkgbase}-${_realver}/source3
- ./configure --prefix=/usr \
- --libdir=/usr/lib/ \
- --localstatedir=/var \
- --with-configdir=/etc/samba \
- --with-lockdir=/var/cache/samba \
- --with-piddir=/var/run/samba \
- --with-fhs \
- --with-pam \
- --with-pam_smbpass \
- --with-pammodulesdir=/lib/security \
- --with-dnsupdate \
- --with-automount \
- --with-quotas \
- --with-ads \
- --with-acl-support \
- --with-cifsmount \
- --with-libsmbclient \
- --with-syslog \
- --enable-external-libtalloc \
- --disable-dnssd \
- --disable-avahi \
- --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \
- --enable-external-libtdb
- make
-}
-
-package_smbclient () {
-pkgdesc="Tools to access a server's filespace and printers via SMB"
-depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc')
- cd ${srcdir}/${pkgbase}-${_realver}/source3
- mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
- install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/
- for i in libnetapi* libwbclient* libsmbclient*;do
- cp -a bin/${i}*.so* ${pkgdir}/usr/lib/
- done
- install -m755 script/smbtar ${pkgdir}/usr/bin/
- mkdir -p ${pkgdir}/usr/lib/cups/backend
- ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb
- mkdir -p ${pkgdir}/usr/include
- install -m644 include/libsmbclient.h ${pkgdir}/usr/include/
- install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/
- mkdir -p ${pkgdir}/usr/share/man/man{1,7}
- for man in rpcclient smbcacls smbclient smbcquotas smbget \
- smbtree smbtar nmblookup; do
- install -m644 ../docs/manpages/${man}.1 ${pkgdir}/usr/share/man/man1/
- done
- install -m644 ../docs/manpages/libsmbclient.7 ${pkgdir}/usr/share/man/man7/
-}
-
-package_samba () {
-pkgdesc="Tools to access a server's filespace and printers via SMB"
-backup=(etc/logrotate.d/samba
- etc/pam.d/samba
- etc/samba/smb.conf
- etc/xinetd.d/swat
- etc/conf.d/samba)
-depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
- cd ${srcdir}/samba-${_realver}/source3
- mkdir -p ${pkgdir}/etc/samba/private
- chmod 700 ${pkgdir}/etc/samba/private
- make DESTDIR=${pkgdir} install
- chmod 644 ${pkgdir}/usr/include/*.h
- rm -rf ${pkgdir}/usr/var
- rm -rf ${pkgdir}/var/run/samba
- (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh)
- install -D -m755 ../../samba ${pkgdir}/etc/rc.d/samba
- install -D -m644 ../../samba.conf.d ${pkgdir}/etc/conf.d/samba
- mkdir -p ${pkgdir}/etc/samba
- cat ../examples/smb.conf.default | \
- sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default
- install -D -m644 ../../samba.logrotate ${pkgdir}/etc/logrotate.d/samba
- install -D -m644 ../../swat.xinetd ${pkgdir}/etc/xinetd.d/swat
- install -D -m644 ../../samba.pam ${pkgdir}/etc/pam.d/samba
- # spool directory
- install -d -m1777 ${pkgdir}/var/spool/samba
- sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default
- # fix logrotate
- sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default
- # nsswitch libraries
- install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/lib/libnss_wins.so
- ln -s libnss_wins.so ${pkgdir}/lib/libnss_wins.so.2
- install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so
- ln -s libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so.2
- # winbind krb5 locator
- mkdir -p ${pkgdir}/usr/lib/krb5/plugins/libkrb5
- install -d -m 0755 ${pkgdir}/usr/lib/krb5/plugins/libkrb5
- install -m 755 bin/winbind_krb5_locator.so ${pkgdir}/usr/lib/krb5/plugins/libkrb5/winbind_krb5_locator.so
- # remove conflict files of smbclient
- for man in libsmbclient smbspool \
- mount.cifs net cifs.upcall; do
- rm -f ${pkgdir}/usr/share/man/man8/${man}.8
- done
- for i in libnetapi* libwbclient* libsmbclient* winbind_krb5*;do
- rm -f ${pkgdir}/usr/lib/$i
- done
- for bin in net \
- nmblookup rpcclient smbcacls smbclient \
- smbcquotas smbget smbspool smbtar smbtree; do
- rm -f ${pkgdir}/usr/bin/$bin
- done
- rm -f ${pkgdir}/usr/sbin/cifs.upcall
- rm -f ${pkgdir}/usr/include/netapi.h
- for man in rpcclient smbcacls smbclient smbcquotas \
- smbtree smbtar nmblookup smbget; do
- rm -f ${pkgdir}/usr/share/man/man1/${man}.1
- done
- for man in tdbbackup tdbdump tdbtool; do
- rm -f ${pkgdir}/usr/share/man/man8/${man}.8
- done
- rm -f ${pkgdir}/usr/share/man/man7/libsmbclient.7
- rm -f ${pkgdir}/usr/include/libsmbclient.h
- # copy ldap example
- install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
-}
-md5sums=('5291717be0734e07dc07b6110e162e87'
- 'a3da19515a234c703876cf850c44e996'
- '5697da77590ec092cc8a883bae06093c'
- 'a4bbfa39fee95bba2e7ad6b535fae7e6'
- '96f82c38f3f540b53f3e5144900acf17'
- 'f2f2e348acd1ccb566e95fa8a561b828'
- 'c6a38a8c8fa24979e6217aed533358ea')
diff --git a/testing/samba/fix-ipv6-mount.patch b/testing/samba/fix-ipv6-mount.patch
deleted file mode 100644
index 89bef6533..000000000
--- a/testing/samba/fix-ipv6-mount.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- client/mount.cifs.c.orig 2010-03-03 13:42:02.143936727 +1000
-+++ client/mount.cifs.c 2010-03-04 01:53:22.752879004 +1000
-@@ -1563,7 +1563,7 @@
- }
- }
-
-- if (addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) {
-+ if (addr && addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) {
- strlcat(options, "%", options_size);
- current_len = strnlen(options, options_size);
- optionstail = options + current_len;
diff --git a/testing/samba/samba b/testing/samba/samba
deleted file mode 100755
index 458eb8e2b..000000000
--- a/testing/samba/samba
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba
-
-[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd)
-
-case "$1" in
- start)
- rc=0
- stat_busy "Starting Samba Server"
- if [ ! -x /var/run/samba ] ; then
- install -m755 -g 81 -o 81 -d /var/run/samba
- fi
- if [ ! -x /var/log/samba ] ; then
- install -m755 -g 81 -o 81 -d /var/log/samba
- fi
- for d in ${SAMBA_DAEMONS[@]}; do
- PID=`pidof -o %PPID /usr/sbin/$d`
- [ -z "$PID" ] && /usr/sbin/$d -D
- rc=$(($rc+$?))
- done
- if [ $rc -gt 0 ]; then
- stat_fail
- else
- add_daemon samba
- stat_done
- fi
- ;;
- stop)
- rc=0
- stat_busy "Stopping Samba Server"
- for d in ${SAMBA_DAEMONS[@]}; do
- PID=`pidof -o %PPID /usr/sbin/$d`
- [ -z "$PID" ] || kill $PID &> /dev/null
- rc=$(($rc+$?))
- done
- if [ $rc -gt 0 ]; then
- stat_fail
- else
- rm /var/run/samba/smbd.pid &>/dev/null
- rm /var/run/samba/nmbd.pid &>/dev/null
- rm /var/run/samba/winbindd.pid &>/dev/null
- rm_daemon samba
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/samba/samba.conf.d b/testing/samba/samba.conf.d
deleted file mode 100644
index 8721f956a..000000000
--- a/testing/samba/samba.conf.d
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Configuration for the samba init script
-#
-
-# space separated list of daemons to launch
-SAMBA_DAEMONS=(smbd nmbd)
-#SAMBA_DAEMONS=(smbd nmbd winbindd)
diff --git a/testing/samba/samba.logrotate b/testing/samba/samba.logrotate
deleted file mode 100644
index 581f4c33b..000000000
--- a/testing/samba/samba.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/samba/log.smbd /var/log/samba/log.nmbd /var/log/samba/*.log {
- notifempty
- missingok
- sharedscripts
- copytruncate
- postrotate
- /bin/kill -HUP `cat /var/run/samba/*.pid 2>/dev/null` 2>/dev/null || true
- endscript
-}
diff --git a/testing/samba/samba.pam b/testing/samba/samba.pam
deleted file mode 100644
index 53724d1f8..000000000
--- a/testing/samba/samba.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
diff --git a/testing/samba/swat.xinetd b/testing/samba/swat.xinetd
deleted file mode 100644
index 2e62a82b2..000000000
--- a/testing/samba/swat.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service swat
-{
- socket_type = stream
- wait = no
- user = root
- server = /usr/sbin/swat
- log_on_success += HOST DURATION
- log_on_failure += HOST
- disable = yes
-}
diff --git a/testing/seahorse/PKGBUILD b/testing/seahorse/PKGBUILD
deleted file mode 100644
index e5105f8c3..000000000
--- a/testing/seahorse/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 140718 2011-10-18 14:25:36Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Michel Brabants <michel.linux@tiscali.be>
-
-pkgname=seahorse
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="GNOME application for managing PGP keys."
-arch=(i686 x86_64)
-license=('GPL')
-url="http://projects.gnome.org/seahorse/"
-depends=('gtk3' 'libgnome-keyring' 'gnome-keyring' 'libsoup' 'gpgme' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf')
-makedepends=('gettext' 'libldap' 'intltool' 'pkgconfig' 'gnome-doc-utils' 'gobject-introspection' 'openssh' 'libsm')
-optdepends=('openssh: SSH support')
-provides=('x11-ssh-askpass')
-options=('!libtool' '!emptydirs')
-groups=('gnome-extra')
-install=seahorse.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
- seahorse-ssh-askpass.sh)
-sha256sums=('84f1df80055ca66179a023130e179de44053e7df91c1f6c7fd536563fac832b2'
- '1792ab2c0bbad446b8fad0a0c9008a75f60a9666c895d37d2adcd827e49fafbb')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --enable-ldap --enable-hkp \
- --disable-scrollkeeper \
- --disable-update-mime-database \
- --disable-schemas-compile
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
- install -Dm755 "$srcdir/seahorse-ssh-askpass.sh" \
- "$pkgdir/etc/profile.d/seahorse-ssh-askpass.sh"
-}
diff --git a/testing/seahorse/seahorse-ssh-askpass.sh b/testing/seahorse/seahorse-ssh-askpass.sh
deleted file mode 100644
index 44281ac2b..000000000
--- a/testing/seahorse/seahorse-ssh-askpass.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -z "$SSH_ASKPASS" ]; then
- export SSH_ASKPASS=/usr/lib/seahorse/seahorse-ssh-askpass
-fi
diff --git a/testing/seahorse/seahorse.install b/testing/seahorse/seahorse.install
deleted file mode 100644
index 9a98d52e0..000000000
--- a/testing/seahorse/seahorse.install
+++ /dev/null
@@ -1,21 +0,0 @@
-pkgname=seahorse
-
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then
- usr/sbin/gconfpkg --uninstall $pkgname
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD
deleted file mode 100644
index c48c0cccb..000000000
--- a/testing/sudo/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 141277 2011-10-28 01:35:38Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=sudo
-_ver=1.8.3p1
-pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=1
-pkgdesc="Give certain users the ability to run some commands as root"
-arch=('i686' 'x86_64')
-url="http://www.sudo.ws/sudo/"
-license=('custom')
-depends=('glibc' 'pam')
-backup=('etc/sudoers' 'etc/pam.d/sudo')
-options=('!libtool' '!makeflags')
-source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig}
- sudo.pam)
-md5sums=('7becc572fa97f94cf721a2ee8299c45b'
- 'b0726a25694fb2cdd5e1c146eb024e9c'
- '4e7ad4ec8f2fe6a40e12bcb2c0b256e3')
-
-build() {
- cd "$srcdir/$pkgname-$_ver"
-
- ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \
- --with-env-editor --with-all-insults --with-logfac=auth
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$_ver"
- install -dm755 "$pkgdir/var/lib"
-
- make DESTDIR="$pkgdir" install
- install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo"
-
- install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE"
-}
diff --git a/testing/sudo/sudo.pam b/testing/sudo/sudo.pam
deleted file mode 100644
index 4e586cd22..000000000
--- a/testing/sudo/sudo.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth required pam_unix.so
-auth required pam_nologin.so
diff --git a/testing/sushi/PKGBUILD b/testing/sushi/PKGBUILD
deleted file mode 100644
index e33cf34e2..000000000
--- a/testing/sushi/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 140633 2011-10-17 15:35:16Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=sushi
-pkgver=0.2.1
-pkgrel=1
-pkgdesc="A quick previewer for Nautilus"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL2')
-groups=(gnome-extra)
-depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz3' 'libwebkit3' 'gtksourceview3' 'evince')
-makedepends=('intltool' 'gobject-introspection')
-options=(!libtool)
-source=(http://download.gnome.org/sources/$pkgname/0.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('b18d166a52738bceeca178318212ef4bd6a5562122f105df40bcd436621cbdb1')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --libexecdir=/usr/lib/sushi
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/totem/PKGBUILD b/testing/totem/PKGBUILD
deleted file mode 100644
index efeeb6fa0..000000000
--- a/testing/totem/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 140611 2011-10-17 13:04:37Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=totem
-pkgname=('totem' 'totem-plugin')
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
-url="http://www.gnome.org"
-arch=('i686' 'x86_64')
-license=('GPL2' 'custom')
-depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm'
- 'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme'
- 'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas' 'dconf' 'clutter-gst'
- 'clutter-gtk' 'mx')
-makedepends=('intltool' 'gtk-doc' 'python2-gobject' 'nautilus' 'libgdata' 'xulrunner' 'lirc-utils'
- 'libepc' 'bluez' 'vala' 'grilo')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
-sha256sums=('e3af3281bde6666af4c7f9594b090087657b06c98e96212b11531269e2ee40a4')
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/totem \
- --localstatedir=/var \
- --disable-static \
- --enable-python \
- --enable-nautilus
- make
-}
-
-package_totem() {
- groups=('gnome-extra')
- install=totem.install
- optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
- 'gstreamer0.10-bad-plugins: Extra media codecs'
- 'gstreamer0.10-ffmpeg: Extra media codecs'
- 'lirc-utils: Infrared Remote Control plugin'
- 'libepc: Publish Playlist plugin'
- 'libgdata: YouTube Browser plugin'
- 'bluez: Bemused plugin'
- 'grilo-plugins: Browse sidebar (remote media)'
- 'pyxdg: opensubtitles plugin')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- rm -r "${pkgdir}/usr/lib/mozilla"
- rm "${pkgdir}/usr/lib/totem/totem-plugin-viewer"
-
- sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \
- $pkgdir/usr/lib/totem/{totem/totem-bugreport.py,plugins/iplayer/iplayer2.py}
-
- install -Dm644 COPYING "${pkgdir}/usr/share/licenses/totem/COPYING"
-}
-
-package_totem-plugin() {
- pkgdesc="Totem plugin for web browsers"
- depends=("totem=${pkgver}")
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make -C browser-plugin \
- plugindir=/usr/lib/mozilla/plugins \
- xptdir=/usr/lib/mozilla/plugins \
- DESTDIR="${pkgdir}" install
-
- install -Dm644 COPYING "${pkgdir}/usr/share/licenses/totem-plugin/COPYING"
-}
diff --git a/testing/totem/totem.install b/testing/totem/totem.install
deleted file mode 100644
index 07cb42dcb..000000000
--- a/testing/totem/totem.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.91.91) < 0 )); then
- usr/sbin/gconfpkg --uninstall totem
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/truecrypt/PKGBUILD b/testing/truecrypt/PKGBUILD
deleted file mode 100644
index 9cdc1bc33..000000000
--- a/testing/truecrypt/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 140995 2011-10-21 02:53:15Z eric $
-# Maintainer: Paul Mattal <paul.archlinux.org>
-
-pkgname=truecrypt
-pkgver=7.1
-pkgrel=1
-pkgdesc="Free open-source cross-platform disk encryption software"
-url="http://www.truecrypt.org/"
-arch=('i686' 'x86_64')
-license=('custom') # TrueCrypt License v2.6
-depends=('fuse>=2.8.0' 'wxgtk>=2.8.9' 'libsm' 'device-mapper')
-makedepends=('nasm')
-optdepends=('sudo: mounting encrypted volumes as nonroot users')
-conflicts=('truecrypt-utils')
-replaces=('truecrypt-utils')
-# N.B. Truecrypt's web-based source download is incompatible with
-# makepkg. Source has been placed on ftp.archlinux.org instead
-source=(ftp://ftp.archlinux.org/other/tc/truecrypt-${pkgver}.tar.gz{,.sig} \
- 'ftp://ftp.archlinux.org/other/tc/pkcs-2.20.tar.gz' \
- "${pkgname}.desktop" \
- "${pkgname}-arch-detection.patch")
-md5sums=('a8268630a870faff07af940f63fb29eb'
- 'ddee7c4b2419ecb44b02c8294a08fbed'
- 'ce6a707b79411e82e8e558aa03e764b0'
- '183b9bf04a943454d4e216130bcbac01'
- '00ea70fa8437de877b31b027ac2b4060')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}-source"
-
- # Work around buggy CPU type detection
- patch -Np1 -i ../${pkgname}-arch-detection.patch
-
- # Build
- make PKCS11_INC="${srcdir}/pkcs-2.20"
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}-source"
-
- # Install Binary
- install -D -m755 Main/${pkgname} "${pkgdir}/usr/bin/${pkgname}"
-
- # Install Desktop file and Icon
- install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
- install -D -m644 Resources/Icons/TrueCrypt-48x48.xpm "${pkgdir}/usr/share/pixmaps/truecrypt.xpm"
-
- # Install License
- install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/License.txt"
-}
diff --git a/testing/truecrypt/truecrypt-arch-detection.patch b/testing/truecrypt/truecrypt-arch-detection.patch
deleted file mode 100644
index bc16a2a36..000000000
--- a/testing/truecrypt/truecrypt-arch-detection.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN truecrypt-7.0a-source/Makefile truecrypt-7.0a-source.fixed/Makefile
---- truecrypt-7.0a-source/Makefile 2010-09-05 10:32:10.000000000 -0400
-+++ truecrypt-7.0a-source.fixed/Makefile 2011-07-05 21:41:50.296437879 -0400
-@@ -120,10 +120,7 @@
-
- export CPU_ARCH ?= unknown
-
--ARCH = $(shell uname -p)
--ifeq "$(ARCH)" "unknown"
-- ARCH = $(shell uname -m)
--endif
-+ARCH = $(shell uname -m)
-
- ifneq (,$(filter i386 i486 i586 i686 x86,$(ARCH)))
- CPU_ARCH = x86
diff --git a/testing/truecrypt/truecrypt.desktop b/testing/truecrypt/truecrypt.desktop
deleted file mode 100644
index 53626f29f..000000000
--- a/testing/truecrypt/truecrypt.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=truecrypt
-Icon=truecrypt
-Comment=On-the-fly encryption
-Terminal=false
-Name=TrueCrypt
-StartupNotify=true
-Categories=System;
diff --git a/testing/udev/81-arch.rules b/testing/udev/81-arch.rules
deleted file mode 100644
index 6bdf4e249..000000000
--- a/testing/udev/81-arch.rules
+++ /dev/null
@@ -1,9 +0,0 @@
-# do not edit this file, it will be overwritten on update
-# this file is going away in the near future
-
-# this might belong in <http://aur.archlinux.org/packages.php?ID=22698>
-# see also /usr/src/*/Documentation/laptops/sonypi.txt
-KERNEL=="sonypi", MODE="0666"
-
-# this might belong in <https://aur.archlinux.org/packages.php?ID=18393>
-KERNEL=="legousbtower*", MODE="0666"
diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD
deleted file mode 100644
index 00ee77d90..000000000
--- a/testing/udev/PKGBUILD
+++ /dev/null
@@ -1,101 +0,0 @@
-# $Id: PKGBUILD 140824 2011-10-19 21:51:21Z tomegun $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-# Maintainer: Tom Gundersen <teg@jklm.no>
-
-pkgbase="udev"
-pkgname=('udev' 'udev-compat')
-pkgver=174
-pkgrel=1
-arch=(i686 x86_64)
-url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
-license=('GPL')
-groups=('base')
-options=(!makeflags !libtool)
-makedepends=('gobject-introspection' 'gperf')
-#source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2
-source=(http://people.freedesktop.org/~kay/$pkgbase-$pkgver.tar.bz2
- 81-arch.rules)
-
-build() {
- cd $srcdir/$pkgbase-$pkgver
-
- ./configure --sysconfdir=/etc\
- --with-rootlibdir=/lib\
- --libexecdir=/lib/udev\
- --sbindir=/sbin\
- --with-systemdsystemunitdir=/lib/systemd/system\
- --disable-rule-generator\
- --enable-udev_acl
-
- make
-}
-
-package_udev() {
- pkgdesc="The userspace dev tools (udev)"
- depends=('util-linux' 'libusb-compat' 'glib2' 'module-init-tools' 'pciutils')
- install=udev.install
- backup=(etc/udev/udev.conf)
- conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07')
- replaces=('devfsd')
-
- cd $srcdir/$pkgbase-$pkgver
- make DESTDIR=${pkgdir} install
- # Install our rule for permissions and symlinks
- install -D -m644 $srcdir/81-arch.rules $pkgdir/lib/udev/rules.d/81-arch.rules
-
- # create framebuffer blacklist
- mkdir -p $pkgdir/lib/modprobe.d/
- for mod in $(find /lib/modules/*/kernel/drivers/video -name '*fb.ko.gz' -exec basename {} .ko.gz \;); do
- echo "blacklist $mod"
- done | sort -u > $pkgdir/lib/modprobe.d/framebuffer_blacklist.conf
-
- # /dev/loop0 is created for convenience, to autoload the module if necessary
- # may be obsoleted by https://lkml.org/lkml/2011/7/30/111
- mknod -m 0660 ${pkgdir}/lib/udev/devices/loop0 b 7 0
- chgrp disk ${pkgdir}/lib/udev/devices/loop0
-
- # udevd moved, symlink to make life easy for restarting udevd manually
- ln -s /lib/udev/udevd ${pkgdir}/sbin/udevd
-
- # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
- for i in $pkgdir/lib/udev/rules.d/*.rules; do
- sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g;
- s#GROUP="tape"#GROUP="storage"#g;
- s#GROUP="cdrom"#GROUP="optical"#g' $i
- done
-}
-
-package_udev-compat() {
- pkgdesc="The userspace dev tools (udev) - additional rules for older kernels"
- depends=('udev')
- groups=('')
- cd $srcdir/$pkgbase-$pkgver
- install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules
- # create static devices in /lib/udev/devices/
- mkdir -p ${pkgdir}/lib/udev/devices/{pts,shm}
-
- mknod -m 0600 ${pkgdir}/lib/udev/devices/console c 5 1
- mknod -m 0666 ${pkgdir}/lib/udev/devices/null c 1 3
- mknod -m 0660 ${pkgdir}/lib/udev/devices/zero c 1 5
- mknod -m 0666 ${pkgdir}/lib/udev/devices/kmsg c 1 11
-
- ln -snf /proc/self/fd ${pkgdir}/lib/udev/devices/fd
- ln -snf /proc/self/fd/0 ${pkgdir}/lib/udev/devices/stdin
- ln -snf /proc/self/fd/1 ${pkgdir}/lib/udev/devices/stdout
- ln -snf /proc/self/fd/2 ${pkgdir}/lib/udev/devices/stderr
- ln -snf /proc/kcore ${pkgdir}/lib/udev/devices/core
-
- # these static devices are created for convenience, to autoload the modules if necessary
- # /dev/net/tun
- mkdir ${pkgdir}/lib/udev/devices/net
- mknod -m 0666 ${pkgdir}/lib/udev/devices/net/tun c 10 200
- # /dev/fuse
- mknod -m 0666 ${pkgdir}/lib/udev/devices/fuse c 10 229
- # /dev/ppp
- mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0
-}
-md5sums=('3b84706046a33d7a7e00491a1136804d'
- '3da2bb9891592f9438a07bd641465531')
diff --git a/testing/udev/udev.install b/testing/udev/udev.install
deleted file mode 100644
index 2cc8caaa0..000000000
--- a/testing/udev/udev.install
+++ /dev/null
@@ -1,62 +0,0 @@
-# arg 1: the new package version
-# arg 2: the old package version
-
-post_upgrade() {
- if [ "$(vercmp $2 174)" -lt 0 ]; then
- echo "ATTENTION UDEV:"
- echo "----------"
- if [ "$(vercmp $2 168)" -lt 0 ]; then
- echo "Kernel 2.6.32 or newer is now required."
- echo " --"
- echo "OSS emulation modules are not loaded by default, add to rc.conf if needed."
- echo " --"
- echo "Arch specific cd symlinks are now no longer created."
- echo " --"
- echo "cd and net persistent rules will no longer be autogenerated,"
- echo "see <https://wiki.archlinux.org/index.php/Udev> for details."
- echo " --"
- echo "Errors are now logged (possibly to the console) by default."
- echo " --"
- fi
- if [ "$(vercmp $2 171)" -lt 0 ]; then
- echo "Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and"
- echo "blacklisting in MODULES no longer works."
- echo "See 'man modprobe.conf' for a replacement to blacklisting."
- echo "To disable a module mod1 on the kernel command line, use"
- echo "mod1.disable=1"
- echo "or"
- echo "modprobe.blacklist=mod1"
- echo " --"
- echo "The following modules are no longer unconditionally loaded:"
- echo " pcspkr irtty-sir analog lp ppdev ide-generic"
- echo "Add them to MODULES in rc.conf if you need them."
- echo " --"
- fi
- if [ "$(vercmp $2 172)" -lt 0 ]; then
- echo "Support for non-devtmpfs self-compiled kernels have been moved to udev-compat."
- echo " --"
- echo "Blacklisting of framebuffer devices has moved from /etc/modprobe.d to"
- echo "/lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it"
- echo "takes precedence."
- echo " --"
- echo "kbd and rtc devices are no longer world readable."
- echo " --"
- echo "rtc is no longer in the audio group and fb devices are no longer in"
- echo "the video group, as permissions and ownership of fb devices are controlled"
- echo "by X."
- echo " --"
- fi
- echo "We now use upstream rules for assigning devices to the 'disk', 'optical',"
- echo "'scanner' and 'video' groups. Beware of any changes."
- echo " --"
- echo "We no longer create symlinks from /dev/<dev> to /dev/<dev>0."
- echo " --"
- echo "For security reasons, we no longer add devices to the 'storage' group. Use"
- echo "udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want"
- echo "this functionality back."
- echo " --"
- echo "We no longer create the static nodes on install needed for an initrd-less and"
- echo "devtmpfs-less boot, this only affects fresh installs."
- echo "---------------"
- fi
-}
diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD
deleted file mode 100644
index 534a3d336..000000000
--- a/testing/util-linux/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 140979 2011-10-20 11:26:22Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=util-linux
-pkgver=2.20.1
-pkgrel=1
-pkgdesc="Miscellaneous system utilities for Linux"
-url="http://userweb.kernel.org/~kzak/util-linux-ng/"
-arch=('i686' 'x86_64')
-groups=('base')
-depends=('filesystem')
-replaces=('linux32' 'util-linux-ng')
-conflicts=('linux32' 'util-linux-ng' 'e2fsprogs<1.41.8-2')
-provides=('linux32' "util-linux-ng=${pkgver}")
-license=('GPL2')
-options=('!libtool')
-#source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-source=(ftp://ftp.infradead.org/pub/${pkgname}/v2.20/${pkgname}-${pkgver}.tar.bz2)
-optdepends=('perl: for chkdupexe support')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # hardware clock
- sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h
-
- ./configure --enable-arch\
- --enable-write\
- --enable-raw\
- --disable-wall\
- --enable-partx\
- --enable-libmount-mount
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- install -dm755 "${pkgdir}/var/lib/hwclock"
-
- make DESTDIR="${pkgdir}" install
-}
-md5sums=('079b37517fd4e002a2e6e992e8b4e361')
diff --git a/testing/vinagre/PKGBUILD b/testing/vinagre/PKGBUILD
deleted file mode 100644
index 189f5a3c2..000000000
--- a/testing/vinagre/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 140698 2011-10-18 08:19:26Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Allan McRae <mcrae_allan@hotmail.com>
-# Contributor: lp76 <l.peduto@gmail.com>
-
-pkgname=vinagre
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="A VNC Client for the GNOME Desktop"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/vinagre/"
-install=vinagre.install
-depends=('libgnome-keyring' 'gtk-vnc' 'vte3' 'telepathy-glib' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme')
-optdepends=('openssh: SSH plugin'
- 'rdesktop: RDP plugin')
-makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh')
-groups=('gnome-extra')
-options=('!emptydirs' '!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('077dc011d048e9ed7a683ed74dc027c5c7e47d0b95b99acb493bf99fff22369c')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- #building with as-needed breaks rdp
- #https://bugzilla.gnome.org/show_bug.cgi?id=653558
- export LDFLAGS="$LDFLAGS,--no-as-needed"
- ./configure --prefix=/usr --sysconfdir=/etc --disable-scrollkeeper \
- --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/vinagre/vinagre.install b/testing/vinagre/vinagre.install
deleted file mode 100644
index 68158ac80..000000000
--- a/testing/vinagre/vinagre.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- update-mime-database usr/share/mime > /dev/null
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.91.91-2) < 0 )); then
- usr/sbin/gconfpkg --uninstall vinagre
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/vino/PKGBUILD b/testing/vino/PKGBUILD
deleted file mode 100644
index 29211ebf2..000000000
--- a/testing/vino/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 140702 2011-10-18 13:14:38Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=vino
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="a VNC server for the GNOME desktop"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libgnome-keyring' 'avahi' 'desktop-file-utils')
-makedepends=('intltool' 'networkmanager')
-groups=('gnome-extra')
-url="http://www.gnome.org"
-options=(!emptydirs)
-install=vino.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('b8c5a59914886b8676fb512da380114adb896264c46a36d3f123cf459ba799df')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/vino \
- --localstatedir=/var \
- --enable-gnome-keyring \
- --enable-avahi \
- --disable-http-server
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/vino/vino.install b/testing/vino/vino.install
deleted file mode 100644
index 469266843..000000000
--- a/testing/vino/vino.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- update-desktop-database -q
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.90.0) < 0 )); then
- usr/sbin/gconfpkg --uninstall vino
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/vte3/PKGBUILD b/testing/vte3/PKGBUILD
deleted file mode 100644
index 01dbce661..000000000
--- a/testing/vte3/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 140602 2011-10-17 12:30:38Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=vte3
-pkgname=(vte3 vte-common)
-pkgver=0.30.1
-pkgrel=1
-pkgdesc="Virtual Terminal Emulator widget for use with GTK3"
-arch=('i686' 'x86_64')
-license=('LGPL')
-options=('!libtool' '!emptydirs')
-makedepends=('intltool' 'gobject-introspection' 'gtk3')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.30/vte-${pkgver}.tar.xz)
-sha256sums=('bbe421de3015935c22f685eea0eb8be2c1fecd5021c1f822996b8f0a282f6b64')
-
-build() {
- cd "${srcdir}/vte-${pkgver}"
- #warning: type-punning to incomplete type might break strict-aliasing rules
- export CFLAGS="$CFLAGS -fno-strict-aliasing"
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/vte \
- --localstatedir=/var --disable-static \
- --enable-introspection
- make
-}
-
-package_vte3(){
- depends=('gtk3' 'vte-common')
- cd "${srcdir}/vte-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- rm "${pkgdir}"/usr/lib/vte/gnome-pty-helper
-}
-
-package_vte-common() {
- pkgdesc="Common files used by vte and vte3"
- cd "${srcdir}/vte-${pkgver}"
-
- make -C gnome-pty-helper DESTDIR="${pkgdir}" install
-}
diff --git a/testing/yelp/PKGBUILD b/testing/yelp/PKGBUILD
deleted file mode 100644
index e916282d7..000000000
--- a/testing/yelp/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 140645 2011-10-17 18:01:35Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=yelp
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="A help browser for GNOME"
-arch=('i686' 'x86_64')
-depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' 'xz' 'bzip2' 'desktop-file-utils' 'dconf')
-makedepends=('intltool' 'gtk-doc')
-groups=('gnome')
-license=('GPL')
-options=('!emptydirs' '!libtool')
-url="http://www.gnome.org"
-install=yelp.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f22cc5e24df4349bffc42a75844615d86924f6b3f4a1951e0240a03a1a40981d')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/yelp/yelp.install b/testing/yelp/yelp.install
deleted file mode 100644
index f3bf19a93..000000000
--- a/testing/yelp/yelp.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- update-desktop-database -q
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.90.0) < 0 )); then
- usr/sbin/gconfpkg --uninstall yelp
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}