summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community-staging/cegui/PKGBUILD43
-rw-r--r--community-staging/cuneiform/PKGBUILD36
-rw-r--r--community-staging/gource/PKGBUILD28
-rw-r--r--community-staging/lightspark/PKGBUILD38
-rw-r--r--community-staging/lightspark/lightspark.install13
-rw-r--r--community-staging/root/PKGBUILD87
-rw-r--r--community-staging/root/root.desktop12
-rw-r--r--community-staging/root/root.install17
-rw-r--r--community-staging/root/root.sh5
-rw-r--r--community-staging/root/root.xml11
-rwxr-xr-xcommunity-staging/root/rootd37
-rw-r--r--community-staging/sfml/PKGBUILD61
-rw-r--r--community-staging/sfml/sfml.install3
-rw-r--r--community-staging/spring/PKGBUILD48
-rw-r--r--community-staging/spring/awk-java.patch48
-rw-r--r--community-staging/spring/gcc46.patch67
-rw-r--r--community-staging/supertux/PKGBUILD31
-rw-r--r--community-staging/supertux/compile.patch67
-rw-r--r--community-staging/supertux/gcc44.patch90
-rw-r--r--community-staging/vdrift/PKGBUILD52
-rw-r--r--community-staging/vdrift/vdrift.desktop11
-rw-r--r--community-staging/widelands/PKGBUILD48
-rw-r--r--community-staging/widelands/widelands-build15-gcc-4.5-patch51
-rw-r--r--community-staging/widelands/widelands.desktop8
-rw-r--r--community-staging/widelands/widelands.pngbin19494 -> 0 bytes
-rw-r--r--community-staging/widelands/widelands.sh3
-rw-r--r--community-testing/calibre/PKGBUILD67
-rw-r--r--community-testing/calibre/calibre.install12
-rw-r--r--community-testing/calibre/desktop_integration.patch68
-rw-r--r--community-testing/cuneiform/PKGBUILD36
-rw-r--r--community-testing/mongodb/PKGBUILD52
-rw-r--r--community-testing/mongodb/mongodb.conf8
-rwxr-xr-xcommunity-testing/mongodb/mongodb.install32
-rwxr-xr-xcommunity-testing/mongodb/mongodb.rc39
-rw-r--r--community/chrpath/ChangeLog10
-rw-r--r--community/dillo/libpng14.patch12
-rw-r--r--community/fdm/LICENSE14
-rw-r--r--community/flumotion/python27.patch27
-rw-r--r--community/gnucap/ChangeLog53
-rw-r--r--community/listen/listen-fix-dbus.diff49
-rw-r--r--community/listen/listen-fix-encoding.diff16
-rw-r--r--community/mms_client/ChangeLog2
-rw-r--r--community/mongodb/add-js185-support-to-SConstruct.diff12
-rw-r--r--community/mongodb/mongodb-1.8.0-spidermonkey-1.8.5-support.patch1502
-rw-r--r--community/notion/doc-build-fix.patch106
-rw-r--r--community/qbittorrent/python2.patch33
-rw-r--r--community/rlog/ChangeLog3
-rw-r--r--community/vnstat/vnstat.install16
-rw-r--r--core/glibc/glibc-2.14-fix-resolver-crash-typo.patch22
-rw-r--r--core/glibc/glibc-2.14-revert-4462fad3.patch37
-rw-r--r--core/openssh/authfile.c.patch198
-rw-r--r--core/util-linux/mount-segfault-2.19.1.patch84
-rw-r--r--core/util-linux/two-component-linux.patch32
-rw-r--r--extra/bdf-unifont/LICENSE60
-rw-r--r--extra/bdf-unifont/PKGBUILD24
-rw-r--r--extra/bdf-unifont/unifont.install15
-rw-r--r--extra/compface/compface-1.4-errno.patch.bz2bin373 -> 0 bytes
-rw-r--r--extra/convmv/PKGBUILD20
-rw-r--r--extra/cowsay/ChangeLog7
-rw-r--r--extra/cowsay/PKGBUILD22
-rw-r--r--extra/cowsay/cowsay.patch11
-rw-r--r--extra/curl/PKGBUILD53
-rw-r--r--extra/curl/curlbuild.h9
-rw-r--r--extra/dbus-qt3/PKGBUILD32
-rw-r--r--extra/dbus-qt3/dbus-qt3-compile-fix-thoenig-01.patch85
-rw-r--r--extra/dbus-qt3/dbus-qt3-do-not-close-shared-connection-thoenig-01.patch12
-rw-r--r--extra/dvd+rw-tools/buildpatch-7.0-3-20080108-karolina.patch22
-rw-r--r--extra/emovix/PKGBUILD23
-rw-r--r--extra/foobillard/03_bugfixes36
-rw-r--r--extra/foobillard/05_foul_explanation262
-rw-r--r--extra/foobillard/06_show_ball_to_hit255
-rw-r--r--extra/foobillard/ChangeLog16
-rw-r--r--extra/foobillard/PKGBUILD46
-rw-r--r--extra/foobillard/foobillard.desktop9
-rw-r--r--extra/foobillard/foobillard.pngbin4288 -> 0 bytes
-rw-r--r--extra/foobillard/snooker_draw.patch48
-rw-r--r--extra/foobillard/snooker_reset.patch11
-rw-r--r--extra/fribidi/ChangeLog5
-rw-r--r--extra/gd/ChangeLog11
-rw-r--r--extra/glhack/ChangeLog12
-rw-r--r--extra/gnome-spell/PKGBUILD30
-rw-r--r--extra/gnome-spell/gnome-spell-enchant.diff551
-rw-r--r--extra/grip/grip.install33
-rw-r--r--extra/kdeplasma-addons/kdeobservatory-qwt6.patch12
-rw-r--r--extra/ladspa/ladspa-sdk-1.12-gcc4.patch18
-rw-r--r--extra/lesstif/ChangeLog19
-rw-r--r--extra/libssh2/PKGBUILD33
-rw-r--r--extra/mkbootcd/PKGBUILD26
-rw-r--r--extra/mkbootcd/boot.msg14
-rwxr-xr-xextra/mkbootcd/mkbootcd143
-rw-r--r--extra/mkbootcd/mkbootcd.conf38
-rw-r--r--extra/mkbootcd/options.msg6
-rw-r--r--extra/mozilla-common/PKGBUILD20
-rwxr-xr-xextra/mozilla-common/mozilla-common.csh1
-rw-r--r--extra/mozilla-common/mozilla-common.install4
-rwxr-xr-xextra/mozilla-common/mozilla-common.sh1
-rw-r--r--extra/ndesk-dbus-glib/PKGBUILD26
-rw-r--r--extra/openjpeg/30_fix_build_for_debian.dpatch70
-rw-r--r--extra/smpeg/ChangeLog6
-rw-r--r--extra/x11vnc/x11vnc.conf5
-rw-r--r--extra/x11vnc/x11vnc.rc37
-rw-r--r--extra/xaos/ChangeLog24
-rw-r--r--extra/xfce4-session/gdm.patch21
-rw-r--r--extra/xfdesktop/fix-desktop-drag-and-drop.patch57
-rw-r--r--extra/xfwm4-themes/PKGBUILD24
-rw-r--r--extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch36
-rw-r--r--gnome-unstable/folks/Bug_658631_crash_at_empathy_startup.patch41
-rw-r--r--gnome-unstable/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch73
-rw-r--r--gnome-unstable/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch17
-rw-r--r--gnome-unstable/pygobject/documentation-location.patch39
-rw-r--r--multilib-testing/lib32-glibc/PKGBUILD170
-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-dlclose-search-reset.patch196
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.13-futex.patch31
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch26
-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-__i686.patch13
-rw-r--r--multilib-testing/lib32-glibc/lib32-glibc.conf1
-rw-r--r--multilib-testing/libtool-multilib/PKGBUILD72
-rw-r--r--multilib-testing/libtool-multilib/libtool.install22
-rw-r--r--multilib/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch22
-rw-r--r--multilib/lib32-glibc/glibc-2.14-revert-4462fad3.patch37
-rw-r--r--staging/blender/PKGBUILD92
-rw-r--r--staging/blender/blender.install17
-rw-r--r--staging/bzflag/PKGBUILD35
-rw-r--r--staging/dvdauthor/PKGBUILD29
-rw-r--r--staging/enblend-enfuse/PKGBUILD34
-rw-r--r--staging/enblend-enfuse/enblend-enfuse.install20
-rw-r--r--staging/enblend-enfuse/libpng-1.4.patch14
-rw-r--r--staging/glew/PKGBUILD29
-rw-r--r--staging/hugin/PKGBUILD35
-rw-r--r--staging/hugin/hugin.install15
-rw-r--r--staging/imagemagick/PKGBUILD81
-rw-r--r--staging/imagemagick/perlmagick.rpath.patch10
-rw-r--r--staging/inkscape/PKGBUILD52
-rw-r--r--staging/inkscape/install13
-rw-r--r--staging/kdeaccessibility/PKGBUILD83
-rw-r--r--staging/kdeaccessibility/kdeaccessibility.install11
-rw-r--r--staging/kdeadmin/PKGBUILD77
-rw-r--r--staging/kdeadmin/kdeadmin.install11
-rw-r--r--staging/kdeadmin/syslog-path.patch11
-rw-r--r--staging/kdeartwork/PKGBUILD104
-rw-r--r--staging/kdebase-konsole/PKGBUILD30
-rw-r--r--staging/kdebase-runtime/PKGBUILD38
-rw-r--r--staging/kdebase-runtime/kdebase-runtime.install12
-rw-r--r--staging/kdebase-workspace/PKGBUILD76
-rw-r--r--staging/kdebase-workspace/fixpath.patch34
-rw-r--r--staging/kdebase-workspace/kde-np.pam7
-rw-r--r--staging/kdebase-workspace/kde.pam7
-rw-r--r--staging/kdebase-workspace/kdebase-workspace.install25
-rw-r--r--staging/kdebase-workspace/kdm36
-rw-r--r--staging/kdebase-workspace/kdm-zsh-profile.patch11
-rw-r--r--staging/kdebase-workspace/kscreensaver.pam1
-rw-r--r--staging/kdebase-workspace/terminate-server.patch11
-rw-r--r--staging/kdebase/PKGBUILD119
-rw-r--r--staging/kdebase/kdebase.install11
-rw-r--r--staging/kdebindings-kimono/PKGBUILD32
-rw-r--r--staging/kdebindings-korundum/PKGBUILD32
-rw-r--r--staging/kdebindings-kross/PKGBUILD51
-rw-r--r--staging/kdebindings-perlkde/PKGBUILD31
-rw-r--r--staging/kdebindings-perlqt/PKGBUILD30
-rw-r--r--staging/kdebindings-python/PKGBUILD34
-rw-r--r--staging/kdebindings-qtruby/PKGBUILD31
-rw-r--r--staging/kdebindings-qyoto/PKGBUILD31
-rw-r--r--staging/kdebindings-smokegen/PKGBUILD30
-rw-r--r--staging/kdebindings-smokekde/PKGBUILD32
-rw-r--r--staging/kdeedu-blinken/PKGBUILD31
-rw-r--r--staging/kdeedu-blinken/kdeedu-blinken.install11
-rw-r--r--staging/kdeedu-cantor/PKGBUILD34
-rw-r--r--staging/kdeedu-cantor/kdeedu-cantor.install12
-rw-r--r--staging/kdeedu-kalgebra/PKGBUILD31
-rw-r--r--staging/kdeedu-kalgebra/kdeedu-kalgebra.install12
-rw-r--r--staging/kdeedu-kalzium/PKGBUILD31
-rw-r--r--staging/kdeedu-kalzium/kdeedu-kalzium.install11
-rw-r--r--staging/kdeedu-kanagram/PKGBUILD31
-rw-r--r--staging/kdeedu-kanagram/kdeedu-kanagram.install11
-rw-r--r--staging/kdeedu-kbruch/PKGBUILD31
-rw-r--r--staging/kdeedu-kbruch/kdeedu-kbruch.install11
-rw-r--r--staging/kdeedu-kgeography/PKGBUILD31
-rw-r--r--staging/kdeedu-kgeography/kdeedu-kgeography.install11
-rw-r--r--staging/kdeedu-khangman/PKGBUILD31
-rw-r--r--staging/kdeedu-khangman/kdeedu-khangman.install11
-rw-r--r--staging/kdeedu-kig/PKGBUILD34
-rw-r--r--staging/kdeedu-kig/kdeedu-kig.install12
-rw-r--r--staging/kdeedu-kiten/PKGBUILD31
-rw-r--r--staging/kdeedu-kiten/kdeedu-kiten.install11
-rw-r--r--staging/kdeedu-klettres/PKGBUILD31
-rw-r--r--staging/kdeedu-klettres/kdeedu-klettres.install11
-rw-r--r--staging/kdeedu-kmplot/PKGBUILD31
-rw-r--r--staging/kdeedu-kmplot/kdeedu-kmplot.install12
-rw-r--r--staging/kdeedu-kstars/PKGBUILD32
-rw-r--r--staging/kdeedu-kstars/kdeedu-kstars.install11
-rw-r--r--staging/kdeedu-ktouch/PKGBUILD31
-rw-r--r--staging/kdeedu-ktouch/kdeedu-ktouch.install11
-rw-r--r--staging/kdeedu-kturtle/PKGBUILD31
-rw-r--r--staging/kdeedu-kturtle/kdeedu-kturtle.install11
-rw-r--r--staging/kdeedu-kwordquiz/PKGBUILD31
-rw-r--r--staging/kdeedu-kwordquiz/kdeedu-kwordquiz.install12
-rw-r--r--staging/kdeedu-marble/PKGBUILD37
-rw-r--r--staging/kdeedu-marble/gpsd3.patch42
-rw-r--r--staging/kdeedu-marble/kdeedu-marble.install12
-rw-r--r--staging/kdeedu-parley/PKGBUILD31
-rw-r--r--staging/kdeedu-parley/kdeedu-parley.install12
-rw-r--r--staging/kdeedu-rocs/PKGBUILD31
-rw-r--r--staging/kdeedu-step/PKGBUILD31
-rw-r--r--staging/kdeedu-step/kdeedu-step.install11
-rw-r--r--staging/kdegames/PKGBUILD514
-rw-r--r--staging/kdegames/kdegames-kbattleship.install24
-rw-r--r--staging/kdegames/kdegames-kfourinline.install12
-rw-r--r--staging/kdegames/kdegames-kigo.install12
-rw-r--r--staging/kdegames/kdegames-kolf.install12
-rw-r--r--staging/kdegames/kdegames-kreversi.install22
-rw-r--r--staging/kdegames/kdegames-kspaceduel.install12
-rw-r--r--staging/kdegames/kdegames-ksquares.install22
-rw-r--r--staging/kdegames/kdegames-ktuberling.install12
-rw-r--r--staging/kdegames/kdegames-lskat.install12
-rw-r--r--staging/kdegames/kdegames-palapeli.install13
-rw-r--r--staging/kdegames/kdegames.install11
-rw-r--r--staging/kdegraphics-gwenview/PKGBUILD32
-rw-r--r--staging/kdegraphics-gwenview/kdegraphics-gwenview.install12
-rw-r--r--staging/kdegraphics-kamera/PKGBUILD30
-rw-r--r--staging/kdegraphics-kcolorchooser/PKGBUILD31
-rw-r--r--staging/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install11
-rw-r--r--staging/kdegraphics-kgamma/PKGBUILD33
-rw-r--r--staging/kdegraphics-kolourpaint/PKGBUILD31
-rw-r--r--staging/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install12
-rw-r--r--staging/kdegraphics-kruler/PKGBUILD31
-rw-r--r--staging/kdegraphics-kruler/kdegraphics-kruler.install12
-rw-r--r--staging/kdegraphics-ksaneplugin/PKGBUILD31
-rw-r--r--staging/kdegraphics-ksnapshot/PKGBUILD32
-rw-r--r--staging/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install12
-rw-r--r--staging/kdegraphics-mobipocket/PKGBUILD31
-rw-r--r--staging/kdegraphics-okular/PKGBUILD34
-rw-r--r--staging/kdegraphics-okular/kdegraphics-okular.install12
-rw-r--r--staging/kdegraphics-strigi-analyzer/PKGBUILD31
-rw-r--r--staging/kdegraphics-svgpart/PKGBUILD31
-rw-r--r--staging/kdegraphics-thumbnailers/PKGBUILD31
-rw-r--r--staging/kdelibs/PKGBUILD58
-rw-r--r--staging/kdelibs/archlinux-menu.patch22
-rw-r--r--staging/kdelibs/kde-applications-menu.patch22
-rw-r--r--staging/kdelibs/kdelibs.install13
-rw-r--r--staging/kdemultimedia/PKGBUILD109
-rw-r--r--staging/kdemultimedia/kdemultimedia.install11
-rw-r--r--staging/kdemultimedia/mplayerthumbs.config2
-rw-r--r--staging/kdenetwork/PKGBUILD111
-rw-r--r--staging/kdenetwork/kdenetwork.install11
-rw-r--r--staging/kdepim-runtime/PKGBUILD32
-rw-r--r--staging/kdepim-runtime/kdepim-runtime.install12
-rw-r--r--staging/kdepim/PKGBUILD253
-rw-r--r--staging/kdepim/kdepim.install11
-rw-r--r--staging/kdepimlibs/PKGBUILD32
-rw-r--r--staging/kdepimlibs/kdepimlibs.install11
-rw-r--r--staging/kdeplasma-addons/PKGBUILD603
-rw-r--r--staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install12
-rw-r--r--staging/kdeplasma-addons/kdeplasma-addons-applets.install11
-rw-r--r--staging/kdesdk-kate/PKGBUILD58
-rw-r--r--staging/kdesdk-kate/kdebase-kwrite.install12
-rw-r--r--staging/kdesdk-kate/kdesdk-kate.install12
-rw-r--r--staging/kdesdk-kate/pkgbuild-syntax-highlight.patch11
-rw-r--r--staging/kdesdk/PKGBUILD247
-rw-r--r--staging/kdesdk/fix-python2-path.patch64
-rw-r--r--staging/kdesdk/kdesdk-okteta.install12
-rw-r--r--staging/kdesdk/kdesdk.install11
-rw-r--r--staging/kdetoys/PKGBUILD56
-rw-r--r--staging/kdetoys/kdetoys.install11
-rw-r--r--staging/kdeutils/PKGBUILD184
-rw-r--r--staging/kdeutils/kdeutils.install11
-rw-r--r--staging/kdewebdev/PKGBUILD67
-rw-r--r--staging/kdewebdev/kdewebdev.install11
-rw-r--r--staging/libkdcraw/PKGBUILD32
-rw-r--r--staging/libkdcraw/libkdcraw.install11
-rw-r--r--staging/libkdeedu/PKGBUILD31
-rw-r--r--staging/libkdeedu/libkdeedu.install11
-rw-r--r--staging/libkexiv2/PKGBUILD31
-rw-r--r--staging/libkipi/PKGBUILD32
-rw-r--r--staging/libkipi/libkipi.install11
-rw-r--r--staging/libksane/PKGBUILD32
-rw-r--r--staging/libksane/libksane.install11
-rw-r--r--staging/obex-data-server/PKGBUILD28
-rw-r--r--staging/psiconv/PKGBUILD30
-rw-r--r--staging/pstoedit/PKGBUILD34
-rw-r--r--staging/pstoedit/pstoedit-3.50-parallel.patch47
-rw-r--r--staging/pstoedit/pstoedit-3.50-plugin-close.patch14
-rw-r--r--staging/transcode/PKGBUILD80
-rw-r--r--staging/transcode/transcode-1.1.5-jpeg-7.patch16
-rw-r--r--staging/transcode/transcode-1.1.5-mpa.patch10
-rw-r--r--staging/xine-lib/PKGBUILD56
-rw-r--r--staging/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch13
-rw-r--r--staging/xine-lib/xine-lib-1.1.19-xvmc.patch17
-rw-r--r--testing/bitlbee/PKGBUILD52
-rw-r--r--testing/bitlbee/install14
-rw-r--r--testing/bitlbee/rc.d40
-rw-r--r--testing/bitlbee/xinetd12
-rw-r--r--testing/coreutils/PKGBUILD69
-rw-r--r--testing/coreutils/coreutils-pam.patch428
-rw-r--r--testing/coreutils/coreutils-uname.patch173
-rw-r--r--testing/coreutils/coreutils.install21
-rw-r--r--testing/coreutils/su.pam9
-rw-r--r--testing/curl/PKGBUILD60
-rw-r--r--testing/curl/curlbuild.h9
-rw-r--r--testing/dvdauthor/PKGBUILD29
-rw-r--r--testing/file/PKGBUILD34
-rw-r--r--testing/glibc/PKGBUILD207
-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-dlclose-search-reset.patch196
-rw-r--r--testing/glibc/glibc-2.13-futex.patch31
-rw-r--r--testing/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch26
-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-__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/gzip/PKGBUILD43
-rw-r--r--testing/gzip/gzip.install20
-rw-r--r--testing/imagemagick/PKGBUILD81
-rw-r--r--testing/imagemagick/perlmagick.rpath.patch10
-rw-r--r--testing/inkscape/PKGBUILD52
-rw-r--r--testing/inkscape/install13
-rw-r--r--testing/iptables/PKGBUILD69
-rw-r--r--testing/iptables/empty-filter.rules6
-rw-r--r--testing/iptables/empty-mangle.rules8
-rw-r--r--testing/iptables/empty-nat.rules7
-rw-r--r--testing/iptables/empty-raw.rules5
-rw-r--r--testing/iptables/empty-security.rules6
-rw-r--r--testing/iptables/empty.rules6
-rwxr-xr-xtesting/iptables/ip6tables69
-rwxr-xr-xtesting/iptables/iptables68
-rw-r--r--testing/iptables/iptables.conf.d12
-rw-r--r--testing/iptables/simple_firewall.rules11
-rw-r--r--testing/libnl/PKGBUILD28
-rw-r--r--testing/libnl/fix-compilation.patch10
-rw-r--r--testing/libtool/PKGBUILD48
-rw-r--r--testing/libtool/libtool.install20
-rw-r--r--testing/make/PKGBUILD55
-rw-r--r--testing/make/bug30612.patch66
-rw-r--r--testing/make/bug30723.patch12
-rw-r--r--testing/make/make-3.82-makeflags.patch36
-rw-r--r--testing/make/make-3.82-sort-blank.patch17
-rw-r--r--testing/make/make.install20
-rw-r--r--testing/mdadm/PKGBUILD55
-rw-r--r--testing/mdadm/disable-werror.patch11
-rw-r--r--testing/mdadm/linux-3.0.patch45
-rwxr-xr-xtesting/mdadm/mdadm37
-rw-r--r--testing/mdadm/mdadm.conf67
-rw-r--r--testing/mdadm/mdadm.install10
-rwxr-xr-xtesting/mdadm/mdadm_hook44
-rw-r--r--testing/mdadm/mdadm_install45
-rw-r--r--testing/mdadm/mdadm_udev_install23
-rw-r--r--testing/mkinitcpio-nfs-utils/PKGBUILD23
-rw-r--r--testing/obex-data-server/PKGBUILD28
-rw-r--r--testing/openssh/PKGBUILD66
-rwxr-xr-xtesting/openssh/sshd45
-rw-r--r--testing/openssh/sshd.confd4
-rw-r--r--testing/openssh/sshd.pam11
-rw-r--r--testing/openssl/PKGBUILD68
-rw-r--r--testing/openssl/ca-dir.patch33
-rw-r--r--testing/openssl/fix-manpages.patch1920
-rw-r--r--testing/openssl/no-rpath.patch11
-rw-r--r--testing/psiconv/PKGBUILD30
-rw-r--r--testing/pstoedit/PKGBUILD34
-rw-r--r--testing/pstoedit/pstoedit-3.50-parallel.patch47
-rw-r--r--testing/pstoedit/pstoedit-3.50-plugin-close.patch14
-rw-r--r--testing/sysvinit/PKGBUILD32
-rw-r--r--testing/sysvinit/sysvinit.install3
-rw-r--r--testing/transcode/PKGBUILD80
-rw-r--r--testing/transcode/transcode-1.1.5-jpeg-7.patch16
-rw-r--r--testing/transcode/transcode-1.1.5-mpa.patch10
-rw-r--r--testing/wget/PKGBUILD45
-rw-r--r--testing/wget/wget.install20
-rw-r--r--testing/xine-lib/PKGBUILD56
-rw-r--r--testing/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch13
-rw-r--r--testing/xine-lib/xine-lib-1.1.19-xvmc.patch17
-rw-r--r--testing/ypbind-mt/PKGBUILD46
-rw-r--r--testing/ypbind-mt/nisdomainname.conf4
-rwxr-xr-xtesting/ypbind-mt/ypbind35
-rw-r--r--testing/ypbind-mt/ypbind.conf4
387 files changed, 0 insertions, 18756 deletions
diff --git a/community-staging/cegui/PKGBUILD b/community-staging/cegui/PKGBUILD
deleted file mode 100644
index f84520018..000000000
--- a/community-staging/cegui/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 55638 2011-09-17 00:22:53Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>,
-# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
-
-pkgname=cegui
-pkgver=0.7.5
-pkgrel=5
-pkgdesc="A free library providing windowing and widgets for graphics APIs/engines"
-arch=('i686' 'x86_64')
-url="http://crayzedsgui.sourceforge.net"
-#options=('!libtool')
-license=("MIT")
-depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua' 'silly')
-makedepends=('python2' 'doxygen')
-source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz)
-md5sums=('38c79d1fdfaaa10f481c99a2ac479516')
-
-build() {
- cd $srcdir/CEGUI-${pkgver}
-
- sed -i '1i#include <cstddef>' cegui/include/CEGUIString.h
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --disable-xerces-c \
- --enable-null-renderer
-
- make
-}
-
-package() {
- cd $srcdir/CEGUI-${pkgver}
-
- make DESTDIR=${pkgdir} install
-
- #build docs
- cd doc/doxygen && doxygen
- cd .. && make DESTDIR=${pkgdir} install-html
-
- install -Dm644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
-
diff --git a/community-staging/cuneiform/PKGBUILD b/community-staging/cuneiform/PKGBUILD
deleted file mode 100644
index ebe5b67a0..000000000
--- a/community-staging/cuneiform/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 55404 2011-09-12 04:01:02Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Maxim Vuets <maxim.vuets@gmail.com>
-
-pkgname=cuneiform
-pkgver=1.1.0
-_dpkgver=1.1
-pkgrel=2
-pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages."
-arch=('i686' 'x86_64')
-url="https://launchpad.net/cuneiform-linux"
-license=('BSD')
-depends=('imagemagick')
-makedepends=('cmake')
-source=(http://launchpad.net/cuneiform-linux/${_dpkgver}/${_dpkgver}/+download/cuneiform-linux-${pkgver}.tar.bz2)
-md5sums=('09fd160cdfc512f26442a7e91246598d')
-
-_SRC_ROOT="${srcdir}/${pkgname}-linux-${pkgver}"
-
-build() {
- cd "${_SRC_ROOT}"
- sed -i 's#lib64#lib#' install_files.cmake
- mkdir builddir
- cd builddir
-
- cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr ..
- make
-}
-
-package() {
- cd "${_SRC_ROOT}"/builddir
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 "${_SRC_ROOT}/cuneiform_src/Kern/license.txt" \
- "${pkgdir}/usr/share/licenses/cuneiform/license.txt"
-}
diff --git a/community-staging/gource/PKGBUILD b/community-staging/gource/PKGBUILD
deleted file mode 100644
index 5dcece8c7..000000000
--- a/community-staging/gource/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 55655 2011-09-17 02:40:36Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com>
-# Contributor: Olivier Ramonat <olivier at ramonat dot fr>
-pkgname=gource
-pkgver=0.35
-pkgrel=2
-pkgdesc="software version control visualization"
-license=(GPL3)
-arch=(i686 x86_64)
-url=http://code.google.com/p/gource/
-depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew')
-source=(http://gource.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('6d4f776d314da3ae5d309cb580b83a9f')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR=$pkgdir install
-}
-# vim: ts=2:sw=2 et:
diff --git a/community-staging/lightspark/PKGBUILD b/community-staging/lightspark/PKGBUILD
deleted file mode 100644
index 35ef4dd99..000000000
--- a/community-staging/lightspark/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=lightspark
-pkgver=0.5.0
-pkgrel=2
-pkgdesc='An alternative Flash Player for Linux.'
-arch=('i686' 'x86_64')
-url='http://lightspark.sourceforge.net'
-license=('LGPL3')
-conflicts=('lightspark-git')
-depends=('mesa' 'ftgl' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpulse' 'libffi' 'boost-libs' 'glibmm' 'gtkglext' 'desktop-file-utils' 'libxml++' 'libxml2')
-makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'fontconfig')
-optdepends=('gnash-gtk: fallback support')
-install="lightspark.install"
-source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver:0:5}/+download/lightspark-${pkgver}.tar.gz")
-md5sums=('7d42c8e92c3c3b318076393a7e9508fb')
-
-build() {
- rm -rf build
- mkdir build
- cd build
-
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCOMPILE_PLUGIN=1 \
- -DCMAKE_BUILD_TYPE=Release \
- -DGNASH_EXE_PATH=/usr/bin/gtk-gnash \
- ../lightspark-${pkgver}
-
- make
-}
-
-package() {
- cd build
-
- make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/lightspark/lightspark.install b/community-staging/lightspark/lightspark.install
deleted file mode 100644
index 75e2b7b55..000000000
--- a/community-staging/lightspark/lightspark.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-staging/root/PKGBUILD b/community-staging/root/PKGBUILD
deleted file mode 100644
index 2b246efc2..000000000
--- a/community-staging/root/PKGBUILD
+++ /dev/null
@@ -1,87 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Sebastian Voecking <voeck@web.de>
-
-pkgname=root
-pkgver=5.30.01
-pkgrel=2
-pkgdesc='C++ data analysis framework and interpreter from CERN.'
-arch=('i686' 'x86_64')
-url='http://root.cern.ch'
-license=('LGPL2.1')
-depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient'
- 'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran')
-makedepends=('fftw')
-install='root.install'
-source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz"
- 'root.sh'
- 'rootd'
- 'root.desktop'
- 'root.xml')
-md5sums=('be7443a1b243c51b3c1ec435a5a9453e'
- '0e883ad44f99da9bc7c23bc102800b62'
- 'efd06bfa230cc2194b38e0c8939e72af'
- 'ac61b17395d75a2705fefa2ef841a6bf'
- 'e2cf69b204192b5889ceb5b4dedc66f7')
-
-build() {
- cd root
-
- if [ ${CARCH} == 'i686' ]; then
- TARGET=linux;
- else
- TARGET=linuxx8664gcc;
- fi
-
- # python2 switch
- find . -type f -exec sed -i -e 's/python -O/python2 -O/g' -e 's/python -c/python2 -c/g' {} \;
- sed \
- -e 's/python 2/python2 2/g' \
- -i configure
- sed \
- -e 's/python $(pkgpyexecdir)/python2 $(pkgpyexecdir)/g' \
- -i cint/reflex/python/genreflex/Makefile.am
- sed \
- -e 's/python /python2 /' \
- -i config/genreflex.in config/genreflex-rootcint.in
-
- ./configure \
- ${TARGET} \
- --prefix=/usr \
- --disable-builtin-ftgl \
- --disable-builtin-freetype \
- --disable-builtin-glew \
- --disable-builtin-pcre \
- --disable-builtin-zlib \
- --disable-builtin-lzma \
- --enable-gdml \
- --enable-gsl-shared \
- --enable-minuit2 \
- --enable-soversion \
- --enable-roofit \
- --enable-python \
- --with-python-incdir=/usr/include/python2.7 \
- --with-python-libdir=/usr/lib \
- --enable-explicitlink
-
- # move from aur
- #--disable-builtin-afterimage \
-
- make
-}
-
-package() {
- cd root
-
- make DESTDIR=${pkgdir} install
-
- install -D ${srcdir}/root.sh \
- ${pkgdir}/etc/profile.d/root.sh
- install -D ${srcdir}/rootd \
- ${pkgdir}/etc/rc.d/rootd
- install -D -m644 ${srcdir}/root.desktop \
- ${pkgdir}/usr/share/applications/root.desktop
- install -D -m644 ${srcdir}/root.xml \
- ${pkgdir}/usr/share/mime/packages/root.xml
-
- rm -rf ${pkgdir}/etc/root/daemons
-}
diff --git a/community-staging/root/root.desktop b/community-staging/root/root.desktop
deleted file mode 100644
index ca382111c..000000000
--- a/community-staging/root/root.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Exec=root
-Terminal=true
-Name=ROOT
-Name[de]=ROOT
-Comment=An object-oriented data analysis framework
-Comment[de]=Ein objektorientiertes Framework zur Datenanalyse
-StartupNotify=true
-MimeType=application/x-root;text/x-c++src
-Categories=Science;Development;Application;
diff --git a/community-staging/root/root.install b/community-staging/root/root.install
deleted file mode 100644
index 457af7314..000000000
--- a/community-staging/root/root.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
- if ! [ `grep '/usr/lib/root' etc/ld.so.conf` ]; then
- echo "/usr/lib/root" >> etc/ld.so.conf
- sbin/ldconfig -r .
- fi
-
- update-desktop-database >/dev/null
-
- update-mime-database /usr/share/mime >/dev/null
-}
-
-pre_remove() {
- cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot
- mv /tmp/.pacroot etc/ld.so.conf
- chmod 644 etc/ld.so.conf
- sbin/ldconfig -r .
-}
diff --git a/community-staging/root/root.sh b/community-staging/root/root.sh
deleted file mode 100644
index 685e6036b..000000000
--- a/community-staging/root/root.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-if [ $PYTHONPATH ]; then
- export PYTHONPATH=$PYTHONPATH:/usr/lib/root;
-else
- export PYTHONPATH=/usr/lib/root;
-fi
diff --git a/community-staging/root/root.xml b/community-staging/root/root.xml
deleted file mode 100644
index af8dd69c5..000000000
--- a/community-staging/root/root.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
- <mime-type type="application/x-root">
- <comment>ROOT file</comment>
- <comment xml:lang="de">ROOT-Datei</comment>
- <glob pattern="*.root"/>
- <magic priority="80">
- <match value="root" type="string" offset="0:64"/>
- </magic>
- </mime-type>
-</mime-info>
diff --git a/community-staging/root/rootd b/community-staging/root/rootd
deleted file mode 100755
index fb2c3388c..000000000
--- a/community-staging/root/rootd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/rootd`
-case "$1" in
- start)
- stat_busy "Starting ROOT file server daemon"
- [ -z "$PID" ] && /usr/bin/rootd >>/var/log/root.log 2>&1
- if [ $? -gt 0 ]; then
- stat_fail
- else
- PID=`pidof -o %PPID /usr/sbin/rootd`
- echo $PID >/var/run/rootd.pid
- add_daemon rootd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping ROOT file server daemon"
- [ ! -z "$PID" ] && kill $PID &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon rootd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-staging/sfml/PKGBUILD b/community-staging/sfml/PKGBUILD
deleted file mode 100644
index 8c7fe1d6a..000000000
--- a/community-staging/sfml/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 55642 2011-09-17 00:27:24Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Ondrej Martinak <omartinak@gmail.com>
-
-pkgname=sfml
-
-_git=true
-
-if [[ "${_git}" = "true" ]]; then
- pkgver=1.99.git20110917
-fi
-
-pkgrel=1
-pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API'
-arch=('i686' 'x86_64')
-url='http://www.sfml-dev.org/'
-license=('zlib')
-depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2')
-makedepends=('git' 'mesa' 'cmake' 'doxygen')
-install=sfml.install
-
-_gitroot='https://github.com/LaurentGomila/SFML.git'
-_gitname='SFML'
-
-build() {
- cd "$srcdir"
- msg "Connecting to GIT server...."
-
- if [ -d $_gitname ] ; then
- cd $_gitname && git pull origin
- msg "The local files are updated."
- else
- git clone $_gitroot
- cd $_gitname
- fi
-
- msg "GIT checkout done or server timeout"
- msg "Starting make..."
-
- rm -rf "$srcdir/$_gitname-build"
- cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build"
- cd "$srcdir/$_gitname-build"
-
- mkdir build && cd build
- cmake -DCMAKE_INSTALL_PREFIX=/usr .. \
- -DBUILD_DOC=true \
- -DBUILD_EXAMPLES=true
- make
- make doc
-}
-
-package() {
- cd "$srcdir/$_gitname-build/build"
- make DESTDIR="$pkgdir/" install
-
- install -Dm644 ../license.txt \
- ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
- make clean
-}
-
diff --git a/community-staging/sfml/sfml.install b/community-staging/sfml/sfml.install
deleted file mode 100644
index 75f760be6..000000000
--- a/community-staging/sfml/sfml.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_install() {
- echo "To view the SFML samples, go to /usr/share/SFML/examples/ and run them individually"
-}
diff --git a/community-staging/spring/PKGBUILD b/community-staging/spring/PKGBUILD
deleted file mode 100644
index 8b223fccc..000000000
--- a/community-staging/spring/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 55657 2011-09-17 02:44:18Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-pkgname=spring
-pkgver=0.82.7.1
-pkgrel=7
-pkgdesc='A free 3D real-time-strategy (RTS) game engine'
-arch=('i686' 'x86_64')
-url="http://springrts.com/"
-license=('GPL')
-depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis')
-makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2')
-optdepends=('python2: python-based bots'
- 'java-runtime: java-based bots')
-source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma
- gcc46.patch
- awk-java.patch)
-md5sums=('378cf0b18a5dd5b840964e5945778503'
- 'e9586b611db1ed04fe4f0c5982fda7d2'
- 'cd94edf21e49ff6ff7d256442ed9aa3c')
-
-build() {
- bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma
-
- cd spring_$pkgver
-
- sed -i '1i\
- #include <list>' rts/lib/lobby/Connection.h
- patch -Np1 < $srcdir/gcc46.patch
- patch -Np1 < $srcdir/awk-java.patch
- cmake . \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DDATADIR=share/spring
- make
-}
-
-package() {
- cd spring_$pkgver
-
- make DESTDIR=$pkgdir install
-
- install -d $pkgdir/etc/spring
- echo '$HOME/.spring' > $pkgdir/etc/spring/datadir
-}
-
-# vim sw=2:ts=2 et:
diff --git a/community-staging/spring/awk-java.patch b/community-staging/spring/awk-java.patch
deleted file mode 100644
index 36c932924..000000000
--- a/community-staging/spring/awk-java.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ru spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappCommands.awk spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappCommands.awk
---- spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappCommands.awk 2011-07-26 17:29:16.623158278 +0200
-+++ spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappCommands.awk 2011-07-26 17:33:00.872921328 +0200
-@@ -341,7 +341,7 @@
- }
-
- # beginn of struct S*Command
--/^\struct S.*Command( \{)?/ {
-+/^struct S.*Command( \{)?/ {
-
- isInsideCmdStruct = 1;
- ind_cmdMember = 0;
-diff -ru spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappEvents.awk spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappEvents.awk
---- spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappEvents.awk 2011-07-26 17:29:16.623158278 +0200
-+++ spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappEvents.awk 2011-07-26 17:32:51.009745026 +0200
-@@ -473,7 +473,7 @@
- }
-
- # beginn of struct S*Event
--/^\struct S.*Event( \{)?/ {
-+/^struct S.*Event( \{)?/ {
-
- isInsideEvtStruct = 1;
- ind_evtMember = 0;
-diff -ru spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappCommands.awk spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappCommands.awk
---- spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappCommands.awk 2011-07-26 17:29:16.626491558 +0200
-+++ spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappCommands.awk 2011-07-26 17:30:25.695391913 +0200
-@@ -387,7 +387,7 @@
- }
-
- # beginn of struct S*Command
--/^\struct S.*Command( \{)?/ {
-+/^struct S.*Command( \{)?/ {
-
- isInsideCmdStruct = 1;
- ind_cmdMember = 0;
-diff -ru spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappEvents.awk spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappEvents.awk
---- spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappEvents.awk 2011-07-26 17:29:16.626491558 +0200
-+++ spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappEvents.awk 2011-07-26 17:30:13.942245701 +0200
-@@ -366,7 +366,7 @@
- }
-
- # beginn of struct S*Event
--/^\struct S.*Event( \{)?/ {
-+/^struct S.*Event( \{)?/ {
-
- isInsideEvtStruct = 1;
- ind_evtMember = 0;
diff --git a/community-staging/spring/gcc46.patch b/community-staging/spring/gcc46.patch
deleted file mode 100644
index 4f6865cac..000000000
--- a/community-staging/spring/gcc46.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: Jan Dittberner <jandd@debian.org>
-Subject: Patch for FTBFS with g++ 4.6.0
-Bug-Debian: http://bugs.debian.org/625097
-Bug: http://springrts.com/mantis/view.php?id=2415
---- a/AI/Skirmish/E323AI/AAStar.h
-+++ b/AI/Skirmish/E323AI/AAStar.h
-@@ -4,6 +4,7 @@
- #include <queue>
- #include <vector>
- #include <list>
-+#include <cstddef> // for NULL
-
- class AAStar {
- public:
---- a/rts/Rendering/ShadowHandler.cpp
-+++ b/rts/Rendering/ShadowHandler.cpp
-@@ -318,6 +318,11 @@
- xmid = 1.0f - (sqrt(fabs(x2)) / (sqrt(fabs(x2)) + sqrt(fabs(x1))));
- ymid = 1.0f - (sqrt(fabs(y2)) / (sqrt(fabs(y2)) + sqrt(fabs(y1))));
-
-+ shadowParams.x = xmid;
-+ shadowParams.y = ymid;
-+ shadowParams.z = p17;
-+ shadowParams.w = p18;
-+
- shadowMatrix[ 0] = cross1.x / maxLengthX;
- shadowMatrix[ 4] = cross1.y / maxLengthX;
- shadowMatrix[ 8] = cross1.z / maxLengthX;
---- a/rts/Rendering/ShadowHandler.h
-+++ b/rts/Rendering/ShadowHandler.h
-@@ -38,7 +38,7 @@
- CMatrix44f shadowMatrix;
- void CalcMinMaxView(void);
-
-- const float4 GetShadowParams() const { return float4(xmid, ymid, p17, p18); }
-+ const float4& GetShadowParams() const { return shadowParams; }
-
- enum ShadowGenProgram {
- SHADOWGEN_PROGRAM_MODEL = 0,
-@@ -76,6 +76,7 @@
- //! to write the (FBO) depth-buffer texture
- std::vector<Shader::IProgramObject*> shadowGenProgs;
-
-+ float4 shadowParams;
- float x1, x2, y1, y2;
- float xmid, ymid;
- float p17, p18;
---- a/rts/Rendering/GLContext.cpp
-+++ b/rts/Rendering/GLContext.cpp
-@@ -9,6 +9,7 @@
- #include "GLContext.h"
-
- #include <list>
-+#include <cstddef> // for NULL
-
-
- using namespace std;
---- a/rts/System/MemPool.h
-+++ b/rts/System/MemPool.h
-@@ -4,6 +4,7 @@
- #define _MEM_POOL_H_
-
- #include <new>
-+#include <cstddef> // for NULL
-
- const size_t MAX_MEM_SIZE=200;
-
diff --git a/community-staging/supertux/PKGBUILD b/community-staging/supertux/PKGBUILD
deleted file mode 100644
index 60606f57c..000000000
--- a/community-staging/supertux/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Eric Belanger <belanger@astro.umontreal.ca>
-# Contributor: vande198
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=supertux
-pkgver=0.3.3
-pkgrel=4
-pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games"
-arch=('i686' 'x86_64')
-url="http://super-tux.sourceforge.net/"
-license=('GPL')
-depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'libgl' 'glew')
-makedepends=('cmake' 'boost')
-source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('f3f803e629ee51a9de0b366a036e393d')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp
- sed -i '/types\.h/d' src/addon/addon_manager.cpp
- cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin .
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/supertux/compile.patch b/community-staging/supertux/compile.patch
deleted file mode 100644
index 05376fe91..000000000
--- a/community-staging/supertux/compile.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -ruN supertux-0.3.1.orig/src/console.hpp supertux-0.3.1/src/console.hpp
---- supertux-0.3.1.orig/src/console.hpp 2008-01-03 21:59:27.000000000 +0100
-+++ supertux-0.3.1/src/console.hpp 2008-08-23 11:57:47.000000000 +0200
-@@ -27,6 +27,8 @@
- #include <sstream>
- #include <iostream>
- #include <squirrel.h>
-+#include <memory>
-+#include <cstdlib>
-
- class Console;
- class ConsoleStreamBuffer;
-diff -ruN supertux-0.3.1.orig/src/lisp/lexer.cpp supertux-0.3.1/src/lisp/lexer.cpp
---- supertux-0.3.1.orig/src/lisp/lexer.cpp 2008-01-03 21:59:26.000000000 +0100
-+++ supertux-0.3.1/src/lisp/lexer.cpp 2008-08-23 13:45:58.000000000 +0200
-@@ -21,6 +21,7 @@
- #include <sstream>
- #include <stdexcept>
- #include <iostream>
-+#include <cstring>
-
- #include "lexer.hpp"
-
-diff -ruN supertux-0.3.1.orig/src/sprite/sprite_manager.hpp supertux-0.3.1/src/sprite/sprite_manager.hpp
---- supertux-0.3.1.orig/src/sprite/sprite_manager.hpp 2008-01-03 21:59:26.000000000 +0100
-+++ supertux-0.3.1/src/sprite/sprite_manager.hpp 2008-08-23 13:29:34.000000000 +0200
-@@ -21,6 +21,7 @@
- #define SUPERTUX_SPRITE_MANAGER_H
-
- #include <map>
-+#include <string>
-
- class SpriteData;
- class Sprite;
-diff -ruN supertux-0.3.1.orig/src/textscroller.hpp supertux-0.3.1/src/textscroller.hpp
---- supertux-0.3.1.orig/src/textscroller.hpp 2008-01-03 21:59:27.000000000 +0100
-+++ supertux-0.3.1/src/textscroller.hpp 2008-08-23 13:34:35.000000000 +0200
-@@ -24,6 +24,7 @@
- #include <vector>
- #include <string>
- #include <map>
-+#include <memory>
-
- #include "screen.hpp"
- #include "math/vector.hpp"
-diff -ruN supertux-0.3.1.orig/src/title.cpp supertux-0.3.1/src/title.cpp
---- supertux-0.3.1.orig/src/title.cpp 2008-01-03 21:59:28.000000000 +0100
-+++ supertux-0.3.1/src/title.cpp 2008-08-23 12:05:19.000000000 +0200
-@@ -32,6 +32,7 @@
- #include <SDL.h>
- #include <SDL_image.h>
- #include <physfs.h>
-+#include <algorithm>
-
- #include "title.hpp"
- #include "mainloop.hpp"
-diff -ruN supertux-0.3.1.orig/src/video/sdl_texture.hpp supertux-0.3.1/src/video/sdl_texture.hpp
---- supertux-0.3.1.orig/src/video/sdl_texture.hpp 2008-01-03 21:59:22.000000000 +0100
-+++ supertux-0.3.1/src/video/sdl_texture.hpp 2008-08-23 13:37:14.000000000 +0200
-@@ -23,6 +23,7 @@
- #include <config.h>
-
- #include <SDL.h>
-+#include <algorithm>
-
- #include "texture.hpp"
- #include "color.hpp"
diff --git a/community-staging/supertux/gcc44.patch b/community-staging/supertux/gcc44.patch
deleted file mode 100644
index b58d9c29d..000000000
--- a/community-staging/supertux/gcc44.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -ruN supertux-0.3.1.orig/src/console.hpp supertux-0.3.1/src/console.hpp
---- supertux-0.3.1.orig/src/console.hpp 2008-01-03 20:59:27.000000000 +0000
-+++ supertux-0.3.1/src/console.hpp 2009-05-17 19:43:26.914307646 +0000
-@@ -27,6 +27,8 @@
- #include <sstream>
- #include <iostream>
- #include <squirrel.h>
-+#include <memory>
-+#include <cstdlib>
-
- class Console;
- class ConsoleStreamBuffer;
-diff -ruN supertux-0.3.1.orig/src/lisp/lexer.cpp supertux-0.3.1/src/lisp/lexer.cpp
---- supertux-0.3.1.orig/src/lisp/lexer.cpp 2008-01-03 20:59:26.000000000 +0000
-+++ supertux-0.3.1/src/lisp/lexer.cpp 2009-05-17 19:43:27.037705317 +0000
-@@ -21,6 +21,7 @@
- #include <sstream>
- #include <stdexcept>
- #include <iostream>
-+#include <cstring>
-
- #include "lexer.hpp"
-
-diff -ruN supertux-0.3.1.orig/src/lisp/lisp.cpp supertux-0.3.1/src/lisp/lisp.cpp
---- supertux-0.3.1.orig/src/lisp/lisp.cpp 2008-01-03 20:59:26.000000000 +0000
-+++ supertux-0.3.1/src/lisp/lisp.cpp 2009-05-17 19:44:29.305165638 +0000
-@@ -18,7 +18,7 @@
- // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- #include <config.h>
--
-+#include <cstdio>
- #include "lisp.hpp"
-
- namespace lisp
-diff -ruN supertux-0.3.1.orig/src/random_generator.cpp supertux-0.3.1/src/random_generator.cpp
---- supertux-0.3.1.orig/src/random_generator.cpp 2008-01-03 20:59:27.000000000 +0000
-+++ supertux-0.3.1/src/random_generator.cpp 2009-05-17 19:44:05.851002254 +0000
-@@ -39,6 +39,7 @@
- #include <stdexcept>
- #include <time.h>
- #include <cassert>
-+#include <cstdio>
- #include "random_generator.hpp"
-
- RandomGenerator systemRandom; // global random number generator
-diff -ruN supertux-0.3.1.orig/src/sprite/sprite_manager.hpp supertux-0.3.1/src/sprite/sprite_manager.hpp
---- supertux-0.3.1.orig/src/sprite/sprite_manager.hpp 2008-01-03 20:59:26.000000000 +0000
-+++ supertux-0.3.1/src/sprite/sprite_manager.hpp 2009-05-17 19:43:27.037705317 +0000
-@@ -21,6 +21,7 @@
- #define SUPERTUX_SPRITE_MANAGER_H
-
- #include <map>
-+#include <string>
-
- class SpriteData;
- class Sprite;
-diff -ruN supertux-0.3.1.orig/src/textscroller.hpp supertux-0.3.1/src/textscroller.hpp
---- supertux-0.3.1.orig/src/textscroller.hpp 2008-01-03 20:59:27.000000000 +0000
-+++ supertux-0.3.1/src/textscroller.hpp 2009-05-17 19:43:27.037705317 +0000
-@@ -24,6 +24,7 @@
- #include <vector>
- #include <string>
- #include <map>
-+#include <memory>
-
- #include "screen.hpp"
- #include "math/vector.hpp"
-diff -ruN supertux-0.3.1.orig/src/title.cpp supertux-0.3.1/src/title.cpp
---- supertux-0.3.1.orig/src/title.cpp 2008-01-03 20:59:28.000000000 +0000
-+++ supertux-0.3.1/src/title.cpp 2009-05-17 19:43:27.041000359 +0000
-@@ -32,6 +32,7 @@
- #include <SDL.h>
- #include <SDL_image.h>
- #include <physfs.h>
-+#include <algorithm>
-
- #include "title.hpp"
- #include "mainloop.hpp"
-diff -ruN supertux-0.3.1.orig/src/video/sdl_texture.hpp supertux-0.3.1/src/video/sdl_texture.hpp
---- supertux-0.3.1.orig/src/video/sdl_texture.hpp 2008-01-03 20:59:22.000000000 +0000
-+++ supertux-0.3.1/src/video/sdl_texture.hpp 2009-05-17 19:43:27.041000359 +0000
-@@ -23,6 +23,7 @@
- #include <config.h>
-
- #include <SDL.h>
-+#include <algorithm>
-
- #include "texture.hpp"
- #include "color.hpp"
diff --git a/community-staging/vdrift/PKGBUILD b/community-staging/vdrift/PKGBUILD
deleted file mode 100644
index 6680cde46..000000000
--- a/community-staging/vdrift/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 55651 2011-09-17 02:02:33Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
-# Contributor: Lone_Wolf lonewolf@xs4all.nl
-
-pkgname=vdrift
-pkgver=2011.09.01
-pkgrel=2
-pkgdesc="An open source driving simulation made with drift racing in mind"
-arch=('i686' 'x86_64')
-url="http://vdrift.net/"
-license=('GPL')
-depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data')
-makedepends=('scons' 'boost' 'asio')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-src-${pkgver//./-}.tar.bz2
- $pkgname.desktop)
-md5sums=('a4099acacca3d4f0799b012cd168f1c0'
- '8bb429f37bcb4aed5e7ab1d80c5a4f93')
-
-build() {
- cd "$srcdir"/$pkgname-src-${pkgver//./-}
-
- # select arch
- if [ `uname -m` = "x86_64" ]; then
- _sconsarch="a64"
- else
- _sconsarch="686"
- fi
-
- sed -i 's/glGenerateMipmap/glGenerateMipmapEXT/g' src/texture.cpp
- sed -i '/types.h/d' src/http.h
-
- # build and install
- scons \
- "destdir"="$pkgdir" \
- "arch"=$_sconsarch \
- "release"=1 \
- "force_feedback"=1 \
- "prefix"=/usr \
- "datadir"=share/$pkgname/
-}
-
-package() {
- cd "$srcdir"/$pkgname-src-${pkgver//./-}
-
- scons install
-
- # install .desktop file
- install -Dm644 ../$pkgname.desktop \
- "$pkgdir"/usr/share/applications/$pkgname.desktop
-}
-# vim: sw=2:ts=2 et:
diff --git a/community-staging/vdrift/vdrift.desktop b/community-staging/vdrift/vdrift.desktop
deleted file mode 100644
index 7078f0d9c..000000000
--- a/community-staging/vdrift/vdrift.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=VDrift
-Version=2009-06-15
-GenericName=Racing Simulation
-Comment=An open source driving simulation made with drift racing in mind
-Exec=vdrift
-Icon=vdrift.png
-Terminal=false
-Categories=Game;Simulation;
diff --git a/community-staging/widelands/PKGBUILD b/community-staging/widelands/PKGBUILD
deleted file mode 100644
index b78b88be3..000000000
--- a/community-staging/widelands/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 55647 2011-09-17 01:09:02Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Christoph Zeiler <rabyte*gmail>
-
-pkgname=widelands
-pkgver=16
-_realver=build16
-pkgrel=3
-pkgdesc="A realtime strategy game with emphasis on economy and transport"
-arch=('i686' 'x86_64')
-url="http://widelands.org/"
-license=('GPL')
-depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2')
-makedepends=('cmake' 'boost')
-source=(http://launchpad.net/$pkgname/build16/$_realver/+download/$pkgname-$_realver-src.tar.bz2
- $pkgname.desktop
- $pkgname.png
- $pkgname.sh)
-md5sums=('3d8c28e145b73c64d8ed1625319d25a2'
- '15820bf099fd6f16251fe70a75c534bb'
- '3dfda7e9ca76ca00dd98d745d0ceb328'
- '7cae50aba5ed0cd2cfeea79124637b46')
-
-build() {
- cd $srcdir/$pkgname-$_realver-src
-
- mkdir -p build/compile && cd build/compile
-
- cmake ../.. -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWL_INSTALL_PREFIX=/usr \
- -DWL_INSTALL_DATADIR=share/$pkgname \
- -DWL_INSTALL_BINDIR=bin
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$_realver-src/build/compile
-
- make DESTDIR="$pkgdir" install
-
- # Install bin, icon and desktop file
- #install -Dm 755 src/$pkgname $pkgdir/usr/share/$pkgname/$pkgname
- #install -Dm 755 $srcdir/$pkgname.sh $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/widelands/widelands-build15-gcc-4.5-patch b/community-staging/widelands/widelands-build15-gcc-4.5-patch
deleted file mode 100644
index 6ba313358..000000000
--- a/community-staging/widelands/widelands-build15-gcc-4.5-patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc
---- widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-04-16 15:41:22.000000000 +0000
-+++ widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-07-01 21:15:56.000000000 +0000
-@@ -113,7 +113,7 @@
- posx, posy, width, height,
- g_gr->get_picture(PicMod_UI, "pics/but1.png"),
- &Main_Menu_New_Map::button_clicked, *this, 4,
-- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
-+ Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
-
- posy += height + spacing + spacing + spacing;
-
-@@ -142,7 +142,7 @@
- if (m_currentworld == m_worlds.size())
- m_currentworld = 0;
- m_world->set_title
-- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name
-+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name
- ());
- break;
- }
-diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc
---- widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-04-16 15:41:22.000000000 +0000
-+++ widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-07-01 21:17:39.000000000 +0000
-@@ -272,7 +272,7 @@
- posx, posy, width, height,
- g_gr->get_picture(PicMod_UI, "pics/but1.png"),
- &Main_Menu_New_Random_Map::button_clicked, *this, 8,
-- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
-+ Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
-
- posy += height + spacing + spacing + spacing;
-
-@@ -343,7 +343,7 @@
- if (m_currentworld == m_worlds.size())
- m_currentworld = 0;
- m_world->set_title
-- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
-+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
- break;
- case 9:
- break;
-@@ -476,7 +476,7 @@
- (strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str()))
- ++m_currentworld;
- m_world->set_title
-- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
-+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
-
- button_clicked(-1); // Update other values in UI as well
-
diff --git a/community-staging/widelands/widelands.desktop b/community-staging/widelands/widelands.desktop
deleted file mode 100644
index 9715d816c..000000000
--- a/community-staging/widelands/widelands.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Widelands
-GenericName=Widelands
-Comment=Realtime strategy game
-Icon=widelands
-Exec=widelands
-Type=Application
-Categories=Game;StrategyGame;
diff --git a/community-staging/widelands/widelands.png b/community-staging/widelands/widelands.png
deleted file mode 100644
index c329cf667..000000000
--- a/community-staging/widelands/widelands.png
+++ /dev/null
Binary files differ
diff --git a/community-staging/widelands/widelands.sh b/community-staging/widelands/widelands.sh
deleted file mode 100644
index 0b21a1694..000000000
--- a/community-staging/widelands/widelands.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/widelands
-./widelands $*
diff --git a/community-testing/calibre/PKGBUILD b/community-testing/calibre/PKGBUILD
deleted file mode 100644
index 11d9b8ab4..000000000
--- a/community-testing/calibre/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 55412 2011-09-12 05:34:02Z ebelanger $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Petrov Roman <nwhisper@gmail.com>
-# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
-
-pkgname=calibre
-pkgver=0.8.18
-pkgrel=2
-pkgdesc="Ebook management application"
-arch=('i686' 'x86_64')
-url="http://calibre-ebook.com/"
-license=('GPL3')
-depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
- 'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup'
- 'imagemagick' 'poppler-qt' 'chmlib' 'python-lxml' 'libusb'
- 'python-imaging' 'desktop-file-utils' 'shared-mime-info'
- 'python-dnspython' 'unrar' 'python2-pyqt' 'icu')
-makedepends=('python2-pycountry')
-optdepends=('ipython: to use calibre-debug')
-install=calibre.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
- desktop_integration.patch)
-md5sums=('6347327567c92ce7ebf82b308e1f6610'
- '253ce4fe5d01f8ff76b63cd3825755ea')
-
-build() {
- cd "${srcdir}/${pkgname}"
-
- #rm -rf src/{cherrypy,pyPdf}
- rm -rf src/cherrypy
- sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py
- sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \
- $(find . -regex ".*.py\|.*.recipe")
-
- python2 setup.py build
- python2 setup.py resources
- python2 setup.py translations
-}
-
-package() {
- cd "${srcdir}/${pkgname}"
-
- patch -Np1 -i "${srcdir}/desktop_integration.patch"
-
- # More on desktop integration (e.g. enforce arch defaults)
- sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \
- -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \
- -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \
- -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \
- -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py
-
- # Fix the environment module location
- sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py
-
- install -d "${pkgdir}/usr/lib/python2.7/site-packages"
- python2 setup.py install --root="${pkgdir}" --prefix=/usr \
- --staging-bindir="${pkgdir}/usr/bin" \
- --staging-libdir="${pkgdir}/usr/lib" \
- --staging-sharedir="${pkgdir}/usr/share"
-
- find "${pkgdir}" -type d -empty -delete
-
- # Decompress the man pages so makepkg will do it for us.
- for decom in "${pkgdir}"/usr/share/man/man1/*.bz2; do
- bzip2 -d "${decom}"
- done
-}
diff --git a/community-testing/calibre/calibre.install b/community-testing/calibre/calibre.install
deleted file mode 100644
index 6210bd0ab..000000000
--- a/community-testing/calibre/calibre.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/community-testing/calibre/desktop_integration.patch b/community-testing/calibre/desktop_integration.patch
deleted file mode 100644
index 4dbf53757..000000000
--- a/community-testing/calibre/desktop_integration.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/src/calibre/linux.py 2011-06-17 19:56:05.000000000 +0200
-+++ b/src/calibre/linux.py 2011-06-18 00:07:46.000000000 +0200
-@@ -339,51 +339,39 @@
-
- with TemporaryDirectory() as tdir:
- with CurrentDir(tdir):
-- render_img('mimetypes/lrf.png', 'calibre-lrf.png')
-- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
-- self.icon_resources.append(('mimetypes', 'application-lrf', '128'))
-- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
-- self.icon_resources.append(('mimetypes', 'application-lrs',
-- '128'))
-- render_img('lt.png', 'calibre-gui.png')
-- check_call('xdg-icon-resource install --noupdate --size 128 calibre-gui.png calibre-gui', shell=True)
-- self.icon_resources.append(('apps', 'calibre-gui', '128'))
-- render_img('viewer.png', 'calibre-viewer.png')
-- check_call('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
-- self.icon_resources.append(('apps', 'calibre-viewer', '128'))
-+ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
-+ os.mkdir(dir)
-+ render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png'))
-+ render_img('lt.png', os.path.join(dir, 'calibre-gui.png'))
-+ render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png'))
-
- mimetypes = set([])
- for x in all_input_formats():
- mt = guess_type('dummy.'+x)[0]
-- if mt and 'chemical' not in mt and 'ctc-posml' not in mt:
-+ if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt:
- mimetypes.add(mt)
-
- def write_mimetypes(f):
- f.write('MimeType=%s;\n'%';'.join(mimetypes))
-
-- f = open('calibre-lrfviewer.desktop', 'wb')
-+ dir = os.path.join(self.opts.staging_sharedir,'../applications')
-+ os.mkdir(dir)
-+ f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb')
- f.write(VIEWER)
- f.close()
-- f = open('calibre-ebook-viewer.desktop', 'wb')
-+ f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb')
- f.write(EVIEWER)
- write_mimetypes(f)
- f.close()
-- f = open('calibre-gui.desktop', 'wb')
-+ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
- f.write(GUI)
- write_mimetypes(f)
- f.close()
-- des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
-- 'calibre-ebook-viewer.desktop')
-- for x in des:
-- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
-- check_call(' '.join(cmd), shell=True)
-- self.menu_resources.append(x)
-- check_call(['xdg-desktop-menu', 'forceupdate'])
-- f = open('calibre-mimetypes', 'wb')
-+ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/')
-+ os.makedirs(dir)
-+ f = open(os.path.join(dir, 'calibre.xml'), 'wb')
- f.write(MIME)
- f.close()
-- self.mime_resources.append('calibre-mimetypes')
-- check_call('xdg-mime install ./calibre-mimetypes', shell=True)
- except Exception:
- if self.opts.fatal_errors:
- raise
diff --git a/community-testing/cuneiform/PKGBUILD b/community-testing/cuneiform/PKGBUILD
deleted file mode 100644
index 510f73bce..000000000
--- a/community-testing/cuneiform/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 55414 2011-09-12 05:34:06Z ebelanger $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Maxim Vuets <maxim.vuets@gmail.com>
-
-pkgname=cuneiform
-pkgver=1.1.0
-_dpkgver=1.1
-pkgrel=2
-pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages."
-arch=('i686' 'x86_64')
-url="https://launchpad.net/cuneiform-linux"
-license=('BSD')
-depends=('imagemagick')
-makedepends=('cmake')
-source=(http://launchpad.net/cuneiform-linux/${_dpkgver}/${_dpkgver}/+download/cuneiform-linux-${pkgver}.tar.bz2)
-md5sums=('09fd160cdfc512f26442a7e91246598d')
-
-_SRC_ROOT="${srcdir}/${pkgname}-linux-${pkgver}"
-
-build() {
- cd "${_SRC_ROOT}"
- sed -i 's#lib64#lib#' install_files.cmake
- mkdir builddir
- cd builddir
-
- cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr ..
- make
-}
-
-package() {
- cd "${_SRC_ROOT}"/builddir
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 "${_SRC_ROOT}/cuneiform_src/Kern/license.txt" \
- "${pkgdir}/usr/share/licenses/cuneiform/license.txt"
-}
diff --git a/community-testing/mongodb/PKGBUILD b/community-testing/mongodb/PKGBUILD
deleted file mode 100644
index 22c2e27d1..000000000
--- a/community-testing/mongodb/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Mathias Stearn <mathias@10gen.com>
-# Contributor: Alec Thomas
-
-pkgname=mongodb
-pkgver=2.0.0
-pkgrel=1
-pkgdesc='A high-performance, open source, schema-free document-oriented database.'
-arch=('i686' 'x86_64')
-url='http://www.mongodb.org'
-license=('AGPL3')
-depends=('boost-libs')
-makedepends=('scons' 'boost')
-optdepends=('libpcap: needed for mongosniff')
-backup=('etc/mongodb.conf')
-install="mongodb.install"
-source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
- 'mongodb.rc'
- 'mongodb.conf')
-md5sums=('52763985c13e06d85bc125c7d3eb03d9'
- '9c67e00f4626ad761a8f7d4e037a54d7'
- '4839fe1d638187ca3226e8267b947318')
-
-build() {
- export SCONSFLAGS="$MAKEFLAGS"
-
- cd mongodb-src-r${pkgver}
-
- scons \
- all \
- --full
-}
-
-package() {
- cd mongodb-src-r${pkgver}
-
- scons \
- install \
- --full \
- --prefix=${pkgdir}/usr
-
- install -D -m755 ${srcdir}/mongodb.rc \
- ${pkgdir}/etc/rc.d/mongodb
- install -D -m644 ${srcdir}/mongodb.conf \
- ${pkgdir}/etc/mongodb.conf
- install -d -m700 ${pkgdir}/var/lib/mongodb
- install -d -m755 ${pkgdir}/var/log/mongodb
-
- if [ -d ${pkgdir}/usr/lib64 ]; then
- mv ${pkgdir}/usr/lib64 ${pkgdir}/usr/lib
- fi
-}
diff --git a/community-testing/mongodb/mongodb.conf b/community-testing/mongodb/mongodb.conf
deleted file mode 100644
index c5272b7f2..000000000
--- a/community-testing/mongodb/mongodb.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# See http://www.mongodb.org/display/DOCS/File+Based+Configuration for format details
-# Run mongod --help to see a list of options
-
-bind_ip = 127.0.0.1
-quiet = true
-dbpath = /var/lib/mongodb
-logpath = /var/log/mongodb/mongod.log
-logappend = true
diff --git a/community-testing/mongodb/mongodb.install b/community-testing/mongodb/mongodb.install
deleted file mode 100755
index 3922c12ef..000000000
--- a/community-testing/mongodb/mongodb.install
+++ /dev/null
@@ -1,32 +0,0 @@
-# vim: syntax=sh
-
-post_install() {
- useradd -r -g daemon -d /var/lib/mongodb -s /bin/bash mongodb
- chown -R mongodb:daemon /var/lib/mongodb
- chown -R mongodb:daemon /var/log/mongodb
-
- if [ "$(arch)" != "x86_64" ]
- then
- echo '==> Warning: the 32 bit version of MongoDB is limited to about 2GB of data.'
- echo '==> See http://blog.mongodb.org/post/137788967/32-bit-limitations'
- fi
-}
-
-post_upgrade() {
- chown -R mongodb:daemon /var/lib/mongodb
- chown -R mongodb:daemon /var/log/mongodb
-
- if [ "$(vercmp $2 1.8.2-3)" -lt 0 ]
- then
- # have to fix my fudge up in 1.8.2-2 and 1.8.2-3
- # added july 5th, 2011
- usermod -s /bin/bash mongodb >& /dev/null
- echo 'The dbpath has changed from /var/state/mongodb to /var/lib/mongodb'
- echo 'Make sure you move your data files to the new dbpath before you start/restart mongodb'
- echo 'The logpath has changed from /var/log/mongod to /var/log/mongodb/mongod.log'
- fi
-}
-
-pre_remove() {
- userdel mongodb
-}
diff --git a/community-testing/mongodb/mongodb.rc b/community-testing/mongodb/mongodb.rc
deleted file mode 100755
index 30f2bbf79..000000000
--- a/community-testing/mongodb/mongodb.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-# vim: syntax=sh
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof /usr/bin/mongod)
-case "$1" in
- start)
- stat_busy "Starting mongodb"
- [ -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --fork" > /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon mongodb
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping mongodb"
- [ ! -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --shutdown" &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon mongodb
- while [ ! -z "$(pidof /usr/bin/mongod)" ]; do
- sleep 1;
- done
- stat_done
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/chrpath/ChangeLog b/community/chrpath/ChangeLog
deleted file mode 100644
index dabc6f97b..000000000
--- a/community/chrpath/ChangeLog
+++ /dev/null
@@ -1,10 +0,0 @@
-2009-05-21 Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-
- * 0.13-2 :
- Replaced in my '# Contributor:' line by '# Maintainer:'
-
-
-2009-03-19 Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-
- * 0.13-1 :
- Initial release.
diff --git a/community/dillo/libpng14.patch b/community/dillo/libpng14.patch
deleted file mode 100644
index 10c45351e..000000000
--- a/community/dillo/libpng14.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr dillo-2.1.1.orig/src/png.c dillo-2.1.1/src/png.c
---- dillo-2.1.1.orig/src/png.c 2010-01-23 04:09:50.000000000 +0200
-+++ dillo-2.1.1/src/png.c 2010-01-23 04:12:34.000000000 +0200
-@@ -345,7 +345,7 @@ static void Png_write(DilloPng *png, voi
- return; /* need MORE data */
- }
- /* check the image signature - DON'T update ipbufstart! */
-- if (!png_check_sig(png->ipbuf, DATASIZE)) {
-+ if (png_sig_cmp(png->ipbuf, 0, DATASIZE)) {
- /* you lied to me about it being a PNG image */
- MSG_WARN("\"%s\" is not a PNG file.\n", URL_STR(png->url));
- png->state = IS_finished;
diff --git a/community/fdm/LICENSE b/community/fdm/LICENSE
deleted file mode 100644
index e6e2170a2..000000000
--- a/community/fdm/LICENSE
+++ /dev/null
@@ -1,14 +0,0 @@
-Copyright (c) 2006 Nicholas Marriott <nicm@users.sourceforge.net>
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
diff --git a/community/flumotion/python27.patch b/community/flumotion/python27.patch
deleted file mode 100644
index 70b00bbeb..000000000
--- a/community/flumotion/python27.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: flumotion/twisted/reflect.py
-===================================================================
---- flumotion/twisted/reflect.py (revision 8894)
-+++ flumotion/twisted/reflect.py (working copy)
-@@ -57,7 +57,10 @@
- # if the ImportError happened in the module being imported,
- # this is a failure that should be handed to our caller.
- shortname = trialname.split('.')[-1]
-- r = str(sys.exc_info()[1])
-+ # if we're on python2.7 the module is wrapped in single quotation
-+ # marks thus broking this method that relies on the message ending
-+ # with the name that failed.
-+ r = str(sys.exc_info()[1]).strip("'")
- if not (r.startswith('No module named') and
- r.endswith(shortname)):
- raise
-@@ -71,3 +74,10 @@
- obj = getattr(obj, n)
-
- return obj
-+
-+# Use the method that comes with twisted if we're running on 8.0 or higher.
-+# FIXME: Remove this module when we can depend on Twisted 8.0
-+from twisted.copyright import version
-+twistedVersion = tuple([int(n) for n in version.split('.')[0:3]])
-+if twistedVersion >= (8, 0, 0):
-+ from twisted.python.reflect import namedAny
diff --git a/community/gnucap/ChangeLog b/community/gnucap/ChangeLog
deleted file mode 100644
index b6fa99fce..000000000
--- a/community/gnucap/ChangeLog
+++ /dev/null
@@ -1,53 +0,0 @@
-2009-09-23 Evangelos Foutras <foutrelis@gmail.com>
-
- * 20090922-1:
- New upstream release.
-
-2009-09-09 Evangelos Foutras <foutrelis@gmail.com>
-
- * 20090909-1:
- New upstream release.
-
-2009-08-22 Jared Casper <jaredcasper@gmail.com>
-
- * 20090822-1:
- - Version bump
-
-2009-08-20 Jared Casper <jaredcasper@gmail.com>
-
- * 20090819-1:
- - Version bump
- - Removed now unnecessary gcc-4.4 patch
-
-2009-08-13 Jared Casper <jaredcasper@gmail.com>
-
- * 20090813-1:
- - Version bump
-
-2009-06-12 Jared Casper <jaredcasper@gmail.com>
-
- * 20090611-1:
- - Version bump
- - Small patch to compile with gcc-4.4
-
-2009-05-19 Jared Casper <jaredcasper@gmail.com>
-
- - Removed termcap-compat from deps
-
-2009-02-05 Jared Casper <jaredcasper@gmail.com>
-
- * 20090202-1:
- - Version bump
-
-2008-12-12 Jared Casper <jaredcasper@gmail.com>
-
- * 20081212-1:
- - Version bump
-
-2008-12-04 Jared Casper <jaredcasper@gmail.com>
-
- * 20081203-1:
- - Adopted from orivej_GeorgeK
- - Version bump
- - added ChangeLog
- - Cleaned up PKGBUILD a bit
diff --git a/community/listen/listen-fix-dbus.diff b/community/listen/listen-fix-dbus.diff
deleted file mode 100644
index 5953352f1..000000000
--- a/community/listen/listen-fix-dbus.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: src/dbus_manager.py
-===================================================================
---- src/dbus_manager.py (revision 670)
-+++ src/dbus_manager.py (working copy)
-@@ -30,9 +30,18 @@
- import dbus
- import dbus.service
- #Try connection du message bus
-- dbus.SessionBus()
-- if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
-+ dbus_version = getattr(dbus, 'version',(0,0,0))
-+ if dbus_version >= (0,41,0) and dbus_version < (0,80,0):
-+ dbus.SessionBus()
- import dbus.glib
-+ elif dbus_version >= (0,80,0):
-+ from dbus.mainloop.glib import DBusGMainLoop
-+ DBusGMainLoop(set_as_default=True)
-+ dbus.SessionBus()
-+ else:
-+ pass
-+
-+
- except: dbus_imported = False
- else: dbus_imported=True
-
-@@ -41,14 +50,14 @@
-
- if not dbus_imported:
- class ListenDBus:
-- def __init__(self,win,player,object_path="/org/gnome/listen/"):
-+ def __init__(self,win,player,object_path="/org/gnome/listen"):
- self.player = player
- self.win = win
- print "No dbus support"
- else:
-
- class ListenDBus(dbus.service.Object):
-- def __init__(self,win,player,object_path="/org/gnome/listen/"):
-+ def __init__(self,win,player,object_path="/org/gnome/listen"):
- self.player = player
- self.win = win
- self.bus = dbus.SessionBus()
-@@ -105,4 +114,4 @@
- song = self.player.song
- return str( song.get_str("title")+ " - ("+song.get_str("album")+" - "+song.get_str("artist")+")")
- else:
-- return ""
-\ No newline at end of file
-+ return ""
diff --git a/community/listen/listen-fix-encoding.diff b/community/listen/listen-fix-encoding.diff
deleted file mode 100644
index 9c29e155c..000000000
--- a/community/listen/listen-fix-encoding.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur listen-0.5-orig/src/const.py listen-0.5/src/const.py
---- listen-0.5-orig/src/const.py 2007-03-19 20:52:43.000000000 -0400
-+++ listen-0.5/src/const.py 2007-03-19 20:53:41.000000000 -0400
-@@ -1,3 +1,4 @@
-+# coding=utf-8
- # vim: ts=4
- ###
- #
-diff -Naur listen-0.5-orig/src/song.py listen-0.5/src/song.py
---- listen-0.5-orig/src/song.py 2007-03-19 20:52:43.000000000 -0400
-+++ listen-0.5/src/song.py 2007-03-19 20:53:58.000000000 -0400
-@@ -1,3 +1,4 @@
-+# coding=utf-8
- # vim: ts=4
- ###
- #
diff --git a/community/mms_client/ChangeLog b/community/mms_client/ChangeLog
deleted file mode 100644
index 7fd5bbf99..000000000
--- a/community/mms_client/ChangeLog
+++ /dev/null
@@ -1,2 +0,0 @@
-2007-06-26 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
diff --git a/community/mongodb/add-js185-support-to-SConstruct.diff b/community/mongodb/add-js185-support-to-SConstruct.diff
deleted file mode 100644
index c621d00cb..000000000
--- a/community/mongodb/add-js185-support-to-SConstruct.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- SConstruct.original 2011-07-05 14:23:46.334748007 +0000
-+++ SConstruct 2011-07-05 14:26:15.729533840 +0000
-@@ -208,6 +208,9 @@
- justClientLib = (COMMAND_LINE_TARGETS == ['mongoclient'])
-
- env = Environment( MSVS_ARCH=msarch , tools = ["default", "gch"], toolpath = '.' )
-+
-+env.ParseConfig('pkg-config --cflags --libs mozjs185')
-+
- if has_option( "cxx" ):
- env["CC"] = get_option( "cxx" )
- env["CXX"] = get_option( "cxx" )
diff --git a/community/mongodb/mongodb-1.8.0-spidermonkey-1.8.5-support.patch b/community/mongodb/mongodb-1.8.0-spidermonkey-1.8.5-support.patch
deleted file mode 100644
index 46160450f..000000000
--- a/community/mongodb/mongodb-1.8.0-spidermonkey-1.8.5-support.patch
+++ /dev/null
@@ -1,1502 +0,0 @@
---- mongodb-src-r1.8.0/SConstruct.mozjs185~ 2011-03-16 16:33:30.000000000 +0100
-+++ mongodb-src-r1.8.0/SConstruct 2011-04-01 22:16:43.411100876 +0200
-@@ -671,7 +671,6 @@ if nix:
- env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
- # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
- if linux:
-- env.Append( CPPFLAGS=" -Werror " )
- env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's
- env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
- env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
-@@ -893,11 +892,11 @@ def doConfigure( myenv , needPcre=True ,
- if usesm:
-
- # see http://www.mongodb.org/pages/viewpageattachments.action?pageId=12157032
-- J = [ "mozjs" , "js", "js_static" ]
-+ J = [ "mozjs185" , "js", "js_static" ]
- if windows:
- if msarch == "amd64":
- if release:
-- J = [ "js64r", "js", "mozjs" , "js_static" ]
-+ J = [ "js64r", "js", "mozjs185" , "js_static" ]
- else:
- J = "js64d"
- print( "looking for js64d.lib for spidermonkey. (available at mongodb.org prebuilt)" );
-@@ -905,14 +904,12 @@ def doConfigure( myenv , needPcre=True ,
- if not force32:
- print( "Assuming a 32 bit build is desired" )
- if release:
-- J = [ "js32r", "js", "mozjs" , "js_static" ]
-+ J = [ "js32r", "js", "mozjs185" , "js_static" ]
- else:
-- J = [ "js32d", "js", "mozjs" , "js_static" ]
-+ J = [ "js32d", "js", "mozjs185" , "js_static" ]
-
- myCheckLib( J , True )
- mozHeader = "js"
-- if bigLibString(myenv).find( "mozjs" ) >= 0:
-- mozHeader = "mozjs"
-
- if not conf.CheckHeader( mozHeader + "/jsapi.h" ):
- if conf.CheckHeader( "jsapi.h" ):
-@@ -921,6 +918,13 @@ def doConfigure( myenv , needPcre=True ,
- print( "no spider monkey headers!" )
- Exit(1)
-
-+ if conf.CheckFunc( 'JS_NewCompartmentAndGlobalObject' ):
-+ myenv.Append( CPPDEFINES=[ "HAVE_COMPARTMENTS" ] )
-+ if conf.CheckFunc( 'JS_GetStringCharsAndLength' ):
-+ myenv.Append( CPPDEFINES=[ "HAVE_JS_GET_STRING_CHARS_AND_LENGTH" ] )
-+ if conf.CheckFunc( 'JS_NewRegExpObjectNoStatics' ):
-+ myenv.Append( CPPDEFINES=[ "JS_NEW_REG_EXP_OBJECT_NO_STATISTICS" ] )
-+
- if usev8:
- if debugBuild:
- myCheckLib( [ "v8_g" , "v8" ] , True )
---- mongodb-src-r1.8.0/scripting/engine_spidermonkey.cpp.mozjs185~ 2011-03-16 16:33:30.000000000 +0100
-+++ mongodb-src-r1.8.0/scripting/engine_spidermonkey.cpp 2011-04-01 22:42:19.780233492 +0200
-@@ -192,8 +192,13 @@ namespace mongo {
- }
-
- string toString( JSString * so ) {
-+#ifdef HAVE_JS_GET_STRING_CHARS_AND_LENGTH
-+ size_t srclen;
-+ const jschar * s = JS_GetStringCharsAndLength( _context , so , &srclen );
-+#else
- jschar * s = JS_GetStringChars( so );
- size_t srclen = JS_GetStringLength( so );
-+#endif
- if( srclen == 0 )
- return "";
-
-@@ -360,7 +365,7 @@ namespace mongo {
-
- case JSTYPE_OBJECT: {
- JSObject * o = JSVAL_TO_OBJECT( val );
-- if ( ! o || o == JSVAL_NULL ) {
-+ if ( ! o || o == (JSObject *)JSVAL_NULL ){
- b.appendNull( name );
- }
- else if ( ! appendSpecialDBObject( this , b , name , val , o ) ) {
-@@ -419,16 +424,15 @@ namespace mongo {
- return true;
- }
-
-- void addRoot( JSFunction * f , const char * name );
-+ void addRoot( JSFunction * f );
-
- JSFunction * compileFunction( const char * code, JSObject * assoc = 0 ) {
-- const char * gcName = "unknown";
-- JSFunction * f = _compileFunction( code , assoc , gcName );
-- //addRoot( f , gcName );
-+ JSFunction * f = _compileFunction( code , assoc );
-+ //addRoot( f );
- return f;
- }
-
-- JSFunction * _compileFunction( const char * raw , JSObject * assoc , const char *& gcName ) {
-+ JSFunction * _compileFunction( const char * raw , JSObject * assoc ) {
- if ( ! assoc )
- assoc = JS_GetGlobalObject( _context );
-
-@@ -447,7 +451,6 @@ namespace mongo {
- if ( isSimpleStatement( s ) ) {
- s = "return " + s;
- }
-- gcName = "cf anon";
- fname << "anon";
- return JS_CompileFunction( _context , assoc , fname.str().c_str() , 0 , 0 , s.c_str() , s.size() , "nofile_a" , 0 );
- }
-@@ -488,7 +491,6 @@ namespace mongo {
- log() << "compile failed for: " << raw << endl;
- return 0;
- }
-- gcName = "cf normal";
- return func;
- }
-
-@@ -630,7 +632,11 @@ namespace mongo {
- flags++;
- }
-
-+#ifdef JS_NEW_REG_EXP_OBJECT_NO_STATISTICS
-+ JSObject * r = JS_NewRegExpObjectNoStatics( _context , (char*)e.regex() , strlen( e.regex() ) , flagNumber);
-+#else
- JSObject * r = JS_NewRegExpObject( _context , (char*)e.regex() , strlen( e.regex() ) , flagNumber );
-+#endif
- assert( r );
- return OBJECT_TO_JSVAL( r );
- }
-@@ -791,7 +797,7 @@ namespace mongo {
-
- BSONFieldIterator * it = (BSONFieldIterator*)JSVAL_TO_PRIVATE( *statep );
- if ( ! it ) {
-- *statep = 0;
-+ *statep = JSVAL_NULL;
- return JS_TRUE;
- }
-
-@@ -803,7 +809,7 @@ namespace mongo {
- }
- else {
- delete it;
-- *statep = 0;
-+ *statep = JSVAL_NULL;
- }
- return JS_TRUE;
- }
-@@ -818,7 +824,7 @@ namespace mongo {
- return JS_FALSE;
- }
-
-- JSBool noaccess( JSContext *cx, JSObject *obj, jsval idval, jsval *vp) {
-+ JSBool noaccess( JSContext *cx, JSObject *obj, jsid id, jsval *vp){
- BSONHolder * holder = GETHOLDER( cx , obj );
- if ( ! holder ) {
- // in init code still
-@@ -830,24 +836,37 @@ namespace mongo {
- return JS_FALSE;
- }
-
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp)
-+ JSBool strict_noaccess( JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp){
-+ return noaccess( cx , obj , id , vp );
-+ }
-+
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp, JSResolveOp)
- JSClass bson_ro_class = {
- "bson_ro_object" , JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE | JSCLASS_NEW_ENUMERATE ,
-- noaccess, noaccess, JS_PropertyStub, noaccess,
-- (JSEnumerateOp)bson_enumerate, (JSResolveOp)(&resolveBSONField) , JS_ConvertStub, bson_finalize ,
-+ noaccess, noaccess, JS_PropertyStub, strict_noaccess,
-+ (JSEnumerateOp)bson_enumerate, (JSResolveOp)resolveBSONField , JS_ConvertStub, bson_finalize ,
- JSCLASS_NO_OPTIONAL_MEMBERS
- };
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JSBool bson_cons( JSContext* cx, uintN argc, jsval* vp ){
-+#else
- JSBool bson_cons( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
-+#endif
- cerr << "bson_cons : shouldn't be here!" << endl;
- JS_ReportError( cx , "can't construct bson object" );
- return JS_FALSE;
- }
-
- JSFunctionSpec bson_functions[] = {
-- { 0 }
-+ JS_FS_END
- };
-
-- JSBool bson_add_prop( JSContext *cx, JSObject *obj, jsval idval, jsval *vp) {
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSPropertyOp)
-+ JSBool bson_add_prop( JSContext *cx, JSObject *obj, jsid id, jsval *vp){
-+ jsval idval;
-+ JS_IdToValue( cx , id , &idval );
- BSONHolder * holder = GETHOLDER( cx , obj );
- if ( ! holder ) {
- // static init
-@@ -864,8 +883,10 @@ namespace mongo {
- return JS_TRUE;
- }
-
--
-- JSBool mark_modified( JSContext *cx, JSObject *obj, jsval idval, jsval *vp) {
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSPropertyOp)
-+ JSBool mark_modified( JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp){
-+ jsval idval;
-+ JS_IdToValue( cx , id , &idval );
- Convertor c(cx);
- BSONHolder * holder = GETHOLDER( cx , obj );
- if ( !holder ) // needed when we're messing with DBRef.prototype
-@@ -877,7 +898,10 @@ namespace mongo {
- return JS_TRUE;
- }
-
-- JSBool mark_modified_remove( JSContext *cx, JSObject *obj, jsval idval, jsval *vp) {
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSPropertyOp)
-+ JSBool mark_modified_remove( JSContext *cx, JSObject *obj, jsid id, jsval *vp){
-+ jsval idval;
-+ JS_IdToValue( cx , id , &idval );
- Convertor c(cx);
- BSONHolder * holder = GETHOLDER( cx , obj );
- if ( holder->_inResolve )
-@@ -887,23 +911,26 @@ namespace mongo {
- return JS_TRUE;
- }
-
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp, JSResolveOp)
- JSClass bson_class = {
- "bson_object" , JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE | JSCLASS_NEW_ENUMERATE ,
- bson_add_prop, mark_modified_remove, JS_PropertyStub, mark_modified,
-- (JSEnumerateOp)bson_enumerate, (JSResolveOp)(&resolveBSONField) , JS_ConvertStub, bson_finalize ,
-+ (JSEnumerateOp)bson_enumerate, (JSResolveOp)resolveBSONField , JS_ConvertStub, bson_finalize ,
- JSCLASS_NO_OPTIONAL_MEMBERS
- };
-
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp)
- static JSClass global_class = {
- "global", JSCLASS_GLOBAL_FLAGS,
-- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
-+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
- JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,
- JSCLASS_NO_OPTIONAL_MEMBERS
- };
-
- // --- global helpers ---
-
-- JSBool native_print( JSContext * cx , JSObject * obj , uintN argc, jsval *argv, jsval *rval ) {
-+ JSBool native_print( JSContext * cx , uintN argc , jsval *vp ){
-+ jsval *argv = JS_ARGV( cx , vp);
- stringstream ss;
- Convertor c( cx );
- for ( uintN i=0; i<argc; i++ ) {
-@@ -913,10 +940,13 @@ namespace mongo {
- }
- ss << "\n";
- Logstream::logLockless( ss.str() );
-+ JS_SET_RVAL( cx , vp , JSVAL_VOID );
- return JS_TRUE;
- }
-
-- JSBool native_helper( JSContext *cx , JSObject *obj , uintN argc, jsval *argv , jsval *rval ) {
-+ JSBool native_helper( JSContext *cx , uintN argc, jsval *vp){
-+ jsval *argv = JS_ARGV( cx , vp );
-+ JSObject *obj = JS_THIS_OBJECT( cx , vp );
- Convertor c(cx);
-
- NativeFunction func = (NativeFunction)((long long)c.getNumber( obj , "x" ) );
-@@ -942,35 +972,37 @@ namespace mongo {
- }
-
- if ( out.isEmpty() ) {
-- *rval = JSVAL_VOID;
-+ JS_SET_RVAL( cx , vp , JSVAL_VOID );
- }
- else {
-- *rval = c.toval( out.firstElement() );
-+ JS_SET_RVAL( cx , vp , c.toval( out.firstElement() ) );
- }
-
- return JS_TRUE;
- }
-
-- JSBool native_load( JSContext *cx , JSObject *obj , uintN argc, jsval *argv , jsval *rval );
-+ JSBool native_load( JSContext *cx , uintN argc, jsval *vp );
-
-- JSBool native_gc( JSContext *cx , JSObject *obj , uintN argc, jsval *argv , jsval *rval ) {
-+ JSBool native_gc( JSContext *cx , uintN argc, jsval *vp ){
- JS_GC( cx );
-+ JS_SET_RVAL( cx , vp , JSVAL_VOID );
- return JS_TRUE;
- }
-
- JSFunctionSpec globalHelpers[] = {
-- { "print" , &native_print , 0 , 0 , 0 } ,
-- { "nativeHelper" , &native_helper , 1 , 0 , 0 } ,
-- { "load" , &native_load , 1 , 0 , 0 } ,
-- { "gc" , &native_gc , 1 , 0 , 0 } ,
-- { 0 , 0 , 0 , 0 , 0 }
-+ JS_FS( "print" , &native_print , 0 , JSFUN_FAST_NATIVE ) ,
-+ JS_FS( "nativeHelper" , &native_helper , 1 , JSFUN_FAST_NATIVE ) ,
-+ JS_FS( "load" , &native_load , 1 , JSFUN_FAST_NATIVE ) ,
-+ JS_FS( "gc" , &native_gc , 1 , JSFUN_FAST_NATIVE ) ,
-+ JS_FS_END
- };
-
- // ----END global helpers ----
-
- // Object helpers
-
-- JSBool bson_get_size(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
-+ JSBool bson_get_size(JSContext *cx, uintN argc, jsval *vp){
-+ jsval *argv = JS_ARGV( cx , vp );
- if ( argc != 1 || !JSVAL_IS_OBJECT( argv[ 0 ] ) ) {
- JS_ReportError( cx , "bsonsize requires one valid object" );
- return JS_FALSE;
-@@ -979,7 +1011,7 @@ namespace mongo {
- Convertor c(cx);
-
- if ( argv[0] == JSVAL_VOID || argv[0] == JSVAL_NULL ) {
-- *rval = c.toval( 0.0 );
-+ JS_SET_RVAL( cx , vp , c.toval( 0.0 ) );
- return JS_TRUE;
- }
-
-@@ -999,18 +1031,21 @@ namespace mongo {
- size = temp.objsize();
- }
-
-- *rval = c.toval( size );
-+ JS_SET_RVAL( cx , vp , c.toval( size ) );
- return JS_TRUE;
- }
-
- JSFunctionSpec objectHelpers[] = {
-- { "bsonsize" , &bson_get_size , 1 , 0 , 0 } ,
-- { 0 , 0 , 0 , 0 , 0 }
-+ JS_FS( "bsonsize" , &bson_get_size , 1 , JSFUN_FAST_NATIVE ) ,
-+ JS_FS_END
- };
-
- // end Object helpers
-
-- JSBool resolveBSONField( JSContext *cx, JSObject *obj, jsval id, uintN flags, JSObject **objp ) {
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSResolveOp)
-+ JSBool resolveBSONField( JSContext *cx, JSObject *obj, jsid id, uintN flags, JSObject **objp ){
-+ jsval idval;
-+ JS_IdToValue( cx , id , &idval );
- assert( JS_EnterLocalRootScope( cx ) );
- Convertor c( cx );
-
-@@ -1023,7 +1058,7 @@ namespace mongo {
- }
- holder->check();
-
-- string s = c.toString( id );
-+ string s = c.toString( idval );
-
- BSONElement e = holder->_obj[ s.c_str() ];
-
-@@ -1139,9 +1174,15 @@ namespace mongo {
- //JS_SetVersion( _context , JSVERSION_LATEST); TODO
- JS_SetErrorReporter( _context , errorReporter );
-
-+#ifdef HAVE_COMPARTMENTS
-+ _global = JS_NewCompartmentAndGlobalObject( _context , &global_class , NULL);
-+ massert( 13442 , "JS_NewCompartmentAndGlobalObject failed for global" , _global );
-+ _call = JS_EnterCrossCompartmentCall( _context , _global);
-+#else
- _global = JS_NewObject( _context , &global_class, NULL, NULL);
- massert( 10432 , "JS_NewObject failed for global" , _global );
- JS_SetGlobalObject( _context , _global );
-+#endif
- massert( 10433 , "js init failed" , JS_InitStandardClasses( _context , _global ) );
-
- JS_SetOptions( _context , JS_GetOptions( _context ) | JSOPTION_VAROBJFIX );
-@@ -1159,13 +1200,14 @@ namespace mongo {
- smlock;
- uassert( 10223 , "deleted SMScope twice?" , _convertor );
-
-- for ( list<void*>::iterator i=_roots.begin(); i != _roots.end(); i++ ) {
-- JS_RemoveRoot( _context , *i );
-+ for ( list<JSObject*>::iterator i=_roots.begin(); i != _roots.end(); i++ ){
-+ JSObject * obj = (JSObject *)*i;
-+ JS_RemoveObjectRoot( _context , &obj );
- }
- _roots.clear();
-
- if ( _this ) {
-- JS_RemoveRoot( _context , &_this );
-+ JS_RemoveObjectRoot( _context , &_this );
- _this = 0;
- }
-
-@@ -1174,6 +1216,13 @@ namespace mongo {
- _convertor = 0;
- }
-
-+#ifdef HAVE_COMPARTMENTS
-+ if ( _call ) {
-+ JS_LeaveCrossCompartmentCall( _call );
-+ _call = 0;
-+ }
-+#endif
-+
- if ( _context ) {
- // This is expected to reclaim _global as well.
- JS_DestroyContext( _context );
-@@ -1187,16 +1236,16 @@ namespace mongo {
- assert( _convertor );
- return;
- if ( _this ) {
-- JS_RemoveRoot( _context , &_this );
-+ JS_RemoveObjectRoot( _context , &_this );
- _this = 0;
- }
- currentScope.reset( this );
- _error = "";
- }
-
-- void addRoot( void * root , const char * name ) {
-- JS_AddNamedRoot( _context , root , name );
-- _roots.push_back( root );
-+ void addRoot( JSObject * obj ){
-+ JS_AddObjectRoot( _context , &obj );
-+ _roots.push_back( obj );
- }
-
- void init( const BSONObj * data ) {
-@@ -1336,13 +1385,13 @@ namespace mongo {
- void setThis( const BSONObj * obj ) {
- smlock;
- if ( _this ) {
-- JS_RemoveRoot( _context , &_this );
-+ JS_RemoveObjectRoot( _context , &_this );
- _this = 0;
- }
-
- if ( obj ) {
- _this = _convertor->toJSObject( obj );
-- JS_AddNamedRoot( _context , &_this , "scope this" );
-+ JS_AddObjectRoot( _context , &_this );
- }
- }
-
-@@ -1402,7 +1451,7 @@ namespace mongo {
- spec->start = boost::posix_time::microsec_clock::local_time();
- spec->count = 0;
- JS_SetContextPrivate( _context, (void*)spec );
--#if defined(SM181) && !defined(XULRUNNER190)
-+#if JS_VERSION >= 181 && !defined(XULRUNNER190)
- JS_SetOperationCallback( _context, _interrupt );
- #else
- JS_SetBranchCallback( _context, interrupt );
-@@ -1412,7 +1461,7 @@ namespace mongo {
-
- void uninstallInterrupt( int timeoutMs ) {
- if ( timeoutMs != 0 || ScriptEngine::haveCheckInterruptCallback() ) {
--#if defined(SM181) && !defined(XULRUNNER190)
-+#if JS_VERSION >= 181 && !defined(XULRUNNER190)
- JS_SetOperationCallback( _context , 0 );
- #else
- JS_SetBranchCallback( _context, 0 );
-@@ -1548,9 +1597,12 @@ namespace mongo {
-
- JSObject * _global;
- JSObject * _this;
-+#ifdef HAVE_COMPARTMENTS
-+ JSCrossCompartmentCall * _call;
-+#endif
-
- string _error;
-- list<void*> _roots;
-+ list<JSObject*> _roots;
-
- bool _externalSetup;
- bool _localConnect;
-@@ -1579,7 +1631,8 @@ namespace mongo {
- }
- }
-
-- JSBool native_load( JSContext *cx , JSObject *obj , uintN argc, jsval *argv , jsval *rval ) {
-+ JSBool native_load( JSContext *cx , uintN argc, jsval *vp ){
-+ jsval *argv = JS_ARGV( cx , vp );
- Convertor c(cx);
-
- Scope * s = currentScope.get();
-@@ -1594,6 +1647,7 @@ namespace mongo {
- }
- }
-
-+ JS_SET_RVAL( cx , vp , JSVAL_VOID );
- return JS_TRUE;
- }
-
-@@ -1633,7 +1687,7 @@ namespace mongo {
- return new SMScope();
- }
-
-- void Convertor::addRoot( JSFunction * f , const char * name ) {
-+ void Convertor::addRoot( JSFunction * f ){
- if ( ! f )
- return;
-
-@@ -1642,7 +1696,7 @@ namespace mongo {
-
- JSObject * o = JS_GetFunctionObject( f );
- assert( o );
-- scope->addRoot( &o , name );
-+ scope->addRoot( o );
- }
-
- }
---- mongodb-src-r1.8.0/scripting/engine_spidermonkey.h.mozjs185~ 2011-03-16 16:33:30.000000000 +0100
-+++ mongodb-src-r1.8.0/scripting/engine_spidermonkey.h 2011-04-01 21:29:15.697678508 +0200
-@@ -21,6 +21,9 @@
-
- // START inc hacking
-
-+#undef malloc
-+#undef realloc
-+
- #if defined( MOZJS )
-
- #define MOZILLA_1_8_BRANCH
-@@ -55,6 +58,9 @@
-
- #endif
-
-+#define malloc MONGO_malloc
-+#define realloc MONGO_realloc
-+
- // END inc hacking
-
- // -- SM 1.6 hacks ---
-@@ -81,6 +87,10 @@ JSBool JS_CStringsAreUTF8() {
- #define SM181
- #endif
-
-+#ifndef JSFUN_FAST_NATIVE
-+#define JSFUN_FAST_NATIVE 0
-+#endif
-+
- namespace mongo {
-
- class SMScope;
-@@ -104,7 +114,7 @@ namespace mongo {
- extern boost::thread_specific_ptr<SMScope> currentScope;
-
- // bson
-- JSBool resolveBSONField( JSContext *cx, JSObject *obj, jsval id, uintN flags, JSObject **objp );
-+ JSBool resolveBSONField( JSContext *cx, JSObject *obj, jsid id, uintN flags, JSObject **objp );
-
-
- // mongo
---- mongodb-src-r1.8.0/scripting/sm_db.cpp.mozjs185~ 2011-03-16 16:33:30.000000000 +0100
-+++ mongodb-src-r1.8.0/scripting/sm_db.cpp 2011-04-01 22:51:59.701652521 +0200
-@@ -79,13 +79,25 @@ namespace mongo {
- return holder->get();
- }
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JSBool internal_cursor_constructor( JSContext* cx, uintN argc, jsval* vp ){
-+ JSObject *obj = JS_NewObjectForConstructor( cx , vp );
-+ if( ! obj ) {
-+ JS_ReportError( cx , "Failed to create 'this' object" );
-+ return JS_FALSE;
-+ }
-+#else
- JSBool internal_cursor_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
-+#endif
- uassert( 10236 , "no args to internal_cursor_constructor" , argc == 0 );
- assert( JS_SetPrivate( cx , obj , 0 ) ); // just for safety
-+#ifdef JSFUN_CONSTRUCTOR
-+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) );
-+#endif
- return JS_TRUE;
- }
-
-- void internal_cursor_finalize( JSContext * cx , JSObject * obj ) {
-+ void internal_cursor_finalize( JSContext * cx, JSObject * obj ){
- CursorHolder * holder = (CursorHolder*)JS_GetPrivate( cx , obj );
- if ( holder ) {
- delete holder;
-@@ -93,10 +105,11 @@ namespace mongo {
- }
- }
-
-- JSBool internal_cursor_hasNext(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
-+ JSBool internal_cursor_hasNext(JSContext *cx , uintN argc , jsval *vp) {
-+ JSObject* obj = JS_THIS_OBJECT( cx , vp );
- DBClientCursor *cursor = getCursor( cx, obj );
- try {
-- *rval = cursor->more() ? JSVAL_TRUE : JSVAL_FALSE;
-+ JS_SET_RVAL( cx , vp , cursor->more() ? JSVAL_TRUE : JSVAL_FALSE );
- }
- catch ( std::exception& e ) {
- JS_ReportError( cx , e.what() );
-@@ -105,14 +118,16 @@ namespace mongo {
- return JS_TRUE;
- }
-
-- JSBool internal_cursor_objsLeftInBatch(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
-+ JSBool internal_cursor_objsLeftInBatch(JSContext *cx, uintN argc, jsval *vp) {
-+ JSObject* obj = JS_THIS_OBJECT( cx , vp );
- DBClientCursor *cursor = getCursor( cx, obj );
- Convertor c(cx);
-- *rval = c.toval((double) cursor->objsLeftInBatch() );
-+ JS_SET_RVAL( cx , vp , c.toval((double) cursor->objsLeftInBatch()) );
- return JS_TRUE;
- }
-
-- JSBool internal_cursor_next(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
-+ JSBool internal_cursor_next(JSContext *cx, uintN argc, jsval *vp) {
-+ JSObject* obj = JS_THIS_OBJECT( cx , vp );
- DBClientCursor *cursor = getCursor( cx, obj );
-
- BSONObj n;
-@@ -131,20 +146,21 @@ namespace mongo {
- }
-
- Convertor c(cx);
-- *rval = c.toval( &n );
-+ JS_SET_RVAL( cx , vp , c.toval( &n ) );
- return JS_TRUE;
- }
-
- JSFunctionSpec internal_cursor_functions[] = {
-- { "hasNext" , internal_cursor_hasNext , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
-- { "objsLeftInBatch" , internal_cursor_objsLeftInBatch , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
-- { "next" , internal_cursor_next , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
-- { 0 }
-+ JS_FS( "hasNext" , internal_cursor_hasNext , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) ,
-+ JS_FS( "objsLeftInBatch" , internal_cursor_objsLeftInBatch , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) ,
-+ JS_FS( "next" , internal_cursor_next , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) ,
-+ JS_FS_END
- };
-
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp)
- JSClass internal_cursor_class = {
- "InternalCursor" , JSCLASS_HAS_PRIVATE ,
-- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
-+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
- JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, internal_cursor_finalize,
- JSCLASS_NO_OPTIONAL_MEMBERS
- };
-@@ -157,7 +173,16 @@ namespace mongo {
- throw -1;
- }
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JSBool mongo_local_constructor( JSContext* cx, uintN argc, jsval* vp ){
-+ JSObject *obj = JS_NewObjectForConstructor( cx , vp );
-+ if( ! obj ) {
-+ JS_ReportError( cx , "Failed to create 'this' object" );
-+ return JS_FALSE;
-+ }
-+#else
- JSBool mongo_local_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
-+#endif
- Convertor c( cx );
-
- shared_ptr< DBClientWithCommands > client( createDirectClient() );
-@@ -166,10 +191,23 @@ namespace mongo {
- jsval host = c.toval( "EMBEDDED" );
- assert( JS_SetProperty( cx , obj , "host" , &host ) );
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) );
-+#endif
- return JS_TRUE;
- }
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JSBool mongo_external_constructor( JSContext* cx, uintN argc, jsval* vp ){
-+ jsval *argv = JS_ARGV( cx , vp );
-+ JSObject *obj = JS_NewObjectForConstructor( cx , vp );
-+ if( ! obj ) {
-+ JS_ReportError( cx , "Failed to create 'this' object" );
-+ return JS_FALSE;
-+ }
-+#else
- JSBool mongo_external_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
-+#endif
- Convertor c( cx );
-
- smuassert( cx , "0 or 1 args to Mongo" , argc <= 1 );
-@@ -197,6 +235,9 @@ namespace mongo {
- assert( JS_SetPrivate( cx , obj , (void*)( new shared_ptr< DBClientWithCommands >( conn ) ) ) );
- jsval host_val = c.toval( host.c_str() );
- assert( JS_SetProperty( cx , obj , "host" , &host_val ) );
-+#ifdef JSFUN_CONSTRUCTOR
-+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) );
-+#endif
- return JS_TRUE;
-
- }
-@@ -215,14 +256,18 @@ namespace mongo {
- }
- }
-
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp)
- JSClass mongo_class = {
- "Mongo" , JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE ,
-- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
-+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
- JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, mongo_finalize,
- JSCLASS_NO_OPTIONAL_MEMBERS
- };
-
-- JSBool mongo_find(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
-+ JSBool mongo_find(JSContext *cx, uintN argc, jsval *vp) {
-+ JSObject* obj = JS_THIS_OBJECT( cx , vp );
-+ jsval* argv = JS_ARGV( cx , vp );
-+
- smuassert( cx , "mongo_find needs 7 args" , argc == 7 );
- shared_ptr< DBClientWithCommands > * connHolder = (shared_ptr< DBClientWithCommands >*)JS_GetPrivate( cx , obj );
- smuassert( cx , "no connection!" , connHolder && connHolder->get() );
-@@ -252,7 +297,8 @@ namespace mongo {
- JSObject * mycursor = JS_NewObject( cx , &internal_cursor_class , 0 , 0 );
- CHECKNEWOBJECT( mycursor, cx, "internal_cursor_class" );
- assert( JS_SetPrivate( cx , mycursor , new CursorHolder( cursor, *connHolder ) ) );
-- *rval = OBJECT_TO_JSVAL( mycursor );
-+
-+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( mycursor ));
- return JS_TRUE;
- }
- catch ( ... ) {
-@@ -261,7 +307,10 @@ namespace mongo {
- }
- }
-
-- JSBool mongo_update(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
-+ JSBool mongo_update(JSContext *cx, uintN argc, jsval *vp) {
-+ JSObject* obj = JS_THIS_OBJECT( cx , vp );
-+ jsval* argv = JS_ARGV( cx , vp );
-+
- smuassert( cx , "mongo_find needs at elast 3 args" , argc >= 3 );
- smuassert( cx , "2nd param to update has to be an object" , JSVAL_IS_OBJECT( argv[1] ) );
- smuassert( cx , "3rd param to update has to be an object" , JSVAL_IS_OBJECT( argv[2] ) );
-@@ -282,6 +331,7 @@ namespace mongo {
-
- try {
- conn->update( ns , c.toObject( argv[1] ) , c.toObject( argv[2] ) , upsert , multi );
-+ JS_SET_RVAL( cx , vp , JSVAL_VOID );
- return JS_TRUE;
- }
- catch ( ... ) {
-@@ -290,7 +340,10 @@ namespace mongo {
- }
- }
-
-- JSBool mongo_insert(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
-+ JSBool mongo_insert(JSContext *cx, uintN argc, jsval *vp) {
-+ JSObject* obj = JS_THIS_OBJECT( cx , vp );
-+ jsval* argv = JS_ARGV( cx , vp );
-+
- smuassert( cx , "mongo_insert needs 2 args" , argc == 2 );
- smuassert( cx , "2nd param to insert has to be an object" , JSVAL_IS_OBJECT( argv[1] ) );
-
-@@ -310,6 +363,7 @@ namespace mongo {
- // TODO: add _id
-
- conn->insert( ns , o );
-+ JS_SET_RVAL( cx, vp, JSVAL_VOID );
- return JS_TRUE;
- }
- catch ( std::exception& e ) {
-@@ -325,7 +379,10 @@ namespace mongo {
- }
- }
-
-- JSBool mongo_remove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
-+ JSBool mongo_remove(JSContext *cx, uintN argc, jsval *vp) {
-+ JSObject* obj = JS_THIS_OBJECT( cx , vp );
-+ jsval* argv = JS_ARGV( cx , vp );
-+
- smuassert( cx , "mongo_remove needs 2 or 3 arguments" , argc == 2 || argc == 3 );
- smuassert( cx , "2nd param to insert has to be an object" , JSVAL_IS_OBJECT( argv[1] ) );
-
-@@ -346,6 +403,7 @@ namespace mongo {
-
- try {
- conn->remove( ns , o , justOne );
-+ JS_SET_RVAL( cx , vp , JSVAL_VOID );
- return JS_TRUE;
- }
- catch ( std::exception& e ) {
-@@ -361,16 +419,26 @@ namespace mongo {
- }
-
- JSFunctionSpec mongo_functions[] = {
-- { "find" , mongo_find , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
-- { "update" , mongo_update , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
-- { "insert" , mongo_insert , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
-- { "remove" , mongo_remove , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
-- { 0 }
-+ JS_FS( "find" , mongo_find , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) ,
-+ JS_FS( "update" , mongo_update , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) ,
-+ JS_FS( "insert" , mongo_insert , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) ,
-+ JS_FS( "remove" , mongo_remove , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) ,
-+ JS_FS_END
- };
-
- // ------------- db_collection -------------
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JSBool db_collection_constructor( JSContext* cx, uintN argc, jsval* vp ){
-+ jsval *argv = JS_ARGV( cx , vp );
-+ JSObject *obj = JS_NewObjectForConstructor( cx , vp );
-+ if( ! obj ) {
-+ JS_ReportError( cx , "Failed to create 'this' object" );
-+ return JS_FALSE;
-+ }
-+#else
- JSBool db_collection_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
-+#endif
- smuassert( cx , "db_collection_constructor wrong args" , argc == 4 );
- assert( JS_SetProperty( cx , obj , "_mongo" , &(argv[0]) ) );
- assert( JS_SetProperty( cx , obj , "_db" , &(argv[1]) ) );
-@@ -382,16 +450,22 @@ namespace mongo {
- JS_ReportError( cx , "can't use sharded collection from db.eval" );
- return JS_FALSE;
- }
--
-+#ifdef JSFUN_CONSTRUCTOR
-+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) );
-+#endif
- return JS_TRUE;
- }
-
-- JSBool db_collection_resolve( JSContext *cx, JSObject *obj, jsval id, uintN flags, JSObject **objp ) {
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSResolveOp)
-+ JSBool db_collection_resolve( JSContext *cx, JSObject *obj, jsid id, uintN flags, JSObject **objp ){
-+ jsval idval;
-+ JS_IdToValue( cx , id , &idval );
-+
- if ( flags & JSRESOLVE_ASSIGNING )
- return JS_TRUE;
-
- Convertor c( cx );
-- string collname = c.toString( id );
-+ string collname = c.toString( idval );
-
- if ( isSpecialName( collname ) )
- return JS_TRUE;
-@@ -419,10 +493,11 @@ namespace mongo {
- return JS_TRUE;
- }
-
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp, JSResolveOp)
- JSClass db_collection_class = {
- "DBCollection" , JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE ,
-- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
-- JS_EnumerateStub, (JSResolveOp)(&db_collection_resolve) , JS_ConvertStub, JS_FinalizeStub,
-+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
-+ JS_EnumerateStub, (JSResolveOp)db_collection_resolve , JS_ConvertStub, JS_FinalizeStub,
- JSCLASS_NO_OPTIONAL_MEMBERS
- };
-
-@@ -454,15 +529,32 @@ namespace mongo {
- // -------------- DB ---------------
-
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JSBool db_constructor( JSContext* cx, uintN argc, jsval* vp ){
-+ jsval *argv = JS_ARGV( cx , vp );
-+ JSObject *obj = JS_NewObjectForConstructor( cx , vp );
-+ if( ! obj ) {
-+ JS_ReportError( cx , "Failed to create 'this' object" );
-+ return JS_FALSE;
-+ }
-+#else
- JSBool db_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
-+#endif
- smuassert( cx, "wrong number of arguments to DB" , argc == 2 );
- assert( JS_SetProperty( cx , obj , "_mongo" , &(argv[0]) ) );
- assert( JS_SetProperty( cx , obj , "_name" , &(argv[1]) ) );
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) );
-+#endif
-+
- return JS_TRUE;
- }
-
-- JSBool db_resolve( JSContext *cx, JSObject *obj, jsval id, uintN flags, JSObject **objp ) {
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSResolveOp)
-+ JSBool db_resolve( JSContext *cx, JSObject *obj, jsid id, uintN flags, JSObject **objp ){
-+ jsval idval;
-+ JS_IdToValue( cx , id , &idval );
- if ( flags & JSRESOLVE_ASSIGNING )
- return JS_TRUE;
-
-@@ -471,7 +563,7 @@ namespace mongo {
- if ( obj == c.getGlobalPrototype( "DB" ) )
- return JS_TRUE;
-
-- string collname = c.toString( id );
-+ string collname = c.toString( idval );
-
- if ( isSpecialName( collname ) )
- return JS_TRUE;
-@@ -489,17 +581,28 @@ namespace mongo {
- return JS_TRUE;
- }
-
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp, JSResolveOp)
- JSClass db_class = {
- "DB" , JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE ,
-- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
-- JS_EnumerateStub, (JSResolveOp)(&db_resolve) , JS_ConvertStub, JS_FinalizeStub,
-+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
-+ JS_EnumerateStub, (JSResolveOp)db_resolve , JS_ConvertStub, JS_FinalizeStub,
- JSCLASS_NO_OPTIONAL_MEMBERS
- };
-
-
- // -------------- object id -------------
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JSBool object_id_constructor( JSContext* cx, uintN argc, jsval* vp ){
-+ jsval *argv = JS_ARGV( cx , vp );
-+ JSObject *obj = JS_NewObjectForConstructor( cx , vp );
-+ if( ! obj ) {
-+ JS_ReportError( cx , "Failed to create 'this' object" );
-+ return JS_FALSE;
-+ }
-+#else
- JSBool object_id_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
-+#endif
- Convertor c( cx );
-
- OID oid;
-@@ -524,35 +627,48 @@ namespace mongo {
- if ( ! JS_InstanceOf( cx , obj , &object_id_class , 0 ) ) {
- obj = JS_NewObject( cx , &object_id_class , 0 , 0 );
- CHECKNEWOBJECT( obj, cx, "object_id_constructor" );
-- *rval = OBJECT_TO_JSVAL( obj );
- }
-
- jsval v = c.toval( oid.str().c_str() );
- assert( JS_SetProperty( cx , obj , "str" , &v ) );
-
-+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) );
- return JS_TRUE;
- }
-
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp)
- JSClass object_id_class = {
- "ObjectId" , JSCLASS_HAS_PRIVATE ,
-- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
-+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
- JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, JS_FinalizeStub,
- JSCLASS_NO_OPTIONAL_MEMBERS
- };
-
-- JSBool object_id_tostring(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
-+ JSBool object_id_tostring(JSContext *cx, uintN argc, jsval *vp){
-+ JSObject *obj = JS_THIS_OBJECT( cx , vp );
- Convertor c(cx);
-- return (JSBool) (*rval = c.getProperty( obj , "str" ));
-+ JS_SET_RVAL( cx , vp , c.getProperty( obj , "str" ));
-+ return JS_TRUE;
- }
-
- JSFunctionSpec object_id_functions[] = {
-- { "toString" , object_id_tostring , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
-- { 0 }
-+ JS_FS( "toString" , object_id_tostring , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) ,
-+ JS_FS_END
- };
-
- // dbpointer
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JSBool dbpointer_constructor( JSContext* cx, uintN argc, jsval* vp ){
-+ jsval *argv = JS_ARGV( cx , vp );
-+ JSObject *obj = JS_NewObjectForConstructor( cx , vp );
-+ if( ! obj ) {
-+ JS_ReportError( cx , "Failed to create 'this' object" );
-+ return JS_FALSE;
-+ }
-+#else
- JSBool dbpointer_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
-+#endif
- Convertor c( cx );
-
- if ( argc == 2 ) {
-@@ -564,6 +680,9 @@ namespace mongo {
-
- assert( JS_SetProperty( cx , obj , "ns" , &(argv[0]) ) );
- assert( JS_SetProperty( cx , obj , "id" , &(argv[1]) ) );
-+#ifdef JSFUN_CONSTRUCTOR
-+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) );
-+#endif
- return JS_TRUE;
- }
- else {
-@@ -572,19 +691,30 @@ namespace mongo {
- }
- }
-
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp)
- JSClass dbpointer_class = {
- "DBPointer" , JSCLASS_HAS_PRIVATE ,
-- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
-+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
- JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, JS_FinalizeStub,
- JSCLASS_NO_OPTIONAL_MEMBERS
- };
-
- JSFunctionSpec dbpointer_functions[] = {
-- { 0 }
-+ JS_FS_END
- };
-
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JSBool dbref_constructor( JSContext* cx, uintN argc, jsval* vp ){
-+ jsval *argv = JS_ARGV( cx , vp );
-+ JSObject *obj = JS_NewObjectForConstructor( cx , vp );
-+ if( ! obj ) {
-+ JS_ReportError( cx , "Failed to create 'this' object" );
-+ return JS_FALSE;
-+ }
-+#else
- JSBool dbref_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
-+#endif
- Convertor c( cx );
-
- if ( argc == 2 ) {
-@@ -594,6 +724,9 @@ namespace mongo {
- assert( JS_SetProperty( cx, o , "$id" , &argv[ 1 ] ) );
- BSONObj bo = c.toObject( o );
- assert( JS_SetPrivate( cx , obj , (void*)(new BSONHolder( bo.getOwned() ) ) ) );
-+#ifdef JSFUN_CONSTRUCTOR
-+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) );
-+#endif
- return JS_TRUE;
- }
- else {
-@@ -607,7 +740,17 @@ namespace mongo {
-
- // UUID **************************
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JSBool uuid_constructor( JSContext* cx, uintN argc, jsval* vp ){
-+ jsval *argv = JS_ARGV( cx , vp );
-+ JSObject *obj = JS_NewObjectForConstructor( cx , vp );
-+ if( ! obj ) {
-+ JS_ReportError( cx , "Failed to create 'this' object" );
-+ return JS_FALSE;
-+ }
-+#else
- JSBool uuid_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
-+#endif
- Convertor c( cx );
-
- if( argc == 0 ) {
-@@ -635,6 +778,9 @@ namespace mongo {
- c.setProperty( obj, "len", c.toval( (double)16 ) );
- c.setProperty( obj, "type", c.toval( (double)3 ) );
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) );
-+#endif
- return JS_TRUE;
- }
- else {
-@@ -643,7 +789,8 @@ namespace mongo {
- }
- }
-
-- JSBool uuid_tostring(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
-+ JSBool uuid_tostring(JSContext *cx, uintN argc, jsval *vp){
-+ JSObject *obj = JS_THIS_OBJECT( cx , vp );
- Convertor c(cx);
- void *holder = JS_GetPrivate( cx, obj );
- assert( holder );
-@@ -652,7 +799,8 @@ namespace mongo {
- ss << "UUID(\"" << toHex(data, 16);
- ss << "\")";
- string ret = ss.str();
-- return *rval = c.toval( ret.c_str() );
-+ JS_SET_RVAL( cx , vp , c.toval( ret.c_str() ) );
-+ return JS_TRUE;
- }
-
- void uuid_finalize( JSContext * cx , JSObject * obj ) {
-@@ -664,21 +812,32 @@ namespace mongo {
- }
- }
-
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp)
- JSClass uuid_class = {
- "UUID" , JSCLASS_HAS_PRIVATE ,
-- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
-+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
- JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, uuid_finalize,
- JSCLASS_NO_OPTIONAL_MEMBERS
- };
-
- JSFunctionSpec uuid_functions[] = {
-- { "toString" , uuid_tostring , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
-- { 0 }
-+ JS_FS( "toString" , uuid_tostring , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) ,
-+ JS_FS_END
- };
-
- // BinData **************************
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JSBool bindata_constructor( JSContext* cx, uintN argc, jsval* vp ){
-+ jsval *argv = JS_ARGV( cx , vp );
-+ JSObject *obj = JS_NewObjectForConstructor( cx , vp );
-+ if( ! obj ) {
-+ JS_ReportError( cx , "Failed to create 'this' object" );
-+ return JS_FALSE;
-+ }
-+#else
- JSBool bindata_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
-+#endif
- Convertor c( cx );
-
- if ( argc == 2 ) {
-@@ -702,6 +861,9 @@ namespace mongo {
- c.setProperty( obj, "len", c.toval( (double)decoded.length() ) );
- c.setProperty( obj, "type", c.toval( (double)type ) );
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) );
-+#endif
- return JS_TRUE;
- }
- else {
-@@ -710,7 +872,8 @@ namespace mongo {
- }
- }
-
-- JSBool bindata_tostring(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
-+ JSBool bindata_tostring(JSContext *cx, uintN argc, jsval *vp){
-+ JSObject *obj = JS_THIS_OBJECT( cx , vp );
- Convertor c(cx);
- int type = (int)c.getNumber( obj , "type" );
- int len = (int)c.getNumber( obj, "len" );
-@@ -722,10 +885,12 @@ namespace mongo {
- base64::encode( ss, (const char *)data, len );
- ss << "\")";
- string ret = ss.str();
-- return *rval = c.toval( ret.c_str() );
-+ JS_SET_RVAL( cx , vp , c.toval( ret.c_str() ) );
-+ return JS_TRUE;
- }
-
-- JSBool bindataBase64(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
-+ JSBool bindataBase64(JSContext *cx, uintN argc, jsval *vp){
-+ JSObject *obj = JS_THIS_OBJECT( cx , vp );
- Convertor c(cx);
- int len = (int)c.getNumber( obj, "len" );
- void *holder = JS_GetPrivate( cx, obj );
-@@ -734,10 +899,12 @@ namespace mongo {
- stringstream ss;
- base64::encode( ss, (const char *)data, len );
- string ret = ss.str();
-- return *rval = c.toval( ret.c_str() );
-+ JS_SET_RVAL( cx , vp , c.toval( ret.c_str() ) );
-+ return JS_TRUE;
- }
-
-- JSBool bindataAsHex(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
-+ JSBool bindataAsHex(JSContext *cx, uintN argc, jsval *vp){
-+ JSObject *obj = JS_THIS_OBJECT( cx , vp );
- Convertor c(cx);
- int len = (int)c.getNumber( obj, "len" );
- void *holder = JS_GetPrivate( cx, obj );
-@@ -750,19 +917,24 @@ namespace mongo {
- ss << v;
- }
- string ret = ss.str();
-- return *rval = c.toval( ret.c_str() );
-+ JS_SET_RVAL( cx , vp , c.toval( ret.c_str() ) );
-+ return JS_TRUE;
- }
-
-- JSBool bindataLength(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
-+ JSBool bindataLength(JSContext *cx, uintN argc, jsval *vp){
-+ JSObject *obj = JS_THIS_OBJECT( cx , vp );
- Convertor c(cx);
- int len = (int)c.getNumber( obj, "len" );
-- return *rval = c.toval((double) len);
-+ JS_SET_RVAL( cx , vp , c.toval((double) len) );
-+ return JS_TRUE;
- }
-
-- JSBool bindataSubtype(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
-+ JSBool bindataSubtype(JSContext *cx, uintN argc, jsval *vp){
-+ JSObject *obj = JS_THIS_OBJECT( cx , vp );
- Convertor c(cx);
- int t = (int)c.getNumber( obj, "type" );
-- return *rval = c.toval((double) t);
-+ JS_SET_RVAL( cx , vp , c.toval((double) t) );
-+ return JS_TRUE;
- }
-
- void bindata_finalize( JSContext * cx , JSObject * obj ) {
-@@ -774,20 +946,21 @@ namespace mongo {
- }
- }
-
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp)
- JSClass bindata_class = {
- "BinData" , JSCLASS_HAS_PRIVATE ,
-- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
-+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
- JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, bindata_finalize,
- JSCLASS_NO_OPTIONAL_MEMBERS
- };
-
- JSFunctionSpec bindata_functions[] = {
-- { "toString" , bindata_tostring , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
-- { "hex", bindataAsHex, 0, JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
-- { "base64", bindataBase64, 0, JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
-- { "length", bindataLength, 0, JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
-- { "subtype", bindataSubtype, 0, JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
-- { 0 }
-+ JS_FS( "toString" , bindata_tostring , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) ,
-+ JS_FS( "hex", bindataAsHex, 0, JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) ,
-+ JS_FS( "base64", bindataBase64, 0, JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) ,
-+ JS_FS( "length", bindataLength, 0, JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) ,
-+ JS_FS( "subtype", bindataSubtype, 0, JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) ,
-+ JS_FS_END
- };
-
- // Map
-@@ -796,7 +969,16 @@ namespace mongo {
- return s == "put" || s == "get" || s == "_get" || s == "values" || s == "_data" || s == "constructor" ;
- }
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JSBool map_constructor( JSContext* cx, uintN argc, jsval* vp ){
-+ JSObject *obj = JS_NewObjectForConstructor( cx , vp );
-+ if( ! obj ) {
-+ JS_ReportError( cx , "Failed to create 'this' object" );
-+ return JS_FALSE;
-+ }
-+#else
- JSBool map_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
-+#endif
- if ( argc > 0 ) {
- JS_ReportError( cx , "Map takes no arguments" );
- return JS_FALSE;
-@@ -808,10 +990,16 @@ namespace mongo {
- jsval a = OBJECT_TO_JSVAL( array );
- JS_SetProperty( cx , obj , "_data" , &a );
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) );
-+#endif
- return JS_TRUE;
- }
-
-- JSBool map_prop( JSContext *cx, JSObject *obj, jsval idval, jsval *vp ) {
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSPropertyOp)
-+ JSBool map_prop( JSContext *cx, JSObject *obj, jsid id, jsval *vp ){
-+ jsval idval;
-+ JS_IdToValue( cx , id , &idval );
- Convertor c(cx);
- if ( specialMapString( c.toString( idval ) ) )
- return JS_TRUE;
-@@ -821,34 +1009,49 @@ namespace mongo {
- return JS_FALSE;
- }
-
-+ JSBool strict_map_prop( JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp ){
-+ return map_prop( cx , obj , id , vp );
-+ }
-+
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp)
- JSClass map_class = {
- "Map" , JSCLASS_HAS_PRIVATE ,
-- map_prop, JS_PropertyStub, map_prop, map_prop,
-+ map_prop, JS_PropertyStub, map_prop, strict_map_prop,
- JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, JS_FinalizeStub,
- JSCLASS_NO_OPTIONAL_MEMBERS
- };
-
- JSFunctionSpec map_functions[] = {
-- { 0 }
-+ JS_FS_END
- };
-
-
- // -----
-
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp)
- JSClass timestamp_class = {
- "Timestamp" , JSCLASS_HAS_PRIVATE ,
-- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
-+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
- JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, JS_FinalizeStub,
- JSCLASS_NO_OPTIONAL_MEMBERS
- };
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JSBool timestamp_constructor( JSContext* cx, uintN argc, jsval* vp ){
-+ jsval *argv = JS_ARGV( cx , vp );
-+ JSObject *obj = JS_NewObjectForConstructor( cx , vp );
-+ if( ! obj ) {
-+ JS_ReportError( cx , "Failed to create 'this' object" );
-+ return JS_FALSE;
-+ }
-+#else
- JSBool timestamp_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
-+#endif
- smuassert( cx , "Timestamp needs 0 or 2 args" , argc == 0 || argc == 2 );
-
- if ( ! JS_InstanceOf( cx , obj , &timestamp_class , 0 ) ) {
- obj = JS_NewObject( cx , &timestamp_class , 0 , 0 );
- CHECKNEWOBJECT( obj, cx, "timestamp_constructor" );
-- *rval = OBJECT_TO_JSVAL( obj );
- }
-
- Convertor c( cx );
-@@ -864,21 +1067,30 @@ namespace mongo {
- return JS_TRUE;
- }
-
--
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp)
- JSClass numberlong_class = {
- "NumberLong" , JSCLASS_HAS_PRIVATE ,
-- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
-+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
- JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, JS_FinalizeStub,
- JSCLASS_NO_OPTIONAL_MEMBERS
- };
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JSBool numberlong_constructor( JSContext* cx, uintN argc, jsval* vp ){
-+ jsval *argv = JS_ARGV( cx , vp );
-+ JSObject *obj = JS_NewObjectForConstructor( cx , vp );
-+ if( ! obj ) {
-+ JS_ReportError( cx , "Failed to create 'this' object" );
-+ return JS_FALSE;
-+ }
-+#else
- JSBool numberlong_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
-+#endif
- smuassert( cx , "NumberLong needs 0 or 1 args" , argc == 0 || argc == 1 );
-
- if ( ! JS_InstanceOf( cx , obj , &numberlong_class , 0 ) ) {
- obj = JS_NewObject( cx , &numberlong_class , 0 , 0 );
- CHECKNEWOBJECT( obj, cx, "numberlong_constructor" );
-- *rval = OBJECT_TO_JSVAL( obj );
- }
-
- Convertor c( cx );
-@@ -903,19 +1115,25 @@ namespace mongo {
- c.makeLongObj( n, obj );
- }
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) );
-+#endif
- return JS_TRUE;
- }
-
-- JSBool numberlong_valueof(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
-+ JSBool numberlong_valueof(JSContext *cx, uintN argc, jsval *vp){
-+ JSObject *obj = JS_THIS_OBJECT( cx , vp );
- Convertor c(cx);
-- return *rval = c.toval( double( c.toNumberLongUnsafe( obj ) ) );
-+ JS_SET_RVAL( cx , vp , c.toval( double( c.toNumberLongUnsafe( obj ) ) ) );
-+ return JS_TRUE;
- }
-
-- JSBool numberlong_tonumber(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
-- return numberlong_valueof( cx, obj, argc, argv, rval );
-+ JSBool numberlong_tonumber(JSContext *cx, uintN argc, jsval *vp){
-+ return numberlong_valueof( cx, argc, vp );
- }
-
-- JSBool numberlong_tostring(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
-+ JSBool numberlong_tostring(JSContext *cx, uintN argc, jsval *vp){
-+ JSObject *obj = JS_THIS_OBJECT( cx , vp );
- Convertor c(cx);
- stringstream ss;
- long long val = c.toNumberLongUnsafe( obj );
-@@ -927,33 +1145,45 @@ namespace mongo {
- ss << "NumberLong(" << val << ")";
-
- string ret = ss.str();
-- return *rval = c.toval( ret.c_str() );
-+ JS_SET_RVAL( cx , vp , c.toval( ret.c_str() ) );
-+ return JS_TRUE;
- }
-
- JSFunctionSpec numberlong_functions[] = {
-- { "valueOf" , numberlong_valueof , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
-- { "toNumber" , numberlong_tonumber , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
-- { "toString" , numberlong_tostring , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
-- { 0 }
-+ JS_FS( "valueOf" , numberlong_valueof , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) ,
-+ JS_FS( "toNumber" , numberlong_tonumber , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) ,
-+ JS_FS( "toString" , numberlong_tostring , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) ,
-+ JS_FS_END
- };
-
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp)
- JSClass minkey_class = {
- "MinKey" , JSCLASS_HAS_PRIVATE ,
-- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
-+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
- JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, JS_FinalizeStub,
- JSCLASS_NO_OPTIONAL_MEMBERS
- };
-
- JSClass maxkey_class = {
- "MaxKey" , JSCLASS_HAS_PRIVATE ,
-- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
-+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
- JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, JS_FinalizeStub,
- JSCLASS_NO_OPTIONAL_MEMBERS
- };
-
- // dbquery
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JSBool dbquery_constructor( JSContext* cx, uintN argc, jsval* vp ){
-+ jsval *argv = JS_ARGV( cx , vp );
-+ JSObject *obj = JS_NewObjectForConstructor( cx , vp );
-+ if( ! obj ) {
-+ JS_ReportError( cx , "Failed to create 'this' object" );
-+ return JS_FALSE;
-+ }
-+#else
- JSBool dbquery_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
-+#endif
- smuassert( cx , "DDQuery needs at least 4 args" , argc >= 4 );
-
- Convertor c(cx);
-@@ -1001,28 +1231,35 @@ namespace mongo {
- c.setProperty( obj , "_numReturned" , JSVAL_ZERO );
- c.setProperty( obj , "_special" , JSVAL_FALSE );
-
-+#ifdef JSFUN_CONSTRUCTOR
-+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) );
-+#endif
- return JS_TRUE;
- }
-
-- JSBool dbquery_resolve( JSContext *cx, JSObject *obj, jsval id, uintN flags, JSObject **objp ) {
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSResolveOp)
-+ JSBool dbquery_resolve( JSContext *cx, JSObject *obj, jsid id, uintN flags, JSObject **objp ){
-+ jsval idval;
-+ JS_IdToValue( cx , id , &idval );
- if ( flags & JSRESOLVE_ASSIGNING )
- return JS_TRUE;
-
-- if ( ! JSVAL_IS_NUMBER( id ) )
-+ if ( ! JSVAL_IS_NUMBER( idval ) )
- return JS_TRUE;
-
- jsval val = JSVAL_VOID;
-- assert( JS_CallFunctionName( cx , obj , "arrayAccess" , 1 , &id , &val ) );
-+ assert( JS_CallFunctionName( cx , obj , "arrayAccess" , 1 , &idval , &val ) );
- Convertor c(cx);
-- c.setProperty( obj , c.toString( id ).c_str() , val );
-+ c.setProperty( obj , c.toString( idval ).c_str() , val );
- *objp = obj;
- return JS_TRUE;
- }
-
-+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp, JSResolveOp)
- JSClass dbquery_class = {
- "DBQuery" , JSCLASS_NEW_RESOLVE ,
-- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
-- JS_EnumerateStub, (JSResolveOp)(&dbquery_resolve) , JS_ConvertStub, JS_FinalizeStub,
-+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
-+ JS_EnumerateStub, (JSResolveOp)dbquery_resolve , JS_ConvertStub, JS_FinalizeStub,
- JSCLASS_NO_OPTIONAL_MEMBERS
- };
-
-@@ -1102,7 +1339,7 @@ namespace mongo {
- return true;
- }
-
--#if defined( SM16 ) || defined( MOZJS )
-+#if defined( SM16 ) || JS_VERSION >= 181
- #warning dates do not work in your version of spider monkey
- {
- jsdouble d = js_DateGetMsecSinceEpoch( c->_context , o );
-@@ -1150,7 +1387,7 @@ namespace mongo {
- }
-
- bool isDate( JSContext * cx , JSObject * o ) {
--#if defined( SM16 ) || defined( MOZJS ) || defined( XULRUNNER )
-+#if defined( SM16 ) || JS_VERSION >= 181 || defined( XULRUNNER )
- return js_DateGetMsecSinceEpoch( cx , o ) != 0;
- #else
- return JS_InstanceOf( cx , o, &js_DateClass, 0 );
diff --git a/community/notion/doc-build-fix.patch b/community/notion/doc-build-fix.patch
deleted file mode 100644
index 45cc19725..000000000
--- a/community/notion/doc-build-fix.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 8cb5b6c..11c3ca0 100644
---- a/Makefile
-+++ b/Makefile
-@@ -19,6 +19,12 @@ FNTEXES=ioncore.exports mod_tiling.exports \
- mod_query.exports de.exports mod_menu.exports \
- mod_dock.exports mod_sp.exports mod_statusbar.exports
-
-+TEXSOURCES=conf-bindings.tex confintro.tex conf-menus.tex \
-+ conf-statusbar.tex conf.tex conf-winprops.tex cstyle.tex designnotes.tex \
-+ de.tex fdl.tex fnref.tex fullhierarchy.tex hookref.tex luaif.tex \
-+ macros.tex miscref.tex notionconf.tex notionnotes.tex objectsimpl.tex objects.tex \
-+ prelim.tex statusd.tex tricks.tex
-+
- RUBBER_DVI=rubber
- RUBBER_PS=rubber -p
- RUBBER_PDF=rubber -d
-@@ -31,14 +37,17 @@ TARGETS = notionconf notionnotes
- nothing:
- @ echo "Please read the README first."
-
--%-dvi:
-+%-dvi: $(TEXSOURCES)
- $(RUBBER_DVI) $*
--
--%-ps:
-+ touch $@
-+
-+%-ps: $(TEXSOURCES)
- $(RUBBER_PS) $*
-+ touch $@
-
--%-pdf:
-+%-pdf: $(TEXSOURCES)
- $(RUBBER_PDF) $*
-+ touch $@
-
- # Install
- ######################################
-@@ -48,30 +57,38 @@ install:
- for d in $(DOCS); do \
- for e in ps pdf dvi; do \
- test -f $$d.$$e && $(INSTALL) -m $(DATA_MODE) $$d.$$e $(DOCDIR); \
-- done; \
-+ done; \
- $(INSTALLDIR) $(DOCDIR)/$$d; \
-- for i in $$d/*; do \
-- $(INSTALL) -m $(DATA_MODE) $$i $(DOCDIR)/$$i; \
-+ for i in $$d/*; do \
-+ $(INSTALL) -m $(DATA_MODE) $$i $(DOCDIR)/$$i; \
- done; \
-- done
-+ rm -f $(DOCDIR)/$$d/*.log; \
-+ rm -f $(DOCDIR)/$$d/WARNINGS; \
-+ rm -f $(DOCDIR)/$$d/*.aux; \
-+ rm -f $(DOCDIR)/$$d/*.idx; \
-+ rm -f $(DOCDIR)/$$d/*.tex; \
-+ rm -f $(DOCDIR)/$$d/*.pl; \
-+ done
-
- # notionconf rules
- ######################################
-
--notionconf-dvi: fnlist.tex
--notionconf-ps: fnlist.tex
--notionconf-pdf: fnlist.tex
-+notionconf-dvi: fnlist.tex $(TEXSOURCES)
-+notionconf-ps: fnlist.tex $(TEXSOURCES)
-+notionconf-pdf: fnlist.tex $(TEXSOURCES)
-
--notionconf-html: $(FNTEXES)
-+notionconf-html: $(FNTEXES) $(TEXSOURCES)
- $(L2H) -split 3 notionconf
- cp notion.css notionconf
-+ touch $@
-
- # notionnotes rules
- ######################################
-
--notionnotes-html:
-+notionnotes-html: $(TEXSOURCES)
- $(L2H) -split 4 notionnotes
- cp notion.css notionnotes
-+ touch $@
-
- # More generic rules
- ######################################
-@@ -94,7 +111,7 @@ all-html: $(patsubst %, %-html, $(TARGETS))
-
- clean:
- rm -f $(FNTEXES) fnlist.tex
-- rm -f *.aux *.toc *.log
-+ rm -f *.aux *.toc *.log *.out
- rm -f *.idx *.ild *.ilg *.ind
-
- realclean: clean
-@@ -111,7 +128,8 @@ $(TOPDIR)/%/exports.tex:
- $(MAKE) -C $$(dirname $@) _exports_doc
-
- %.exports: $(TOPDIR)/%/exports.tex
-- cp $< $@
-+ cat $< | sed 's|UTF8_STRING|UTF8\\_STRING|' >$@
-+# cp $< $@
-
- # Function list
- ######################################
diff --git a/community/qbittorrent/python2.patch b/community/qbittorrent/python2.patch
deleted file mode 100644
index 24ab742db..000000000
--- a/community/qbittorrent/python2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nur qbittorrent-2.4.8.orig/src/searchengine/searchengine.cpp qbittorrent-2.4.8/src/searchengine.cpp
---- qbittorrent-2.4.8.orig/src/searchengine/searchengine.cpp 2010-10-01 13:52:53.000000000 -0700
-+++ qbittorrent-2.4.8/src/searchengine/searchengine.cpp 2010-10-25 01:20:20.046700620 -0700
-@@ -354,7 +354,7 @@
- //on change le texte du label courrant
- currentSearchTab->getCurrentLabel()->setText(tr("Results")+" <i>(0)</i>:");
- // Launch search
-- searchProcess->start("python", params, QIODevice::ReadOnly);
-+ searchProcess->start("python2", params, QIODevice::ReadOnly);
- searchTimeout->start(180000); // 3min
- }
-
-@@ -421,7 +421,7 @@
- params << engine_url;
- params << torrent_url;
- // Launch search
-- downloadProcess->start("python", params, QIODevice::ReadOnly);
-+ downloadProcess->start("python2", params, QIODevice::ReadOnly);
- }
- }
-
-diff -Nur qbittorrent-2.4.8.orig/src/searchengine/supportedengines.h qbittorrent-2.4.8/src/supportedengines.h
---- qbittorrent-2.4.8.orig/src/searchengine/supportedengines.h 2010-10-24 01:32:39.000000000 -0700
-+++ qbittorrent-2.4.8/src/searchengine/supportedengines.h 2010-10-25 01:18:42.230032834 -0700
-@@ -144,7 +144,7 @@
- QStringList params;
- params << misc::searchEngineLocation()+QDir::separator()+"nova2.py";
- params << "--capabilities";
-- nova.start("python", params, QIODevice::ReadOnly);
-+ nova.start("python2", params, QIODevice::ReadOnly);
- nova.waitForStarted();
- nova.waitForFinished();
- QString capabilities = QString(nova.readAll());
diff --git a/community/rlog/ChangeLog b/community/rlog/ChangeLog
deleted file mode 100644
index 811f87d4f..000000000
--- a/community/rlog/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2007-06-28 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
-
diff --git a/community/vnstat/vnstat.install b/community/vnstat/vnstat.install
deleted file mode 100644
index 364684142..000000000
--- a/community/vnstat/vnstat.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
- echo '==> Testing the kernel ...'
- /usr/bin/vnstat --testkernel
- echo '==> Every interface you want to monitor has to be introduced to vnStat!'
- echo '==> eg. vnstat -u -i eth0'
- echo '==> An example of a crontab to update vnStats database every 5 minutes'
- echo '==> has been put in /usr/share/doc/vnstat/examples/vnstat.cron'
- echo '==> Additionally, vnstat includes a daemon which can be added to your'
- echo '==> rc.conf to update the database.'
- echo '==> DO NOT HAVE BOTH THE CRON AND RC SCRIPTS ACTIVE AT THE SAME TIME.'
- echo '==>'
- echo '==> Webbased statistics can be generated using:'
- echo '==> /usr/share/doc/vnstat/examples/vnstat.cgi'
- /bin/true
-}
-
diff --git a/core/glibc/glibc-2.14-fix-resolver-crash-typo.patch b/core/glibc/glibc-2.14-fix-resolver-crash-typo.patch
deleted file mode 100644
index b5d86c7d2..000000000
--- a/core/glibc/glibc-2.14-fix-resolver-crash-typo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/resolv/res_send.c b/resolv/res_send.c
-index 97142b7..a001c1e 100644
---- a/resolv/res_send.c
-+++ b/resolv/res_send.c
-@@ -549,7 +549,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
- ns, ansp, ansp2, nansp2, resplen2);
- if (n < 0)
- return (-1);
-- if (n == 0 && (buf2 == NULL || resplen2 == 0))
-+ if (n == 0 && (buf2 == NULL || *resplen2 == 0))
- goto next_ns;
- } else {
- /* Use datagrams. */
-@@ -559,7 +559,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
- ansp2, nansp2, resplen2);
- if (n < 0)
- return (-1);
-- if (n == 0 && (buf2 == NULL || resplen2 == 0))
-+ if (n == 0 && (buf2 == NULL || *resplen2 == 0))
- goto next_ns;
- if (v_circuit)
- // XXX Check whether both requests failed or
diff --git a/core/glibc/glibc-2.14-revert-4462fad3.patch b/core/glibc/glibc-2.14-revert-4462fad3.patch
deleted file mode 100644
index d71e37492..000000000
--- a/core/glibc/glibc-2.14-revert-4462fad3.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/core/openssh/authfile.c.patch b/core/openssh/authfile.c.patch
deleted file mode 100644
index 6c18fe807..000000000
--- a/core/openssh/authfile.c.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-diff -aur old/authfile.c new/authfile.c
---- old/authfile.c 2011-06-12 02:21:52.262338254 +0200
-+++ new/authfile.c 2011-06-12 02:13:43.051467269 +0200
-@@ -1,4 +1,4 @@
--/* $OpenBSD: authfile.c,v 1.87 2010/11/29 18:57:04 markus Exp $ */
-+/* $OpenBSD: authfile.c,v 1.95 2011/05/29 11:42:08 djm Exp $ */
- /*
- * Author: Tatu Ylonen <ylo@cs.hut.fi>
- * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-@@ -69,6 +69,8 @@
- #include "misc.h"
- #include "atomicio.h"
-
-+#define MAX_KEY_FILE_SIZE (1024 * 1024)
-+
- /* Version identification string for SSH v1 identity files. */
- static const char authfile_id_string[] =
- "SSH PRIVATE KEY FILE FORMAT 1.1\n";
-@@ -312,12 +314,12 @@
- return pub;
- }
-
--/* Load the contents of a key file into a buffer */
--static int
-+/* Load a key from a fd into a buffer */
-+int
- key_load_file(int fd, const char *filename, Buffer *blob)
- {
-+ u_char buf[1024];
- size_t len;
-- u_char *cp;
- struct stat st;
-
- if (fstat(fd, &st) < 0) {
-@@ -325,30 +327,45 @@
- filename == NULL ? "" : filename,
- filename == NULL ? "" : " ",
- strerror(errno));
-- close(fd);
- return 0;
- }
-- if (st.st_size > 1*1024*1024) {
-+ if ((st.st_mode & (S_IFSOCK|S_IFCHR|S_IFIFO)) == 0 &&
-+ st.st_size > MAX_KEY_FILE_SIZE) {
-+ toobig:
- error("%s: key file %.200s%stoo large", __func__,
- filename == NULL ? "" : filename,
- filename == NULL ? "" : " ");
-- close(fd);
- return 0;
- }
-- len = (size_t)st.st_size; /* truncated */
--
- buffer_init(blob);
-- cp = buffer_append_space(blob, len);
--
-- if (atomicio(read, fd, cp, len) != len) {
-- debug("%s: read from key file %.200s%sfailed: %.100s", __func__,
-- filename == NULL ? "" : filename,
-- filename == NULL ? "" : " ",
-- strerror(errno));
-+ for (;;) {
-+ if ((len = atomicio(read, fd, buf, sizeof(buf))) == 0) {
-+ if (errno == EPIPE)
-+ break;
-+ debug("%s: read from key file %.200s%sfailed: %.100s",
-+ __func__, filename == NULL ? "" : filename,
-+ filename == NULL ? "" : " ", strerror(errno));
-+ buffer_clear(blob);
-+ bzero(buf, sizeof(buf));
-+ return 0;
-+ }
-+ buffer_append(blob, buf, len);
-+ if (buffer_len(blob) > MAX_KEY_FILE_SIZE) {
-+ buffer_clear(blob);
-+ bzero(buf, sizeof(buf));
-+ goto toobig;
-+ }
-+ }
-+ bzero(buf, sizeof(buf));
-+ if ((st.st_mode & (S_IFSOCK|S_IFCHR|S_IFIFO)) == 0 &&
-+ st.st_size != buffer_len(blob)) {
-+ debug("%s: key file %.200s%schanged size while reading",
-+ __func__, filename == NULL ? "" : filename,
-+ filename == NULL ? "" : " ");
- buffer_clear(blob);
-- close(fd);
- return 0;
- }
-+
- return 1;
- }
-
-@@ -606,7 +623,7 @@
- error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
- error("Permissions 0%3.3o for '%s' are too open.",
- (u_int)st.st_mode & 0777, filename);
-- error("It is recommended that your private key files are NOT accessible by others.");
-+ error("It is required that your private key files are NOT accessible by others.");
- error("This private key will be ignored.");
- return 0;
- }
-@@ -626,6 +643,7 @@
- case KEY_UNSPEC:
- return key_parse_private_pem(blob, type, passphrase, commentp);
- default:
-+ error("%s: cannot parse key type %d", __func__, type);
- break;
- }
- return NULL;
-@@ -670,11 +688,38 @@
- }
-
- Key *
-+key_parse_private(Buffer *buffer, const char *filename,
-+ const char *passphrase, char **commentp)
-+{
-+ Key *pub, *prv;
-+ Buffer pubcopy;
-+
-+ buffer_init(&pubcopy);
-+ buffer_append(&pubcopy, buffer_ptr(buffer), buffer_len(buffer));
-+ /* it's a SSH v1 key if the public key part is readable */
-+ pub = key_parse_public_rsa1(&pubcopy, commentp);
-+ buffer_free(&pubcopy);
-+ if (pub == NULL) {
-+ prv = key_parse_private_type(buffer, KEY_UNSPEC,
-+ passphrase, NULL);
-+ /* use the filename as a comment for PEM */
-+ if (commentp && prv)
-+ *commentp = xstrdup(filename);
-+ } else {
-+ key_free(pub);
-+ /* key_parse_public_rsa1() has already loaded the comment */
-+ prv = key_parse_private_type(buffer, KEY_RSA1, passphrase,
-+ NULL);
-+ }
-+ return prv;
-+}
-+
-+Key *
- key_load_private(const char *filename, const char *passphrase,
- char **commentp)
- {
-- Key *pub, *prv;
-- Buffer buffer, pubcopy;
-+ Key *prv;
-+ Buffer buffer;
- int fd;
-
- fd = open(filename, O_RDONLY);
-@@ -697,23 +742,7 @@
- }
- close(fd);
-
-- buffer_init(&pubcopy);
-- buffer_append(&pubcopy, buffer_ptr(&buffer), buffer_len(&buffer));
-- /* it's a SSH v1 key if the public key part is readable */
-- pub = key_parse_public_rsa1(&pubcopy, commentp);
-- buffer_free(&pubcopy);
-- if (pub == NULL) {
-- prv = key_parse_private_type(&buffer, KEY_UNSPEC,
-- passphrase, NULL);
-- /* use the filename as a comment for PEM */
-- if (commentp && prv)
-- *commentp = xstrdup(filename);
-- } else {
-- key_free(pub);
-- /* key_parse_public_rsa1() has already loaded the comment */
-- prv = key_parse_private_type(&buffer, KEY_RSA1, passphrase,
-- NULL);
-- }
-+ prv = key_parse_private(&buffer, filename, passphrase, commentp);
- buffer_free(&buffer);
- return prv;
- }
-@@ -737,13 +766,19 @@
- case '\0':
- continue;
- }
-+ /* Abort loading if this looks like a private key */
-+ if (strncmp(cp, "-----BEGIN", 10) == 0)
-+ break;
- /* Skip leading whitespace. */
- for (; *cp && (*cp == ' ' || *cp == '\t'); cp++)
- ;
- if (*cp) {
- if (key_read(k, &cp) == 1) {
-- if (commentp)
-- *commentp=xstrdup(filename);
-+ cp[strcspn(cp, "\r\n")] = '\0';
-+ if (commentp) {
-+ *commentp = xstrdup(*cp ?
-+ cp : filename);
-+ }
- fclose(f);
- return 1;
- }
diff --git a/core/util-linux/mount-segfault-2.19.1.patch b/core/util-linux/mount-segfault-2.19.1.patch
deleted file mode 100644
index 7bcb3bc05..000000000
--- a/core/util-linux/mount-segfault-2.19.1.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From f53edda83ebcfd7015c3f35196d6cbd7bc2d8369 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Wed, 11 May 2011 16:57:27 +0200
-Subject: [PATCH] mount: -a segfaults when 4th field is omitted (mount
- options)
-
- # echo 'tmpd /tmp/x tmpfs' >> /etc/fstab
- # mkdir /tmp/x
- # mount -a
- segfault
-
-Reported-by: Mike Frysinger <vapier@gentoo.org>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- mount/mount.c | 8 +++++---
- mount/mount_mntent.c | 5 +++--
- mount/sundries.c | 2 ++
- 3 files changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/mount/mount.c b/mount/mount.c
-index ba71149..29963c2 100644
---- a/mount/mount.c
-+++ b/mount/mount.c
-@@ -1163,7 +1163,9 @@ is_mounted_same_loopfile(const char *node0, const char *loopfile, unsigned long
- res = loopfile_used_with((char *) mnt->m.mnt_fsname,
- loopfile, offset);
-
-- else if ((p = strstr(mnt->m.mnt_opts, "loop="))) {
-+ else if (mnt->m.mnt_opts &&
-+ (p = strstr(mnt->m.mnt_opts, "loop=")))
-+ {
- char *dev = xstrdup(p+5);
- if ((p = strchr(dev, ',')))
- *p = '\0';
-@@ -2052,8 +2054,8 @@ is_fstab_entry_mounted(struct mntentchn *mc, int verbose)
- goto yes;
-
- /* extra care for loop devices */
-- if ((strstr(mc->m.mnt_opts, "loop=") ||
-- (stat(mc->m.mnt_fsname, &st) == 0 && S_ISREG(st.st_mode)))) {
-+ if ((mc->m.mnt_opts && strstr(mc->m.mnt_opts, "loop=")) ||
-+ (stat(mc->m.mnt_fsname, &st) == 0 && S_ISREG(st.st_mode))) {
-
- char *p = get_option_value(mc->m.mnt_opts, "offset=");
- uintmax_t offset = 0;
-diff --git a/mount/mount_mntent.c b/mount/mount_mntent.c
-index d90def3..f42c0ad 100644
---- a/mount/mount_mntent.c
-+++ b/mount/mount_mntent.c
-@@ -70,7 +70,7 @@ my_addmntent (mntFILE *mfp, struct my_mntent *mnt) {
- m1 = mangle(mnt->mnt_fsname);
- m2 = mangle(mnt->mnt_dir);
- m3 = mangle(mnt->mnt_type);
-- m4 = mangle(mnt->mnt_opts);
-+ m4 = mnt->mnt_opts ? mangle(mnt->mnt_opts) : "rw";
-
- res = fprintf (mfp->mntent_fp, "%s %s %s %s %d %d\n",
- m1, m2, m3, m4, mnt->mnt_freq, mnt->mnt_passno);
-@@ -78,7 +78,8 @@ my_addmntent (mntFILE *mfp, struct my_mntent *mnt) {
- free(m1);
- free(m2);
- free(m3);
-- free(m4);
-+ if (mnt->mnt_opts)
-+ free(m4);
- return (res < 0) ? 1 : 0;
- }
-
-diff --git a/mount/sundries.c b/mount/sundries.c
-index ae4501a..2dec37f 100644
---- a/mount/sundries.c
-+++ b/mount/sundries.c
-@@ -217,6 +217,8 @@ matching_opts (const char *options, const char *test_opts) {
-
- if (test_opts == NULL)
- return 1;
-+ if (options == NULL)
-+ options = "";
-
- len = strlen(test_opts);
- q = alloca(len+1);
---
-1.7.5.1
-
diff --git a/core/util-linux/two-component-linux.patch b/core/util-linux/two-component-linux.patch
deleted file mode 100644
index 1b65ca295..000000000
--- a/core/util-linux/two-component-linux.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From fa7e0d6d442de9f5940f99fd93f4522602439131 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Mon, 6 Jun 2011 12:35:26 +0200
-Subject: [PATCH] lib: [linux_version.c] accommodate two-component linux
- version (e.g. 3.0)
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- lib/linux_version.c | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lib/linux_version.c b/lib/linux_version.c
-index f9fbd8d..ada566a 100644
---- a/lib/linux_version.c
-+++ b/lib/linux_version.c
-@@ -16,10 +16,10 @@ get_linux_version (void)
- return kver;
- if (uname (&uts))
- kver = 0;
-- else if (sscanf (uts.release, "%d.%d.%d", &major, &minor, &teeny) != 3)
-- kver = 0;
-- else
-+ else if (sscanf (uts.release, "%d.%d.%d", &major, &minor, &teeny) == 3)
- kver = KERNEL_VERSION (major, minor, teeny);
-+ else if (sscanf (uts.release, "%d.%d", &major, &minor) == 2)
-+ kver = KERNEL_VERSION (major, minor, 0);
-
- return kver;
- }
---
-1.7.6
-
diff --git a/extra/bdf-unifont/LICENSE b/extra/bdf-unifont/LICENSE
deleted file mode 100644
index 066ea1699..000000000
--- a/extra/bdf-unifont/LICENSE
+++ /dev/null
@@ -1,60 +0,0 @@
-CENSE
--------
-Roman Czyborra released his work (Perl scripts and font .hex files)
-under the following terms:
-
- All of my works you find here are freeware. You may
- freely copy, use, quote, modify or redistribute them
- as long as you properly attribute my contribution and
- have given a quick thought about whether Roman might
- perhaps be interested to read what you did with his
- stuff. Horizontal rules don't apply.
-
-David Starner released what in this package is named "hex2bdf-split"
-under the same license as Roman Czyborra's work.
-
-License for all of Paul Hardy's work (except "johab2ucs2" and
-"blanks.hex", mentioned separately), Makefile and debian/ mods
-by Anthony Fok, and modified software from Luis Gonzalez Miranda
-(with permission granted to Paul Hardy):
-
- These are released under the terms of the GNU General Public
- License version 2, or (at your option) a later version.
-
-License for Fonts:
-
- Any fonts using glyphs from the "wqy-cjk.hex" file (including
- the default TrueType font) are bound by the terms of the Wen
- Quan Yi font license. Those fonts are released under the terms
- of the GNU General Public License (GPL) versionn 2, with the
- exception that embedding the font in a document does not by
- itself bind that document to the terms of the GNU GPL.
-
- Any fonts that do not use glyphs from the "wqy-cjk.hex" file
- fall under the above "License for all of Roman Czyborra's work".
-
- The fonts in "./font/precompiled" do use wqy-cjk.hex, and so
- are licensed under the GNU GPL version 2, with the exception
- that embedding the font in a document does not in itself bind
- that document to the terms of the GNU GPL. The following
- paragraphs explaining the exception is taken from the Wen
- Quan Yi font distribution:
-
- ** GPL v2.0 license with font embedding exception:
-
- As a special exception, if you create a document which
- uses this font, and embed this font or unaltered portions
- of this font into the document, this font does not by
- itself cause the resulting document to be covered by
- the GNU General Public License. This exception does not
- however invalidate any other reasons why the document
- might be covered by the GNU General Public License.
- If you modify this font, you may extend this exception
- to your version of the font, but you are not obligated
- to do so. If you do not wish to do so, delete this
- exception statement from your version.
-
-License for "blanks.hex":
-
- There is one exception to the above rules: Paul Hardy earlier
- released the "blanks.hex" file into the public domain.
diff --git a/extra/bdf-unifont/PKGBUILD b/extra/bdf-unifont/PKGBUILD
deleted file mode 100644
index 2df7993e6..000000000
--- a/extra/bdf-unifont/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD,v 1.5 2008/09/24 07:16:54 ronald Exp $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=bdf-unifont
-pkgver=5.1.20080820
-pkgrel=1
-pkgdesc="GNU Unifont Glyphs"
-arch=('i686' 'x86_64')
-license=('custom' 'GPL2')
-url="http://unifoundry.com/unifont.html"
-depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
-install=unifont.install
-source=('http://unifoundry.com/unifont-5.1.20080820.bdf.gz' 'LICENSE')
-md5sums=('6b8263ceccef33bd633aa019d74b7943'
- '64da5a96d6789d29d485cd67a43bc547')
-
-build() {
- install -Dm644 ${srcdir}/unifont-5.1.20080820.bdf \
- ${pkgdir}/usr/share/fonts/misc/unifont.bdf
-
- # install LICENSE file
- install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
-
diff --git a/extra/bdf-unifont/unifont.install b/extra/bdf-unifont/unifont.install
deleted file mode 100644
index 7d21ab51b..000000000
--- a/extra/bdf-unifont/unifont.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- echo -n "Updating font cache... "
- fc-cache -f > /dev/null
- mkfontscale /usr/share/fonts/misc
- mkfontdir /usr/share/fonts/misc
- echo "done."
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/extra/compface/compface-1.4-errno.patch.bz2 b/extra/compface/compface-1.4-errno.patch.bz2
deleted file mode 100644
index bfc47425d..000000000
--- a/extra/compface/compface-1.4-errno.patch.bz2
+++ /dev/null
Binary files differ
diff --git a/extra/convmv/PKGBUILD b/extra/convmv/PKGBUILD
deleted file mode 100644
index 4601b7cf3..000000000
--- a/extra/convmv/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 26708 2009-02-11 17:18:18Z tpowa $
-# Maintainer : Aaron Griffin <aaron@archlinux.org>
-
-pkgname=convmv
-pkgver=1.14
-pkgrel=1
-pkgdesc="Tool for converting encodings on filesystems"
-license=('GPL2')
-arch=(i686 x86_64)
-url="http://j3e.de/linux/convmv/"
-depends=('perl')
-source=(http://j3e.de/linux/convmv/$pkgname-$pkgver.tar.gz)
-
-build()
-{
- cd $startdir/src/$pkgname-$pkgver
- make
- make PREFIX=$startdir/pkg/usr install || return 1
-}
-md5sums=('d41238051c13b2e6c0cc2310a8f69d68')
diff --git a/extra/cowsay/ChangeLog b/extra/cowsay/ChangeLog
deleted file mode 100644
index ca646a273..000000000
--- a/extra/cowsay/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-2008-12-08 Eric Belanger <eric@archlinux.org>
-
- * cowsay 3.03-6
- * Added license
- * FHS man pages
- * Added arch tag
- * Added ChangeLog
diff --git a/extra/cowsay/PKGBUILD b/extra/cowsay/PKGBUILD
deleted file mode 100644
index 7f71b15e7..000000000
--- a/extra/cowsay/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 21051 2008-12-09 04:32:04Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-
-pkgname=cowsay
-pkgver=3.03
-pkgrel=6
-pkgdesc="Add speaking and thinking cows (and a few other creatures) to anything"
-arch=('i686' 'x86_64')
-url="http://www.nog.net/~tony/warez/cowsay.shtml"
-license=('PerlArtistic' 'GPL')
-depends=('perl')
-source=(http://www.nog.net/~tony/warez/${pkgname}-${pkgver}.tar.gz cowsay.patch)
-md5sums=('b29169797359420dadb998079021a494' '7091f9a6d97006299a1f27a665b638b6')
-sha1sums=('cc65a9b13295c87df94a58caa8a9176ce5ec4a27' '0da25fd2f80de4d92096c5d1ece2c6dcc05bea75')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -p1 < ../cowsay.patch
- sed -i 's|/man/|/share/man/|' install.sh
- echo "${pkgdir}/usr" | ./install.sh
-}
diff --git a/extra/cowsay/cowsay.patch b/extra/cowsay/cowsay.patch
deleted file mode 100644
index 299d52895..000000000
--- a/extra/cowsay/cowsay.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cowsay-3.03/install.sh 1999-11-01 21:19:21.000000000 +0100
-+++ cowsay-3.03-new/install.sh 2003-08-15 17:14:23.000000000 +0200
-@@ -67,7 +67,7 @@
- echo Okay, time to install this puppy.
-
- echo s,%BANGPERL%,!$usethisperl,\; > install.pl
--echo s,%PREFIX%,$PREFIX,\; >> install.pl
-+echo s,%PREFIX%,/usr,\; >> install.pl
- set -x
- mkdir -p $PREFIX/bin || (mkdir $PREFIX; mkdir $PREFIX/bin)
- $usethisperl -p install.pl cowsay > $PREFIX/bin/cowsay
diff --git a/extra/curl/PKGBUILD b/extra/curl/PKGBUILD
deleted file mode 100644
index 07712c045..000000000
--- a/extra/curl/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 128353 2011-06-23 12:54:15Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=curl
-pkgver=7.21.7
-pkgrel=1
-pkgdesc="An URL retrival utility and library"
-arch=('i686' 'x86_64')
-url="http://curl.haxx.se"
-license=('MIT')
-depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2')
-options=('!libtool')
-source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2
- curlbuild.h)
-
-[[ $CARCH == "x86_64" ]] && _curlbuild=curlbuild-64.h
-[[ $CARCH == "i686" ]] && _curlbuild=curlbuild-32.h
-md5sums=('5f6d50c4d4ee38c57fe37e3cff75adbd'
- '751bd433ede935c8fae727377625a8ae')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- ./configure \
- --with-random=/dev/urandom \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --disable-dependency-tracking \
- --enable-ipv6 \
- --disable-ldaps \
- --disable-ldap \
- --enable-manual \
- --enable-versioned-symbols \
- --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
- --without-libidn \
- --enable-threaded-resolver
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
- install -Dm644 docs/libcurl/libcurl.m4 \
- "$pkgdir/usr/share/aclocal/libcurl.m4"
- mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
- install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
-}
diff --git a/extra/curl/curlbuild.h b/extra/curl/curlbuild.h
deleted file mode 100644
index b48862696..000000000
--- a/extra/curl/curlbuild.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-#include "curlbuild-32.h"
-#elif __WORDSIZE == 64
-#include "curlbuild-64.h"
-#else
-#error "Unknown word size"
-#endif
diff --git a/extra/dbus-qt3/PKGBUILD b/extra/dbus-qt3/PKGBUILD
deleted file mode 100644
index c14237077..000000000
--- a/extra/dbus-qt3/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 49853 2009-08-16 18:53:06Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=dbus-qt3
-pkgver=0.62
-pkgrel=4
-pkgdesc="QT3 bindings for DBUS"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.freedesktop.org/software/dbus"
-depends=('qt3' 'dbus-core>=1.2.14')
-makedepends=('pkgconfig')
-options=('!libtool')
-source=(ftp://ftp.archlinux.org/other/dbus/dbus-qt3_0.62.git.20060814.orig.tar.gz
- dbus-qt3-compile-fix-thoenig-01.patch
- dbus-qt3-do-not-close-shared-connection-thoenig-01.patch)
-md5sums=('bdc61add46f64238fdc68a15e5f7269c'
- '6c7a45865568340ee601d31e184653c1'
- '9252c03a00d751201e53839d6a8ef78f')
-
-build() {
- . /etc/profile.d/qt3.sh
- cd "${srcdir}/${pkgname}-${pkgver}/qt3"
- patch -Np1 -i "${srcdir}/dbus-qt3-compile-fix-thoenig-01.patch" || return 1
- patch -Np1 -i "${srcdir}/dbus-qt3-do-not-close-shared-connection-thoenig-01.patch" || return 1
- cd ..
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
- sed -e "s|DBUS_QT3_LIBS =|DBUS_QT3_LIBS = -L${QTDIR}/lib -lqt-mt|" \
- -i Makefile qt3/Makefile || return 1
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/extra/dbus-qt3/dbus-qt3-compile-fix-thoenig-01.patch b/extra/dbus-qt3/dbus-qt3-compile-fix-thoenig-01.patch
deleted file mode 100644
index 00b8b6026..000000000
--- a/extra/dbus-qt3/dbus-qt3-compile-fix-thoenig-01.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- dbus-qt3/connection.cpp 2005-04-18 05:19:17.000000000 -0600
-+++ dbus-qt3/connection.cpp 2005-04-19 14:35:07.000000000 -0600
-@@ -154,6 +154,7 @@
-
- void* Connection::virtual_hook( int, void* )
- {
-+ return (void *)NULL;
- }
-
- void Connection::dbus_connection_setup_with_qt_main (DBusConnection *connection)
---- dbus-qt3/message.cpp 2005-04-18 05:19:17.000000000 -0600
-+++ dbus-qt3/message.cpp 2005-04-19 14:55:32.000000000 -0600
-@@ -359,6 +359,7 @@
- Message Message::operator=( const Message& other )
- {
- //FIXME: ref the other.d->msg instead of copying it?
-+ return (Message &)(d->msg);
- }
- /**
- * Destructs message.
-@@ -508,42 +509,49 @@
- const dbus_bool_t right_size_bool = b;
- dbus_message_append_args( d->msg, DBUS_TYPE_BOOLEAN, &right_size_bool,
- DBUS_TYPE_INVALID );
-+ return (Message &)(d->msg);
- }
-
- Message& Message::operator<<( Q_INT8 byte )
- {
- dbus_message_append_args( d->msg, DBUS_TYPE_BYTE, &byte,
- DBUS_TYPE_INVALID );
-+ return (Message &)(d->msg);
- }
-
- Message& Message::operator<<( Q_INT32 num )
- {
- dbus_message_append_args( d->msg, DBUS_TYPE_INT32, &num,
- DBUS_TYPE_INVALID );
-+ return (Message &)(d->msg);
- }
-
- Message& Message::operator<<( Q_UINT32 num )
- {
- dbus_message_append_args( d->msg, DBUS_TYPE_UINT32, &num,
- DBUS_TYPE_INVALID );
-+ return (Message &)(d->msg);
- }
-
- Message& Message::operator<<( Q_INT64 num )
- {
- dbus_message_append_args( d->msg, DBUS_TYPE_INT64, &num,
- DBUS_TYPE_INVALID );
-+ return (Message &)(d->msg);
- }
-
- Message& Message::operator<<( Q_UINT64 num )
- {
- dbus_message_append_args( d->msg, DBUS_TYPE_UINT64, &num,
- DBUS_TYPE_INVALID );
-+ return (Message &)(d->msg);
- }
-
- Message& Message::operator<<( double num )
- {
- dbus_message_append_args( d->msg, DBUS_TYPE_DOUBLE, &num,
- DBUS_TYPE_INVALID );
-+ return (Message &)(d->msg);
- }
-
- Message& Message::operator<<( const QString& str )
-@@ -551,11 +559,13 @@
- const char *u = str.utf8();
- dbus_message_append_args( d->msg, DBUS_TYPE_STRING, &u,
- DBUS_TYPE_INVALID );
-+ return (Message &)(d->msg);
- }
-
- Message& Message::operator<<( const QVariant& custom )
- {
- //FIXME: imeplement
-+ return (Message &)(d->msg);
- }
-
- }
-
diff --git a/extra/dbus-qt3/dbus-qt3-do-not-close-shared-connection-thoenig-01.patch b/extra/dbus-qt3/dbus-qt3-do-not-close-shared-connection-thoenig-01.patch
deleted file mode 100644
index c159c0a90..000000000
--- a/extra/dbus-qt3/dbus-qt3-do-not-close-shared-connection-thoenig-01.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- dbus-qt3/connection.cpp 2006-10-20 16:33:29.000000000 +0200
-+++ dbus-qt3/connection.cpp 2006-10-20 16:33:10.000000000 +0200
-@@ -106,7 +106,7 @@
-
- void Connection::close()
- {
-- dbus_connection_close( d->connection );
-+ dbus_connection_unref ( d->connection );
- }
-
- void Connection::flush()
-
diff --git a/extra/dvd+rw-tools/buildpatch-7.0-3-20080108-karolina.patch b/extra/dvd+rw-tools/buildpatch-7.0-3-20080108-karolina.patch
deleted file mode 100644
index 0b7951f1b..000000000
--- a/extra/dvd+rw-tools/buildpatch-7.0-3-20080108-karolina.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur dvd+rw-tools-7.0/growisofs.c dvd+rw-tools-7.0_new/growisofs.c
---- dvd+rw-tools-7.0/growisofs.c 2006-09-24 19:28:53.000000000 +0200
-+++ dvd+rw-tools-7.0_new/growisofs.c 2008-01-08 00:56:57.000000000 +0100
-@@ -418,6 +418,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <assert.h>
-+#include <limits.h>
- #include "mp.h"
-
- #if defined(__unix) || defined(__unix__)
-diff -Naur dvd+rw-tools-7.0/transport.hxx dvd+rw-tools-7.0_new/transport.hxx
---- dvd+rw-tools-7.0/transport.hxx 2006-09-23 13:29:07.000000000 +0200
-+++ dvd+rw-tools-7.0_new/transport.hxx 2008-01-08 00:57:36.000000000 +0100
-@@ -137,6 +137,7 @@
- #include <sys/wait.h>
- #include <sys/utsname.h>
- #include <scsi/sg.h>
-+#include <limits.h>
- #if !defined(SG_FLAG_LUN_INHIBIT)
- # if defined(SG_FLAG_UNUSED_LUN_INHIBIT)
- # define SG_FLAG_LUN_INHIBIT SG_FLAG_UNUSED_LUN_INHIBIT
diff --git a/extra/emovix/PKGBUILD b/extra/emovix/PKGBUILD
deleted file mode 100644
index f18c36675..000000000
--- a/extra/emovix/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 37013 2009-04-29 22:54:35Z eric $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=emovix
-pkgver=0.9.0
-pkgrel=4
-pkgdesc="Create Movix-CD's (also emovix plugin for k3b)"
-arch=(i686 x86_64)
-url="http://movix.sourceforge.net/"
-license=('GPL2')
-depends=('perl' 'cdrtools')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/movix/$pkgname-$pkgver.tar.gz)
-md5sums=('a96492f338824b24c5a9e714c57eddcf')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr || return 1
- make || return 1
- make DESTDIR=$pkgdir install || return 1
- find $pkgdir/usr/share/emovix -type d -exec chmod 755 {} \; || return 1
-}
-
diff --git a/extra/foobillard/03_bugfixes b/extra/foobillard/03_bugfixes
deleted file mode 100644
index 99f282b10..000000000
--- a/extra/foobillard/03_bugfixes
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: foobillard-3.0a/src/ball.c
-===================================================================
---- foobillard-3.0a.orig/src/ball.c 2006-10-12 16:42:39.000000000 +0200
-+++ foobillard-3.0a/src/ball.c 2006-10-12 16:42:48.000000000 +0200
-@@ -1821,6 +1821,7 @@
- } else if( options_cuberef && cuberef_binds!=0 ){
- glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, cuberef_binds[i]);
- #ifdef GL_VERTEX_PROGRAM_NV
-+#ifdef USE_BALL_FRESNEL
- {
- myvec cam_pos2;
- // cam_pos2=vec_scale(vec_unit(vec_diff(cam_pos,balls.ball[i].r)),BALL_D/2.5);
-@@ -1829,6 +1830,7 @@
- BALL_D/2.0,BALL_D/2.5,0,0 );
- }
- #endif
-+#endif
- draw_ball(&balls.ball[i],cam_pos,cam_FOV,win_width,0);
- }else{
- draw_ball(&balls.ball[i],cam_pos,cam_FOV,win_width,0);
-Index: foobillard-3.0a/src/evaluate_move.c
-===================================================================
---- foobillard-3.0a.orig/src/evaluate_move.c 2006-10-12 16:42:43.000000000 +0200
-+++ foobillard-3.0a/src/evaluate_move.c 2006-10-12 16:42:48.000000000 +0200
-@@ -385,6 +385,11 @@
- int ball_out;
- int other_player=(act_player==1)?0:1;
- int b1hit = BM_get_1st_ball_hit(); if (b1hit>=8) b1hit=1;
-+ if(st.to_play==SN_DONE)
-+ {
-+ BM_reset_move_info();
-+ return;
-+ }
-
- if( player[act_player].place_cue_ball ) player[act_player].place_cue_ball=0;
- printf("EVAL start\n");
diff --git a/extra/foobillard/05_foul_explanation b/extra/foobillard/05_foul_explanation
deleted file mode 100644
index af89c5e95..000000000
--- a/extra/foobillard/05_foul_explanation
+++ /dev/null
@@ -1,262 +0,0 @@
-Index: foobillard-3.0a/src/billard3d.c
-===================================================================
---- foobillard-3.0a.orig/src/billard3d.c 2006-10-12 16:44:17.000000000 +0200
-+++ foobillard-3.0a/src/billard3d.c 2006-10-12 16:44:31.000000000 +0200
-@@ -331,6 +331,8 @@
- static textObj * winner_name_text_obj;
- static textObj * winner_text_obj;
-
-+textObj * last_fault_text;
-+
- #ifndef _WIN32
-
- enum optionType
-@@ -3322,6 +3324,13 @@
- if( player[act_player].text != 0 ){
- textObj_draw( player[act_player].text );
- }
-+ /* last fault */
-+ if (strcmp("x", last_fault_text->str)!=0) {
-+ glTranslatef(0.0, 70.0, 0.0);
-+ textObj_draw(last_fault_text);
-+ glTranslatef(0.0,-70.0,0.0);
-+ }
-+
- glTranslatef(0,30,0);
- if (gametype==GAME_8BALL){
- switch(player[act_player].half_full){
-@@ -5197,6 +5206,9 @@
- }
- DPRINTF("created winner text obj's\n");
-
-+
-+ last_fault_text = textObj_new( "x", options_help_fontname, 20 );
-+
- init_menu();
-
- sys_set_timer(frametime_ms, Idle_timer); /* assure a framerate of max 50 fps (1frame/20ms) */
-Index: foobillard-3.0a/src/evaluate_move.c
-===================================================================
---- foobillard-3.0a.orig/src/evaluate_move.c 2006-10-12 16:44:22.000000000 +0200
-+++ foobillard-3.0a/src/evaluate_move.c 2006-10-12 16:44:31.000000000 +0200
-@@ -4,6 +4,9 @@
- ** Copyright (C) 2001 Florian Berger
- ** Email: harpin_floh@yahoo.de, florian.berger@jk.uni-linz.ac.at
- **
-+** Small changes to output a reason why the last shot was a fault by
-+** Thorsten Gunkel <tgunkel-lists@tgunkel.de>
-+**
- ** This program is free software; you can redistribute it and/or modify
- ** it under the terms of the GNU General Public License Version 2 as
- ** published by the Free Software Foundation;
-@@ -108,11 +111,12 @@
-
- /* wenn fremde kugel zuerst angespielt -> foul */
- first_ball_hit=BM_get_1st_ball_hit();
-- if( player[act_player].half_full == BALL_FULL ){
-- if ( first_ball_hit>8 && first_ball_hit<16 ) foul=1;
-- }
-- if( player[act_player].half_full == BALL_HALF ){
-- if ( first_ball_hit>0 && first_ball_hit<8 ) foul=1;
-+ if(
-+ ( player[act_player].half_full == BALL_FULL && first_ball_hit>8 && first_ball_hit<16 ) ||
-+ ( player[act_player].half_full == BALL_HALF && first_ball_hit>0 && first_ball_hit<8 )
-+ ){
-+ foul=1;
-+ textObj_setText(last_fault_text, "First ball hit was not one of yours");
- }
-
- /* erst an 2. stelle, da oben kein foul bei break */
-@@ -146,7 +150,10 @@
- }
- }
- }
-- if(eigene_da) foul=1;
-+ if(eigene_da){
-+ foul=1;
-+ textObj_setText(last_fault_text, "You hit the 8-Ball too soon");
-+ }
- }
-
- /* wenn angespielte kugel im strafraum */
-@@ -154,6 +161,7 @@
- in_strafraum(BM_get_1st_ball_hit_pos()) &&
- !BM_get_non_strafraum_wall_hit_before_1st_ball(in_strafraum) ){
- foul=1;
-+ textObj_setText(last_fault_text, "You hit a ball not behind the head string");
- }
-
- /* wenn eigene rein naechster */
-@@ -169,7 +177,10 @@
- }
-
-
-- if( BM_get_balls_hit()==0 ) foul=1;
-+ if( BM_get_balls_hit()==0 ){
-+ foul=1;
-+ textObj_setText(last_fault_text, "No Ball hit");
-+ }
-
- /* wenn weisse rein */
- if( BM_get_white_out() ){
-@@ -177,6 +188,7 @@
- foul=1;
- balls.ball[0].in_game=1;
- balls.ball[0].in_hole=0;
-+ textObj_setText(last_fault_text, "White ball potted");
- }
-
- /* wenn foul */
-@@ -188,6 +200,8 @@
- balls.ball[0].w=vec_xyz(0.0,0.0,0.0);
- balls.ball[0].r=vec_xyz(0.0,-TABLE_L/4.0,0.0);
- // balls.ball[0].r=vec_xyz(x,y,0.0);
-+ } else {
-+ textObj_setText(last_fault_text, "x");
- }
-
- /* if 8 out */
-@@ -221,6 +235,7 @@
- else
- {
- player[(act_player==1)?0:1].winner=1;
-+ textObj_setText(last_fault_text, "8 ball potted too soon");
- }
-
- }
-@@ -277,9 +292,15 @@
- nextplayer=0;
- }
-
-- if( BM_get_balls_hit()==0 ) foul=1;
--
-- if( BM_get_1st_ball_hit()!=minball ) foul=1;
-+ if( BM_get_balls_hit()==0 ){
-+ textObj_setText(last_fault_text, "No Ball hit");
-+ foul=1;
-+ } else {
-+ if( BM_get_1st_ball_hit()!=minball ){
-+ textObj_setText(last_fault_text, "First ball hit was not the lowest");
-+ foul=1;
-+ }
-+ }
-
- /* wenn weisse rein */
- if( BM_get_white_out() ){
-@@ -287,6 +308,7 @@
- nextplayer=1;
- pballs->ball[0].in_game=1;
- pballs->ball[0].in_hole=0;
-+ textObj_setText(last_fault_text, "White ball is potted");
- }
-
- /* wenn foul - weisse platzieren */
-@@ -297,6 +319,8 @@
- pballs->ball[0].v=vec_xyz(0.0,0.0,0.0);
- pballs->ball[0].w=vec_xyz(0.0,0.0,0.0);
- pballs->ball[0].r=vec_xyz(0,-TABLE_L/4.0,0.0);
-+ } else {
-+ textObj_setText(last_fault_text, "x");
- }
-
- fprintf(stderr,"foul:%d, nextplayer:%d, BM_get_ball_out(9):%d\n",foul,nextplayer,BM_get_ball_out(9));
-@@ -409,6 +433,7 @@
- act_penalty =MAX(act_penalty,(BM_get_1st_ball_hit()<=7?BM_get_1st_ball_hit():4));
- spot_snooker_ball(pballs,0);
- player[other_player].place_cue_ball=1;
-+ textObj_setText(last_fault_text, "White ball is potted");
- }
-
- switch(st.to_play)
-@@ -420,6 +445,11 @@
- foul=1;
- act_penalty=MAX(act_penalty,b1hit);
- printf("EVAL foul 1\n");
-+ if( BM_get_balls_hit()==0 ){
-+ textObj_setText(last_fault_text, "No Ball hit");
-+ } else {
-+ textObj_setText(last_fault_text, "First ball hit was not a red one");
-+ }
- }
- i=1;
- while((ball_out=BM_get_nth_ball_out(i++))>=0)
-@@ -434,6 +464,11 @@
- act_penalty=MAX(act_penalty,ball_out);
- foul=1;
- printf("EVAL foul 2\n");
-+ if (BM_get_white_out()){
-+ textObj_setText(last_fault_text, "White ball potted");
-+ } else {
-+ textObj_setText(last_fault_text, "Potted ball was not a red one");
-+ }
- }
- }
- for(i=2;i<8;i++)
-@@ -449,6 +484,11 @@
- foul=1;
- printf("EVAL foul 3\n");
- act_penalty=MAX(act_penalty,7);
-+ if( BM_get_balls_hit()==0 ){
-+ textObj_setText(last_fault_text, "No Ball hit");
-+ } else {
-+ textObj_setText(last_fault_text, "First ball hit was not a colored one");
-+ }
- }
- color_to_pot=b1hit;
- i=1;
-@@ -464,6 +504,11 @@
- foul=1;
- printf("EVAL foul 4\n");
- act_penalty=MAX(act_penalty,ball_out==1?7:ball_out);
-+ if (BM_get_white_out()){
-+ textObj_setText(last_fault_text, "White ball potted");
-+ } else {
-+ textObj_setText(last_fault_text, "Potted ball was not a colored one");
-+ }
- }
- }
- if(red_balls_are_in_game)
-@@ -490,6 +535,11 @@
- printf("EVAL foul 5\n");
- act_penalty=MAX(act_penalty,b1hit);
- act_penalty=MAX(act_penalty,color_to_pot);
-+ if( BM_get_balls_hit()==0 ){
-+ textObj_setText(last_fault_text, "No Ball hit");
-+ } else {
-+ textObj_setText(last_fault_text, "First ball hit was not the correct one");
-+ }
- }
- i=1;
- while((ball_out=BM_get_nth_ball_out(i++))>=0)
-@@ -505,6 +555,11 @@
- printf("EVAL foul 6\n");
- act_penalty=MAX(act_penalty,b1hit);
- act_penalty=MAX(act_penalty,color_to_pot);
-+ if (BM_get_white_out()){
-+ textObj_setText(last_fault_text, "White ball potted");
-+ } else {
-+ textObj_setText(last_fault_text, "Potted ball was not the correct one");
-+ }
- }
- }
- if(!foul && act_score>0) st.to_play++;
-@@ -528,6 +583,7 @@
- {
- player[act_player].score += act_score ;
- printf("EVAL no foul\n");
-+ textObj_setText(last_fault_text, "x");
- }
- if(act_score==0 || foul)
- {
-Index: foobillard-3.0a/src/evaluate_move.h
-===================================================================
---- foobillard-3.0a.orig/src/evaluate_move.h 2006-10-12 16:44:24.000000000 +0200
-+++ foobillard-3.0a/src/evaluate_move.h 2006-10-12 16:44:31.000000000 +0200
-@@ -31,6 +31,7 @@
- BallsType * pballs, int * pqueue_view, float * pXque );
- #endif
-
-+extern textObj * last_fault_text;
-
- void evaluate_last_move_8ball ( struct Player * player, int * actual_player,
- BallsType * pballs, int * pqueue_view, float * pXque );
diff --git a/extra/foobillard/06_show_ball_to_hit b/extra/foobillard/06_show_ball_to_hit
deleted file mode 100644
index 9c49f58cc..000000000
--- a/extra/foobillard/06_show_ball_to_hit
+++ /dev/null
@@ -1,255 +0,0 @@
-Index: foobillard-3.0a/src/billard.c
-===================================================================
---- foobillard-3.0a.orig/src/billard.c 2006-10-12 16:45:04.000000000 +0200
-+++ foobillard-3.0a/src/billard.c 2006-10-12 16:45:23.000000000 +0200
-@@ -31,6 +31,8 @@
- void * (*billard_malloc)( size_t size ) = malloc;
- void (*billard_free)( void * ptr ) = free;
-
-+SnookerState snooker_state={SN_PLAY_RED};
-+
- void setfunc_create_scene( void (*func)( BallsType * balls ) )
- {
- create_scene=func;
-Index: foobillard-3.0a/src/billard.h
-===================================================================
---- foobillard-3.0a.orig/src/billard.h 2006-10-12 16:45:05.000000000 +0200
-+++ foobillard-3.0a/src/billard.h 2006-10-12 16:45:23.000000000 +0200
-@@ -76,9 +76,30 @@
- #define BALL_HALF 2
- #define BALL_ANY 0
-
-+typedef enum
-+{
-+ SN_PLAY_RED,
-+ SN_PLAY_ANY_COLOR,
-+ SN_PLAY_YELLOW,
-+ SN_PLAY_GREEN,
-+ SN_PLAY_BROWN,
-+ SN_PLAY_BLUE,
-+ SN_PLAY_PINK,
-+ SN_PLAY_BLACK,
-+ SN_DONE
-+}
-+SnookerBallToPlay;
-+
-+typedef struct
-+{
-+ SnookerBallToPlay to_play;
-+}
-+SnookerState;
-+
- #ifndef BILLARD_C
- extern void (*create_scene)( BallsType * balls );
- extern void (*create_walls)( BordersType * walls );
-+extern SnookerState snooker_state;
- #endif
-
- void create_0hole_walls( BordersType * walls ); /* carambol */
-Index: foobillard-3.0a/src/billard3d.c
-===================================================================
---- foobillard-3.0a.orig/src/billard3d.c 2006-10-12 16:45:08.000000000 +0200
-+++ foobillard-3.0a/src/billard3d.c 2006-10-12 16:45:23.000000000 +0200
-@@ -829,6 +829,7 @@
- player[act_player].place_cue_ball=1;
- human_player_roster.player[0].cue_ball=0; human_player_roster.player[1].cue_ball=0;
- human_player_roster.player[act_player].place_cue_ball=1;
-+ snooker_state.to_play=SN_PLAY_RED;
- }
- }
-
-@@ -1787,6 +1788,7 @@
- /* score text */
- for(i=0;i<2;i++){
- char str[256];
-+ char *color;
- switch(gametype){
- case GAME_8BALL: strcpy(str,"0"); break;
- case GAME_9BALL:
-@@ -1805,7 +1807,44 @@
- sprintf( str, "%d", player[i].score );
- break;
- case GAME_SNOOKER:
-- sprintf( str, "%c%03d %s", (player[i].score<0)?'-':'+', abs(player[i].score), player[i].snooker_on_red ? "red":"col" );
-+ switch(snooker_state.to_play)
-+ {
-+ case SN_PLAY_RED:
-+ color="red";
-+ break;
-+ case SN_PLAY_ANY_COLOR:
-+ color="color";
-+ break;
-+ case SN_PLAY_YELLOW:
-+ color="yellow";
-+ break;
-+ case SN_PLAY_GREEN:
-+ color="green";
-+ break;
-+ case SN_PLAY_BROWN:
-+ color="brown";
-+ break;
-+ case SN_PLAY_BLUE:
-+ color="blue";
-+ break;
-+ case SN_PLAY_PINK:
-+ color="pink";
-+ break;
-+ case SN_PLAY_BLACK:
-+ color="black";
-+ break;
-+ case SN_DONE:
-+ color="";
-+ break;
-+ }
-+ if(i==act_player)
-+ {
-+ sprintf( str, "%.3d %s", player[i].score, color);
-+ }
-+ else
-+ {
-+ sprintf( str, "%.3d", player[i].score);
-+ }
- break;
- }
- textObj_setText( player[i].score_text, str );
-Index: foobillard-3.0a/src/evaluate_move.c
-===================================================================
---- foobillard-3.0a.orig/src/evaluate_move.c 2006-10-12 16:45:12.000000000 +0200
-+++ foobillard-3.0a/src/evaluate_move.c 2006-10-12 16:45:23.000000000 +0200
-@@ -30,26 +30,6 @@
-
- #define MAX(x,y) ((x)>(y)?(x):(y));
-
--typedef enum
--{
-- SN_PLAY_RED,
-- SN_PLAY_ANY_COLOR,
-- SN_PLAY_YELLOW,
-- SN_PLAY_GREEN,
-- SN_PLAY_BROWN,
-- SN_PLAY_BLUE,
-- SN_PLAY_PINK,
-- SN_PLAY_BLACK,
-- SN_DONE
--}
--SnookerBallToPlay;
--
--typedef struct
--{
-- SnookerBallToPlay to_play;
--}
--SnookerState;
--
-
- void spot_snooker_ball(BallsType *balls,int nr);
-
-@@ -400,7 +380,6 @@
- #define act_player (*pact_player)
- #define IS_RED(x) ( x==1 || x>=8 )
- int red_balls_are_in_game=0;
-- static SnookerState st={SN_PLAY_RED};
- int color_to_pot;
- int i;
- int act_score=0;
-@@ -409,7 +388,7 @@
- int ball_out;
- int other_player=(act_player==1)?0:1;
- int b1hit = BM_get_1st_ball_hit(); if (b1hit>=8) b1hit=1;
-- if(st.to_play==SN_DONE)
-+ if(snooker_state.to_play==SN_DONE)
- {
- BM_reset_move_info();
- return;
-@@ -417,7 +396,7 @@
-
- if( player[act_player].place_cue_ball ) player[act_player].place_cue_ball=0;
- printf("EVAL start\n");
-- printf("EVAL to_play=%d\n",st.to_play);
-+ printf("EVAL to_play=%d\n",snooker_state.to_play);
- printf("EVAL b1hit=%d\n",b1hit);
- for(i=0;i<pballs->nr;i++){
- if( IS_RED(pballs->ball[i].nr) && pballs->ball[i].in_game ){
-@@ -436,7 +415,7 @@
- textObj_setText(last_fault_text, "White ball is potted");
- }
-
-- switch(st.to_play)
-+ switch(snooker_state.to_play)
- {
- case SN_PLAY_RED:
- color_to_pot=1;
-@@ -476,7 +455,7 @@
- if( BM_get_ball_out(i))
- spot_snooker_ball(pballs,i);
- }
-- st.to_play=SN_PLAY_ANY_COLOR;
-+ snooker_state.to_play=SN_PLAY_ANY_COLOR;
- break;
- case SN_PLAY_ANY_COLOR:
- if(b1hit==1)
-@@ -512,9 +491,9 @@
- }
- }
- if(red_balls_are_in_game)
-- st.to_play=SN_PLAY_RED;
-+ snooker_state.to_play=SN_PLAY_RED;
- else
-- st.to_play=SN_PLAY_YELLOW;
-+ snooker_state.to_play=SN_PLAY_YELLOW;
-
- for(i=2;i<8;i++)
- {
-@@ -528,7 +507,7 @@
- case SN_PLAY_BLUE:
- case SN_PLAY_PINK:
- case SN_PLAY_BLACK:
-- color_to_pot=st.to_play;
-+ color_to_pot=snooker_state.to_play;
- if(b1hit!=color_to_pot)
- {
- foul=1;
-@@ -562,9 +541,9 @@
- }
- }
- }
-- if(!foul && act_score>0) st.to_play++;
-+ if(!foul && act_score>0) snooker_state.to_play++;
-
-- for(i=st.to_play;i<8;i++)
-+ for(i=snooker_state.to_play;i<8;i++)
- {
- if( BM_get_ball_out(i))
- spot_snooker_ball(pballs,i);
-@@ -590,13 +569,13 @@
- printf("EVAL next player\n");
- if(red_balls_are_in_game)
- {
-- st.to_play=SN_PLAY_RED;
-+ snooker_state.to_play=SN_PLAY_RED;
- }
- else
- {
-- if(st.to_play<=SN_PLAY_ANY_COLOR)
-+ if(snooker_state.to_play<=SN_PLAY_ANY_COLOR)
- {
-- st.to_play=SN_PLAY_YELLOW;
-+ snooker_state.to_play=SN_PLAY_YELLOW;
- }
- }
- player[act_player].queue_view=*pqueue_view;
-@@ -605,11 +584,11 @@
- *pqueue_view=player[act_player].queue_view;
- }
-
-- player[act_player].snooker_on_red=st.to_play==SN_PLAY_RED;
-- player[act_player].snooker_next_color=st.to_play;
-- printf("EVAL to_play=%d\n",st.to_play);
-+ player[act_player].snooker_on_red=snooker_state.to_play==SN_PLAY_RED;
-+ player[act_player].snooker_next_color=snooker_state.to_play;
-+ printf("EVAL to_play=%d\n",snooker_state.to_play);
-
-- if(st.to_play==SN_DONE)
-+ if(snooker_state.to_play==SN_DONE)
- {
- int other_player;
-
diff --git a/extra/foobillard/ChangeLog b/extra/foobillard/ChangeLog
deleted file mode 100644
index 0b82e7aec..000000000
--- a/extra/foobillard/ChangeLog
+++ /dev/null
@@ -1,16 +0,0 @@
-2010-07-10 Eric Belanger <eric@archlinux.org>
-
- * foobillard 3.0a-6
- * Fixed hang after a draw in snooker (close FS#18631)
- * Removed unneeded libxaw and libxi depends
-
-2010-01-18 Eric Belanger <eric@archlinux.org>
-
- * foobillard 3.0a-4
- * Rebuilt for libpng 1.4 and libjpeg 8
- * Added bug fix and improvement patches
- * Fixed license
- * Updated url
- * Added man page
- * Added desktop file and icon
- * Added ChangeLog
diff --git a/extra/foobillard/PKGBUILD b/extra/foobillard/PKGBUILD
deleted file mode 100644
index decb5c49d..000000000
--- a/extra/foobillard/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 85242 2010-07-11 02:23:37Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=foobillard
-pkgver=3.0a
-pkgrel=6
-pkgdesc="An OpenGL billiard game for Linux"
-arch=('i686' 'x86_64')
-url="http://foobillard.sourceforge.net/"
-license=('GPL2' 'custom')
-depends=('sdl' 'freetype2' 'libpng' 'mesa')
-changelog=ChangeLog
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz \
- foobillard.desktop foobillard.png 03_bugfixes 05_foul_explanation \
- 06_show_ball_to_hit snooker_reset.patch snooker_draw.patch)
-md5sums=('c2d92edeaaf8bfb18aa26f1c79931b7d' '436f76ad44910a2524a38ff158bc32fc'\
- '4bb47566197a252388bf49583536dd4d' '4400c87674b8a442c0cbbd619e118cd3'\
- '0b79b9b71bebd7e0e1584f0593cc348d' 'eed13569ab099054619137eabce96045'\
- '329ddc735af17f33df99c5fe7ff672b9' '97f04be3ad4a0f78c6d7a8b658099a5d')
-sha1sums=('1caa51a201b55883640b5c5b1e9fde20fc71a095' '7e820e047497eae5f3d495cc8c61870d7b438a2e'\
- '67db7b2a96784ff3baaeca9610414376210e5c49' '119aa2bfcfb2b074e0d9b441441808c22eacf625'\
- '347535e3db4b04caab2f040779576229b2ce71ac' '11cff3e62fccd101cc85d58cc0d0eb4a1b99670f'\
- '405a64db7e92e7ba046dd9007d4bf1433914ef79' 'a3151458667488117524ce8948b0d101657ad425')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i -e 's/-lXaw//' -e 's/-lXi//' src/Makefile.in
- patch -p1 < ../03_bugfixes
- patch -p1 < ../05_foul_explanation
- patch -p1 < ../06_show_ball_to_hit
- patch -p0 < ../snooker_reset.patch
- patch -p0 < ../snooker_draw.patch
-
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -D -m644 foobillard.6 "${pkgdir}/usr/share/man/man6/foobillard.6"
- install -D -m644 README.FONTS "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.FONTS"
- install -D -m644 ../foobillard.desktop "${pkgdir}/usr/share/applications/foobillard.desktop"
- install -D -m644 ../foobillard.png "${pkgdir}/usr/share/pixmaps/foobillard.png"
-}
diff --git a/extra/foobillard/foobillard.desktop b/extra/foobillard/foobillard.desktop
deleted file mode 100644
index 1028c19f5..000000000
--- a/extra/foobillard/foobillard.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Foobillard
-Comment=A 3D billiards game using OpenGL
-Exec=foobillard
-Icon=foobillard.png
-Terminal=false
-Type=Application
-Categories=Game;SportsGame;
-StartupNotify=false
diff --git a/extra/foobillard/foobillard.png b/extra/foobillard/foobillard.png
deleted file mode 100644
index c57fadb30..000000000
--- a/extra/foobillard/foobillard.png
+++ /dev/null
Binary files differ
diff --git a/extra/foobillard/snooker_draw.patch b/extra/foobillard/snooker_draw.patch
deleted file mode 100644
index 1d45e9498..000000000
--- a/extra/foobillard/snooker_draw.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: src/evaluate_move.c
-===================================================================
---- src/evaluate_move.c (revision 6)
-+++ src/evaluate_move.c (working copy)
-@@ -602,6 +602,11 @@
- player[act_player].winner=0;
- player[other_player].winner=1;
- }
-+ if(player[act_player].score==player[other_player].score) {
-+ player[act_player].winner=1;
-+ player[other_player].winner=1;
-+ }
-+
- }
-
- printf("EVAL done\n");
-Index: src/billard3d.c
-===================================================================
---- src/billard3d.c (revision 6)
-+++ src/billard3d.c (working copy)
-@@ -1760,8 +1760,17 @@
- options_gamemode==options_gamemode_tournament &&
- (player[0].winner || player[1].winner) )
- {
-- tournament_evaluate_last_match( &tournament_state );
-- tournament_state.wait_for_next_match=1;
-+ if ( player[0].winner == player[1].winner )
-+ { // Draw
-+ restart_game_common();
-+ player[act_player].winner=0;
-+ player[other_player].winner=0;
-+ }
-+ else
-+ {
-+ tournament_evaluate_last_match( &tournament_state );
-+ tournament_state.wait_for_next_match=1;
-+ }
- }
- } else {
- int old_cueball_ind;
-@@ -3654,6 +3663,7 @@
- create_walls( &walls );
- create_scene( &balls );
- g_shot_due=1;
-+ snooker_state.to_play=SN_PLAY_RED;
- }
-
-
diff --git a/extra/foobillard/snooker_reset.patch b/extra/foobillard/snooker_reset.patch
deleted file mode 100644
index 392226ec3..000000000
--- a/extra/foobillard/snooker_reset.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/billard3d.c 2010-02-27 04:01:40.000000000 -0600
-+++ src/billard3d.c 2010-02-27 04:02:59.000000000 -0600
-@@ -1219,6 +1219,8 @@
- printf("tournament_state_setup_next_match 7\n");
- queue_view=player[act_player].queue_view;
- printf("tournament_state_setup_next_match 8\n");
-+ snooker_state.to_play = SN_PLAY_RED;
-+ printf("tournament_state_setup_next_match 9\n");
- }
-
- void create_players_text()
diff --git a/extra/fribidi/ChangeLog b/extra/fribidi/ChangeLog
deleted file mode 100644
index 43b17a515..000000000
--- a/extra/fribidi/ChangeLog
+++ /dev/null
@@ -1,5 +0,0 @@
-2008-02-16 Travis Willard <travis@archlinux.org>
-
- * 0.10.9
- Added ChangeLog
- New upstream release.
diff --git a/extra/gd/ChangeLog b/extra/gd/ChangeLog
deleted file mode 100644
index 813a49e46..000000000
--- a/extra/gd/ChangeLog
+++ /dev/null
@@ -1,11 +0,0 @@
-2010-01-17 Ionut Biru <ionut@archlinux.ro>
-
- * gd 2.0.36RC1-2
- * libpng 1.4.0/libjpeg 8 rebuild
-
-2009-10-30 Eric Belanger <eric@archlinux.org>
-
- * gd 2.0.36RC1-1
- * Upstream update
- * Added perl depends
- * Added ChangeLog
diff --git a/extra/glhack/ChangeLog b/extra/glhack/ChangeLog
deleted file mode 100644
index cc13a2560..000000000
--- a/extra/glhack/ChangeLog
+++ /dev/null
@@ -1,12 +0,0 @@
-2010-01-18 Eric Belanger <eric@archlinux.org>
-
- * glhack 1.2-4
- * Rebuilt for libpng 1.4 and libjpeg 8
- * Fixed man page conflict with nethack (close FS#17226)
-
-2009-06-29 Eric Belanger <eric@archlinux.org>
-
- * glhack 1.2-3
- * Moved binaries to /usr/bin (close FS#15303)
- * Moved saved games to /var
- * Added ChangeLog
diff --git a/extra/gnome-spell/PKGBUILD b/extra/gnome-spell/PKGBUILD
deleted file mode 100644
index 020398658..000000000
--- a/extra/gnome-spell/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 49931 2009-08-16 21:48:16Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-spell
-pkgver=1.0.8
-pkgrel=2
-pkgdesc="Spell Checking Support for Gnome"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('libgnomeui>=2.24.1' 'enchant>=1.4.2')
-makedepends=('pkgconfig' 'intltool')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.0/${pkgname}-${pkgver}.tar.bz2
- gnome-spell-enchant.diff)
-md5sums=('6ccc46b4e3dc7cb1c6d413358e35d445' '12a357212809e0f0aba8c08d1372e60a')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np0 -i "${srcdir}/gnome-spell-enchant.diff" || return 1
- libtoolize --force || return 1
- aclocal || return 1
- autoconf || return 1
- automake || return 1
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static || return 1
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/extra/gnome-spell/gnome-spell-enchant.diff b/extra/gnome-spell/gnome-spell-enchant.diff
deleted file mode 100644
index 7c0493813..000000000
--- a/extra/gnome-spell/gnome-spell-enchant.diff
+++ /dev/null
@@ -1,551 +0,0 @@
-? INSTALL
-? autom4te.cache
-? depcomp
-? gnome-spell-enchant.diff
-? gnome-spell-zip
-? intltool-extract
-? intltool-extract.in
-? intltool-merge
-? intltool-merge.in
-? intltool-update
-? intltool-update.in
-? missing
-? mkinstalldirs
-? stamp-h1
-? gnome-spell/GNOME_Spell.server
-? gnome-spell/GNOME_Spell.server.in
-? gnome-spell/
-Index: configure.in
-===================================================================
-RCS file: /cvs/gnome/gnome-spell/configure.in,v
-retrieving revision 1.86
-diff -u -p -u -p -r1.86 configure.in
---- configure.in 10 Feb 2006 12:08:11 -0000 1.86
-+++ configure.in 2 Apr 2006 14:31:45 -0000
-@@ -68,34 +68,6 @@ AC_DEFINE_UNQUOTED(API_VERSION, "${API_V
- AC_SUBST(API_VERSION)
-
- dnl
--dnl aspell
--dnl
--
--AC_ARG_WITH(aspell-prefix, [ --with-aspell-prefix=DIR
-- specify under which prefix aspell is installed.], with_aspell_prefix="$withval", )
--
--if test "x$with_aspell_prefix" != "x"; then
-- saved_LDFLAGS=$LDFLAGS
-- LDFLAGS="-L$with_aspell_prefix/lib "$LDFLAGS
-- ASPELL_INC="-I$with_aspell_prefix/include"
-- ASPELL_LIBS="-L$with_aspell_prefix/lib -laspell"
-- ASPELL_DATA="$with_aspell_prefix/lib/aspell"
--else
-- LDFLAGS="-L`aspell config prefix`/lib "$LDFLAGS
-- ASPELL_INC="-I`aspell config prefix`/include"
-- ASPELL_LIBS="-L`aspell config prefix`/lib -laspell"
-- ASPELL_DICT="`aspell config dict-dir`"
--fi
--AC_CHECK_LIB(aspell,new_aspell_config,,AC_MSG_ERROR([gnome-spell cannot be built without aspell library]),)
--if test "x$with_aspell_prefix" != "x"; then
-- LDFLAGS=$saved_LDFLAGS
--fi
--
--AC_SUBST(ASPELL_DICT)
--AC_SUBST(ASPELL_INC)
--AC_SUBST(ASPELL_LIBS)
--
--dnl
- dnl flags
- dnl
-
-@@ -104,7 +76,7 @@ AC_SUBST(CFLAGS)
- AC_SUBST(CPPFLAGS)
- AC_SUBST(LDFLAGS)
-
--GNOME_SPELL_MODULES="libgnomeui-2.0 >= 1.112.1 libbonoboui-2.0 >= 1.112.1 libglade-2.0 >= 1.99.9"
-+GNOME_SPELL_MODULES="libgnomeui-2.0 >= 1.112.1 libbonoboui-2.0 >= 1.112.1 libglade-2.0 >= 1.99.9 enchant >= 1.2.5"
- PKG_CHECK_MODULES(GNOME_SPELL, $GNOME_SPELL_MODULES)
- AC_SUBST(GNOME_SPELL_CFLAGS)
- AC_SUBST(GNOME_SPELL_LIBS)
-Index: gnome-spell/Makefile.am
-===================================================================
-RCS file: /cvs/gnome/gnome-spell/gnome-spell/Makefile.am,v
-retrieving revision 1.34
-diff -u -p -u -p -r1.34 Makefile.am
---- gnome-spell/Makefile.am 19 Jan 2006 23:37:50 -0000 1.34
-+++ gnome-spell/Makefile.am 2 Apr 2006 14:31:46 -0000
-@@ -7,13 +7,11 @@ END =
-
- INCLUDES = \
- -I$(srcdir) \
-- $(ASPELL_INC) \
- -DPREFIX=\""$(prefix)"\" \
- -DGNOMEDATADIR=\""$(datadir)"\" \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -DGLADE_DATADIR=\"$(gladedir)\" \
- -DPLUGIN_DIR=\""$(PLUGIN_DIR)"\" \
-- -DASPELL_DICT=\""$(ASPELL_DICT)"\" \
- $(GNOME_SPELL_CFLAGS) \
- $(END)
-
-@@ -55,7 +53,6 @@ libgnome_spell_idl_la_SOURCES = \
- libgnome_spell_component_la_LDFLAGS = -release $(API_VERSION) $(NO_UNDEFINED)
- libgnome_spell_component_la_LIBADD = \
- libgnome-spell-idl.la \
-- $(ASPELL_LIBS) \
- $(GNOME_SPELL_LIBS) \
- $(END)
-
-@@ -69,7 +66,6 @@ libgnome_spell_component_la_SOURCES = \
-
- test_gnome_spell_component_LDADD = \
- libgnome-spell-idl.la \
-- $(ASPELL_LIBS) \
- $(GNOME_SPELL_LIBS) \
- $(END)
-
-Index: gnome-spell/dictionary.c
-===================================================================
-RCS file: /cvs/gnome/gnome-spell/gnome-spell/dictionary.c,v
-retrieving revision 1.39
-diff -u -p -u -p -r1.39 dictionary.c
---- gnome-spell/dictionary.c 5 Feb 2006 21:31:09 -0000 1.39
-+++ gnome-spell/dictionary.c 2 Apr 2006 14:31:46 -0000
-@@ -30,16 +30,21 @@
- #include <glib.h>
- #include <libgnome/gnome-i18n.h>
- #include <libgnome/gnome-config.h>
--#include <gconf/gconf-client.h>
- #include <bonobo.h>
-
- #include "Spell.h"
- #include "dictionary.h"
-
-+#include <enchant.h>
-+
-+typedef struct {
-+ EnchantBroker * config;
-+ EnchantDict * speller;
-+} SpellEngine;
-+
- static BonoboObjectClass *dictionary_parent_class;
-
- #define DICT_DEBUG(x)
--#define GNOME_SPELL_GCONF_DIR "/GNOME/Spell"
-
- static void release_engines (GNOMESpellDictionary *dict);
-
-@@ -72,12 +77,24 @@ gnome_spell_dictionary_init (GObject *ob
- {
- GNOMESpellDictionary *dict = GNOME_SPELL_DICTIONARY (object);
-
-- dict->changed = TRUE;
- dict->engines = NULL;
- dict->languages = g_hash_table_new (g_str_hash, g_str_equal);
- dict->engines_ht = g_hash_table_new (NULL, NULL);
- }
-
-+static char **
-+dup_string_list (char ** str_list, size_t list_len)
-+{
-+ char ** new_str_list;
-+ size_t i;
-+
-+ new_str_list = g_new0 (char *, list_len + 1);
-+ for (i = 0; i < list_len; i++)
-+ new_str_list [i] = g_strdup (str_list [i]);
-+
-+ return new_str_list;
-+}
-+
- static void
- dictionary_finalize (GObject *object)
- {
-@@ -93,15 +110,16 @@ dictionary_finalize (GObject *object)
- }
-
- static SpellEngine *
--new_engine (const gchar *language)
-+new_engine (const gchar *language, CORBA_Environment *ev)
- {
- SpellEngine *se;
-
- se = g_new0 (SpellEngine, 1);
-- se->config = new_aspell_config ();
-- aspell_config_replace (se->config, "language-tag", language);
-- aspell_config_replace (se->config, "encoding", "utf-8");
-- se->changed = TRUE;
-+ se->config = enchant_broker_init ();
-+ se->speller = enchant_broker_request_dict (se->config, language);
-+
-+ if(se->speller == NULL)
-+ raise_error (ev, enchant_broker_get_error (se->config));
-
- return se;
- }
-@@ -129,9 +147,9 @@ release_engines (GNOMESpellDictionary *d
- SpellEngine *se = dict->engines->data;
-
- if (se->speller)
-- delete_aspell_speller (se->speller);
-+ enchant_broker_free_dict (se->config, se->speller);
- if (se->config)
-- delete_aspell_config (se->config);
-+ enchant_broker_free (se->config);
- g_free (se);
- dict->engines = g_slist_remove (dict->engines, se);
- }
-@@ -140,7 +158,6 @@ release_engines (GNOMESpellDictionary *d
- g_hash_table_foreach_remove (dict->languages, remove_engine_ht, NULL);
-
- dict->engines = NULL;
-- dict->changed = TRUE;
- }
-
- static LangInfo known_languages [] = {
-@@ -352,88 +369,31 @@ static LangInfo known_languages [] = {
- };
-
- static GSList *
--get_languages_real (gint *ln)
-+get_languages (gint *ln)
- {
- GSList *langs;
-- AspellCanHaveError *err;
-- AspellConfig *config;
-- AspellSpeller *speller;
-- gint i;
-+ EnchantBroker *broker;
-+ gint i, nb_langs;
-
-- DICT_DEBUG (printf ("get_languages_real\n"));
-+ DICT_DEBUG (printf ("get_languages\n"));
-
-+ /* todo: this could probably be better done by enchant_broker_list_dicts(), but let's keep
-+ the initial code change to a minimum */
-+
-+ broker = enchant_broker_init ();
- langs = NULL;
-- *ln = 0;
-+ nb_langs = 0;
- for (i=0; i < G_N_ELEMENTS (known_languages); i++) {
-- config = new_aspell_config ();
-- aspell_config_replace (config, "language-tag", known_languages [i].abbreviation);
-- err = new_aspell_speller (config);
-- if (aspell_error_number (err) == 0) {
-- speller = to_aspell_speller (err);
-+ if (enchant_broker_dict_exists (broker, known_languages [i].abbreviation)) {
- DICT_DEBUG (printf ("Language: %s\n", known_languages [i].name));
-- delete_aspell_speller (speller);
- langs = g_slist_prepend (langs, GINT_TO_POINTER (i));
-- (*ln) ++;
-+ nb_langs++;
- }
- }
-
-- return langs;
--}
--
--static GSList *
--get_languages_load (GConfClient *gc, gint *ln)
--{
-- GString *str;
-- GSList *langs = NULL;
-- gint i, lang_num;
--
-- /* printf ("get_languages_load\n"); */
--
-- str = g_string_new (NULL);
-- *ln = gconf_client_get_int (gc, GNOME_SPELL_GCONF_DIR "/languages", NULL);
-- for (i = 0; i < *ln; i++) {
-- g_string_sprintf (str, GNOME_SPELL_GCONF_DIR "/language%d", i);
-- lang_num = gconf_client_get_int (gc, str->str, NULL);
-- langs = g_slist_prepend (langs, GINT_TO_POINTER (lang_num));
-- }
--
-- return langs;
--}
--
--static GSList *
--get_languages (gint *ln)
--{
-- GSList *langs, *l;
-- GConfClient *gc;
-- time_t mtime;
-- struct stat buf;
-- gint i, kl;
--
-- gc = gconf_client_get_default ();
--
-- mtime = gconf_client_get_int (gc, GNOME_SPELL_GCONF_DIR "/mtime", NULL);
-- kl = gconf_client_get_int (gc, GNOME_SPELL_GCONF_DIR "/known_languages", NULL);
--
-- if (stat (ASPELL_DICT, &buf) || buf.st_mtime != mtime || kl != G_N_ELEMENTS(known_languages)) {
-- GString *str;
-- langs = get_languages_real (ln);
--
-- str = g_string_new (NULL);
-- gconf_client_set_int (gc, GNOME_SPELL_GCONF_DIR "/languages", *ln, NULL);
-- for (l = langs, i = 0; i < *ln; i ++) {
-- g_string_sprintf (str, GNOME_SPELL_GCONF_DIR "/language%d", *ln - i - 1);
-- gconf_client_set_int (gc, str->str, GPOINTER_TO_INT (l->data), NULL);
-- l = l->next;
-- }
-- gconf_client_set_int (gc, GNOME_SPELL_GCONF_DIR "/mtime", buf.st_mtime, NULL);
-- gconf_client_set_int (gc, GNOME_SPELL_GCONF_DIR "/known_languages", G_N_ELEMENTS(known_languages), NULL);
-- g_string_free (str, TRUE);
-- gnome_config_sync ();
-- } else
-- langs = get_languages_load (gc, ln);
-+ *ln = nb_langs;
-
-- gconf_client_suggest_sync (gc, NULL);
-- g_object_unref (gc);
-+ enchant_broker_free (broker);
-
- return langs;
- }
-@@ -504,59 +464,19 @@ impl_gnome_spell_dictionary_set_language
- SpellEngine *se;
-
- one_language = g_strndup (begin, len);
-- se = new_engine (one_language);
-+ se = new_engine (one_language, ev);
- dict->engines = g_slist_prepend (dict->engines, se);
- g_hash_table_insert (dict->languages, one_language, se);
- g_hash_table_insert (dict->engines_ht, se, g_strdup (one_language));
--
-- dict->changed = TRUE;
-- }
-- }
--}
--
--static void
--update_engine (SpellEngine *se, CORBA_Environment * ev)
--{
-- AspellCanHaveError *err;
--
-- DICT_DEBUG (printf ("Dictionary: creating new aspell speller\n"));
--
-- if (se->changed) {
-- if (se->speller)
-- delete_aspell_speller (se->speller);
-- err = new_aspell_speller (se->config);
-- if (aspell_error_number (err) != 0) {
-- g_warning ("aspell error: %s\n", aspell_error_message (err));
-- se->speller = NULL;
-- raise_error (ev, aspell_error_message (err));
-- } else {
-- se->speller = to_aspell_speller (err);
-- se->changed = FALSE;
- }
- }
- }
-
--static void
--update_engines (GNOMESpellDictionary *dict, CORBA_Environment * ev)
--{
-- g_return_if_fail (IS_GNOME_SPELL_DICTIONARY (dict));
--
-- if (dict->changed) {
-- GSList *l;
--
-- for (l = dict->engines; l; l = l->next) {
-- update_engine ((SpellEngine *) l->data, ev);
-- }
--
-- dict->changed = FALSE;
-- }
--}
--
- static CORBA_boolean
- engine_check_word (SpellEngine *se, const gchar *word, CORBA_Environment *ev)
- {
-- CORBA_boolean result = CORBA_TRUE;
-- gint aspell_result;
-+ CORBA_boolean result = CORBA_FALSE;
-+ gint enchant_result;
-
- #ifndef G_DISABLE_CHECKS
- g_return_val_if_fail (se->speller, CORBA_TRUE);
-@@ -564,12 +484,12 @@ engine_check_word (SpellEngine *se, cons
- if (!se->speller)
- return CORBA_TRUE;
- #endif
-- aspell_result = aspell_speller_check (se->speller, word, strlen (word));
-- if (aspell_result == 0)
-- result = CORBA_FALSE;
-- if (aspell_result == -1) {
-- g_warning ("aspell error: %s\n", aspell_speller_error_message (se->speller));
-- raise_error (ev, aspell_speller_error_message (se->speller));
-+ enchant_result = enchant_dict_check (se->speller, word, strlen (word));
-+ if (enchant_result == 0)
-+ result = CORBA_TRUE;
-+ if (enchant_result == -1) {
-+ g_warning ("enchant error: %s\n", enchant_dict_get_error (se->speller));
-+ raise_error (ev, enchant_dict_get_error (se->speller));
- }
-
- return result;
-@@ -592,7 +512,6 @@ impl_gnome_spell_dictionary_check_word (
- if (!strcmp (word, "Ximian"))
- return CORBA_TRUE;
-
-- update_engines (dict, ev);
- for (l = dict->engines; l; l = l->next) {
- if (((SpellEngine *) l->data)->speller) {
- valid_speller = TRUE;
-@@ -621,11 +540,10 @@ impl_gnome_spell_dictionary_add_word_to_
- if (!word)
- return;
- #endif
-- update_engines (dict, ev);
- DICT_DEBUG (printf ("Dictionary add_word_to_session: %s\n", word));
- for (l = dict->engines; l; l = l->next) {
- if (((SpellEngine *) l->data)->speller)
-- aspell_speller_add_to_session (((SpellEngine *) l->data)->speller, word, strlen (word));
-+ enchant_dict_add_to_session (((SpellEngine *) l->data)->speller, word, strlen (word));
- }
- }
-
-@@ -642,13 +560,11 @@ impl_gnome_spell_dictionary_add_word_to_
- if (!word || !language)
- return;
- #endif
-- update_engines (dict, ev);
- DICT_DEBUG (printf ("Dictionary add_word_to_personal: %s (%s)\n", word, language));
- se = (SpellEngine *) g_hash_table_lookup (dict->languages, language);
-
- if (se && se->speller) {
-- aspell_speller_add_to_personal (se->speller, word, strlen (word));
-- aspell_speller_save_all_word_lists (se->speller);
-+ enchant_dict_add_to_pwl (se->speller, word, strlen (word));
- DICT_DEBUG (printf ("Added and saved.\n"));
- }
- }
-@@ -666,14 +582,12 @@ impl_gnome_spell_dictionary_set_correcti
- if (!word || !replacement)
- return;
- #endif
-- update_engines (dict, ev);
- DICT_DEBUG (printf ("Dictionary correction: %s <-- %s\n", word, replacement));
- se = (SpellEngine *) g_hash_table_lookup (dict->languages, language);
-
- if (se && se->speller) {
-- aspell_speller_store_replacement (se->speller, word, strlen (word),
-- replacement, strlen (replacement));
-- aspell_speller_save_all_word_lists (se->speller);
-+ enchant_dict_store_replacement (se->speller, word, strlen (word),
-+ replacement, strlen (replacement));
- DICT_DEBUG (printf ("Set and saved.\n"));
- }
- }
-@@ -683,8 +597,8 @@ impl_gnome_spell_dictionary_get_suggesti
- const CORBA_char *word, CORBA_Environment *ev)
- {
- GNOMESpellDictionary *dict = GNOME_SPELL_DICTIONARY (bonobo_object_from_servant (servant));
-- const AspellWordList *suggestions;
-- AspellStringEnumeration *elements;
-+ char **suggestions;
-+ size_t number_of_suggestions;
- GNOME_Spell_StringSeq *seq = NULL;
- GSList *l, *suggestion_list = NULL;
- gint i, len, pos;
-@@ -696,17 +610,19 @@ impl_gnome_spell_dictionary_get_suggesti
- return NULL;
- #endif
- DICT_DEBUG (printf ("Dictionary correction: %s\n", word));
-- update_engines (dict, ev);
-
- len = 0;
- for (l = dict->engines; l; l = l->next) {
- SpellEngine *se = (SpellEngine *) l->data;
-
- if (se->speller) {
-- suggestions = aspell_speller_suggest (se->speller, word, strlen (word));
-- suggestion_list = g_slist_prepend (suggestion_list, (gpointer) suggestions);
-- len += 2*aspell_word_list_size (suggestions);
-+ suggestions = enchant_dict_suggest (se->speller, word, strlen (word), &number_of_suggestions);
-+ suggestion_list = g_slist_prepend (suggestion_list,
-+ (gpointer) dup_string_list (suggestions, number_of_suggestions));
-+ len += 2*number_of_suggestions;
- suggestion_list = g_slist_prepend (suggestion_list, engine_to_language (dict, se));
-+ suggestion_list = g_slist_prepend (suggestion_list, GINT_TO_POINTER (number_of_suggestions));
-+ enchant_dict_free_string_list (se->speller, suggestions);
- }
- }
-
-@@ -723,17 +639,18 @@ impl_gnome_spell_dictionary_get_suggesti
- gint list_len;
- gchar *language;
-
-+ list_len = GPOINTER_TO_INT (l->data);
-+ l = l->next;
- language = (gchar *) l->data;
- l = l->next;
-- suggestions = (const AspellWordList *) l->data;
-- elements = aspell_word_list_elements (suggestions);
-- list_len = aspell_word_list_size (suggestions);
-+ suggestions = (char **) l->data;
- for (i = 0; i < list_len; i ++, pos ++) {
-- seq->_buffer [pos] = CORBA_string_dup (aspell_string_enumeration_next (elements));
-+ seq->_buffer [pos] = CORBA_string_dup (suggestions [i]);
- pos ++;
- seq->_buffer [pos] = CORBA_string_dup (language);
- }
-- delete_aspell_string_enumeration (elements);
-+
-+ g_strfreev (suggestions);
- }
- CORBA_sequence_set_release (seq, CORBA_TRUE);
- g_slist_free (suggestion_list);
-Index: gnome-spell/dictionary.h
-===================================================================
-RCS file: /cvs/gnome/gnome-spell/gnome-spell/dictionary.h,v
-retrieving revision 1.8
-diff -u -p -u -p -r1.8 dictionary.h
---- gnome-spell/dictionary.h 5 Feb 2006 21:31:09 -0000 1.8
-+++ gnome-spell/dictionary.h 2 Apr 2006 14:31:46 -0000
-@@ -26,7 +26,6 @@
- G_BEGIN_DECLS
-
- #include <bonobo/bonobo-object.h>
--#include <aspell.h>
-
- #define GNOME_SPELL_DICTIONARY_TYPE (gnome_spell_dictionary_get_type ())
- #define GNOME_SPELL_DICTIONARY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
-@@ -37,12 +36,6 @@ G_BEGIN_DECLS
- #define IS_GNOME_SPELL_DICTIONARY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GNOME_SPELL_DICTIONARY_TYPE))
-
- typedef struct {
-- AspellConfig *config;
-- AspellSpeller *speller;
-- gboolean changed;
--} SpellEngine;
--
--typedef struct {
- gchar *abbreviation;
- gchar *name;
- } LangInfo;
-@@ -50,7 +43,6 @@ typedef struct {
- typedef struct {
- BonoboObject parent;
-
-- gboolean changed;
- GSList *engines;
- GHashTable *languages;
- GHashTable *engines_ht;
-Index: gnome-spell/test-spell.c
-===================================================================
-RCS file: /cvs/gnome/gnome-spell/gnome-spell/test-spell.c,v
-retrieving revision 1.12
-diff -u -p -u -p -r1.12 test-spell.c
---- gnome-spell/test-spell.c 6 Mar 2003 16:37:36 -0000 1.12
-+++ gnome-spell/test-spell.c 2 Apr 2006 14:31:46 -0000
-@@ -52,7 +52,6 @@ main (int argc, char *argv [])
- * test dictionary
- */
-
-- GNOME_Spell_Dictionary_getLanguages (en, &ev);
- GNOME_Spell_Dictionary_setLanguage (en, "en", &ev);
-
- printf ("check: %s --> %d\n",
diff --git a/extra/grip/grip.install b/extra/grip/grip.install
deleted file mode 100644
index db4c764ac..000000000
--- a/extra/grip/grip.install
+++ /dev/null
@@ -1,33 +0,0 @@
-
-# This is a default template for a post-install scriptlet. You can
-# remove any functions you don't need (and this header).
-
-# arg 1: the new package version
-post_install() {
- cat << EOM
-
- --> please note that you will need "yelp" to display the help and the notices
- --> of grip. Every other functionality can be used out of the box.
-
-EOM
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install $1
-}
-
-# arg 1: the old package version
-pre_remove() {
- /bin/true
-}
-
-# arg 1: the old package version
-post_remove() {
- /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/extra/kdeplasma-addons/kdeobservatory-qwt6.patch b/extra/kdeplasma-addons/kdeobservatory-qwt6.patch
deleted file mode 100644
index 46ba0345d..000000000
--- a/extra/kdeplasma-addons/kdeobservatory-qwt6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur kdeplasma-addons-4.6.5.bak/applets/kdeobservatory/src/commithistoryview.cpp kdeplasma-addons-4.6.5/applets/kdeobservatory/src/commithistoryview.cpp
---- kdeplasma-addons-4.6.5.bak/applets/kdeobservatory/src/commithistoryview.cpp 2011-07-15 14:04:17.323188525 +0200
-+++ kdeplasma-addons-4.6.5/applets/kdeobservatory/src/commithistoryview.cpp 2011-07-15 14:04:39.186521458 +0200
-@@ -124,7 +124,7 @@
- plot->setCanvasBackground(QColor(0, 0, 140));
-
- QwtPlotCurve *curve = new QwtPlotCurve;
-- curve->setData(x, y, j);
-+ curve->setSamples(x, y, j);
- delete []x;
- delete []y;
-
diff --git a/extra/ladspa/ladspa-sdk-1.12-gcc4.patch b/extra/ladspa/ladspa-sdk-1.12-gcc4.patch
deleted file mode 100644
index fa21be8ef..000000000
--- a/extra/ladspa/ladspa-sdk-1.12-gcc4.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ladspa_sdk/src/plugins/sine.cpp.orig 2002-07-06 17:23:17.000000000
-0000
-+++ ladspa_sdk/src/plugins/sine.cpp 2005-11-25 11:15:11.691087784 +0000
-@@ -59,6 +59,15 @@
-
- /*****************************************************************************/
-
-+LADSPA_Handle instantiateSineOscillator(const LADSPA_Descriptor *, unsigned long SampleRate);
-+void connectPortToSineOscillator(LADSPA_Handle Instance, unsigned long Port, LADSPA_Data * DataLocation);
-+void activateSineOscillator(void * pvHandle);
-+void runSineOscillator_FreqAudio_AmpAudio(LADSPA_Handle Instance, unsigned long SampleCount);
-+void runSineOscillator_FreqAudio_AmpCtrl(LADSPA_Handle Instance, unsigned long SampleCount);
-+void runSineOscillator_FreqCtrl_AmpAudio(LADSPA_Handle Instance, unsigned long SampleCount);
-+void runSineOscillator_FreqCtrl_AmpCtrl(LADSPA_Handle Instance, unsigned long SampleCount);
-+void cleanupSineOscillator(void *pvHandle);
-+
- class SineOscillator {
- private:
diff --git a/extra/lesstif/ChangeLog b/extra/lesstif/ChangeLog
deleted file mode 100644
index c600228c3..000000000
--- a/extra/lesstif/ChangeLog
+++ /dev/null
@@ -1,19 +0,0 @@
-2010-01-05 Eric Belanger <eric@archlinux.org>
-
- * lesstif 0.95.2-2
- * Fixed segmentation fault when doing copy/paste on i686 (close FS#17712)
-
-2009-12-30 Eric Belanger <eric@archlinux.org>
-
- * lesstif 0.95.2-1
- * Upstream update
- * Added docs
-
-2008-12-08 Eric Belanger <eric@archlinux.org>
-
- * lesstif 0.95.0-3
- * Added license
- * Updated options syntax
- * Added url
- * FHS man pages
- * Added ChangeLog
diff --git a/extra/libssh2/PKGBUILD b/extra/libssh2/PKGBUILD
deleted file mode 100644
index 00a2e5bb3..000000000
--- a/extra/libssh2/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 137230 2011-09-06 21:12:10Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: ice-man <icemanf@gmail.com>
-
-pkgname=libssh2
-pkgver=1.3.0
-pkgrel=1
-pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts"
-url="http://www.libssh2.org/"
-arch=('i686' 'x86_64')
-license=('BSD')
-depends=('openssl')
-makedepends=('zlib')
-options=('!libtool')
-source=("http://www.libssh2.org/download/$pkgname-$pkgver.tar.gz"{,.asc})
-md5sums=('6425331899ccf1015f1ed79448cb4709'
- '6ddcc9f2b37941f8291d7494ee8f89b7')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/extra/mkbootcd/PKGBUILD b/extra/mkbootcd/PKGBUILD
deleted file mode 100644
index dc06beb41..000000000
--- a/extra/mkbootcd/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 12672 2008-09-17 21:20:37Z tpowa $
-# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=mkbootcd
-pkgver=2008.09
-pkgrel=1
-pkgdesc="Advanced, modular isolinux bootcd image creation utility"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.archlinux.org/"
-depends=('mkinitcpio' 'cdrkit' 'syslinux')
-source=('boot.msg' 'mkbootcd' 'mkbootcd.conf' 'options.msg')
-backup=(etc/mkbootcd.conf)
-
-build()
-{
- cd $startdir/src/
- install -D -m755 mkbootcd $startdir/pkg/usr/sbin/mkbootcd
- install -D -m644 mkbootcd.conf $startdir/pkg/etc/mkbootcd.conf
- install -D -m644 boot.msg $startdir/pkg/usr/share/mkbootcd/boot.msg
- install -D -m644 options.msg $startdir/pkg/usr/share/mkbootcd/options.msg
-}
-md5sums=('d02e111f81204044644f728ff85e2284'
- 'bfae68f0a5168bd41f8d0c56f524fb08'
- 'e08b9b952b5e468feb16e3f20ee3faf2'
- 'fa078942b8adf261e4d925e080dc3018')
diff --git a/extra/mkbootcd/boot.msg b/extra/mkbootcd/boot.msg
deleted file mode 100644
index 271c58016..000000000
--- a/extra/mkbootcd/boot.msg
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-------------------------------------------------------------------------------
-Arch Linux
-ISOLINUX BOOT
-created with 'mkbootcd' written by Tobias Powalowski <tpowa@archlinux.org>
-
-Press ENTER or type 'arch' to boot the CD.
-
-If you wish to change your defaults to boot into your existing system,
-type 'vmlinuz initrd=initrd.img <any_other_boot_option>'
-Use the F2 key for troubleshooting and options.
-------------------------------------------------------------------------------
-
diff --git a/extra/mkbootcd/mkbootcd b/extra/mkbootcd/mkbootcd
deleted file mode 100755
index e7e5e62b1..000000000
--- a/extra/mkbootcd/mkbootcd
+++ /dev/null
@@ -1,143 +0,0 @@
-#! /bin/sh
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Settings
-APPNAME=$(basename "${0}")
-CONFIG="/etc/mkbootcd.conf"
-GENIMG=""
-BURN="0"
-BLANK="0"
-GRUB="0"
-TARNAME=""
-export TEMPDIR=$(mktemp /tmp/mkbootcd.XXXX)
-usage ()
-{
- echo "${APPNAME}: usage"
- echo " -g=IMAGE Generate a ISO image as IMAGE"
- echo " -c=CONFIG Use CONFIG file. default: /etc/mkbootcd.conf"
- echo " -B Burn the ISO image after creation"
- echo " -b Blanking media first"
- echo " -grub Use grub instead of isolinux"
- echo " -t=TARNAME Generate a tar image instead of an iso image"
- echo " -h This message."
- exit 1
-}
-
-[ "$1" == "" ] && usage
-
-while [ $# -gt 0 ]; do
- case $1 in
- -c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;;
- -g=*|--g=*) GENIMG="$(echo $1 | awk -F= '{print $2;}')" ;;
- -B|--B) BURN="1" ;;
- -b|--b) BLANK="1" ;;
- -grub|--grub) GRUB="1" ;;
- -t=*|--t=*) TARNAME="$(echo $1 | awk -F= '{print $2;}')" ;;
- -h|--h|?) usage ;;
- *) usage ;;
- esac
- shift
-done
-
-if [ "${TARNAME}" = "" -a "${GENIMG}" = "" ]; then
- echo "ERROR: No image name specified, please use the -g option"
- exit 1
-fi
-
-if [ ! -f "${CONFIG}" ]; then
- echo "config file '${CONFIG}' cannot be found, aborting..."
- exit 1
-fi
-
-. "${CONFIG}"
-# export for mkinitcpio
-[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE
-[ -n "${APPENDBOOTMESSAGE_SYSLINUX}" ] && export APPENDBOOTMESSAGE_SYSLINUX
-[ -n "${APPENDBOOTMESSAGE_SYSLINUX_LOWMEM}" ] && export APPENDBOOTMESSAGE_SYSLINUX_LOWMEM
-[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE
-
-if [ "$GRUB" = "1" ]; then
- export RUNPROGRAM="${APPNAME}-grub"
- export BOOTDIRNAME="boot"
-else
- export RUNPROGRAM="${APPNAME}"
- export BOOTDIRNAME="isolinux"
-fi
-[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX)
-[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX)
-[ "${ISONAME}" = "" ] && export ISONAME=$(mktemp /tmp/isoname.XXXX)
-export USEKERNEL=${VERSION}
-# begin script
-[ -e ${TEMPDIR} ] && rm -r ${TEMPDIR}
-mkdir -p ${TEMPDIR}/${BOOTDIRNAME}
-if [ "$GRUB" = "1" ]; then
- mkdir ${TEMPDIR}/${BOOTDIRNAME}/grub
- install -m755 /usr/share/grub/i386-pc/stage2_eltorito ${TEMPDIR}/${BOOTDIRNAME}/grub/stage2_eltorito
-else
- install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin
-fi
-# create isolinux.cfg
-if [ "$GRUB" = "1" ]; then
- echo ":: Creating menu.lst ..."
- [ ! -e "${MENULST}" ] && echo "No menu.lst found" && exit 1
- sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \
- ${MENULST} \
- > ${TEMPDIR}/${BOOTDIRNAME}/grub/menu.lst
-else
- echo ":: Creating isolinux.cfg ..."
- if [ "${ISOLINUXCFG}" = "" ]; then
- [ -e ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg ] && rm ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- echo "prompt ${PROMPT}" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- echo "timeout ${TIMEOUT}" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- echo "display boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- echo "F1 boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- echo "F2 options.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- echo "default arch" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- echo "label arch" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- echo "kernel vmlinuz" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- echo "append initrd=initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- else
- sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \
- ${ISOLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
- fi
- [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg ] && echo "No isolinux.cfg found" && exit 1
-fi
-echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..."
-# generate initramdisk
-echo ":: Creating initramdisk ..."
- mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/${BOOTDIRNAME}/initrd.img
-echo ":: Using ${KERNEL} as image kernel ..."
- install -m644 ${KERNEL} ${TEMPDIR}/${BOOTDIRNAME}/vmlinuz
- install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg
- install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg
- [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1
- [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1
-# create image
-if ! [ "${TARNAME}" = "" ]; then
- echo ":: Creating tar image ..."
- [ -e ${TARNAME} ] && rm ${TARNAME}
- rm ${TEMPDIR}/arch/pkg/*.pkg.tar.gz > /dev/null 2>&1
- tar cfv ${TARNAME} ${TEMPDIR} > /dev/null 2>&1 && echo ":: tar Image succesfull created at ${TARNAME}"
-else
- echo ":: Creating ISO image ..."
- [ -e ${GENIMG} ] && rm ${GENIMG}
- [ -s "${ISONAME}" ] && ISONAME=$(cat $ISONAME) || ISONAME="Arch Linux"
- if [ "$GRUB" = "1" ]; then
- mkisofs -RlDJLV "${ISONAME}" -b boot/grub/stage2_eltorito -c boot/boot.cat \
- -no-emul-boot -boot-load-size 4 -boot-info-table -o ${GENIMG} ${TEMPDIR}/ > /dev/null 2>&1
- else
- mkisofs -RlDJLV "${ISONAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat \
- -no-emul-boot -boot-load-size 4 -boot-info-table -o ${GENIMG} ${TEMPDIR}/ > /dev/null 2>&1
- fi
- [ $? -ne 0 ] && echo ":: ISO Image succesfull created at ${GENIMG}"
- # burning/blanking image
- if [ "$BLANK" = "1" ]; then
- echo ":: Blanking media DEVICE=${DEVICE}, BLANKMODE=${BLANKMODE}, SPEED=${SPEED} ..."
- cdrecord dev=${DEVICE} speed=${SPEED} blank=${BLANKMODE} > /dev/null 2>&1 && echo ":: Successfull."
- fi
- if [ "$BURN" = "1" ]; then
- echo ":: Burning ISO image DEVICE=${DEVICE}, SPEED=${SPEED} ..."
- cdrecord dev=${DEVICE} speed=${SPEED} -eject ${GENIMG} > /dev/null 2>&1 && echo ":: Successfull."
- fi
-fi
-# clean /tmp
-rm -r ${TEMPDIR}
diff --git a/extra/mkbootcd/mkbootcd.conf b/extra/mkbootcd/mkbootcd.conf
deleted file mode 100644
index b27be81e6..000000000
--- a/extra/mkbootcd/mkbootcd.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-# config file of mkbootcd
-
-# DEFAULT kernel boot options like root=/dev/hda3 etc.
-# add your root= option, if you boot from a disk device
-# and don't want to add it by hand on each boot
-KERNEL_BOOT_OPTIONS=""
-
-# mkinitcpio config file, defaulted to stock config file
-MKINITCPIO_CONFIG="/etc/mkinitcpio.conf"
-
-# kernel version, defaulted to build for runtime kernel
-VERSION="$(uname -r)"
-
-# kernel image, defaulted to stock arch kernel
-KERNEL="/boot/vmlinuz26"
-
-# boot message files
-BOOTMESSAGE="/usr/share/mkbootcd/boot.msg"
-OPTIONSBOOTMESSAGE="/usr/share/mkbootcd/options.msg"
-
-# menu.lst or isolinux.cfg file to use
-ISOLINUXCFG=""
-MENULST=""
-
-# Prompt on CD boot, defaulted to yes, 1=yes 0=no
-PROMPT="1"
-
-# Name of the ISO, if empty Arch Linux is used if not set by a HOOK later
-ISONAME=""
-
-# Timeout in seconds on CD boot, defaulted to 0, because we prompt by default
-TIMEOUT="0"
-
-# Setting cdrecord options
-DEVICE=""
-SPEED=""
-BLANKMODE="" \ No newline at end of file
diff --git a/extra/mkbootcd/options.msg b/extra/mkbootcd/options.msg
deleted file mode 100644
index 300922e38..000000000
--- a/extra/mkbootcd/options.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-------------------------------------------------------------------------------
-Arch Linux options and troubleshooting:
-
-- If your system hangs during the boot process, any combinations of the
- boot options noapic acpi=off pci=routeirq nosmp may be useful.
------------------------------------------------------------------------------- \ No newline at end of file
diff --git a/extra/mozilla-common/PKGBUILD b/extra/mozilla-common/PKGBUILD
deleted file mode 100644
index ad7efa3a2..000000000
--- a/extra/mozilla-common/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 42378 2009-06-13 13:07:05Z jgc $
-# Maintainer: dale <dale@archlinux.org>
-
-pkgname=mozilla-common
-pkgver=1.4
-pkgrel=1
-pkgdesc="Common Initialization Profile for Mozilla.org products"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.mozilla.org/"
-install=mozilla-common.install
-source=(mozilla-common.sh
- mozilla-common.csh)
-md5sums=('39451f6fe87d3cb224e140322c55eb27'
- '924887e41bd96db37029f479befe40cf')
-
-build() {
- install -m755 -d "${pkgdir}/etc/profile.d"
- install -m755 mozilla-common.{,c}sh "${pkgdir}/etc/profile.d/" || return 1
-}
diff --git a/extra/mozilla-common/mozilla-common.csh b/extra/mozilla-common/mozilla-common.csh
deleted file mode 100755
index 09e49c783..000000000
--- a/extra/mozilla-common/mozilla-common.csh
+++ /dev/null
@@ -1 +0,0 @@
-setenv MOZ_PLUGIN_PATH "/usr/lib/mozilla/plugins"
diff --git a/extra/mozilla-common/mozilla-common.install b/extra/mozilla-common/mozilla-common.install
deleted file mode 100644
index dc4228b08..000000000
--- a/extra/mozilla-common/mozilla-common.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install() {
- echo "relogin or source /etc/profile.d/mozilla-common.sh"
-}
-# vim:set ts=2 sw=2 et:
diff --git a/extra/mozilla-common/mozilla-common.sh b/extra/mozilla-common/mozilla-common.sh
deleted file mode 100755
index 132b5731e..000000000
--- a/extra/mozilla-common/mozilla-common.sh
+++ /dev/null
@@ -1 +0,0 @@
-export MOZ_PLUGIN_PATH="/usr/lib/mozilla/plugins"
diff --git a/extra/ndesk-dbus-glib/PKGBUILD b/extra/ndesk-dbus-glib/PKGBUILD
deleted file mode 100644
index b25ce9ce5..000000000
--- a/extra/ndesk-dbus-glib/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 33728 2009-04-04 18:41:25Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: tardo <tardo@nagi-fanboi.net>
-
-pkgname=ndesk-dbus-glib
-pkgver=0.4.1
-pkgrel=2
-pkgdesc="C# GLib implementation of D-Bus"
-arch=('i686' 'x86_64')
-url="http://www.ndesk.org/DBusSharp"
-license=('custom')
-depends=('ndesk-dbus>=0.6')
-makedepends=('pkgconfig')
-options=(!makeflags)
-source=(http://www.ndesk.org/archive/dbus-sharp/$pkgname-$pkgver.tar.gz)
-md5sums=('7faf8770b214956fa9de009def550826')
-
-build() {
- cd $startdir/src/$pkgname-$pkgver
- export MONO_SHARED_DIR="${startdir}/src/.wabi"
- mkdir -p "${MONO_SHARED_DIR}"
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
- make || return 1
- make DESTDIR=$startdir/pkg install || return 1
- install -D COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING
-}
diff --git a/extra/openjpeg/30_fix_build_for_debian.dpatch b/extra/openjpeg/30_fix_build_for_debian.dpatch
deleted file mode 100644
index afd995054..000000000
--- a/extra/openjpeg/30_fix_build_for_debian.dpatch
+++ /dev/null
@@ -1,70 +0,0 @@
-
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_fix_build_for_debian.dpatch by <robin.cornelius@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Dont apply the -s strip flag to the shared lib debian will do it for us
-## DP: where necessary
-## DP: Remove unnecessary linkage on lstdc++ and lm and add missing linkage for -lm
-
-@DPATCH@
-
-Index: ./Makefile
-===================================================================
---- ./Makefile (revision 96)
-+++ ./Makefile (working copy)
-@@ -18,8 +18,7 @@
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
-
--COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC
--LIBRARIES = -lstdc++
-+COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC -g $(EXTRA_CFLAGS)
-
- MODULES = $(SRCS:.c=.o)
- CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
-@@ -54,7 +53,7 @@
- $(AR) r $@ $(MODULES)
-
- $(SHAREDLIB): $(MODULES)
-- $(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
-+ $(CC) -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) -lm
-
- install: OpenJPEG
- install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'
-
-Index: ./indexer_JPIP/Makefile
-===================================================================
---- ./indexer_JPIP/Makefile (revision 95)
-+++ ./indexer_JPIP/Makefile (working copy)
-@@ -1,7 +1,6 @@
- CC = gcc
-
--LDFLAGS = -lm
--CFLAGS = -Wall
-+CFLAGS = -Wall $(EXTRA_CFLAGS)
-
- all: index_create
-
-Index: ./codec/Makefile
-===================================================================
---- ./codec/Makefile (revision 96)
-+++ ./codec/Makefile (working copy)
-@@ -1,13 +1,13 @@
- # Makefile for the main OpenJPEG codecs: j2k_to_image and image_to_j2k
-
--CFLAGS = -O3 -lstdc++ # -g -p -pg
-+CFLAGS = $(EXTRA_CFLAGS) # -g -p -pg
-
- all: j2k_to_image image_to_j2k
-
--j2k_to_image: j2k_to_image.c ../libopenjpeg.a
-+j2k_to_image: j2k_to_image.c
- gcc $(CFLAGS) compat/getopt.c index.c convert.c j2k_to_image.c -o j2k_to_image -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
-
--image_to_j2k: image_to_j2k.c ../libopenjpeg.a
-+image_to_j2k: image_to_j2k.c
- gcc $(CFLAGS) compat/getopt.c index.c convert.c image_to_j2k.c -o image_to_j2k -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
-
- clean:
-
diff --git a/extra/smpeg/ChangeLog b/extra/smpeg/ChangeLog
deleted file mode 100644
index 77a784590..000000000
--- a/extra/smpeg/ChangeLog
+++ /dev/null
@@ -1,6 +0,0 @@
-2009-02-07 Eric Belanger <eric@archlinux.org>
-
- * smpeg 0.4.4-5
- * Added gtk and mesa optdepends (close FS#12693)
- * FHS man pages
- * Added ChangeLog
diff --git a/extra/x11vnc/x11vnc.conf b/extra/x11vnc/x11vnc.conf
deleted file mode 100644
index 8a81e3286..000000000
--- a/extra/x11vnc/x11vnc.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Parameters to be passed to x11vnc
-#
-
-X11VNC_ARGS=""
diff --git a/extra/x11vnc/x11vnc.rc b/extra/x11vnc/x11vnc.rc
deleted file mode 100644
index d7bbdd15e..000000000
--- a/extra/x11vnc/x11vnc.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/x11vnc
-
-PID=$(pidof -o %PPID /usr/bin/x11vnc)
-case "$1" in
- start)
- stat_busy "Starting x11vnc"
- [ -z "$PID" ] && /usr/bin/x11vnc $X11VNC_ARGS &> /dev/null &
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon x11vnc
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping x11vnc"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon x11vnc
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/xaos/ChangeLog b/extra/xaos/ChangeLog
deleted file mode 100644
index 7554cd7b3..000000000
--- a/extra/xaos/ChangeLog
+++ /dev/null
@@ -1,24 +0,0 @@
-2010-02-06 Eric Belanger <eric@archlinux.org>
-
- * xaos 3.5-3
- * Added aalib support
- * Removed unneeded depends
- * Improved description
-
-2010-01-19 Eric Belanger <eric@archlinux.org>
-
- * xaos 3.5-2
- * Rebuilt for libpng 1.4 and libjpeg 8
-
-2009-07-21 Eric Belanger <eric@archlinux.org>
-
- * xaos 3.5-1
- * Upstream update
- * Added texinfo depends
-
-2008-11-08 Eric Belanger <eric@archlinux.org>
-
- * xaos 3.4-1
- * Upstream update
- * Added install scriptlet for info file
- * Added ChangeLog
diff --git a/extra/xfce4-session/gdm.patch b/extra/xfce4-session/gdm.patch
deleted file mode 100644
index e89e6a0b6..000000000
--- a/extra/xfce4-session/gdm.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 3bba8eb773a96339fb841c76b04f2d4fd3317814 Mon Sep 17 00:00:00 2001
-From: Panu Matilainen <pmatilai@laiskiainen.org>
-Date: Wed, 23 Mar 2011 21:13:40 +0000
-Subject: Fix GDM_LANG usage to be compatible with GDM3 (bug #7400).
-
----
-diff --git a/xfce4-session/main.c b/xfce4-session/main.c
-index ff6e324..fcf69f8 100644
---- a/xfce4-session/main.c
-+++ b/xfce4-session/main.c
-@@ -103,7 +103,7 @@ setup_environment (void)
-
- /* this is for compatibility with the GNOME Display Manager */
- lang = g_getenv ("GDM_LANG");
-- if (lang != NULL)
-+ if (lang != NULL && strlen (lang) > 0)
- {
- xfce_setenv ("LANG", lang, TRUE);
- xfce_unsetenv ("GDM_LANG");
---
-cgit
diff --git a/extra/xfdesktop/fix-desktop-drag-and-drop.patch b/extra/xfdesktop/fix-desktop-drag-and-drop.patch
deleted file mode 100644
index 8c0c4bcc8..000000000
--- a/extra/xfdesktop/fix-desktop-drag-and-drop.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
-index 2711646..d3ca2eb 100644
---- a/src/xfdesktop-file-icon-manager.c
-+++ b/src/xfdesktop-file-icon-manager.c
-@@ -2794,7 +2794,7 @@ xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager
- GFile *tfile = NULL;
- gboolean copy_only = TRUE, drop_ok = FALSE;
- GList *file_list;
--
-+
- if(info == TARGET_XDND_DIRECT_SAVE0) {
- /* we don't suppose XdndDirectSave stage 3, result F, i.e., the app
- * has to save the data itself given the filename we provided in
-@@ -2816,7 +2816,7 @@ xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager
- /* data is "URL\nTITLE" */
- GFile *source_file = NULL;
- gchar *exo_desktop_item_edit = g_find_program_in_path("exo-desktop-item-edit");
--
-+
- if(drop_icon) {
- GFileInfo *finfo = xfdesktop_file_icon_peek_file_info(XFDESKTOP_FILE_ICON(drop_icon));
- if(g_file_info_get_file_type(finfo) == G_FILE_TYPE_DIRECTORY)
-@@ -2911,8 +2911,15 @@ xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager
- gchar *dest_basename = g_file_get_basename(l->data);
-
- if(dest_basename && *dest_basename != '\0') {
-- GFile *dest_file = g_file_get_child(base_dest_file, dest_basename);
-- dest_file_list = g_list_prepend(dest_file_list, dest_file);
-+ /* If we copy a file, we need to use the new absolute filename
-+ * as the destination. If we move, we need to use the destination
-+ * directory. */
-+ if(copy_only) {
-+ GFile *dest_file = g_file_get_child(base_dest_file, dest_basename);
-+ dest_file_list = g_list_prepend(dest_file_list, dest_file);
-+ } else {
-+ dest_file_list = g_list_prepend(dest_file_list, base_dest_file);
-+ }
- }
-
- g_free(dest_basename);
-@@ -2923,10 +2930,10 @@ xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager
- if(dest_file_list) {
- dest_file_list = g_list_reverse(dest_file_list);
-
-- drop_ok =xfdesktop_file_utils_transfer_files(context->action,
-- file_list,
-- dest_file_list,
-- fmanager->priv->gscreen);
-+ drop_ok = xfdesktop_file_utils_transfer_files(context->action,
-+ file_list,
-+ dest_file_list,
-+ fmanager->priv->gscreen);
- }
-
- xfdesktop_file_utils_file_list_free(dest_file_list);
-
-
diff --git a/extra/xfwm4-themes/PKGBUILD b/extra/xfwm4-themes/PKGBUILD
deleted file mode 100644
index 2e6f414e6..000000000
--- a/extra/xfwm4-themes/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 28064 2009-02-27 20:44:58Z andyrtr $
-# Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
-
-pkgname=xfwm4-themes
-pkgver=4.6.0
-pkgrel=1
-pkgdesc="A set of additionnal themes for the Xfce window manager"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://www.xfce.org/"
-groups=('xfce4')
-depends=("xfwm4>=${pkgver}")
-makedepends=('pkgconfig')
-options=('!libtool')
-source=(http://www.xfce.org/archive/xfce-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('4dc5cb29cbd40e3b9dece12a85e20854')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
- --localstatedir=/var --disable-static
- make || return 1
- make DESTDIR=${pkgdir} install || return 1
-}
diff --git a/extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch b/extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch
deleted file mode 100644
index 36d28ded0..000000000
--- a/extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From fa425363e3927e86d57f42c4b6e4995d26d6bd0c Mon Sep 17 00:00:00 2001
-From: Aaron Plattner <aplattner@nvidia.com>
-Date: Fri, 29 Jul 2011 23:12:06 +0000
-Subject: randr: Compare all the bytes in RRPostPendingProperties
-
-RRPostPendingProperties tries to compare the pending and current
-property values to decide whether they're actually changing. However,
-it does this using a memcmp that passes in pending_value->size as the
-number of bytes. This is actually the number of elements, where each
-element is (pending_value->format / 8) bytes long. This causes the
-pending value to not be propagated if the first pending_value->size
-bytes are the same and only the end of it is changing.
-
-Fix this by computing the total number of bytes to compare in the
-memcmp.
-
-Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
-Reviewed-by: Keith Packard <keithp@keithp.com>
-Signed-off-by: Keith Packard <keithp@keithp.com>
-(cherry picked from commit 08dfff92e8d0c2b1726634392c147f6634d1706d)
----
-diff --git a/randr/rrproperty.c b/randr/rrproperty.c
-index ba04c16..61e7bb4 100644
---- a/randr/rrproperty.c
-+++ b/randr/rrproperty.c
-@@ -283,7 +283,7 @@ RRPostPendingProperties (RROutputPtr output)
- pending_value->format == current_value->format &&
- pending_value->size == current_value->size &&
- !memcmp (pending_value->data, current_value->data,
-- pending_value->size))
-+ pending_value->size * (pending_value->format / 8)))
- continue;
-
- if (RRChangeOutputProperty (output, property->propertyName,
---
-cgit v0.8.3-6-g21f6
diff --git a/gnome-unstable/folks/Bug_658631_crash_at_empathy_startup.patch b/gnome-unstable/folks/Bug_658631_crash_at_empathy_startup.patch
deleted file mode 100644
index 6ba35bc02..000000000
--- a/gnome-unstable/folks/Bug_658631_crash_at_empathy_startup.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 1f85f89051e63b05e271b418687c242a83e2f296 Mon Sep 17 00:00:00 2001
-From: Philip Withnall <philip@tecnocode.co.uk>
-Date: Mon, 12 Sep 2011 22:09:10 +0000
-Subject: Bug 658631 — crash at empathy startup
-
-In the case that a persona is removed and the individual containing that
-persona is replaced by a different non-null individual which doesn't contain
-that persona (because it's been removed), we need to set the persona's
-individual pointer to null rather than the replacement individual.
-
-This stops us tripping the assertion in the setter for Persona.individual.
-
-Closes: bgo#658631
----
-diff --git a/folks/individual.vala b/folks/individual.vala
-index 3b6c12b..59548ee 100644
---- a/folks/individual.vala
-+++ b/folks/individual.vala
-@@ -1510,7 +1510,19 @@ public class Folks.Individual : Object,
- * aggregator's rewritten, it would be nice to fix this. */
- if (persona.individual == this)
- {
-- persona.individual = replacement_individual;
-+ /* It may be the case that the persona's being removed from the
-+ * individual (i.e. the replacement individual is non-null, but
-+ * doesn't contain this persona). In this case, we need to set the
-+ * persona's individual to null. */
-+ if (replacement_individual != null &&
-+ persona in replacement_individual.personas)
-+ {
-+ persona.individual = replacement_individual;
-+ }
-+ else
-+ {
-+ persona.individual = null;
-+ }
- }
- }
-
---
-cgit v0.9.0.2
diff --git a/gnome-unstable/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch b/gnome-unstable/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch
deleted file mode 100644
index c26f422aa..000000000
--- a/gnome-unstable/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 9e2aaacafb45d51cff57dc033f4b5ad5bc1a1762 Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Fri, 16 Sep 2011 15:29:29 +0000
-Subject: gnutls: fix G_TLS_ERROR_EOF handling with gnutls 3.0
-
-gnutls 3.0 has a new error code for "peer closed connection without
-sending a Close packet", so add some #ifdefs to do the right thing
-with either 2.x or 3.x.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=659233
----
-diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c
-index c1ede79..0f792bb 100644
---- a/tls/gnutls/gtlsconnection-gnutls.c
-+++ b/tls/gnutls/gtlsconnection-gnutls.c
-@@ -132,7 +132,10 @@ struct _GTlsConnectionGnutlsPrivate
-
- GError *error;
- GCancellable *cancellable;
-- gboolean blocking, eof;
-+ gboolean blocking;
-+#ifndef GNUTLS_E_PREMATURE_TERMINATION
-+ gboolean eof;
-+#endif
- GIOCondition internal_direction;
- };
-
-@@ -548,19 +551,22 @@ end_gnutls_io (GTlsConnectionGnutls *gnutls,
- gnutls->priv->need_handshake = TRUE;
- return status;
- }
-- else if (status == GNUTLS_E_UNEXPECTED_PACKET_LENGTH)
-+ else if (
-+#ifdef GNUTLS_E_PREMATURE_TERMINATION
-+ status == GNUTLS_E_PREMATURE_TERMINATION
-+#else
-+ status == GNUTLS_E_UNEXPECTED_PACKET_LENGTH && gnutls->priv->eof
-+#endif
-+ )
- {
-- if (gnutls->priv->eof)
-+ if (gnutls->priv->require_close_notify)
- {
-- if (gnutls->priv->require_close_notify)
-- {
-- g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_EOF,
-- _("TLS connection closed unexpectedly"));
-- return status;
-- }
-- else
-- return 0;
-+ g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_EOF,
-+ _("TLS connection closed unexpectedly"));
-+ return status;
- }
-+ else
-+ return 0;
- }
-
- return status;
-@@ -795,8 +801,10 @@ g_tls_connection_gnutls_pull_func (gnutls_transport_ptr_t transport_data,
-
- if (ret < 0)
- set_gnutls_error (gnutls, G_IO_IN);
-+#ifndef GNUTLS_E_PREMATURE_TERMINATION
- else if (ret == 0)
- gnutls->priv->eof = TRUE;
-+#endif
-
- return ret;
- }
---
-cgit v0.9.0.2
diff --git a/gnome-unstable/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch b/gnome-unstable/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch
deleted file mode 100644
index 19a168638..000000000
--- a/gnome-unstable/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: tls/gnutls/gtlsconnection-gnutls.c
-===================================================================
---- tls/gnutls/gtlsconnection-gnutls.c
-+++ tls/gnutls/gtlsconnection-gnutls.c 2011-08-04 00:40:33.194189789 +0200
-@@ -860,9 +860,10 @@
-
- if (peer_certificate)
- {
-- int status;
-+ int verify_ret;
-+ unsigned int status;
-
-- status = gnutls_certificate_verify_peers (gnutls->priv->session);
-+ verify_ret = gnutls_certificate_verify_peers2 (gnutls->priv->session, &status);
- peer_certificate_errors = g_tls_certificate_gnutls_convert_flags (status);
- if (peer_certificate_errors)
- {
diff --git a/gnome-unstable/pygobject/documentation-location.patch b/gnome-unstable/pygobject/documentation-location.patch
deleted file mode 100644
index a3bacd345..000000000
--- a/gnome-unstable/pygobject/documentation-location.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 07cbf21a0c729000db28da7cb9ba08e5b79f7674 Mon Sep 17 00:00:00 2001
-From: Dieter Verfaillie <dieterv@optionexplicit.be>
-Date: Tue, 23 Aug 2011 10:45:50 +0200
-Subject: [PATCH] Fix documentation installation directory
-
----
- docs/Makefile.am | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/docs/Makefile.am b/docs/Makefile.am
-index 775e1e9..b9086a9 100644
---- a/docs/Makefile.am
-+++ b/docs/Makefile.am
-@@ -1,3 +1,4 @@
-+PLATFORM_VERSION = 3.0
- REF_VERSION = $(PYGOBJECT_MAJOR_VERSION).$(PYGOBJECT_MINOR_VERSION)
- FULL_VERSION = $(REF_VERSION).$(PYGOBJECT_MICRO_VERSION)
-
-@@ -52,7 +53,7 @@ XSL_FILES = \
- # so the date is newer then the files in HTML_FILES
- FIXXREF = xsl/fixxref.py
-
--TARGET_DIR = $(datadir)/gtk-doc/html/pygobject
-+TARGET_DIR = $(datadir)/gtk-doc/html/pygobject-$(PLATFORM_VERSION)
- CSSdir = $(TARGET_DIR)
- CSS_DATA = $(CSS_FILES)
-
-@@ -75,7 +76,7 @@ uninstall-local:
- rm -f $(DESTDIR)$(TARGET_DIR)/*
-
-
--XSLdir = $(datadir)/pygobject/xsl
-+XSLdir = $(datadir)/pygobject-$(PLATFORM_VERSION)/xsl
- XSL_DATA = $(XSL_FILES) $(FIXXREF)
-
- EXTRA_DIST = \
---
-1.7.6.msysgit.0
-
diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD
deleted file mode 100644
index c0a6c9f1f..000000000
--- a/multilib-testing/lib32-glibc/PKGBUILD
+++ /dev/null
@@ -1,170 +0,0 @@
-# $Id: PKGBUILD 55287 2011-09-08 23:36:17Z 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
-pkgrel=6
-_glibcdate=20110908
-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.13-dlclose-search-reset.patch
- glibc-2.14-libdl-crash.patch
- glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
- glibc-2.14-reexport-rpc-interface.patch
- glibc-2.14-reinstall-nis-rpc-headers.patch
- lib32-glibc.conf)
-md5sums=('069069eb9100cc7affd7ad884cb3c3e9'
- '4dadb9203b69a3210d53514bb46f41c3'
- '0c5540efc51c0b93996c51b57a8540ae'
- '40cd342e21f71f5e49e32622b25acc52'
- 'a3ac6f318d680347bb6e2805d42b73b2'
- 'b042647ea7d6f22ad319e12e796bd13e'
- '7d0154b7e17ea218c9fa953599d24cc4'
- '22d09c58718fb3d1d31c3a6c14ca6886'
- 'cea62cc6b903d222c5f26e05a3c0e0e6'
- '13728807283f111e5d9d38cf38e0a461'
- 'c5de2a946215d647c8af5432ec4b0da0'
- '55febbb72139ac7b65757df085024b83'
- '6e052f1cb693d5d3203f50f9d4e8c33b')
-
-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
-
- # https://bugzilla.redhat.com/show_bug.cgi?id=593675
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=2f811bf8 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.13-dlclose-search-reset.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
-
- # 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-avoid-assertion-on-empty-dns-answer.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=/usr/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 \
- --disable-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 \
- usr/lib32/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so
-
- strip $STRIP_SHARED usr/lib32/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \
- usr/lib32/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
- usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
- usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \
- usr/lib32/{pt_chown,{audit,gconv}/*.so}
-
- # Dynamic linker
- install -d -m755 ${pkgdir}/lib
- ln -s ../usr/lib32/ld-linux.so.2 ${pkgdir}/lib/
-
- # Add /usr/lib32 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-dlclose-search-reset.patch b/multilib-testing/lib32-glibc/glibc-2.13-dlclose-search-reset.patch
deleted file mode 100644
index 3ad8b418a..000000000
--- a/multilib-testing/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-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-avoid-assertion-on-empty-dns-answer.patch b/multilib-testing/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
deleted file mode 100644
index ef91116e5..000000000
--- a/multilib-testing/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-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 ee29f8c20..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-__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 9b08c3f43..000000000
--- a/multilib-testing/lib32-glibc/lib32-glibc.conf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib32
diff --git a/multilib-testing/libtool-multilib/PKGBUILD b/multilib-testing/libtool-multilib/PKGBUILD
deleted file mode 100644
index 60dff1b3d..000000000
--- a/multilib-testing/libtool-multilib/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 55288 2011-09-08 23:39:10Z 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
-pkgrel=5
-pkgdesc="A generic library support script for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/libtool"
-license=('GPL')
-_gccver=4.6.1
-makedepends=("gcc-multilib=$_gccver")
-options=('!libtool')
-source=(ftp://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz)
-md5sums=('4e6144439d95d7332dc50ace6dd24c55')
-
-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" "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.14-fix-resolver-crash-typo.patch b/multilib/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch
deleted file mode 100644
index b5d86c7d2..000000000
--- a/multilib/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/resolv/res_send.c b/resolv/res_send.c
-index 97142b7..a001c1e 100644
---- a/resolv/res_send.c
-+++ b/resolv/res_send.c
-@@ -549,7 +549,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
- ns, ansp, ansp2, nansp2, resplen2);
- if (n < 0)
- return (-1);
-- if (n == 0 && (buf2 == NULL || resplen2 == 0))
-+ if (n == 0 && (buf2 == NULL || *resplen2 == 0))
- goto next_ns;
- } else {
- /* Use datagrams. */
-@@ -559,7 +559,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
- ansp2, nansp2, resplen2);
- if (n < 0)
- return (-1);
-- if (n == 0 && (buf2 == NULL || resplen2 == 0))
-+ if (n == 0 && (buf2 == NULL || *resplen2 == 0))
- goto next_ns;
- if (v_circuit)
- // XXX Check whether both requests failed or
diff --git a/multilib/lib32-glibc/glibc-2.14-revert-4462fad3.patch b/multilib/lib32-glibc/glibc-2.14-revert-4462fad3.patch
deleted file mode 100644
index d71e37492..000000000
--- a/multilib/lib32-glibc/glibc-2.14-revert-4462fad3.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/staging/blender/PKGBUILD b/staging/blender/PKGBUILD
deleted file mode 100644
index a2333aed7..000000000
--- a/staging/blender/PKGBUILD
+++ /dev/null
@@ -1,92 +0,0 @@
-# $Id: PKGBUILD 138115 2011-09-17 00:41:35Z allan $
-# Contributor: John Sowiak <john@archlinux.org>
-# Maintainer: tobias <tobias@archlinux.org>
-
-# Apparently, the blender guys refuse to release source tarballs for
-# intermediate releases that deal mainly with binaries but incorporate tiny
-# minor changes from svn. Since I'm sick and tired of the urges of users that
-# look for release numbers only, we make a messy PKGBUILD that can checkout svn
-# release if necessary.
-
-#_svn=true
-_svn=false
-
-pkgname=blender
-pkgver=2.59
-pkgrel=3
-epoch=2
-pkgdesc="A fully integrated 3D graphics creation suite"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.blender.org"
-depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
- 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
- 'freetype2' 'openal' 'libsamplerate' 'ffmpeg')
-makedepends=('cmake') # 'subversion'
-install=blender.install
-if [ $_svn = false ]; then
- source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
- md5sums=('6f68fe3c3c2b6a85f1ba9ebc5b1155fe')
-else
- source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
- md5sums=('7579d1139d0d6025df8afcfca64a65c4')
-fi
-
-# source PKGBUILD && mksource
-mksource() {
- _svnver=38016
- _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
- _svnmod="$pkgname-$pkgver"
- mkdir ${pkgname}-$pkgver
- pushd ${pkgname}-$pkgver
- svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
- find . -depth -type d -name .svn -exec rm -rf {} \;
- tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
- popd
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- mkdir build
- cd build
-
- [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF"
-
- cmake .. \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DCMAKE_BUILD_TYPE:STRING=Release \
- -DWITH_INSTALL_PORTABLE:BOOL=OFF \
- -DWITH_PYTHON_INSTALL:BOOL=OFF \
- -DWITH_OPENCOLLADA:BOOL=OFF \
- -DWITH_GAMEENGINE:BOOL=ON \
- -DWITH_PLAYER:BOOL=ON \
- -DWITH_BUILTIN_GLEW:BOOL=OFF \
- -DWITH_CODEC_FFMPEG:BOOL=ON \
- -DWITH_CODEC_SNDFILE:BOOL=ON \
- -DPYTHON_VERSION:STRING=3.2 \
- -DPYTHON_LIBPATH:STRING=/usr/lib \
- -DPYTHON_LIBRARY:STRING=python3.2mu \
- -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \
- $ENABLESSE2
-
- make $MAKEFLAGS
-
- cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \
- "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/
- cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi
- chmod 755 bmake
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver/build"
- make DESTDIR="${pkgdir}" install
- python -m compileall "${pkgdir}/usr/share/blender"
-
-# install plugins
- install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
- cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \
- "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
- cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \
- "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
-}
diff --git a/staging/blender/blender.install b/staging/blender/blender.install
deleted file mode 100644
index f4d7cc443..000000000
--- a/staging/blender/blender.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
- update-desktop-database -q
- update-mime-database usr/share/mime &> /dev/null
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- update-desktop-database -q
- update-mime-database usr/share/mime &> /dev/null
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_remove() {
- update-desktop-database -q
- update-mime-database usr/share/mime &> /dev/null
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/bzflag/PKGBUILD b/staging/bzflag/PKGBUILD
deleted file mode 100644
index edaaefe5f..000000000
--- a/staging/bzflag/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 138113 2011-09-17 00:06:00Z bisson $
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Contributor: Kevin Piche <kevin@archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=bzflag
-pkgver=2.4.0
-pkgrel=2
-pkgdesc='Multiplayer 3D tank battle game'
-url='http://bzflag.org/'
-license=('LGPL')
-options=('!libtool')
-arch=('i686' 'x86_64')
-depends=('curl' 'glew' 'mesa' 'sdl')
-source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2")
-sha1sums=('af469d63af7143479176ea0ac91ce2eaa6e4561f')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr
- make
-
- cd misc
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 misc/bzflag.desktop "${pkgdir}"/usr/share/applications/bzflag.desktop
- install -Dm644 data/bzflag-48x48.png "${pkgdir}"/usr/share/pixmaps/bzflag-48x48.png
-}
diff --git a/staging/dvdauthor/PKGBUILD b/staging/dvdauthor/PKGBUILD
deleted file mode 100644
index 5f06234be..000000000
--- a/staging/dvdauthor/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 137846 2011-09-12 03:23:19Z allan $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Travis Willard <travisw@wmpub.ca>
-# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
-# Contributor: Nicolai Lissner <nlissne@linux01.gwdg.de>
-
-pkgname=dvdauthor
-pkgver=0.7.0
-pkgrel=2
-pkgdesc="DVD authoring tools"
-arch=('i686' 'x86_64')
-url="http://dvdauthor.sourceforge.net/"
-license=('GPL')
-depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('33a447fb98ab3293ac40f869eedc17ff')
-
-build() {
- cd "${srcdir}/${pkgname}"
- ./configure --prefix=/usr \
- --sysconfdir=/etc
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/enblend-enfuse/PKGBUILD b/staging/enblend-enfuse/PKGBUILD
deleted file mode 100644
index b85d11e59..000000000
--- a/staging/enblend-enfuse/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 138117 2011-09-17 00:53:33Z allan $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Dominik Ryba <domryba@post.pl>
-
-pkgname=enblend-enfuse
-pkgver=4.0
-pkgrel=3
-pkgdesc="intelligent blend tool for overlapping picture"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://enblend.sourceforge.net"
-depends=('openexr' 'glew>=1.5' 'libxmi' 'freeglut' 'libgl' 'lcms' 'texinfo' 'libpng')
-makedepends=('boost' 'pkgconfig')
-replaces=('enblend')
-conflicts=('enblend')
-provides=('enblend')
-install=${pkgname}.install
-source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz libpng-1.4.patch)
-md5sums=('2e7c950061e0085fd75d94576130250f' 'a39df8dd32ccfa020dea2ea388642575')
-sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033' 'eae6cf48ea082865130302d0b4d1ca0b884a563b')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
- patch -Np1 -i ../libpng-1.4.patch
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
- make DESTDIR="${pkgdir}" install
- install -D -m644 doc/enblend.info "${pkgdir}/usr/share/info/enblend.info"
- install -D -m644 doc/enfuse.info "${pkgdir}/usr/share/info/enfuse.info"
-}
diff --git a/staging/enblend-enfuse/enblend-enfuse.install b/staging/enblend-enfuse/enblend-enfuse.install
deleted file mode 100644
index 0ba358878..000000000
--- a/staging/enblend-enfuse/enblend-enfuse.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(enblend.info enfuse-focus-stacking.info enfuse.info)
-
-post_install() {
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- 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/staging/enblend-enfuse/libpng-1.4.patch b/staging/enblend-enfuse/libpng-1.4.patch
deleted file mode 100644
index 3bf852b58..000000000
--- a/staging/enblend-enfuse/libpng-1.4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx enblend-enfuse-3.2/src/vigra_impex/png.cxx
---- enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx 2010-01-19 22:09:36.000000000 -0500
-+++ enblend-enfuse-3.2/src/vigra_impex/png.cxx 2010-01-19 22:13:43.000000000 -0500
-@@ -275,8 +275,8 @@
- // expand gray values to at least one byte size
- if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
- if (setjmp(png->jmpbuf))
-- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
-- png_set_gray_1_2_4_to_8(png);
-+ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-+ png_set_expand_gray_1_2_4_to_8(png);
- bit_depth = 8;
- }
-
diff --git a/staging/glew/PKGBUILD b/staging/glew/PKGBUILD
deleted file mode 100644
index 86797b8a0..000000000
--- a/staging/glew/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 138111 2011-09-16 23:20:21Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: SleepyDog
-
-pkgname=glew
-pkgver=1.7.0
-pkgrel=1
-pkgdesc="The OpenGL Extension Wrangler Library"
-arch=('i686' 'x86_64')
-url="http://glew.sourceforge.net"
-license=('BSD' 'MIT' 'GPL')
-depends=('libxmu' 'libxi' 'mesa')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz)
-sha1sums=('9266f2360c1687a96f2ea06419671d370b2928d1')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i 's|lib64|lib|' config/Makefile.linux
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make GLEW_DEST="${pkgdir}/usr" install.all
- install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
- rm "${pkgdir}"/usr/lib/{libGLEW,libGLEWmx}.a
- chmod 0755 "${pkgdir}"/usr/lib/libGLEW*.so.${pkgver}
-}
diff --git a/staging/hugin/PKGBUILD b/staging/hugin/PKGBUILD
deleted file mode 100644
index fbb942cf2..000000000
--- a/staging/hugin/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 138119 2011-09-17 01:22:30Z allan $
-# Maintainer: Tobias Kieslich <tobias@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Dominik Ryba <domryba@post.pl>
-
-pkgname=hugin
-pkgver=2011.0.0
-pkgrel=3
-pkgdesc="A frontend to the panorama-tools"
-arch=('i686' 'x86_64')
-url="http://hugin.sourceforge.net/"
-license=('LGPL')
-depends=('wxgtk' 'libpano13' 'boost-libs' 'enblend-enfuse' 'exiv2' 'openexr'
- 'autopano-sift-c' 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool')
-makedepends=('zip' 'cmake' 'boost')
-install=hugin.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ac8a129b4c3021233df6d9368c8164cf')
-sha1sums=('22e1ad3846291a9bbe58570683e213921a6f0116')
-
-build() {
- cd "${srcdir}"
- mkdir build && cd build
- cmake "${srcdir}/${pkgname}-${pkgver}" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \
- -DENABLE_LAPACK=yes
- make
-}
-
-package(){
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/hugin/hugin.install b/staging/hugin/hugin.install
deleted file mode 100644
index 362749233..000000000
--- a/staging/hugin/hugin.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/gnome
- update-desktop-database -q
- update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/gnome
- update-desktop-database -q
- update-mime-database usr/share/mime > /dev/null
-}
diff --git a/staging/imagemagick/PKGBUILD b/staging/imagemagick/PKGBUILD
deleted file mode 100644
index 284b8eed7..000000000
--- a/staging/imagemagick/PKGBUILD
+++ /dev/null
@@ -1,81 +0,0 @@
-# $Id: PKGBUILD 137838 2011-09-12 00:54:46Z eric $
-# Maintainer: Eric BĂ©langer <eric@archlinux.org>
-
-pkgbase=imagemagick
-pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.2.5
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.imagemagick.org/"
-license=('custom')
-depends=('libltdl' 'lcms2' 'libxt' 'bzip2' 'xz' 'fontconfig' 'libxext' 'libjpeg-turbo')
-makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng')
-source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
- perlmagick.rpath.patch)
-md5sums=('ce0294e6bc7ca3ece03a432518143a29'
- 'ff9974decbfe9846f8e347239d87e4eb')
-sha1sums=('0af2f0fb913f390b0b25bc4e57b344b0d54c3560'
- '23405f80904b1de94ebd7bd6fe2a332471b8c283')
-
-build() {
- cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-
- sed '/AC_PATH_XTRA/d' -i configure.ac
- autoreconf
- patch -Np0 -i ../perlmagick.rpath.patch
-
- LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" \
- ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
- --enable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
- --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
- --with-perl --with-perl-options="INSTALLDIRS=vendor" \
- --without-gvc --without-djvu --without-autotrace --without-webp \
- --without-jbig --without-fpx --without-dps --without-fftw --without-lqr
- make
-}
-
-package_imagemagick() {
- pkgdesc="An image viewing/manipulation program"
- optdepends=('ghostscript: for Ghostscript support'
- 'openexr: for OpenEXR support'
- 'libwmf: for WMF support'
- 'librsvg: for SVG support'
- 'libxml2: for XML support'
- 'jasper: for JPEG-2000 support'
- 'libpng: for PNG support')
- backup=('etc/ImageMagick/coder.xml'
- 'etc/ImageMagick/colors.xml'
- 'etc/ImageMagick/delegates.xml'
- 'etc/ImageMagick/log.xml'
- 'etc/ImageMagick/magic.xml'
- 'etc/ImageMagick/mime.xml'
- 'etc/ImageMagick/policy.xml'
- 'etc/ImageMagick/sRGB.icm'
- 'etc/ImageMagick/thresholds.xml'
- 'etc/ImageMagick/type.xml'
- 'etc/ImageMagick/type-dejavu.xml'
- 'etc/ImageMagick/type-ghostscript.xml'
- 'etc/ImageMagick/type-windows.xml')
- options=('!makeflags' '!docs' 'libtool')
-
- cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
- make DESTDIR="${pkgdir}" install
- chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so"
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
- install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
-
-#Cleaning
- find "${pkgdir}" -name '*.bs' -delete
- rm -f "${pkgdir}"/usr/lib/*.la
-}
-
-package_imagemagick-doc() {
- pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)"
- depends=()
- options=('!makeflags')
-
- cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
- make DESTDIR="${pkgdir}" install-data-html
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE"
- install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE"
-}
diff --git a/staging/imagemagick/perlmagick.rpath.patch b/staging/imagemagick/perlmagick.rpath.patch
deleted file mode 100644
index 958c0f2ee..000000000
--- a/staging/imagemagick/perlmagick.rpath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig 2009-05-26 16:22:11.000000000 -0300
-+++ Makefile.in 2009-05-26 16:23:27.000000000 -0300
-@@ -10067,6 +10067,7 @@
-
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
-+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile
-
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install
diff --git a/staging/inkscape/PKGBUILD b/staging/inkscape/PKGBUILD
deleted file mode 100644
index fc0a05d64..000000000
--- a/staging/inkscape/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 137854 2011-09-12 03:46:01Z bisson $
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=inkscape
-pkgver=0.48.2
-pkgrel=2
-pkgdesc='Vector graphics editor using the SVG file format'
-url='http://inkscape.sourceforge.net/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-makedepends=('boost' 'pkg-config' 'intltool')
-depends=('gc' 'gtkmm' 'poppler-glib' 'pyxml' 'libxslt' 'gsl' 'popt' 'python2'
- 'gtkspell' 'imagemagick' 'desktop-file-utils' 'hicolor-icon-theme')
-optdepends=('pstoedit: latex formulas'
- 'texlive-core: latex formulas'
- 'python2-numpy: some extensions'
- 'python-lxml: some extensions and filters'
- 'uniconvertor: reading/writing to some proprietary formats')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3')
-
-install=install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
- sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py
- sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp
- sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
- sed -i 's|"python"|"python2"|g' src/main.cpp
-
- ./configure --prefix=/usr \
- --with-python \
- --with-perl \
- --without-gnome-vfs \
- --with-xft \
- --enable-lcms \
- --enable-poppler-cairo \
- --disable-dependency-tracking \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/inkscape/install b/staging/inkscape/install
deleted file mode 100644
index 6e803bf1d..000000000
--- a/staging/inkscape/install
+++ /dev/null
@@ -1,13 +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/staging/kdeaccessibility/PKGBUILD b/staging/kdeaccessibility/PKGBUILD
deleted file mode 100644
index b5094d3a5..000000000
--- a/staging/kdeaccessibility/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# $Id: PKGBUILD 137251 2011-09-06 21:33:42Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeaccessibility
-pkgname=('kdeaccessibility-jovie'
- 'kdeaccessibility-kaccessible'
- 'kdeaccessibility-kmag'
- 'kdeaccessibility-kmousetool'
- 'kdeaccessibility-kmouth')
-pkgver=4.7.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://accessibility.kde.org'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'speech-dispatcher')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('b9d0bf7503e684f9ddd1912d9c274bcdd8489bfd')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_Opentts=OFF
- make
-}
-
-package_kdeaccessibility-jovie() {
- pkgdesc='A text to speech application'
- depends=('kdebase-runtime' 'speech-dispatcher')
- replaces=('kdeaccessibility-kttsd')
- install='kdeaccessibility.install'
- cd $srcdir/build/jovie
- make DESTDIR=$pkgdir install
- cd $srcdir/build/jovie/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kaccessible() {
- pkgdesc='Provides accessibility services like focus tracking and a screenreader'
- depends=('kdebase-runtime' 'speech-dispatcher')
- install='kdeaccessibility.install'
- cd $srcdir/build/kaccessible
- make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kmag() {
- pkgdesc='Screen Magnifier'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kmag/"
- install='kdeaccessibility.install'
- cd $srcdir/build/kmag
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kmag/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kmousetool() {
- pkgdesc='Clicks the mouse for you, reducing the effects of RSI'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kmousetool/"
- install='kdeaccessibility.install'
- cd $srcdir/build/kmousetool
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kmousetool/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kmouth() {
- pkgdesc='Speech Synthesizer Frontend'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kmouth/"
- install='kdeaccessibility.install'
- cd $srcdir/build/kmouth
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kmouth/doc
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeaccessibility/kdeaccessibility.install b/staging/kdeaccessibility/kdeaccessibility.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeaccessibility/kdeaccessibility.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/staging/kdeadmin/PKGBUILD b/staging/kdeadmin/PKGBUILD
deleted file mode 100644
index 546057d0d..000000000
--- a/staging/kdeadmin/PKGBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# $Id: PKGBUILD 137252 2011-09-06 21:34:45Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeadmin
-pkgname=('kdeadmin-kcron'
- 'kdeadmin-ksystemlog'
- 'kdeadmin-kuser'
- 'kdeadmin-system-config-printer-kde')
-pkgver=4.7.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeadmin')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python'
- 'system-config-printer-common')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'syslog-path.patch')
-sha1sums=('3d1b1be2003fe20c5c3faee63ba31c65621d53b7'
- '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
- patch -p1 -i ${srcdir}/syslog-path.patch
-
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_strigi-analyzer=OFF
- make
-}
-
-package_kdeadmin-kcron() {
- pkgdesc='Configure and schedule tasks'
- depends=('kdelibs')
- cd $srcdir/build/kcron
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kcron
- make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-ksystemlog() {
- pkgdesc='System log viewer tool'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/system/ksystemlog/"
- cd $srcdir/build/ksystemlog
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ksystemlog
- make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-kuser() {
- pkgdesc='User Manager'
- depends=('kdepim-runtime')
- url="http://kde.org/applications/system/kuser/"
- install='kdeadmin.install'
- cd $srcdir/build/kuser
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kuser
- make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-system-config-printer-kde() {
- pkgdesc='Configure local and remote Printers'
- depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt')
- url="http://kde.org/applications/system/printerapplet/"
- cd $srcdir/build/system-config-printer-kde
- make DESTDIR=$pkgdir install
-
- # Use the python2 executable
- find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
diff --git a/staging/kdeadmin/kdeadmin.install b/staging/kdeadmin/kdeadmin.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeadmin/kdeadmin.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/staging/kdeadmin/syslog-path.patch b/staging/kdeadmin/syslog-path.patch
deleted file mode 100644
index 8a9142bf6..000000000
--- a/staging/kdeadmin/syslog-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h~ 2011-01-27 14:24:29.840000005 +0100
-+++ kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h 2011-01-27 14:24:53.803333335 +0100
-@@ -39,7 +39,7 @@
- SystemConfiguration() :
- GenericLogModeConfiguration(
- QLatin1String( SYSTEM_LOG_MODE_ID ),
-- QStringList() << QLatin1String( "/var/log/syslog" ),
-+ QStringList() << QLatin1String( "/var/log/messages.log" ),
- QList<int>() << INFORMATION_LOG_LEVEL_ID
- ) {
-
diff --git a/staging/kdeartwork/PKGBUILD b/staging/kdeartwork/PKGBUILD
deleted file mode 100644
index f6aefef26..000000000
--- a/staging/kdeartwork/PKGBUILD
+++ /dev/null
@@ -1,104 +0,0 @@
-# $Id: PKGBUILD 137253 2011-09-06 21:35:12Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeartwork
-pkgname=('kdeartwork-aurorae'
- 'kdeartwork-colorschemes'
- 'kdeartwork-desktopthemes'
- 'kdeartwork-emoticons'
- 'kdeartwork-iconthemes'
- 'kdeartwork-kscreensaver'
- 'kdeartwork-sounds'
- 'kdeartwork-styles'
- 'kdeartwork-wallpapers'
- 'kdeartwork-weatherwallpapers')
-pkgver=4.7.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeartwork')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen'
- 'kdebase-workspace' 'libkexiv2')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('df8c3225b025e0afb43efb73a5c53573ee3be77e')
-
-build() {
- cd $srcdir
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdeartwork-aurorae() {
- pkgdesc='An Aurorae theme based on the Oxygen plasma theme'
- cd $srcdir/build/aurorae
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-colorschemes() {
- pkgdesc='KDE color schemes'
- replaces=('kdeaccessibility-colorschemes')
- cd $srcdir/build/ColorSchemes
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-desktopthemes() {
- pkgdesc='KDE desktop themes'
- cd $srcdir/build/desktopthemes
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-emoticons() {
- pkgdesc='KDE emoticons'
- cd $srcdir/build/emoticons
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-iconthemes() {
- pkgdesc='KDE icon themes'
- replaces=('kdeaccessibility-iconthemes')
- cd $srcdir/build/IconThemes
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-kscreensaver() {
- pkgdesc='KDE screensaver'
- depends=('kdebase-workspace' 'libkexiv2')
- cd $srcdir/build/kscreensaver
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-sounds() {
- pkgdesc='KDE sounds'
- cd $srcdir/build/sounds
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-styles() {
- pkgdesc='KDE styles'
- depends=('kdebase-workspace')
- cd $srcdir/build/styles
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kwin-styles
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-wallpapers() {
- pkgdesc='KDE wallpapers'
- cd $srcdir/build/wallpapers
- make DESTDIR=$pkgdir install
- cd $srcdir/build/HighResolutionWallpapers
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-weatherwallpapers() {
- pkgdesc='KDE weather wallpapers'
- cd $srcdir/build/WeatherWallpapers
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdebase-konsole/PKGBUILD b/staging/kdebase-konsole/PKGBUILD
deleted file mode 100644
index 048bb35b0..000000000
--- a/staging/kdebase-konsole/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 137254 2011-09-06 21:37:49Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebase-konsole
-pkgver=4.7.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://kde.org/applications/system/konsole/'
-pkgdesc="Terminal"
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebase')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.bz2")
-sha1sums=('1169c7ea5e4c5aa0a29d1948c9e02ee3cc2c54a2')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../konsole-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebase-runtime/PKGBUILD b/staging/kdebase-runtime/PKGBUILD
deleted file mode 100644
index fedaee18c..000000000
--- a/staging/kdebase-runtime/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 137231 2011-09-06 21:16:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-runtime
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="KDE Base Runtime Environment"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons'
- 'xorg-xauth' 'hicolor-icon-theme')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'xine-lib')
-optdepends=('htdig: to build the search index in khelpcenter'
- 'rarian: needed by khelpcenter'
- 'gdb: drkonq crash handler')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2")
-sha1sums=('fc8da236bff699518b54b2fe6bcf8a518206b6e3')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kde-runtime-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "$srcdir/build"
- make DESTDIR="$pkgdir" install
- rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
- ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
-}
diff --git a/staging/kdebase-runtime/kdebase-runtime.install b/staging/kdebase-runtime/kdebase-runtime.install
deleted file mode 100644
index 3f06b8deb..000000000
--- a/staging/kdebase-runtime/kdebase-runtime.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdebase-workspace/PKGBUILD b/staging/kdebase-workspace/PKGBUILD
deleted file mode 100644
index c2e4d34d0..000000000
--- a/staging/kdebase-workspace/PKGBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Id: PKGBUILD 137243 2011-09-06 21:27:13Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-workspace
-_pkgname=kde-workspace
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="KDE Base Workspace"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde')
-# note on libxdamage:
-# not detected by namcap because libgl depends on it
-# but nvidia providing libgl does not depend on libxdamage
-depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'qimageblitz'
- 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier'
- 'xorg-xsetroot' 'libxcomposite' 'libxinerama' 'libgles' 'libegl')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python')
-optdepends=('kde-wallpapers: officials KDE wallapers')
-replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
-conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
-install="${pkgname}.install"
-backup=('usr/share/config/kdm/kdmrc'
- 'etc/pam.d/kde'
- 'etc/pam.d/kde-np'
- 'etc/pam.d/kscreensaver')
-options=('emptydirs')
-source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
- 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
- 'fixpath.patch' 'terminate-server.patch')
-sha1sums=('c7867d2f788086078abbcff53a035a6131232539'
- '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
- '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
- 'f7b38af38549242a240f1a90ab9964ca8a366129'
- '603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
- '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
- 'd7b5883f7e65c6839b1f65f94d58026673dd0226'
- 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee')
-
-build() {
- cd ${srcdir}/${_pkgname}-${pkgver}
- patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
- patch -p0 -i ${srcdir}/fixpath.patch
- patch -p0 -i ${srcdir}/terminate-server.patch
-
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${_pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_Xmms=OFF \
- -DWITH_Googlegadgets=OFF \
- -DWITH_libgps=OFF \
- -DWITH_NetworkManager=OFF \
- -DKWIN_BUILD_WITH_OPENGLES=ON
- make
-}
-
-package() {
- cd ${srcdir}/build
- make DESTDIR=${pkgdir} install
-
- install -D -m755 ${srcdir}/kdm ${pkgdir}/etc/rc.d/kdm
- install -D -m644 ${srcdir}/kde.pam ${pkgdir}/etc/pam.d/kde
- install -D -m644 ${srcdir}/kde-np.pam ${pkgdir}/etc/pam.d/kde-np
- install -D -m644 ${srcdir}/kscreensaver.pam ${pkgdir}/etc/pam.d/kscreensaver
- install -d -m755 ${pkgdir}/usr/share/xsessions/
- ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop ${pkgdir}/usr/share/xsessions/
- install -d -m755 ${pkgdir}/etc/kde/{env,shutdown}
-
- install -d -g 135 -o 135 ${pkgdir}/var/lib/kdm
-}
diff --git a/staging/kdebase-workspace/fixpath.patch b/staging/kdebase-workspace/fixpath.patch
deleted file mode 100644
index be2b8383e..000000000
--- a/staging/kdebase-workspace/fixpath.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100
-+++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100
-@@ -34,22 +34,6 @@
- MALLOC_CHECK_=2
- export MALLOC_CHECK_
-
--# in case we have been started with full pathname spec without being in PATH
--bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
--if [ -n "$bindir" ]; then
-- qbindir=`$bindir/kde4-config --qt-binaries`
-- if [ -n "$qbindir" ]; then
-- case $PATH in
-- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
-- *) PATH=$qbindir:$PATH; export PATH;;
-- esac
-- fi
-- case $PATH in
-- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-- *) PATH=$bindir:$PATH; export PATH;;
-- esac
--fi
--
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage
-@@ -206,7 +190,7 @@
- # For anything else (that doesn't set env vars, or that needs a window manager),
- # better use the Autostart folder.
-
--libpath=`kde4-config --path lib | tr : '\n'`
-+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
-
- for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
- for file in "$prefix"*.sh; do
diff --git a/staging/kdebase-workspace/kde-np.pam b/staging/kdebase-workspace/kde-np.pam
deleted file mode 100644
index 81eeef47b..000000000
--- a/staging/kdebase-workspace/kde-np.pam
+++ /dev/null
@@ -1,7 +0,0 @@
-#%PAM-1.0
-auth required pam_nologin.so
-auth required pam_permit.so
-account required pam_unix.so
-password required pam_unix.so
-session required pam_unix.so
-session required pam_limits.so \ No newline at end of file
diff --git a/staging/kdebase-workspace/kde.pam b/staging/kdebase-workspace/kde.pam
deleted file mode 100644
index 1a259390f..000000000
--- a/staging/kdebase-workspace/kde.pam
+++ /dev/null
@@ -1,7 +0,0 @@
-#%PAM-1.0
-auth required pam_unix.so
-auth required pam_nologin.so
-account required pam_unix.so
-password required pam_unix.so
-session required pam_unix.so
-session required pam_limits.so \ No newline at end of file
diff --git a/staging/kdebase-workspace/kdebase-workspace.install b/staging/kdebase-workspace/kdebase-workspace.install
deleted file mode 100644
index f7d6d305b..000000000
--- a/staging/kdebase-workspace/kdebase-workspace.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install() {
- groupadd -g 135 kdm &>/dev/null
- useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
- chown -R 135:135 var/lib/kdm &>/dev/null
- xdg-icon-resource forceupdate --theme hicolor &>/dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null
- getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
- chown -R 135:135 var/lib/kdm &>/dev/null
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_remove() {
- if getent passwd kdm >/dev/null 2>&1; then
- userdel kdm
- fi
- if getent group kdm >/dev/null 2>&1; then
- groupdel kdm
- fi
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdebase-workspace/kdm b/staging/kdebase-workspace/kdm
deleted file mode 100644
index 799d58f4b..000000000
--- a/staging/kdebase-workspace/kdm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/kdm)
-case "$1" in
- start)
- stat_busy "Starting KDE Desktop Manager"
- [ -z "$PID" ] && /usr/bin/kdm &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon kdm
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping KDE Desktop Manager"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon kdm
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/staging/kdebase-workspace/kdm-zsh-profile.patch b/staging/kdebase-workspace/kdm-zsh-profile.patch
deleted file mode 100644
index 779456b39..000000000
--- a/staging/kdebase-workspace/kdm-zsh-profile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/kfrontend/genkdmconf.c 2008-02-13 09:40:49.000000000 +0000
-+++ kdm/kfrontend/genkdmconf.c 2008-05-16 12:47:36.000000000 +0000
-@@ -662,7 +662,7 @@
- " [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc\n"
- " zhome=${ZDOTDIR:-$HOME}\n"
- " # zshenv is always sourced automatically.\n"
--" [ -f $zdir/zprofile ] && . $zdir/zprofile\n"
-+" [ -f /etc/profile ] && . /etc/profile\n"
- " [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
- " [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
- " [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
diff --git a/staging/kdebase-workspace/kscreensaver.pam b/staging/kdebase-workspace/kscreensaver.pam
deleted file mode 100644
index b4d80c21f..000000000
--- a/staging/kdebase-workspace/kscreensaver.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth required pam_unix_auth.so
diff --git a/staging/kdebase-workspace/terminate-server.patch b/staging/kdebase-workspace/terminate-server.patch
deleted file mode 100644
index 094591317..000000000
--- a/staging/kdebase-workspace/terminate-server.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/config.def 2009-08-27 10:17:39.000000000 +0200
-+++ kdm/config.def 2009-10-31 00:40:21.000000000 +0100
-@@ -1448,7 +1448,7 @@
-
- Key: TerminateServer
- Type: bool
--Default: false
-+Default: true
- User: core
- Instance: #:*/!
- Merge: xdm
diff --git a/staging/kdebase/PKGBUILD b/staging/kdebase/PKGBUILD
deleted file mode 100644
index e33f1426e..000000000
--- a/staging/kdebase/PKGBUILD
+++ /dev/null
@@ -1,119 +0,0 @@
-# $Id: PKGBUILD 137244 2011-09-06 21:28:21Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdebase
-pkgname=('kdebase-dolphin'
- 'kdebase-kdepasswd'
- 'kdebase-kdialog'
- 'kdebase-keditbookmarks'
- 'kdebase-kfind'
- 'kdebase-konq-plugins'
- 'kdebase-konqueror'
- 'kdebase-lib'
- 'kdebase-plasma')
-pkgver=4.7.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebase')
-makedepends=('kdelibs' 'pkgconfig' 'cmake' 'automoc4' 'tidyhtml')
-source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2")
-sha1sums=('5e7ced4d94f035ed86960025dbd66a1126a848ac')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../kde-baseapps-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdebase-dolphin() {
- pkgdesc='File Manager'
- depends=('kdebase-runtime' 'kdebase-lib')
- optdepends=('kdegraphics-svgpart: thumbailers for SVG files'
- 'kdegraphics-thumbnailers: thumbnailers for graphics file'
- 'ruby: servicemenu installation')
- url="http://kde.org/applications/system/dolphin/"
- cd $srcdir/build/dolphin
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/dolphin
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kdepasswd() {
- pkgdesc='Change Password'
- depends=('kdebase-runtime' 'kdebase-lib')
- cd $srcdir/build/kdepasswd
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kdepasswd
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kdialog() {
- pkgdesc='A utility for displaying dialog boxes from shell scripts'
- depends=('kdebase-runtime')
- cd $srcdir/build/kdialog
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-keditbookmarks() {
- pkgdesc='Bookmark Organizer and Editor'
- depends=('kdebase-runtime')
- cd $srcdir/build/keditbookmarks
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kfind() {
- pkgdesc='Find Files/Folders'
- depends=('kdebase-runtime' 'kdebase-lib')
- url="http://kde.org/applications/utilities/kfind/"
- install='kdebase.install'
- cd $srcdir/build/kfind
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kfind
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-konq-plugins() {
- pkgdesc='Extra plugins for Konqueror'
- depends=('kdebase-konqueror' 'tidyhtml')
- replaces=('konq-plugins')
- install='kdebase.install'
- cd $srcdir/build/konq-plugins
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-konqueror() {
- pkgdesc='KDE File Manager & Web Browser'
- depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
- optdepends=('kwebkitpart: to enable webkit engine')
- url="http://kde.org/applications/internet/konqueror/"
- install='kdebase.install'
- conflicts=('kdebase-nsplugins')
- replaces=('kdebase-nsplugins')
- for i in konqueror doc/konqueror nsplugins; do
- cd $srcdir/build/${i}
- make DESTDIR=$pkgdir install
- done
-}
-
-package_kdebase-lib() {
- pkgdesc='KDE libraries for the basic desktop applications'
- groups=()
- depends=('kdelibs')
- cd $srcdir/build/lib
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-plasma() {
- pkgdesc='Display the contents of folders (User´s home folder as default)'
- depends=('kdebase-workspace' 'kdebase-lib')
- cd $srcdir/build/plasma
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdebase/kdebase.install b/staging/kdebase/kdebase.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdebase/kdebase.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/staging/kdebindings-kimono/PKGBUILD b/staging/kdebindings-kimono/PKGBUILD
deleted file mode 100644
index 2ae88a5ae..000000000
--- a/staging/kdebindings-kimono/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 137255 2011-09-06 21:38:15Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-kimono
-pkgver=4.7.1
-pkgrel=1
-pkgdesc=".NET/Mono bindings for the KDE libraries"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-qyoto' 'kdebindings-smokekde')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs')
-conflicts=('kdebindings-csharp')
-source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.bz2")
-sha1sums=('e8cf2bfbb47a606a5ca8674a8b6913bb1dcac96f')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kimono-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_Soprano=OFF
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-korundum/PKGBUILD b/staging/kdebindings-korundum/PKGBUILD
deleted file mode 100644
index dfbf02b2f..000000000
--- a/staging/kdebindings-korundum/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 137256 2011-09-06 21:38:43Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-korundum
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="KDE bindings for ruby"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-qtruby' 'kdebindings-smokekde')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
- 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
-conflicts=('kdebindings-ruby')
-source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.bz2")
-sha1sums=('fdbcde4dd622f41faa7c22cbc96a8687612d099e')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../korundum-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-kross/PKGBUILD b/staging/kdebindings-kross/PKGBUILD
deleted file mode 100644
index 421d373d9..000000000
--- a/staging/kdebindings-kross/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 137257 2011-09-06 21:39:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdebindings-kross
-pkgname=('kdebindings-kross-python'
-# 'kdebindings-kross-ruby'
- 'kdebindings-kross-java')
-pkgver=4.7.1
-pkgrel=1
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'openjdk6')
-source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.bz2")
-sha1sums=('4e5923fcb30501ca3474981a3d210940f0bc7320')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kross-interpreters-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_ruby=OFF
- make
-}
-
-package_kdebindings-kross-python() {
- pkgdesc="Python2 language interpreters to enable in-process scripting with Kross"
- depends=('kdelibs' 'python2')
-
- cd "${srcdir}"/build/python
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdebindings-kross-java() {
- pkgdesc="Java language interpreters to enable in-process scripting with Kross"
- depends=('kdelibs' 'openjdk6')
-
- cd "${srcdir}"/build/java
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdebindings-kross-ruby() {
- pkgdesc="Ruby language interpreters to enable in-process scripting with Kross"
- depends=('kdelibs' 'ruby')
-
- cd "${srcdir}"/build/ruby
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-perlkde/PKGBUILD b/staging/kdebindings-perlkde/PKGBUILD
deleted file mode 100644
index 759a08b1c..000000000
--- a/staging/kdebindings-perlkde/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137258 2011-09-06 21:39:33Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-perlkde
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Perl bindings for the KDE libraries"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-perlqt' 'kdebindings-smokekde')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs'
- 'kdegraphics-okular' 'kdesdk-kate')
-source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.bz2")
-sha1sums=('24e90923554ac1194da9fb84dab9efe580fa979e')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../perlkde-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-perlqt/PKGBUILD b/staging/kdebindings-perlqt/PKGBUILD
deleted file mode 100644
index be2a924ae..000000000
--- a/staging/kdebindings-perlqt/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 137239 2011-09-06 21:23:00Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-perlqt
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Perl bindings for the Qt libraries"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.bz2")
-sha1sums=('f2534fc9677ce4f3e58a67b4d9b255f403250064')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../perlqt-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-python/PKGBUILD b/staging/kdebindings-python/PKGBUILD
deleted file mode 100644
index 5163652f1..000000000
--- a/staging/kdebindings-python/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 137240 2011-09-06 21:23:26Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-python
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="KDE bindings for Python"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs')
-makedepends=('cmake' 'automoc4' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2")
-sha1sums=('fd05f0c04586878c3c23e80bb1c59b316184d7ab')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../pykde4-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DPYTHON_EXECUTABLE=/usr/bin/python2
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-
- # Use the python2 executable
- find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
diff --git a/staging/kdebindings-qtruby/PKGBUILD b/staging/kdebindings-qtruby/PKGBUILD
deleted file mode 100644
index c4795a160..000000000
--- a/staging/kdebindings-qtruby/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137242 2011-09-06 21:24:23Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-qtruby
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Qt bindings for ruby"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt' 'ruby')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-conflicts=('kdebindings-ruby')
-source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.bz2")
-sha1sums=('a40e760ea16482885cbd061c95cec984af1ec4ac')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../qtruby-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-qyoto/PKGBUILD b/staging/kdebindings-qyoto/PKGBUILD
deleted file mode 100644
index b57a21f17..000000000
--- a/staging/kdebindings-qyoto/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137241 2011-09-06 21:23:56Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-qyoto
-pkgver=4.7.1
-pkgrel=1
-pkgdesc=".NET/Mono bindings for the Qt libraries"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt' 'mono')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-conflicts=('kdebindings-csharp')
-source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.bz2")
-sha1sums=('a08fd3750cd021578e82e096a1534b093591dbb1')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../qyoto-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-smokegen/PKGBUILD b/staging/kdebindings-smokegen/PKGBUILD
deleted file mode 100644
index 971d2029c..000000000
--- a/staging/kdebindings-smokegen/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 137234 2011-09-06 21:19:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokegen
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="A general purpose C++ parser with a plugin infrastructure"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.bz2")
-sha1sums=('952181277c8d212db7028476034d0160a152e696')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../smokegen-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-smokekde/PKGBUILD b/staging/kdebindings-smokekde/PKGBUILD
deleted file mode 100644
index 8f795f910..000000000
--- a/staging/kdebindings-smokekde/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 137238 2011-09-06 21:22:33Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokekde
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Language independent library for KDE bindings"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
- 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
-conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.bz2")
-sha1sums=('20b8db2cce9aad11047ba758e1e327ea6970427a')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../smokekde-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-blinken/PKGBUILD b/staging/kdeedu-blinken/PKGBUILD
deleted file mode 100644
index e4d361575..000000000
--- a/staging/kdeedu-blinken/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137259 2011-09-06 21:40:16Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-blinken
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Memory Enhancement Game"
-url="http://kde.org/applications/education/blinken/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.bz2")
-sha1sums=('3b3062ce82174417c8a7496743f78e6b583fa1e9')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../blinken-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-blinken/kdeedu-blinken.install b/staging/kdeedu-blinken/kdeedu-blinken.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-blinken/kdeedu-blinken.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/staging/kdeedu-cantor/PKGBUILD b/staging/kdeedu-cantor/PKGBUILD
deleted file mode 100644
index f0faea7da..000000000
--- a/staging/kdeedu-cantor/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 137260 2011-09-06 21:41:00Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-cantor
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="KDE Frontend to Mathematical Software"
-url="http://kde.org/applications/education/cantor/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libspectre')
-makedepends=('cmake' 'automoc4' 'r')
-optdepends=('maxima: Maxima backend'
- 'octave: Octave backend'
- 'r: R backend')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.bz2")
-sha1sums=('97251c369424e22d26c804387270d0e3291587b1')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../cantor-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-cantor/kdeedu-cantor.install b/staging/kdeedu-cantor/kdeedu-cantor.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-cantor/kdeedu-cantor.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/kdeedu-kalgebra/PKGBUILD b/staging/kdeedu-kalgebra/PKGBUILD
deleted file mode 100644
index 1b316059a..000000000
--- a/staging/kdeedu-kalgebra/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137261 2011-09-06 21:41:44Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kalgebra
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Graph Calculator"
-url="http://kde.org/applications/education/kalgebra/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.bz2")
-sha1sums=('16d74602bc446d3e45688379b92aabb2158becbb')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kalgebra-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kalgebra/kdeedu-kalgebra.install b/staging/kdeedu-kalgebra/kdeedu-kalgebra.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-kalgebra/kdeedu-kalgebra.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/kdeedu-kalzium/PKGBUILD b/staging/kdeedu-kalzium/PKGBUILD
deleted file mode 100644
index 2d850b89a..000000000
--- a/staging/kdeedu-kalzium/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137262 2011-09-06 21:42:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kalzium
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Periodic Table of Elements"
-url="http://kde.org/applications/education/kalzium/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdelibs' 'avogadro' 'ocaml')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.bz2")
-sha1sums=('08600b1cf7df1afed67e5edd619953ae0f585687')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kalzium-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kalzium/kdeedu-kalzium.install b/staging/kdeedu-kalzium/kdeedu-kalzium.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-kalzium/kdeedu-kalzium.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/staging/kdeedu-kanagram/PKGBUILD b/staging/kdeedu-kanagram/PKGBUILD
deleted file mode 100644
index faa8d8522..000000000
--- a/staging/kdeedu-kanagram/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137263 2011-09-06 21:43:16Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kanagram
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Letter Order Game"
-url="http://kde.org/applications/education/kanagram/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.bz2")
-sha1sums=('8e1aab59132504d36cedfe843290d9a630562f7c')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kanagram-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kanagram/kdeedu-kanagram.install b/staging/kdeedu-kanagram/kdeedu-kanagram.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-kanagram/kdeedu-kanagram.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/staging/kdeedu-kbruch/PKGBUILD b/staging/kdeedu-kbruch/PKGBUILD
deleted file mode 100644
index 461f73e2c..000000000
--- a/staging/kdeedu-kbruch/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137264 2011-09-06 21:43:59Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kbruch
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Exercise Fractions"
-url="http://kde.org/applications/education/kbruch/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.bz2")
-sha1sums=('6d6a44740e52618c84dffb33dec41535637a7466')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kbruch-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kbruch/kdeedu-kbruch.install b/staging/kdeedu-kbruch/kdeedu-kbruch.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-kbruch/kdeedu-kbruch.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/staging/kdeedu-kgeography/PKGBUILD b/staging/kdeedu-kgeography/PKGBUILD
deleted file mode 100644
index ecc963e2f..000000000
--- a/staging/kdeedu-kgeography/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137265 2011-09-06 21:44:42Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kgeography
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Geography Trainer"
-url="http://kde.org/applications/education/kgeography/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.bz2")
-sha1sums=('65ebeb391952229ee3d410d0087d8a4e5262b6f7')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kgeography-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kgeography/kdeedu-kgeography.install b/staging/kdeedu-kgeography/kdeedu-kgeography.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-kgeography/kdeedu-kgeography.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/staging/kdeedu-khangman/PKGBUILD b/staging/kdeedu-khangman/PKGBUILD
deleted file mode 100644
index 63e87292b..000000000
--- a/staging/kdeedu-khangman/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137266 2011-09-06 21:45:32Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-khangman
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Hangman Game"
-url="http://kde.org/applications/education/khangman/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.bz2")
-sha1sums=('ac13da342cb2380ba2c703fbef9f131b75675b9e')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../khangman-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-khangman/kdeedu-khangman.install b/staging/kdeedu-khangman/kdeedu-khangman.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-khangman/kdeedu-khangman.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/staging/kdeedu-kig/PKGBUILD b/staging/kdeedu-kig/PKGBUILD
deleted file mode 100644
index a46729baf..000000000
--- a/staging/kdeedu-kig/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 137267 2011-09-06 21:46:15Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kig
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Interactive Geometry"
-url="http://kde.org/applications/education/kig/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.bz2")
-sha1sums=('b198ceff93164fe455e466cb8e1d5616f524d209')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kig-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-
- # Use the python2 executable
- sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/bin/pykig.py
-}
diff --git a/staging/kdeedu-kig/kdeedu-kig.install b/staging/kdeedu-kig/kdeedu-kig.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-kig/kdeedu-kig.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/kdeedu-kiten/PKGBUILD b/staging/kdeedu-kiten/PKGBUILD
deleted file mode 100644
index a780632b4..000000000
--- a/staging/kdeedu-kiten/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137268 2011-09-06 21:47:00Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kiten
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Japanese Reference/Study Tool"
-url="http://kde.org/applications/education/kiten/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.bz2")
-sha1sums=('bc9f7b4e1891d8be6e322345e941377c988b8697')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kiten-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kiten/kdeedu-kiten.install b/staging/kdeedu-kiten/kdeedu-kiten.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-kiten/kdeedu-kiten.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/staging/kdeedu-klettres/PKGBUILD b/staging/kdeedu-klettres/PKGBUILD
deleted file mode 100644
index 402e1d3da..000000000
--- a/staging/kdeedu-klettres/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137269 2011-09-06 21:47:46Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-klettres
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Learn The Alphabet"
-url="http://kde.org/applications/education/klettres/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.bz2")
-sha1sums=('e7fba352257c44d9ee84439dee4d3dfb58d4fd8d')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../klettres-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-klettres/kdeedu-klettres.install b/staging/kdeedu-klettres/kdeedu-klettres.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-klettres/kdeedu-klettres.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/staging/kdeedu-kmplot/PKGBUILD b/staging/kdeedu-kmplot/PKGBUILD
deleted file mode 100644
index b066ce890..000000000
--- a/staging/kdeedu-kmplot/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137270 2011-09-06 21:48:31Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kmplot
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Mathematical Function Plotter"
-url="http://kde.org/applications/education/kmplot/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.bz2")
-sha1sums=('d0058f4d7a3f63b9a092085cb8058c4426dba1f8')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kmplot-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kmplot/kdeedu-kmplot.install b/staging/kdeedu-kmplot/kdeedu-kmplot.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-kmplot/kdeedu-kmplot.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/kdeedu-kstars/PKGBUILD b/staging/kdeedu-kstars/PKGBUILD
deleted file mode 100644
index 0207a867f..000000000
--- a/staging/kdeedu-kstars/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 137271 2011-09-06 21:49:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kstars
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Desktop Planetarium"
-url="http://kde.org/applications/education/kstars/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.bz2")
-sha1sums=('e9f899897df555933c7f9fd9e931dc49bcb924ae')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kstars-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_Xplanet=OFF
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kstars/kdeedu-kstars.install b/staging/kdeedu-kstars/kdeedu-kstars.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-kstars/kdeedu-kstars.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/staging/kdeedu-ktouch/PKGBUILD b/staging/kdeedu-ktouch/PKGBUILD
deleted file mode 100644
index 78bb87177..000000000
--- a/staging/kdeedu-ktouch/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137272 2011-09-06 21:50:12Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-ktouch
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Touch Typing Tutor"
-url="http://kde.org/applications/education/ktouch/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.bz2")
-sha1sums=('88e607fb584ea5cacc05f0f2909ae07139fdeed3')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../ktouch-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-ktouch/kdeedu-ktouch.install b/staging/kdeedu-ktouch/kdeedu-ktouch.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-ktouch/kdeedu-ktouch.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/staging/kdeedu-kturtle/PKGBUILD b/staging/kdeedu-kturtle/PKGBUILD
deleted file mode 100644
index ff4b32998..000000000
--- a/staging/kdeedu-kturtle/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137273 2011-09-06 21:50:57Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kturtle
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Educational Programming Environment"
-url="http://kde.org/applications/education/kturtle/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.bz2")
-sha1sums=('c2a33ff1ac68715e81108a8009ff67b5cb53ae2e')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kturtle-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kturtle/kdeedu-kturtle.install b/staging/kdeedu-kturtle/kdeedu-kturtle.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-kturtle/kdeedu-kturtle.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/staging/kdeedu-kwordquiz/PKGBUILD b/staging/kdeedu-kwordquiz/PKGBUILD
deleted file mode 100644
index 26b1a9336..000000000
--- a/staging/kdeedu-kwordquiz/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137274 2011-09-06 21:51:43Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kwordquiz
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Flash Card Trainer"
-url="http://kde.org/applications/education/kwordquiz/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.bz2")
-sha1sums=('17952dd5f8c042c467f15f2840399b7c5dd3fa05')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kwordquiz-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kwordquiz/kdeedu-kwordquiz.install b/staging/kdeedu-kwordquiz/kdeedu-kwordquiz.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-kwordquiz/kdeedu-kwordquiz.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/kdeedu-marble/PKGBUILD b/staging/kdeedu-marble/PKGBUILD
deleted file mode 100644
index ccf21ef87..000000000
--- a/staging/kdeedu-marble/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 137246 2011-09-06 21:30:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-marble
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Desktop Globe"
-url="http://kde.org/applications/education/marble/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'gpsd')
-optdepends=('gpsd: gps support')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2"
- 'gpsd3.patch')
-sha1sums=('71c9ccd884495b34c8af4f7c432ca8942dfaa9dd'
- '3916dd6307109d70d0dd538de913c91eede81d78')
-
-build() {
- cd "${srcdir}"/marble-${pkgver}
- patch -p1 -i "${srcdir}"/gpsd3.patch
-
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../marble-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-marble/gpsd3.patch b/staging/kdeedu-marble/gpsd3.patch
deleted file mode 100644
index e11859b0b..000000000
--- a/staging/kdeedu-marble/gpsd3.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -up marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
---- marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig 2011-05-20 15:34:41.000000000 -0500
-+++ marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp 2011-08-24 13:38:37.050200241 -0500
-@@ -20,6 +20,9 @@ using namespace Marble;
-
- GpsdConnection::GpsdConnection( QObject* parent )
- : QObject( parent ),
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+ m_gpsd("localhost", DEFAULT_GPSD_PORT),
-+#endif
- m_timer( 0 )
- {
- m_oldLocale = setlocale( LC_NUMERIC, NULL );
-@@ -35,7 +38,11 @@ GpsdConnection::~GpsdConnection()
- void GpsdConnection::initialize()
- {
- m_timer.stop();
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+ gps_data_t* data;
-+#else
- gps_data_t* data = m_gpsd.open();
-+#endif
- if ( data ) {
- m_status = PositionProviderStatusAcquiring;
- emit statusChanged( m_status );
-@@ -82,8 +89,16 @@ void GpsdConnection::initialize()
- void GpsdConnection::update()
- {
- #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET )
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+ if ( m_gpsd.waiting(0) ) {
-+#else
- if ( m_gpsd.waiting() ) {
-+#endif
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+ gps_data_t* data = m_gpsd.read();
-+#else
- gps_data_t* data = m_gpsd.poll();
-+#endif
- if ( data && data->set & PACKET_SET ) {
- emit gpsdInfo( *data );
- }
diff --git a/staging/kdeedu-marble/kdeedu-marble.install b/staging/kdeedu-marble/kdeedu-marble.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-marble/kdeedu-marble.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/kdeedu-parley/PKGBUILD b/staging/kdeedu-parley/PKGBUILD
deleted file mode 100644
index b1e27a55f..000000000
--- a/staging/kdeedu-parley/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137275 2011-09-06 21:52:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-parley
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Vocabulary Trainer"
-url="http://kde.org/applications/education/parley/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.bz2")
-sha1sums=('c89739816f87048b0f9e336c3f3b74d038b8fae9')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../parley-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-parley/kdeedu-parley.install b/staging/kdeedu-parley/kdeedu-parley.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-parley/kdeedu-parley.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/kdeedu-rocs/PKGBUILD b/staging/kdeedu-rocs/PKGBUILD
deleted file mode 100644
index 42464ab2a..000000000
--- a/staging/kdeedu-rocs/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137276 2011-09-06 21:53:02Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-rocs
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Rocs Graph Theory"
-url="http://kde.org/applications/education/rocs/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'boost-libs')
-makedepends=('cmake' 'automoc4' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.bz2")
-sha1sums=('a22bfef644447271702c7e164070306a54270d57')
-options=('!makeflags')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../rocs-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-step/PKGBUILD b/staging/kdeedu-step/PKGBUILD
deleted file mode 100644
index 5ef33fad2..000000000
--- a/staging/kdeedu-step/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137277 2011-09-06 21:53:41Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-step
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Interactive Physical Simulator"
-url="http://kde.org/applications/education/step/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.bz2")
-sha1sums=('64463c38648dcb7d1727f42aad642ce00602eee4')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../step-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-step/kdeedu-step.install b/staging/kdeedu-step/kdeedu-step.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-step/kdeedu-step.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/staging/kdegames/PKGBUILD b/staging/kdegames/PKGBUILD
deleted file mode 100644
index e519d2e58..000000000
--- a/staging/kdegames/PKGBUILD
+++ /dev/null
@@ -1,514 +0,0 @@
-# $Id: PKGBUILD 137278 2011-09-06 21:57:22Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdegames
-pkgname=('kdegames-bomber'
- 'kdegames-bovo'
- 'kdegames-granatier'
- 'kdegames-kajongg'
- 'kdegames-kapman'
- 'kdegames-katomic'
- 'kdegames-kbattleship'
- 'kdegames-kblackbox'
- 'kdegames-kblocks'
- 'kdegames-kbounce'
- 'kdegames-kbreakout'
- 'kdegames-kdiamond'
- 'kdegames-kfourinline'
- 'kdegames-kgoldrunner'
- 'kdegames-kigo'
- 'kdegames-killbots'
- 'kdegames-kiriki'
- 'kdegames-kjumpingcube'
- 'kdegames-klines'
- 'kdegames-klickety'
- 'kdegames-kmahjongg'
- 'kdegames-kmines'
- 'kdegames-knetwalk'
- 'kdegames-kolf'
- 'kdegames-kollision'
- 'kdegames-konquest'
- 'kdegames-kpatience'
- 'kdegames-kreversi'
- 'kdegames-kshisen'
- 'kdegames-ksirk'
- 'kdegames-kspaceduel'
- 'kdegames-ksquares'
- 'kdegames-ksudoku'
- 'kdegames-ktron'
- 'kdegames-ktuberling'
- 'kdegames-kubrick'
- 'kdegames-libkdegames'
- 'kdegames-libkmahjongg'
- 'kdegames-lskat'
- 'kdegames-palapeli')
-pkgver=4.7.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'ggz-client-libs' 'twisted'
- 'kdebindings-python' 'openal')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('282a54432b3f38bbb6afcf13e859299757ce59f8')
-
-build() {
- cd $srcdir
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdegames-bomber() {
- pkgdesc='Arcade Bombing Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/bomber/"
- install='kdegames.install'
- cd $srcdir/build/bomber
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/bomber
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-bovo() {
- pkgdesc='Five-in-a-row Board Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/bovo/"
- install='kdegames.install'
- cd $srcdir/build/bovo
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/bovo
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-granatier() {
- pkgdesc='Granatier'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal')
- url="http://kde.org/applications/games/granatier/"
- install='kdegames.install'
- cd $srcdir/build/granatier
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/granatier
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kajongg() {
- pkgdesc='The ancient Chinese board game for 4 players'
- depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python' 'twisted')
- install='kdegames.install'
- cd $srcdir/build/kajongg
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kajongg
- make DESTDIR=$pkgdir install
-
- # Use the python2 executable
- find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
-
-package_kdegames-kapman() {
- pkgdesc='Eat pills escaping ghosts'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kapman/"
- install='kdegames.install'
- cd $srcdir/build/kapman
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kapman
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-katomic() {
- pkgdesc='Sokoban-like Logic Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/katomic/"
- install='kdegames.install'
- cd $srcdir/build/katomic
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/katomic
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbattleship() {
- pkgdesc='Battleship Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
- url="http://kde.org/applications/games/kbattleship/"
- install='kdegames-kbattleship.install'
- cd $srcdir/build/kbattleship
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kbattleship
- make DESTDIR=$pkgdir install
- install -D -m644 $srcdir/${pkgbase}-${pkgver}/kbattleship/src/module.dsc \
- $pkgdir/usr/share/ggz/kbattleship.dsc
-}
-
-package_kdegames-kblackbox() {
- pkgdesc='Blackbox Logic Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kblackbox/"
- install='kdegames.install'
- cd $srcdir/build/kblackbox
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kblackbox
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kblocks() {
- pkgdesc='Falling Blocks Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kblocks/"
- install='kdegames.install'
- cd $srcdir/build/kblocks
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kblocks
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbounce() {
- pkgdesc='Ball Bouncing Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kbounce/"
- install='kdegames.install'
- cd $srcdir/build/kbounce
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kbounce
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbreakout() {
- pkgdesc='Breakout-like Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kbreakout/"
- install='kdegames.install'
- cd $srcdir/build/kbreakout
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kbreakout
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kdiamond() {
- pkgdesc='Three-in-a-row game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kdiamond/"
- install='kdegames.install'
- cd $srcdir/build/kdiamond
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kdiamond
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kfourinline() {
- pkgdesc='Four-in-a-row Board Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kfourinline/"
- install='kdegames-kfourinline.install'
- cd $srcdir/build/kfourinline
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kfourinline
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kgoldrunner() {
- pkgdesc='A game of action and puzzle-solving'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal')
- url="http://kde.org/applications/games/kgoldrunner/"
- install='kdegames.install'
- cd $srcdir/build/kgoldrunner
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kgoldrunner
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kigo() {
- pkgdesc='Go Board Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'gnugo')
- url="http://kde.org/applications/games/kigo/"
- install='kdegames-kigo.install'
- cd $srcdir/build/kigo
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kigo
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-killbots() {
- pkgdesc='Killbots'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/killbots/"
- install='kdegames.install'
- cd $srcdir/build/killbots
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/killbots
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kiriki() {
- pkgdesc='Yahtzee-like Dice Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kiriki/"
- install='kdegames.install'
- cd $srcdir/build/kiriki
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kiriki
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kjumpingcube() {
- pkgdesc='Territory Capture Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kjumpingcube/"
- install='kdegames.install'
- cd $srcdir/build/kjumpingcube
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kjumpingcube
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-klickety() {
- pkgdesc='Board Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- replaces=('kdegames-ksame')
- conflicts=('kdegames-ksame')
- url="http://kde.org/applications/games/ksame/"
- install='kdegames.install'
- cd $srcdir/build/klickety
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/klickety
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-klines() {
- pkgdesc='Tactical Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/klines/"
- install='kdegames.install'
- cd $srcdir/build/klines
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/klines
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kmahjongg() {
- pkgdesc='Mahjongg Solitaire'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg')
- url="http://kde.org/applications/games/kmahjongg/"
- install='kdegames.install'
- cd $srcdir/build/kmahjongg
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kmahjongg
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kmines() {
- pkgdesc='Minesweeper-like Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kmines/"
- install='kdegames.install'
- cd $srcdir/build/kmines
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kmines
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-knetwalk() {
- pkgdesc='Network Construction Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/knetwalk/"
- install='kdegames.install'
- cd $srcdir/build/knetwalk
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/knetwalk
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kolf() {
- pkgdesc='Miniature Golf'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kolf/"
- install='kdegames-kolf.install'
- cd $srcdir/build/kolf
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kolf
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kollision() {
- pkgdesc='A simple ball dodging game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kollision/"
- install='kdegames.install'
- cd $srcdir/build/kollision
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kollision
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-konquest() {
- pkgdesc='Galactic Strategy Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/konquest/"
- install='kdegames.install'
- cd $srcdir/build/konquest
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/konquest
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kpatience() {
- pkgdesc='Patience Card Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kpatience/"
- install='kdegames.install'
- replaces=('kdegames-kpat')
- cd $srcdir/build/kpat
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kpat
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kreversi() {
- pkgdesc='Reversi Board Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
- url="http://kde.org/applications/games/kreversi/"
- install='kdegames-kreversi.install'
- cd $srcdir/build/kreversi
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kreversi
- make DESTDIR=$pkgdir install
- install -D -m644 $srcdir/${pkgbase}-${pkgver}/kreversi/module.dsc \
- $pkgdir/usr/share/ggz/kreversi.dsc
-}
-
-package_kdegames-kshisen() {
- pkgdesc='Shisen-Sho Mahjongg-like Tile Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg')
- url="http://kde.org/applications/games/kshisen/"
- install='kdegames.install'
- cd $srcdir/build/kshisen
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kshisen
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksirk() {
- pkgdesc='World Domination Strategy Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/ksirk/"
- install='kdegames.install'
- cd $srcdir/build/ksirk
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ksirk
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kspaceduel() {
- pkgdesc='Space Arcade Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kspaceduel/"
- install='kdegames-kspaceduel.install'
- cd $srcdir/build/kspaceduel
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kspaceduel
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksquares() {
- pkgdesc='Connect the dots to create squares'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
- url="http://kde.org/applications/games/ksquares/"
- install='kdegames-ksquares.install'
- cd $srcdir/build/ksquares
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ksquares
- make DESTDIR=$pkgdir install
- install -D -m644 $srcdir/${pkgbase}-${pkgver}/ksquares/src/module.dsc \
- $pkgdir/usr/share/ggz/ksquares.dsc
-}
-
-package_kdegames-ksudoku() {
- pkgdesc='KSudoku, Sudoku game & more for KDE'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/ksudoku/"
- install='kdegames.install'
- cd $srcdir/build/ksudoku
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ksudoku
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ktron() {
- pkgdesc='Tron-like Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/ktron/"
- install='kdegames.install'
- cd $srcdir/build/ktron
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ktron
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ktuberling() {
- pkgdesc='Picture Game for Children'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/ktuberling/"
- install='kdegames-ktuberling.install'
- cd $srcdir/build/ktuberling
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ktuberling
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kubrick() {
- pkgdesc='A 3-D game based on Rubik´s Cube'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kubrick/"
- install='kdegames.install'
- cd $srcdir/build/kubrick
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kubrick
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-libkdegames() {
- pkgdesc='KDE game library'
- groups=()
- depends=('kdelibs')
- cd $srcdir/build/libkdegames
- make DESTDIR=$pkgdir install
- for i in $srcdir/${pkgbase}-${pkgver}/cmake/modules/*.cmake; do
- install -D -m644 $i $pkgdir/usr/share/apps/cmake/modules/$(basename $i)
- done
-}
-
-package_kdegames-libkmahjongg() {
- pkgdesc='Library used for loading and rendering of Mahjongg tilesets'
- groups=()
- depends=('kdelibs')
- cd $srcdir/build/libkmahjongg
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-lskat() {
- pkgdesc='Card Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/lskat/"
- install='kdegames-lskat.install'
- cd $srcdir/build/lskat
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/lskat
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-palapeli() {
- pkgdesc='Jigsaw puzzle game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/palapeli/"
- install='kdegames-palapeli.install'
- cd $srcdir/build/palapeli
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/palapeli
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdegames/kdegames-kbattleship.install b/staging/kdegames/kdegames-kbattleship.install
deleted file mode 100644
index ac4516ed0..000000000
--- a/staging/kdegames/kdegames-kbattleship.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
- ggz-config -i -f -m usr/share/ggz/kbattleship.dsc >& /dev/null
-}
-
-pre_remove() {
- if [ -f usr/share/ggz/kbattleship.dsc ]; then
- ggz-config -r -m usr/share/ggz/kbattleship.dsc >& /dev/null
- fi
-}
-
-pre_upgrade() {
- pre_remove
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
diff --git a/staging/kdegames/kdegames-kfourinline.install b/staging/kdegames/kdegames-kfourinline.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-kfourinline.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/kdegames/kdegames-kigo.install b/staging/kdegames/kdegames-kigo.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-kigo.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/kdegames/kdegames-kolf.install b/staging/kdegames/kdegames-kolf.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-kolf.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/kdegames/kdegames-kreversi.install b/staging/kdegames/kdegames-kreversi.install
deleted file mode 100644
index 4623e6e49..000000000
--- a/staging/kdegames/kdegames-kreversi.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- ggz-config -i -f -m usr/share/ggz/kreversi.dsc >& /dev/null
-}
-
-pre_remove() {
- if [ -f usr/share/ggz/kreversi.dsc ]; then
- ggz-config -r -m usr/share/ggz/kreversi.dsc >& /dev/null
- fi
-}
-
-pre_upgrade() {
- pre_remove
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdegames/kdegames-kspaceduel.install b/staging/kdegames/kdegames-kspaceduel.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-kspaceduel.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/kdegames/kdegames-ksquares.install b/staging/kdegames/kdegames-ksquares.install
deleted file mode 100644
index 5a619897d..000000000
--- a/staging/kdegames/kdegames-ksquares.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- ggz-config -i -f -m usr/share/ggz/ksquares.dsc >& /dev/null
-}
-
-pre_remove() {
- if [ -f usr/share/ggz/ksquares.dsc ]; then
- ggz-config -r -m usr/share/ggz/ksquares.dsc >& /dev/null
- fi
-}
-
-pre_upgrade() {
- pre_remove
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdegames/kdegames-ktuberling.install b/staging/kdegames/kdegames-ktuberling.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-ktuberling.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/kdegames/kdegames-lskat.install b/staging/kdegames/kdegames-lskat.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-lskat.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/kdegames/kdegames-palapeli.install b/staging/kdegames/kdegames-palapeli.install
deleted file mode 100644
index c77e68041..000000000
--- a/staging/kdegames/kdegames-palapeli.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegames/kdegames.install b/staging/kdegames/kdegames.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdegames/kdegames.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/staging/kdegraphics-gwenview/PKGBUILD b/staging/kdegraphics-gwenview/PKGBUILD
deleted file mode 100644
index 9bb7a0ba6..000000000
--- a/staging/kdegraphics-gwenview/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 137279 2011-09-06 21:59:17Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-gwenview
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="A fast and easy to use image viewer for KDE"
-url="http://kde.org/applications/graphics/gwenview/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-lib' 'libkipi')
-makedepends=('cmake' 'automoc4')
-optdepends=('kipi-plugins: extra plugins to share photos')
-install=$pkgname.install
-source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.bz2")
-sha1sums=('a58997d7e23f5708ff94d9198258dc0d6e82f8cf')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../gwenview-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-gwenview/kdegraphics-gwenview.install b/staging/kdegraphics-gwenview/kdegraphics-gwenview.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdegraphics-gwenview/kdegraphics-gwenview.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/kdegraphics-kamera/PKGBUILD b/staging/kdegraphics-kamera/PKGBUILD
deleted file mode 100644
index 4e3c98952..000000000
--- a/staging/kdegraphics-kamera/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 137280 2011-09-06 21:59:44Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kamera
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Configure Kamera"
-url="http://kde.org/applications/graphics/kamera/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'gphoto2')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.bz2")
-sha1sums=('3b6dda64d13f25f521e9839709d716af27cf9f74')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kamera-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-kcolorchooser/PKGBUILD b/staging/kdegraphics-kcolorchooser/PKGBUILD
deleted file mode 100644
index 0fb1ef824..000000000
--- a/staging/kdegraphics-kcolorchooser/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137281 2011-09-06 22:00:28Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kcolorchooser
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Color Chooser"
-url="http://kde.org/applications/graphics/kcolorchooser/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.bz2")
-sha1sums=('ca8885cf33806e32c9be572d5c5819c17f935f75')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kcolorchooser-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install b/staging/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.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/staging/kdegraphics-kgamma/PKGBUILD b/staging/kdegraphics-kgamma/PKGBUILD
deleted file mode 100644
index 69ac7a632..000000000
--- a/staging/kdegraphics-kgamma/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 137282 2011-09-06 22:00:52Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kgamma
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="A monitor calibration tool"
-url="http://kde.org/applications/graphics/kgamma/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-# note on libxxf86vm:
-# not detected by namcap because libgl depends on it
-# but nvidia providing libgl does not depend on libxxf86vm
-depends=('kdebase-runtime' 'libxxf86vm')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.bz2")
-sha1sums=('789a1b7908be10711e2c4c38abecf37cebc8239d')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kgamma-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-kolourpaint/PKGBUILD b/staging/kdegraphics-kolourpaint/PKGBUILD
deleted file mode 100644
index d3c0419b9..000000000
--- a/staging/kdegraphics-kolourpaint/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137283 2011-09-06 22:01:34Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kolourpaint
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Paint Program"
-url="http://kde.org/applications/graphics/kolourpaint/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'qimageblitz')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.bz2")
-sha1sums=('bb49a7e07fea66110502f7042c898611d2d5329e')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kolourpaint-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install b/staging/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdegraphics-kolourpaint/kdegraphics-kolourpaint.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/kdegraphics-kruler/PKGBUILD b/staging/kdegraphics-kruler/PKGBUILD
deleted file mode 100644
index b9725ffa4..000000000
--- a/staging/kdegraphics-kruler/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137284 2011-09-06 22:02:18Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kruler
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Screen Ruler"
-url="http://kde.org/applications/graphics/kruler/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.bz2")
-sha1sums=('96fd638bb9db27abd3bbb57d90d7c60ec6d65185')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kruler-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-kruler/kdegraphics-kruler.install b/staging/kdegraphics-kruler/kdegraphics-kruler.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdegraphics-kruler/kdegraphics-kruler.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/kdegraphics-ksaneplugin/PKGBUILD b/staging/kdegraphics-ksaneplugin/PKGBUILD
deleted file mode 100644
index b902e6e2e..000000000
--- a/staging/kdegraphics-ksaneplugin/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137285 2011-09-06 22:02:44Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-ksaneplugin
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="A scan plugin that implements the scanning"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('libksane')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.bz2")
-sha1sums=('e5b94fd03ddbc1be74881f19e52932c070663044')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../ksaneplugin-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-ksnapshot/PKGBUILD b/staging/kdegraphics-ksnapshot/PKGBUILD
deleted file mode 100644
index 3039a2705..000000000
--- a/staging/kdegraphics-ksnapshot/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 137286 2011-09-06 22:03:30Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-ksnapshot
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Screen Capture Program"
-url="http://kde.org/applications/graphics/ksnapshot/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdelibs' 'libkipi')
-makedepends=('cmake' 'automoc4')
-optdepends=('kipi-plugins')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.bz2")
-sha1sums=('a59b5bf582a70cd4b8620697161b022df31294e2')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../ksnapshot-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install b/staging/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdegraphics-ksnapshot/kdegraphics-ksnapshot.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/kdegraphics-mobipocket/PKGBUILD b/staging/kdegraphics-mobipocket/PKGBUILD
deleted file mode 100644
index f902b5466..000000000
--- a/staging/kdegraphics-mobipocket/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137287 2011-09-06 22:03:56Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-mobipocket
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="A collection of plugins to handle mobipocket files"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/mobipocket-${pkgver}.tar.bz2")
-sha1sums=('54b7cd4e32325f8fe10f1765856e418fcc75e469')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../mobipocket-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-okular/PKGBUILD b/staging/kdegraphics-okular/PKGBUILD
deleted file mode 100644
index 9793b92d4..000000000
--- a/staging/kdegraphics-okular/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 137236 2011-09-06 21:20:46Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-okular
-pkgver=4.7.1
-pkgrel=1
-pkgdesc='Document Viewer'
-arch=('i686' 'x86_64')
-url="http://kde.org/applications/graphics/okular/"
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
- 'ebook-tools' 'libspectre')
-makedepends=('pkgconfig' 'cmake' 'automoc4')
-optdepends=('kdegraphics-mobipocket: mobipocket support')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2")
-sha1sums=('73d2b9ecdafa43feb9da645d6ff9ea309a55b669')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../okular-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-okular/kdegraphics-okular.install b/staging/kdegraphics-okular/kdegraphics-okular.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdegraphics-okular/kdegraphics-okular.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/kdegraphics-strigi-analyzer/PKGBUILD b/staging/kdegraphics-strigi-analyzer/PKGBUILD
deleted file mode 100644
index 622fca374..000000000
--- a/staging/kdegraphics-strigi-analyzer/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137288 2011-09-06 22:04:23Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-strigi-analyzer
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Strigi analyzers for various graphics file formats"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('1d88ceb5c156625945dabbb347cc405b253b67a5')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-svgpart/PKGBUILD b/staging/kdegraphics-svgpart/PKGBUILD
deleted file mode 100644
index 3fb541df0..000000000
--- a/staging/kdegraphics-svgpart/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137289 2011-09-06 22:04:49Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-svgpart
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="A KPart for viewving SVGs"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.bz2")
-sha1sums=('62bf2bc578a84a7b585002d80cc2386b9be10817')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../svgpart-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-thumbnailers/PKGBUILD b/staging/kdegraphics-thumbnailers/PKGBUILD
deleted file mode 100644
index 01237384b..000000000
--- a/staging/kdegraphics-thumbnailers/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137290 2011-09-06 22:05:13Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-thumbnailers
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Thumbnailers for various graphics file formats"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('libkexiv2' 'libkdcraw')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('b82128adbd0cc352765a25428f38839f40715bc4')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdelibs/PKGBUILD b/staging/kdelibs/PKGBUILD
deleted file mode 100644
index c6b2e4f0a..000000000
--- a/staging/kdelibs/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 137224 2011-09-06 20:14:57Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
- 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee'
- 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils'
- 'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor'
- 'docbook-xsl')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl'
- 'hspell')
-replaces=('kdelibs-experimental')
-install='kdelibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
- 'kde-applications-menu.patch' 'archlinux-menu.patch')
-sha1sums=('661cc56f199b7250bd825cc0e85ff442b85171e2'
- '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- # avoid file conflict with gnome-menu
- patch -p1 -i $srcdir/kde-applications-menu.patch
- # add Archlinux menu entry
- patch -p1 -i $srcdir/archlinux-menu.patch
-
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
- -DKDE_DEFAULT_HOME='.kde4' \
- -DWITH_FAM=OFF
- make
-}
-
-package() {
- cd $srcdir/build
- make DESTDIR=$pkgdir install
-
- # cert bundle seems to be hardcoded
- # link it to the one from ca-certificates
- rm -f $pkgdir/usr/share/apps/kssl/ca-bundle.crt
- ln -sf /etc/ssl/certs/ca-certificates.crt $pkgdir/usr/share/apps/kssl/ca-bundle.crt
-}
diff --git a/staging/kdelibs/archlinux-menu.patch b/staging/kdelibs/archlinux-menu.patch
deleted file mode 100644
index 546784fa2..000000000
--- a/staging/kdelibs/archlinux-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000 +0000
-+++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077 +0000
-@@ -16,11 +16,19 @@
- </DefaultLayout>
- <Layout>
- <Merge type="menus"/>
-+ <Menuname>Arch Linux</Menuname>
- <Menuname>Applications</Menuname>
- <Merge type="files"/>
- </Layout>
-
- <Menu>
-+ <Name>Arch Linux</Name>
-+ <Directory>Archlinux.directory</Directory>
-+ <Include>
-+ <Category>Archlinux</Category>
-+ </Include>
-+ </Menu>
-+ <Menu>
- <Name>Applications</Name>
- <Directory>kde-unknown.directory</Directory>
- <OnlyUnallocated/>
diff --git a/staging/kdelibs/kde-applications-menu.patch b/staging/kdelibs/kde-applications-menu.patch
deleted file mode 100644
index 4b513298a..000000000
--- a/staging/kdelibs/kde-applications-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000
-+++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000
-@@ -69,7 +69,7 @@
- if (WIN32)
- install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus )
- else (WIN32)
--install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus )
-+install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
- endif (WIN32)
- install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
- install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
---- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000
-+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572 +0000
-@@ -302,7 +302,7 @@
- if (!m_trackId.isEmpty())
- g_vfolder->setTrackId(m_trackId);
-
-- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
-
- KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
- entry->setLayoutInfo(kdeMenu->layoutList);
diff --git a/staging/kdelibs/kdelibs.install b/staging/kdelibs/kdelibs.install
deleted file mode 100644
index c77e68041..000000000
--- a/staging/kdelibs/kdelibs.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdemultimedia/PKGBUILD b/staging/kdemultimedia/PKGBUILD
deleted file mode 100644
index a2ac21f37..000000000
--- a/staging/kdemultimedia/PKGBUILD
+++ /dev/null
@@ -1,109 +0,0 @@
-# $Id: PKGBUILD 137291 2011-09-06 22:06:13Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdemultimedia
-pkgname=('kdemultimedia-dragonplayer'
- 'kdemultimedia-ffmpegthumbs'
- 'kdemultimedia-juk'
- 'kdemultimedia-kioslave'
- 'kdemultimedia-kmix'
- 'kdemultimedia-kscd'
- 'kdemultimedia-mplayerthumbs')
-pkgver=4.7.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp'
- 'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'mplayerthumbs.config')
-sha1sums=('7f20d969133a146bce0e3ea18285aa6db9e4a262'
- 'ba016fa2563c14ffcba852c62506b66bfc6ee683')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_Xine=OFF
- make
-}
-
-package_kdemultimedia-dragonplayer() {
- pkgdesc='Video Player'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/multimedia/dragonplayer/"
- install='kdemultimedia.install'
- cd $srcdir/build/dragonplayer
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/dragonplayer
- make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-ffmpegthumbs() {
- pkgdesc='Video Files (ffmpegthumbs)'
- depends=('kdebase-runtime' 'ffmpeg')
- install='kdemultimedia.install'
- cd $srcdir/build/ffmpegthumbs
- make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-juk() {
- pkgdesc='Music Player'
- depends=('kdebase-runtime' 'tunepimp')
- url="http://kde.org/applications/multimedia/juk"
- install='kdemultimedia.install'
- cd $srcdir/build/juk
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/juk
- make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-kioslave() {
- pkgdesc='Audio CD Browser'
- depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia')
- conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
- replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
- for i in kioslave doc/kioslave libkcddb libkcompactdisc; do
- cd $srcdir/build/${i}
- make DESTDIR=$pkgdir install
- done
-}
-
-package_kdemultimedia-kmix() {
- pkgdesc='Sound Mixer'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/multimedia/kmix"
- install='kdemultimedia.install'
- cd $srcdir/build/kmix
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kmix
- make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-kscd() {
- pkgdesc='CD Player'
- depends=('kdebase-runtime' 'libmusicbrainz3')
- url="http://kde.org/applications/multimedia/kscd"
- install='kdemultimedia.install'
- cd $srcdir/build/kscd
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kcontrol/cddbretrieval
- make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-mplayerthumbs() {
- pkgdesc='Video Files (MPlayerThumbs)'
- depends=('kdebase-runtime' 'mplayer')
- replaces=('mplayerthumbs')
- conflicts=('mplayerthumbs')
- cd $srcdir/build/mplayerthumbs
- make DESTDIR=$pkgdir install
- install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs
-}
diff --git a/staging/kdemultimedia/kdemultimedia.install b/staging/kdemultimedia/kdemultimedia.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdemultimedia/kdemultimedia.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/staging/kdemultimedia/mplayerthumbs.config b/staging/kdemultimedia/mplayerthumbs.config
deleted file mode 100644
index 761a17953..000000000
--- a/staging/kdemultimedia/mplayerthumbs.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[MPlayerThumbsCfg]
-backend=0
diff --git a/staging/kdenetwork/PKGBUILD b/staging/kdenetwork/PKGBUILD
deleted file mode 100644
index 69f1320bd..000000000
--- a/staging/kdenetwork/PKGBUILD
+++ /dev/null
@@ -1,111 +0,0 @@
-# $Id: PKGBUILD 137293 2011-09-06 22:07:00Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdenetwork
-pkgname=('kdenetwork-filesharing'
- 'kdenetwork-kdnssd'
- 'kdenetwork-kget'
- 'kdenetwork-kopete'
- 'kdenetwork-kppp'
- 'kdenetwork-krdc'
- 'kdenetwork-krfb')
-pkgver=4.7.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdenetwork')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr'
- 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' 'ppp'
- 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
- 'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('4fd674223dcb68a548ddec3e65acf380d3d2ec68')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
- -DWITH_Xmms=OFF \
- -DWITH_LibMeanwhile=OFF
- make
-}
-
-package_kdenetwork-filesharing() {
- pkgdesc='Konqueror properties dialog plugin to share a directory with the local network'
- depends=('kdelibs' 'smbclient')
- install='kdenetwork.install'
- cd $srcdir/build/filesharing
- make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kdnssd() {
- pkgdesc='Monitors the network for DNS-SD services'
- depends=('kdelibs')
- cd $srcdir/build/kdnssd
- make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kget() {
- pkgdesc='Download Manager'
- depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms')
- optdepends=('python2: YouTube plugin')
- url="http://kde.org/applications/internet/kget/"
- install='kdenetwork.install'
- cd $srcdir/build/kget
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kget
- make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kopete() {
- pkgdesc='Instant Messenger'
- depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn'
- 'libidn' 'qimageblitz' 'v4l-utils' 'libgadu' 'mediastreamer')
- url="http://kde.org/applications/internet/kopete/"
- install='kdenetwork.install'
- cd $srcdir/build/kopete
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kopete
- make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kppp() {
- pkgdesc='Internet Dial-Up Tool'
- depends=('kdebase-runtime' 'ppp')
- url="http://kde.org/applications/internet/kppp/"
- install='kdenetwork.install'
- cd $srcdir/build/kppp
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kppp
- make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-krdc() {
- pkgdesc='Remote Desktop Client'
- depends=('kdebase-runtime' 'libvncserver' 'rdesktop' 'telepathy-qt4')
- optdepends=('kdebase-keditbookmarks: to edit bookmarks')
- url="http://kde.org/applications/internet/krdc/"
- cd $srcdir/build/krdc
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/krdc
- make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-krfb() {
- pkgdesc='Desktop Sharing'
- # note on libxdamage:
- # not detected by namcap because libgl depends on it
- # but nvidia providing libgl does not depend on libxdamage
- depends=('kdebase-runtime' 'libvncserver' 'libxdamage')
- cd $srcdir/build/krfb
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/krfb
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdenetwork/kdenetwork.install b/staging/kdenetwork/kdenetwork.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdenetwork/kdenetwork.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/staging/kdepim-runtime/PKGBUILD b/staging/kdepim-runtime/PKGBUILD
deleted file mode 100644
index e83b0beb8..000000000
--- a/staging/kdepim-runtime/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 137233 2011-09-06 21:19:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdepim-runtime
-pkgver=4.7.1
-pkgrel=1
-pkgdesc='KDE PIM Runtime Environment'
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdepimlibs' 'kdebase-runtime')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('0e7645c83debc64d0b351d39f97b801dc8417630')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdepim-runtime/kdepim-runtime.install b/staging/kdepim-runtime/kdepim-runtime.install
deleted file mode 100644
index ce5c32e1b..000000000
--- a/staging/kdepim-runtime/kdepim-runtime.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-} \ No newline at end of file
diff --git a/staging/kdepim/PKGBUILD b/staging/kdepim/PKGBUILD
deleted file mode 100644
index 3a1a7c50c..000000000
--- a/staging/kdepim/PKGBUILD
+++ /dev/null
@@ -1,253 +0,0 @@
-# $Id: PKGBUILD 137294 2011-09-06 22:07:56Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdepim
-pkgname=('kdepim-akonadiconsole'
- 'kdepim-akregator'
- 'kdepim-blogilo'
- 'kdepim-console'
- 'kdepim-kaddressbook'
- 'kdepim-kalarm'
- 'kdepim-kjots'
- 'kdepim-kleopatra'
- 'kdepim-kmail'
- 'kdepim-knode'
- 'kdepim-knotes'
- 'kdepim-kontact'
- 'kdepim-korganizer'
- 'kdepim-kresources'
- 'kdepim-ktimetracker'
- 'kdepim-libkdepim'
- 'kdepim-wizards')
-pkgver=4.7.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://pim.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdepim')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
- 'pilot-link' 'kde-agent')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('be22b012f547b2caa6ca92a6dd396328fda6a53b')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDEPIM_BUILD_MOBILE=OFF
- make
-}
-
-package_kdepim-akonadiconsole() {
- pkgdesc='Akonadi Management and Debugging Console'
- depends=('kdepim-libkdepim')
- url='http://pim.kde.org'
- install='kdepim.install'
- cd "${srcdir}"/build/akonadiconsole
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-akregator() {
- pkgdesc='A Feed Reader for KDE'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/internet/akregator/"
- install='kdepim.install'
- cd "${srcdir}"/build/akregator
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/akregator
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/akregator
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-blogilo() {
- pkgdesc='A KDE Blogging Client'
- depends=('kdepim-runtime')
- url="http://kde.org/applications/internet/blogilo/"
- replaces=('blogilo')
- conflicts=('blogilo')
- install='kdepim.install'
- cd "${srcdir}"/build/blogilo
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/blogilo
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-console() {
- pkgdesc='Command line tool for accessing calendar files'
- depends=('kdepim-runtime')
- url='http://pim.kde.org'
- install='kdepim.install'
- cd "${srcdir}"/build/console
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kaddressbook() {
- pkgdesc='Contact Manager'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/office/kaddressbook/"
- install='kdepim.install'
- cd "${srcdir}"/build/kaddressbook
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/kaddressbook
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/plugins/kaddressbook
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kalarm() {
- pkgdesc='Personal Alarm Scheduler'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/utilities/kalarm/"
- install='kdepim.install'
- cd "${srcdir}"/build/kalarm
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kalarm
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kjots() {
- pkgdesc='Note Taker'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/utilities/kjots/"
- install='kdepim.install'
- cd "${srcdir}"/build/kjots
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kjots
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/kjots
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kleopatra() {
- pkgdesc='Certificate Manager and Unified Crypto GUI'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/utilities/kleopatra/"
- cd "${srcdir}"/build/kleopatra
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kleopatra
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kmail() {
- pkgdesc='Mail Client'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/internet/kmail/"
- install='kdepim.install'
- conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
- 'kdepim-mimelib' 'kdepim-plugins')
- replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
- 'kdepim-mimelib' 'kdepim-plugins')
- optdepends=('cyrus-sasl-plugins: CRAM-MD5 authentication')
- for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \
- nepomuk_email_feeder ontologies kontact/plugins/kmail; do
- cd "${srcdir}"/build/${i}
- make DESTDIR="${pkgdir}" install
- done
-}
-
-package_kdepim-knode() {
- pkgdesc='News Reader'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/internet/knode/"
- install='kdepim.install'
- cd "${srcdir}"/build/knode
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/knode
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/knode
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-knotes() {
- pkgdesc='Popup Notes'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/utilities/knotes/"
- install='kdepim.install'
- cd "${srcdir}"/build/knotes
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/knotes
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/knotes
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kontact() {
- pkgdesc='Personal Information Manager'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/office/kontact/"
- install='kdepim.install'
- conflcits=('kdepim-kontactinterfaces')
- replaces=('kdepim-kontactinterfaces')
- for i in kontact/src doc/kontact \
- kontact/plugins/summary kontact/plugins/specialdates; do
- cd "${srcdir}"/build/${i}
- make DESTDIR="${pkgdir}" install
- done
-}
-
-package_kdepim-korganizer() {
- pkgdesc='Calendar and Scheduling Program'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/office/korganizer"
- install='kdepim.install'
- cd "${srcdir}"/build/korganizer
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/korganizer
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/korganizer
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kresources() {
- pkgdesc='KDE PIM resources'
- depends=('kdepim-libkdepim')
- url='http://pim.kde.org'
- cd "${srcdir}"/build/kresources
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-ktimetracker() {
- pkgdesc='Personal Time Tracker'
- depends=('kdepim-kresources')
- url="http://kde.org/applications/utilities/ktimetracker/"
- install='kdepim.install'
- cd "${srcdir}"/build/ktimetracker
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/ktimetracker
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/ktimetracker
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-libkdepim() {
- pkgdesc='Library for KDE PIM'
- groups=()
- depends=('kde-agent' 'kdepim-runtime')
- url='http://pim.kde.org'
- conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
- 'kdepim-strigi-analyzer' 'kdepim-akonadi')
- replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
- 'kdepim-strigi-analyzer' 'kdepim-akonadi')
- for i in akonadi_next calendarsupport calendarviews incidenceeditor-ng \
- kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
- messagecomposer messagecore messagelist messageviewer icons \
- strigi-analyzer templateparser plugins/messageviewer \
- plugins/ktexteditor; do
- cd "${srcdir}"/build/${i}
- make DESTDIR="${pkgdir}" install
- done
-}
-
-package_kdepim-wizards() {
- pkgdesc='KDE Groupware Wizard'
- depends=('kdepim-kresources')
- url='http://pim.kde.org'
- cd "${srcdir}"/build/wizards
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdepim/kdepim.install b/staging/kdepim/kdepim.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdepim/kdepim.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/staging/kdepimlibs/PKGBUILD b/staging/kdepimlibs/PKGBUILD
deleted file mode 100644
index 0b61fdc36..000000000
--- a/staging/kdepimlibs/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 137225 2011-09-06 20:21:05Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdepimlibs
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="KDE PIM Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap')
-install='kdepimlibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('6a2cb3d872339fc9549189f31163fc07889fc3ec')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd $srcdir/build
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdepimlibs/kdepimlibs.install b/staging/kdepimlibs/kdepimlibs.install
deleted file mode 100644
index 99262607c..000000000
--- a/staging/kdepimlibs/kdepimlibs.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-} \ No newline at end of file
diff --git a/staging/kdeplasma-addons/PKGBUILD b/staging/kdeplasma-addons/PKGBUILD
deleted file mode 100644
index b51de219a..000000000
--- a/staging/kdeplasma-addons/PKGBUILD
+++ /dev/null
@@ -1,603 +0,0 @@
-# $Id: PKGBUILD 137296 2011-09-06 22:09:16Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeplasma-addons
-pkgname=('kdeplasma-addons-applets-bball'
- 'kdeplasma-addons-applets-binary-clock'
- 'kdeplasma-addons-applets-blackboard'
- 'kdeplasma-addons-applets-bookmarks'
- 'kdeplasma-addons-applets-bubblemon'
- 'kdeplasma-addons-applets-calculator'
- 'kdeplasma-addons-applets-charselect'
- 'kdeplasma-addons-applets-comic'
- 'kdeplasma-addons-applets-community'
- 'kdeplasma-addons-applets-dict'
- 'kdeplasma-addons-applets-eyes'
- 'kdeplasma-addons-applets-fifteenpuzzle'
- 'kdeplasma-addons-applets-filewatcher'
- 'kdeplasma-addons-applets-frame'
- 'kdeplasma-addons-applets-fuzzy-clock'
- 'kdeplasma-addons-applets-incomingmsg'
- 'kdeplasma-addons-applets-kdeobservatory'
- 'kdeplasma-addons-applets-kimpanel'
- 'kdeplasma-addons-applets-knowledgebase'
- 'kdeplasma-addons-applets-kolourpicker'
- 'kdeplasma-addons-applets-konqprofiles'
- 'kdeplasma-addons-applets-konsoleprofiles'
- 'kdeplasma-addons-applets-lancelot'
- 'kdeplasma-addons-applets-leavenote'
- 'kdeplasma-addons-applets-life'
- 'kdeplasma-addons-applets-luna'
- 'kdeplasma-addons-applets-magnifique'
- 'kdeplasma-addons-applets-mediaplayer'
- 'kdeplasma-addons-applets-microblog'
- 'kdeplasma-addons-applets-news'
- 'kdeplasma-addons-applets-notes'
- 'kdeplasma-addons-applets-nowplaying'
- 'kdeplasma-addons-applets-paste'
- 'kdeplasma-addons-applets-pastebin'
- 'kdeplasma-addons-applets-plasmaboard'
- 'kdeplasma-addons-applets-previewer'
- 'kdeplasma-addons-applets-qalculate'
- 'kdeplasma-addons-applets-rememberthemilk'
- 'kdeplasma-addons-applets-rssnow'
- 'kdeplasma-addons-applets-showdashboard'
- 'kdeplasma-addons-applets-showdesktop'
- 'kdeplasma-addons-applets-social-news'
- 'kdeplasma-addons-applets-spellcheck'
- 'kdeplasma-addons-applets-systemloadviewer'
- 'kdeplasma-addons-applets-timer'
- 'kdeplasma-addons-applets-unitconverter'
- 'kdeplasma-addons-applets-weather'
- 'kdeplasma-addons-applets-weatherstation'
- 'kdeplasma-addons-applets-webslice'
- 'kdeplasma-addons-containments'
- 'kdeplasma-addons-libs'
- 'kdeplasma-addons-runners-audioplayercontrol'
- 'kdeplasma-addons-runners-browserhistory'
- 'kdeplasma-addons-runners-characters'
- 'kdeplasma-addons-runners-contacts'
- 'kdeplasma-addons-runners-converter'
- 'kdeplasma-addons-runners-datetime'
- 'kdeplasma-addons-runners-events'
- 'kdeplasma-addons-runners-katesessions'
- 'kdeplasma-addons-runners-konquerorsessions'
- 'kdeplasma-addons-runners-konsolesessions'
- 'kdeplasma-addons-runners-kopete'
- 'kdeplasma-addons-runners-mediawiki'
- 'kdeplasma-addons-runners-spellchecker'
- 'kdeplasma-addons-wallpapers-mandelbrot'
- 'kdeplasma-addons-wallpapers-marble'
- 'kdeplasma-addons-wallpapers-pattern'
- 'kdeplasma-addons-wallpapers-virus'
- 'kdeplasma-addons-wallpapers-weather')
-pkgver=4.7.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-groups=('kde' 'kdeplasma-addons')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble'
- 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('301714467bef00c99613d334558eb517664e29a5')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdeplasma-addons-applets-bball() {
- pkgdesc='A bouncy ball for plasma'
- depends=('kdebase-workspace')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/bball
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-binary-clock() {
- pkgdesc='Time displayed in binary format'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/binary-clock
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-blackboard() {
- pkgdesc='Black Board'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/blackboard
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-bookmarks() {
- pkgdesc='Quick Access to the Bookmarks'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/bookmarks
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-bubblemon() {
- pkgdesc='A pretty bubble that monitors your system.'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/bubblemon
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-calculator() {
- pkgdesc='Calculate simple sums'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/calculator
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-charselect() {
- pkgdesc='View, select, and copy characters from a font collection'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/charselect
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-comic() {
- pkgdesc='View comic strips from the Internet'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/applets/comic
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-community() {
- pkgdesc='Communicate using the Social Desktop'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/community
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-dict() {
- pkgdesc='Look up the meaning of words and their translation into different languages'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/dict
- make DESTDIR=$pkgdir install
- # FIXME
- # /usr/share/icons/oxygen/scalable/apps/accessories-dictionary.svgz
- rm -rf $pkgdir/usr/share/icons
-}
-
-package_kdeplasma-addons-applets-eyes() {
- pkgdesc='XEyes clone'
- depends=('kdebase-workspace')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/eyes
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-fifteenpuzzle() {
- pkgdesc='Put the pieces in order'
- depends=('kdebase-workspace')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/fifteenPuzzle
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-filewatcher() {
- pkgdesc='Watch for changes in specified files'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/fileWatcher
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-frame() {
- pkgdesc='Display your favorite pictures'
- depends=('kdebase-workspace' 'libkexiv2')
- cd $srcdir/build/applets/frame
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-fuzzy-clock() {
- pkgdesc='Time displayed in a less precise format'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/fuzzy-clock
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-incomingmsg() {
- pkgdesc='Notification of new messages'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/incomingmsg
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-kdeobservatory() {
- pkgdesc='Visualize the KDE ecosystem'
- depends=('kdebase-workspace' 'qwt')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/kdeobservatory
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-kimpanel() {
- pkgdesc='A generic input method panel for Oriental languages'
- depends=('kdebase-workspace')
- optdepends=('scim: SCIM backend'
- 'fcitx: FCITX backend')
- cd $srcdir/build/applets/kimpanel
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-knowledgebase() {
- pkgdesc='Opendesktop Knowledgebase'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/knowledgebase
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-kolourpicker() {
- pkgdesc='Pick a color from the desktop'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/kolourpicker
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-konqprofiles() {
- pkgdesc='List and launch Konqueror profiles'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/konqprofiles
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-konsoleprofiles() {
- pkgdesc='List and launch Konsole profiles'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/konsoleprofiles
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-lancelot() {
- pkgdesc='Launcher to start applications'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- replaces=('lancelot')
- provides=('lancelot')
- conflicts=('lancelot')
- install='kdeplasma-addons-applets-lancelot.install'
- cd $srcdir/build/applets/lancelot
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-leavenote() {
- pkgdesc='Leave notes for users while they are away'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/leavenote
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-life() {
- pkgdesc='Life'
- depends=('kdebase-workspace')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/life
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-luna() {
- pkgdesc='Display moon phases for your location'
- depends=('kdebase-workspace')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/luna
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-magnifique() {
- pkgdesc='A magnification glass for the Plasma desktop'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/magnifique
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-mediaplayer() {
- pkgdesc='Widget that can play video and sound'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/mediaplayer
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-microblog() {
- pkgdesc='Update and view your microblog status.'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/applets/microblog
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-news() {
- pkgdesc='Show news from various sources'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/news
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-notes() {
- pkgdesc='Desktop sticky notes'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/notes
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-nowplaying() {
- pkgdesc='Displays currently playing audio'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/nowplaying
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-paste() {
- pkgdesc='Paste text snippets'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/paste
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-pastebin() {
- pkgdesc='Paste text/images to a remote server'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/pastebin
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-plasmaboard() {
- pkgdesc='A virtual, on-screen keyboard'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/plasmaboard
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-previewer() {
- pkgdesc='Preview This File'
- depends=('kdebase-workspace')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/previewer
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-qalculate() {
- pkgdesc='A powerful mathematical equation solver'
- depends=('kdebase-workspace')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/qalculate
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-rememberthemilk() {
- pkgdesc='Remember The Milk Todo list applet'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/applets/rememberthemilk
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-rssnow() {
- pkgdesc='Show news from various sources'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/rssnow
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-showdashboard() {
- pkgdesc='Show the Plasma widget dashboard above other windows'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/showdashboard
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-showdesktop() {
- pkgdesc='Show the Plasma desktop'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/showdesktop
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-social-news() {
- pkgdesc='Stay informed with the Social Desktop'
- replaces=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities')
- conflicts=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities')
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/social-news
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-spellcheck() {
- pkgdesc='Fast spell checking'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/spellcheck
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-systemloadviewer() {
- pkgdesc='Tiny CPU/RAM/Swap monitor'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/systemloadviewer
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-timer() {
- pkgdesc='Countdown over a specified time period'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/timer
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-unitconverter() {
- pkgdesc='Plasmoid for converting units'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/applets/unitconverter
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-weather() {
- pkgdesc='Displays Weather information'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/applets/weather
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-weatherstation() {
- pkgdesc='Weather reports with an LCD display style'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/applets/weatherstation
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-webslice() {
- pkgdesc='Show a part of a webpage'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/applets/webslice
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-containments() {
- pkgdesc='Activities types for Plasma shells'
- depends=('kdebase-workspace')
- cd $srcdir/build/containments
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-libs() {
- pkgdesc='Plasma Addon Library'
- depends=('kdebase-workspace')
- groups=()
- replaces=('kdeplasma-addons-dataengines')
- provides=('kdeplasma-addons-dataengines')
- conflicts=('kdeplasma-addons-dataengines')
- cd $srcdir/build/libs
- make DESTDIR=$pkgdir install
- cd $srcdir/build/dataengines
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-audioplayercontrol() {
- pkgdesc='Allows to control MPRIS audio players (it is able to search through Amarok´s collection, too)'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/audioplayercontrol
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-browserhistory() {
- pkgdesc='Searches in Konqueror´s history'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/browserhistory
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-characters() {
- pkgdesc='special Characters'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/characters
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-contacts() {
- pkgdesc='Finds entries in your address book'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/contacts
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-converter() {
- pkgdesc='Convert values to different units'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/runners/converter
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-datetime() {
- pkgdesc='The current date and time, locally or in any timezone'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/datetime
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-events() {
- pkgdesc='Calendar Events runner'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/events
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-katesessions() {
- pkgdesc='Matches Kate Sessions'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/katesessions
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-konquerorsessions() {
- pkgdesc='Matches Konqueror Sessions'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/konquerorsessions
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-konsolesessions() {
- pkgdesc='Matches Konsole Sessions'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/konsolesessions
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-kopete() {
- pkgdesc='Kopete Contact runner'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/kopete
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-mediawiki() {
- pkgdesc='Search on Wikitravel'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/mediawiki
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-spellchecker() {
- pkgdesc='Check the spelling of a word'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/spellchecker
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-mandelbrot() {
- pkgdesc='Mandelbrot'
- depends=('kdebase-workspace')
- cd $srcdir/build/wallpapers/mandelbrot
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-marble() {
- pkgdesc='Globe'
- depends=('kdebase-workspace' 'kdeedu-marble')
- cd $srcdir/build/wallpapers/marble
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-pattern() {
- pkgdesc='Pattern'
- depends=('kdebase-workspace')
- cd $srcdir/build/wallpapers/pattern
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-virus() {
- pkgdesc='Virus'
- depends=('kdebase-workspace')
- cd $srcdir/build/wallpapers/virus
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-weather() {
- pkgdesc='Weather'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/wallpapers/weather
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install b/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install
deleted file mode 100644
index ce5c32e1b..000000000
--- a/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-} \ No newline at end of file
diff --git a/staging/kdeplasma-addons/kdeplasma-addons-applets.install b/staging/kdeplasma-addons/kdeplasma-addons-applets.install
deleted file mode 100644
index c4ef46ba8..000000000
--- a/staging/kdeplasma-addons/kdeplasma-addons-applets.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
-} \ No newline at end of file
diff --git a/staging/kdesdk-kate/PKGBUILD b/staging/kdesdk-kate/PKGBUILD
deleted file mode 100644
index 1876d9e31..000000000
--- a/staging/kdesdk-kate/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 137237 2011-09-06 21:22:05Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdesdk-kate
-pkgname=('kdebase-kwrite'
- 'kdesdk-kate')
-pkgver=4.7.1
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-makedepends=('kdelibs ''cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.bz2"
- 'pkgbuild-syntax-highlight.patch')
-sha1sums=('12eadb7c74c16fb11d51d4415d141095a624f010'
- 'ab0c5d2a796b0f283154799add161c99f48ffcd5')
-
-build() {
- cd "${srcdir}"/kate-${pkgver}
- patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch
-
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kate-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_KTEXTEDITOR=OFF
- make
-}
-
-package_kdebase-kwrite() {
- pkgdesc="Text Editor"
- depends=('kdebase-runtime')
- groups=('kde' 'kdebase')
- install='kdebase-kwrite.install'
-
- cd "${srcdir}"/build/kwrite
- make DESTDIR="${pkgdir}" install
-
- cd "${srcdir}"/build/part
- make DESTDIR="${pkgdir}" install
-
- cd "${srcdir}"/build/doc/kwrite
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdesdk-kate() {
- pkgdesc="Advanced Text Editor"
- depends=('kdebase-kwrite')
- groups=('kde' 'kdesdk')
- install='kdesdk-kate.install'
-
- cd "${srcdir}"/build/kate
- make DESTDIR="${pkgdir}" install
-
- cd "${srcdir}"/build/doc/kate
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdesdk-kate/kdebase-kwrite.install b/staging/kdesdk-kate/kdebase-kwrite.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdesdk-kate/kdebase-kwrite.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/kdesdk-kate/kdesdk-kate.install b/staging/kdesdk-kate/kdesdk-kate.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdesdk-kate/kdesdk-kate.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/kdesdk-kate/pkgbuild-syntax-highlight.patch b/staging/kdesdk-kate/pkgbuild-syntax-highlight.patch
deleted file mode 100644
index 3c43eca0f..000000000
--- a/staging/kdesdk-kate/pkgbuild-syntax-highlight.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kate-4.6.80/part/syntax/data/bash.xml~ 2011-05-23 21:20:34.295137123 +0000
-+++ kate-4.6.80/part/syntax/data/bash.xml 2011-05-23 21:20:54.581993368 +0000
-@@ -8,7 +8,7 @@
- <!ENTITY noword "(?![\w$+-])"> <!-- no word, $, + or - following -->
- <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )"> <!-- valid character in a file name -->
- ]>
--<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-+<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-
- <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
- Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
diff --git a/staging/kdesdk/PKGBUILD b/staging/kdesdk/PKGBUILD
deleted file mode 100644
index 34dfcd16a..000000000
--- a/staging/kdesdk/PKGBUILD
+++ /dev/null
@@ -1,247 +0,0 @@
-# $Id: PKGBUILD 137297 2011-09-06 22:10:42Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdesdk
-pkgname=('kdesdk-cervisia'
- 'kdesdk-dolphin-plugins'
- 'kdesdk-kapptemplate'
- 'kdesdk-kcachegrind'
- 'kdesdk-kdeaccounts-plugin'
- 'kdesdk-kdepalettes'
- 'kdesdk-kioslave'
- 'kdesdk-kmtrace'
- 'kdesdk-kompare'
- 'kdesdk-kpartloader'
- 'kdesdk-kprofilemethod'
-# 'kdesdk-kspy'
- 'kdesdk-kstartperf'
- 'kdesdk-kuiviewer'
- 'kdesdk-lokalize'
- 'kdesdk-okteta'
- 'kdesdk-poxml'
-# 'kdesdk-scheck'
- 'kdesdk-scripts'
- 'kdesdk-strigi-analyzer'
- 'kdesdk-umbrello')
-pkgver=4.7.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdesdk')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'subversion' 'antlr2'
- 'kdepimlibs' 'kdebase-lib')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'fix-python2-path.patch')
-sha1sums=('0c47d62a32e737c6ff576843d5b5c7f9bceeccbd'
- 'd05ca0231869c484fd3861955d960a60aff7dcfb')
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- # Fix python2 path
- patch -Np1 -i ${srcdir}/fix-python2-path.patch
- sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
- -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
- $(find . -name '*.py')
-
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdesdk-cervisia() {
- pkgdesc='CVS Frontend'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/development/cervisia/"
- install='kdesdk.install'
- cd $srcdir/build/cervisia
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/cervisia
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-dolphin-plugins() {
- pkgdesc='Extra Dolphin plugins'
- depends=('kdebase-dolphin' 'subversion' 'git' 'kdesdk-kompare')
- install='kdesdk.install'
- cd $srcdir/build/dolphin-plugins/git
- make DESTDIR=$pkgdir install
- cd $srcdir/build/dolphin-plugins/svn
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kapptemplate() {
- pkgdesc='KDE Template Generator'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/development/kapptemplate/"
- install='kdesdk.install'
- cd $srcdir/build/kapptemplate
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kapptemplate
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kcachegrind() {
- pkgdesc='Visualization of Performance Profiling Data'
- depends=('kdebase-runtime' 'python2')
- optdepends=('php: PHP support')
- url="http://kde.org/applications/development/kcachegrind/"
- install='kdesdk.install'
- cd $srcdir/build/kcachegrind
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kcachegrind
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kdeaccounts-plugin() {
- pkgdesc='KDE Repository Accounts'
- depends=('kdepim-runtime')
- cd $srcdir/build/kdeaccounts-plugin
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kdepalettes() {
- pkgdesc='Palettes for the Gimp that match the KDE standard color palette'
- optdepends=('gimp')
- install -D -m644 $srcdir/${pkgbase}-${pkgver}/kdepalettes/KDE_Gimp \
- $pkgdir/usr/share/gimp/2.0/palettes/KDE.gpl
-}
-
-package_kdesdk-kioslave() {
- pkgdesc='KDED Subversion Module'
- depends=('kdebase-runtime' 'subversion')
- cd $srcdir/build/kioslave
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kmtrace() {
- pkgdesc='A KDE tool to assist with malloc debugging using glibc´s "mtrace" functionality'
- depends=('kdebase-runtime')
- cd $srcdir/build/kmtrace
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kmtrace
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kompare() {
- pkgdesc='Diff/Patch Frontend'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/development/kompare/"
- install='kdesdk.install'
- cd $srcdir/build/kompare
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kompare
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kpartloader() {
- pkgdesc='A test application for KParts'
- depends=('kdebase-runtime')
- install='kdesdk.install'
- cd $srcdir/build/kpartloader
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kprofilemethod() {
- pkgdesc='Macros helping to profile'
- cd $srcdir/build/kprofilemethod
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kspy() {
- pkgdesc='An Object Inspector for Qt/KDE applications'
- depends=('kdebase-runtime')
- cd $srcdir/build/kspy
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kstartperf() {
- pkgdesc='Startup time measurement tool for KDE applications'
- depends=('kdebase-runtime')
- cd $srcdir/build/kstartperf
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kuiviewer() {
- pkgdesc='Qt Designer UI File Viewer'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/development/kuiviewer/"
- install='kdesdk.install'
- cd $srcdir/build/kuiviewer
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-lokalize() {
- pkgdesc='Computer-Aided Translation System'
- depends=('kdebase-runtime' 'kdebindings-python')
- url="http://kde.org/applications/development/lokalize/"
- optdepends=('translate-toolkit: enable extra python script')
- install='kdesdk.install'
- cd $srcdir/build/lokalize
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/lokalize
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-okteta() {
- pkgdesc='Hex Editor'
- depends=('kdebase-runtime')
- replaces=('kdeutils-okteta')
- conflicts=('kdeutils-okteta')
- url="http://kde.org/applications/utilities/okteta"
- install='kdesdk-okteta.install'
- cd $srcdir/build/okteta
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/okteta
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-poxml() {
- pkgdesc='Translates DocBook XML files using gettext po files'
- depends=('qt' 'antlr2')
- cd $srcdir/build/poxml
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/poxml
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-scheck() {
- pkgdesc='An interface style to highlight accel and style guide conflicts'
- depends=('kdebase-runtime')
- cd $srcdir/build/scheck
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-scripts() {
- pkgdesc='KDE SDK scripts'
- depends=('python2')
- cd $srcdir/build/scripts
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/scripts
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-strigi-analyzer() {
- pkgdesc='Strigi-Analyzer for KDE SDK'
- depends=('kdelibs')
- cd $srcdir/build/strigi-analyzer
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-umbrello() {
- pkgdesc='UML Modeller'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/development/umbrello/"
- install='kdesdk.install'
- cd $srcdir/build/umbrello
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/umbrello
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdesdk/fix-python2-path.patch b/staging/kdesdk/fix-python2-path.patch
deleted file mode 100644
index c2c0745d1..000000000
--- a/staging/kdesdk/fix-python2-path.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree~ 2010-11-24 11:53:38.586666671 +0100
-+++ kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree 2010-11-24 11:53:38.623333337 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- # _*_ coding: latin1 _*_
-
- #
---- kdesdk-4.5.80/lokalize/scripts/msgmerge.py~ 2010-11-24 11:22:42.120000002 +0100
-+++ kdesdk-4.5.80/lokalize/scripts/msgmerge.py 2010-11-24 11:22:42.146666670 +0100
-@@ -114,7 +114,7 @@
- print >>sys.stderr, "Execution failed:", e
-
- cmd='%s/odf/xliffmerge.py -i %s -t %s -o %s' % (ourPath,xliffpathname,xlifftemplatepathname,xliffpathname)
-- if os.name!='nt': cmd='python '+cmd
-+ if os.name!='nt': cmd='python2 '+cmd
- else: cmd=cmd.replace('/','\\')
- os.system(cmd)
-
---- kdesdk-4.5.80/lokalize/scripts/xliff2odf.py~ 2010-11-24 11:24:10.853333336 +0100
-+++ kdesdk-4.5.80/lokalize/scripts/xliff2odf.py 2010-11-24 11:24:10.883333336 +0100
-@@ -42,7 +42,7 @@
- xliff2odf.convertxliff(xliffinput, translatedodfpathname, odf)
-
- ourpath=([p for p in sys.path if os.path.exists(p+'/xliff2odf.py')]+[''])[0]
-- os.system('python "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId()))
-+ os.system('python2 "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId()))
-
- try: convert()
- except: print 'error occured'
---- kdesdk-4.5.80/scripts/rename_source_files~ 2010-11-24 11:45:41.040000004 +0100
-+++ kdesdk-4.5.80/scripts/rename_source_files 2010-11-24 11:45:41.093333336 +0100
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python2
- #
- # Copyright David Faure <faure@kde.org>, License LGPL v2
- #
---- kdesdk-4.5.80/scripts/svn2log.sh~ 2010-11-24 11:46:24.863333337 +0100
-+++ kdesdk-4.5.80/scripts/svn2log.sh 2010-11-24 11:46:24.896666669 +0100
-@@ -17,6 +17,6 @@
- svn cat svn://anonsvn.kde.org/home/kde/trunk/kde-common/accounts > /tmp/accounts.$PPID
-
- echo "Creating changelog...";
--svn log -v --xml $1 | python $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
-+svn log -v --xml $1 | python2 $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
-
- rm /tmp/accounts.$PPID
---- kdesdk-4.5.80/scripts/kde_generate_export_header~ 2010-11-24 11:48:49.696666669 +0100
-+++ kdesdk-4.5.80/scripts/kde_generate_export_header 2010-11-24 11:48:49.753333338 +0100
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python2
-
- import os, sys, string
-
---- kdesdk-4.5.80/scripts/reviewboarddiff~ 2010-11-24 11:49:37.686666670 +0100
-+++ kdesdk-4.5.80/scripts/reviewboarddiff 2010-11-24 11:49:37.740000003 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- # encoding: utf-8
- #
- # Generates reviewboard compatible diffs from git-svn repositories.
diff --git a/staging/kdesdk/kdesdk-okteta.install b/staging/kdesdk/kdesdk-okteta.install
deleted file mode 100644
index 3f06b8deb..000000000
--- a/staging/kdesdk/kdesdk-okteta.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdesdk/kdesdk.install b/staging/kdesdk/kdesdk.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdesdk/kdesdk.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/staging/kdetoys/PKGBUILD b/staging/kdetoys/PKGBUILD
deleted file mode 100644
index 55c1c32cb..000000000
--- a/staging/kdetoys/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 137298 2011-09-06 22:11:33Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdetoys
-pkgname=('kdetoys-amor'
- 'kdetoys-kteatime'
- 'kdetoys-ktux')
-pkgver=4.7.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdetoys')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('05e0f77fd13ed9887afa0c5dd33afd224abc2505')
-
-build() {
- cd $srcdir
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdetoys-amor() {
- pkgdesc='On-Screen Creature'
- depends=('kdebase-runtime')
- install='kdetoys.install'
- cd $srcdir/build/amor
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/amor
- make DESTDIR=$pkgdir install
-}
-
-package_kdetoys-kteatime() {
- pkgdesc='Tea Cooker'
- depends=('kdebase-runtime')
- install='kdetoys.install'
- cd $srcdir/build/kteatime
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kteatime
- make DESTDIR=$pkgdir install
-}
-
-package_kdetoys-ktux() {
- pkgdesc='KTux'
- depends=('kdebase-workspace' )
- install='kdetoys.install'
- cd $srcdir/build/ktux
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdetoys/kdetoys.install b/staging/kdetoys/kdetoys.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdetoys/kdetoys.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/staging/kdeutils/PKGBUILD b/staging/kdeutils/PKGBUILD
deleted file mode 100644
index caabe81e9..000000000
--- a/staging/kdeutils/PKGBUILD
+++ /dev/null
@@ -1,184 +0,0 @@
-# $Id: PKGBUILD 137299 2011-09-06 22:12:16Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeutils
-pkgname=('kdeutils-ark'
- 'kdeutils-filelight'
- 'kdeutils-kcalc'
- 'kdeutils-kcharselect'
- 'kdeutils-kdf'
- 'kdeutils-kfloppy'
- 'kdeutils-kgpg'
- 'kdeutils-kremotecontrol'
- 'kdeutils-ktimer'
- 'kdeutils-kwallet'
- 'kdeutils-printer-applet'
- 'kdeutils-superkaramba'
- 'kdeutils-sweeper')
-pkgver=4.7.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeutils')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace'
- 'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz'
- 'qjson')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('96eb89be0e319e5d0709430f86dc6a7db80d9967')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdeutils-ark() {
- pkgdesc='Archiving Tool'
- depends=('kdebase-runtime' 'kdebase-lib' 'libarchive')
- optdepends=('p7zip' 'zip' 'unzip' 'unrar')
- url="http://kde.org/applications/utilities/ark/"
- cd $srcdir/build/ark
- make DESTDIR=$pkgdir install
- cd $srcdir/build/ark/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-filelight() {
- pkgdesc='View disk usage information'
- depends=('kdebase-runtime' 'qimageblitz')
- replaces=('filelight')
- conflicts=('filelight')
- install='kdeutils.install'
- url="http://methylblue.com/filelight/"
- cd $srcdir/build/filelight
- make DESTDIR=$pkgdir install
- cd $srcdir/build/filelight/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kcalc() {
- pkgdesc='Scientific Calculator'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kcalc/"
- cd $srcdir/build/kcalc
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kcalc/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kcharselect() {
- pkgdesc='Character Selector'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kcharselect/"
- cd $srcdir/build/kcharselect
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kcharselect/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kdf() {
- pkgdesc='View Disk Usage'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/system/kdiskfree/"
- install='kdeutils.install'
- cd $srcdir/build/kdf
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kdf/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kfloppy() {
- pkgdesc='Floppy Formatter'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kfloppy/"
- install='kdeutils.install'
- cd $srcdir/build/kfloppy
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kfloppy/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kgpg() {
- pkgdesc='A GnuPG frontend'
- depends=('kdepim-runtime' 'kde-agent')
- url="http://kde.org/applications/utilities/kgpg"
- install='kdeutils.install'
- cd $srcdir/build/kgpg
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kgpg/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kremotecontrol() {
- pkgdesc='Configure your remote controls for use with applications'
- replaces=('kdeutils-kdelirc')
- conflicts=('kdeutils-kdelirc')
- depends=('kdebase-workspace')
- url="http://kde.org/applications/utilities/kremotecontrol"
- install='kdeutils.install'
- cd $srcdir/build/kremotecontrol
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kremotecontrol/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-ktimer() {
- pkgdesc='Countdown Launcher'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/ktimer"
- install='kdeutils.install'
- cd $srcdir/build/ktimer
- make DESTDIR=$pkgdir install
- cd $srcdir/build/ktimer/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kwallet() {
- pkgdesc='Wallet Management Tool'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/system/kwalletmanager/"
- install='kdeutils.install'
- cd $srcdir/build/kwallet
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kwallet/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-printer-applet() {
- pkgdesc='System tray icon for managing print jobs'
- depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common')
- url="http://kde.org/applications/system/printerapplet/"
- cd $srcdir/build/printer-applet
- make DESTDIR=$pkgdir install
- cd $srcdir/build/printer-applet/doc
- make DESTDIR=$pkgdir install
-
- # Use the python2 executable
- find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
-
-package_kdeutils-superkaramba() {
- pkgdesc='An engine for cool desktop eyecandy'
- depends=('kdebase-runtime' 'kdebindings-python' 'qimageblitz')
- url="http://kde.org/applications/utilities/superkaramba"
- install='kdeutils.install'
- cd $srcdir/build/superkaramba
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-sweeper() {
- pkgdesc='System Cleaner'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/sweeper/"
- cd $srcdir/build/sweeper
- make DESTDIR=$pkgdir install
- cd $srcdir/build/sweeper/doc
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeutils/kdeutils.install b/staging/kdeutils/kdeutils.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeutils/kdeutils.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/staging/kdewebdev/PKGBUILD b/staging/kdewebdev/PKGBUILD
deleted file mode 100644
index 011a57b59..000000000
--- a/staging/kdewebdev/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 137300 2011-09-06 22:12:56Z andrea $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdewebdev
-pkgname=('kdewebdev-kfilereplace'
- 'kdewebdev-kimagemapeditor'
- 'kdewebdev-klinkstatus'
- 'kdewebdev-kommander')
-pkgver=4.7.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdewebdev')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime'
- 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('ce9e7c37d2056b2f69e88fb92154463d917c9b85')
-
-build() {
- cd $srcdir
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdewebdev-kfilereplace() {
- pkgdesc='Search & Replace Tool'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kfilereplace/"
- install='kdewebdev.install'
- cd $srcdir/build/kfilereplace
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kfilereplace
- make DESTDIR=$pkgdir install
-}
-
-package_kdewebdev-kimagemapeditor() {
- pkgdesc='HTML Image Map Editor'
- depends=('kdebase-runtime')
- install='kdewebdev.install'
- cd $srcdir/build/kimagemapeditor
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kimagemapeditor
- make DESTDIR=$pkgdir install
-}
-
-package_kdewebdev-klinkstatus() {
- pkgdesc='Link Checker'
- depends=('kdepim-runtime' 'tidyhtml')
- install='kdewebdev.install'
- cd $srcdir/build/klinkstatus
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/klinkstatus
- make DESTDIR=$pkgdir install
-}
-
-package_kdewebdev-kommander() {
- pkgdesc='Executor for Kommander dialogs'
- depends=('kdebase-runtime')
- cd $srcdir/build/kommander
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdewebdev/kdewebdev.install b/staging/kdewebdev/kdewebdev.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdewebdev/kdewebdev.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/staging/libkdcraw/PKGBUILD b/staging/libkdcraw/PKGBUILD
deleted file mode 100644
index adddf01fc..000000000
--- a/staging/libkdcraw/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 137247 2011-09-06 21:31:09Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkdcraw
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="A C++ interface used to decode RAW picture"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'lcms')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('d54aa4671c0d1f396bf1923583988d6c3aa19137')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libkdcraw/libkdcraw.install b/staging/libkdcraw/libkdcraw.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/libkdcraw/libkdcraw.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/staging/libkdeedu/PKGBUILD b/staging/libkdeedu/PKGBUILD
deleted file mode 100644
index 75f24c942..000000000
--- a/staging/libkdeedu/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137245 2011-09-06 21:29:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkdeedu
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="Libraries used by KDE Education applications"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-replaces=('kdeedu-libkdeedu' 'kdeedu-data')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('6eb16c156f35332675c9eaad0074e31969313e7b')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libkdeedu/libkdeedu.install b/staging/libkdeedu/libkdeedu.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/libkdeedu/libkdeedu.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/staging/libkexiv2/PKGBUILD b/staging/libkexiv2/PKGBUILD
deleted file mode 100644
index b57157575..000000000
--- a/staging/libkexiv2/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 137248 2011-09-06 21:31:34Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkexiv2
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="A library to manipulate pictures metadata"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('c1c1afb6c3928222eb33ce592d77dd6478aa4911')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libkipi/PKGBUILD b/staging/libkipi/PKGBUILD
deleted file mode 100644
index dd7a6f5ea..000000000
--- a/staging/libkipi/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 137249 2011-09-06 21:32:16Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkipi
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="An interface to use kipi-plugins from a KDE application"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('309b93ca86ae2c803f5b91ac206affc0059059f1')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libkipi/libkipi.install b/staging/libkipi/libkipi.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/libkipi/libkipi.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/staging/libksane/PKGBUILD b/staging/libksane/PKGBUILD
deleted file mode 100644
index 1edf1affc..000000000
--- a/staging/libksane/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 137250 2011-09-06 21:33:00Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libksane
-pkgver=4.7.1
-pkgrel=1
-pkgdesc="An image scanning library"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'sane')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('d461b668e890069afb8818e6b367063fc92721da')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libksane/libksane.install b/staging/libksane/libksane.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/libksane/libksane.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/staging/obex-data-server/PKGBUILD b/staging/obex-data-server/PKGBUILD
deleted file mode 100644
index 25b4c9bf3..000000000
--- a/staging/obex-data-server/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 137852 2011-09-12 03:35:14Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-# Contributor: Keerthi <keerthi.linux@gmail.com>
-
-pkgname=obex-data-server
-pkgver=0.4.6
-pkgrel=2
-pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality"
-arch=('i686' 'x86_64')
-url="http://wiki.muiline.com/obex-data-server"
-license=('GPL')
-depends=('dbus-glib' 'openobex' 'imagemagick')
-source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz")
-md5sums=('961ca5db6fe9c97024e133cc6203cc4d')
-
-build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --sysconfdir=/etc
- make
-}
-
-package() {
- cd "${srcdir}"/${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/psiconv/PKGBUILD b/staging/psiconv/PKGBUILD
deleted file mode 100644
index 474feade1..000000000
--- a/staging/psiconv/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 137848 2011-09-12 03:27:09Z allan $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=psiconv
-pkgver=0.9.8
-pkgrel=8
-pkgdesc="Converts Psion 5(MX) files to more commonly used file formats"
-arch=('i686' 'x86_64')
-url="http://software.frodo.looijaard.name/psiconv/"
-license=('GPL')
-depends=('imagemagick')
-makedepends=('bc')
-backup=('etc/psiconv/psiconv.conf')
-options=('!libtool')
-source=(http://software.frodo.looijaard.name/${pkgname}/files/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8d7548e3c6b9cd408544736133728acd')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-}
diff --git a/staging/pstoedit/PKGBUILD b/staging/pstoedit/PKGBUILD
deleted file mode 100644
index 1f61e7e80..000000000
--- a/staging/pstoedit/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 137850 2011-09-12 03:31:42Z allan $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Tobias Powalowski <t.powa@gmx.de>
-
-pkgname=pstoedit
-pkgver=3.60
-pkgrel=2
-pkgdesc="Translates PostScript and PDF graphics into other vector formats"
-arch=('i686' 'x86_64')
-url="http://www.pstoedit.net/"
-license=('GPL')
-depends=('gcc-libs' 'plotutils' 'gd' 'imagemagick')
-makedepends=('ghostscript')
-options=('!libtool' '!makeflags')
-source=("http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz"
- 'pstoedit-3.50-parallel.patch' 'pstoedit-3.50-plugin-close.patch')
-sha1sums=('649ade3d873429548eb6dd9f3e13cb79a8d6a1a2'
- '6e278b164d3e59fbb11e7fd5ae8ffb038932d69a'
- '54bbe019de66eb4cb8525371462595d21fbd074e')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- sed -i 's/-pedantic//' configure
-
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/pstoedit/pstoedit-3.50-parallel.patch b/staging/pstoedit/pstoedit-3.50-parallel.patch
deleted file mode 100644
index 4f1f73b04..000000000
--- a/staging/pstoedit/pstoedit-3.50-parallel.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d6178df..66f377b 100755
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -86,6 +86,7 @@ libp2edrvstd_la_SOURCES= \
- $(sample_drivers_src)
- libp2edrvstd_la_LIBADD=-L. libpstoedit.la
- libp2edrvstd_la_LDFLAGS=-no-undefined -module
-+libp2edrvstd_la_DEPENDENCIES = libpstoedit.la
-
- #libp2edrvplugins_la_SOURCES=drvmif.cpp drvcgm.cpp drvrtf.cpp drvwwmf.cpp
- #libp2edrvplugins_la_LIBADD=
-@@ -95,15 +96,18 @@ libp2edrvstd_la_LDFLAGS=-no-undefined -module
- libp2edrvlplot_la_SOURCES=drvlplot.cpp drvlplot.h initlibrary.cpp
- libp2edrvlplot_la_LIBADD=$(LIBPLOTTER_LDFLAGS) -L. libpstoedit.la
- libp2edrvlplot_la_LDFLAGS=-no-undefined -module
-+libp2edrvlplot_la_DEPENDENCIES = libpstoedit.la
-
- libp2edrvswf_la_SOURCES=drvswf.cpp drvswf.h initlibrary.cpp
- libp2edrvswf_la_LIBADD=$(LIBMING_LDFLAGS) -L. libpstoedit.la
- libp2edrvswf_la_LDFLAGS=-no-undefined -module
-+libp2edrvswf_la_DEPENDENCIES = libpstoedit.la
-
- # note the __ stand for ++ - automake treats all no alphanums chars as _
- libp2edrvmagick___la_SOURCES=drvmagick++.cpp drvmagick++.h initlibrary.cpp
- libp2edrvmagick___la_LIBADD=-L. libpstoedit.la
- libp2edrvmagick___la_LDFLAGS=-no-undefined ${LIBMAGICK_LDFLAGS} -module
-+libp2edrvmagick___la_DEPENDENCIES = libpstoedit.la
- # moved to configure.ac because needed only for g++ libp2edrvmagick___la_CPPFLAGS=$(LIBMAGICK_CFLAGS) $(AM_CPPFLAGS) -Wno-long-long
-
- if USE_EMFBYSOURCE
-@@ -113,6 +117,7 @@ else
- libp2edrvwmf_la_SOURCES=drvwmf.cpp drvwmf.h initlibrary.cpp
- libp2edrvwmf_la_LDFLAGS=-no-undefined $(LIBEMF_LDFLAGS) -L. libpstoedit.la -module
- endif
-+libp2edrvwmf_la_DEPENDENCIES = libpstoedit.la
-
- libpstoedit_la_SOURCES = \
- dynload.cpp dynload.h \
-@@ -135,6 +140,7 @@ libpstoedit_la_LDFLAGS = -no-undefined
-
- pstoedit_SOURCES = cmdmain.cpp
- pstoedit_LDFLAGS = -no-undefined -L. libpstoedit.la ${LIBLD_LDFLAGS}
-+pstoedit_DEPENDENCIES = libpstoedit.la
-
- pkginclude_HEADERS = \
- pstoedit.h \
diff --git a/staging/pstoedit/pstoedit-3.50-plugin-close.patch b/staging/pstoedit/pstoedit-3.50-plugin-close.patch
deleted file mode 100644
index 6787d6aef..000000000
--- a/staging/pstoedit/pstoedit-3.50-plugin-close.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugzilla.redhat.com/507035
-
-diff --git a/src/dynload.cpp b/src/dynload.cpp
-index c0db355..7c073ef 100644
---- a/src/dynload.cpp
-+++ b/src/dynload.cpp
-@@ -147,7 +147,6 @@ void DynLoader::close()
-
- DynLoader::~DynLoader()
- {
-- close();
- libname=0;
- }
-
diff --git a/staging/transcode/PKGBUILD b/staging/transcode/PKGBUILD
deleted file mode 100644
index ab57f20d8..000000000
--- a/staging/transcode/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 137842 2011-09-12 02:25:43Z eric $
-# Maintainer:
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: roberto <roberto@archlinux.org>
-
-pkgname=transcode
-_sripver=0.3-4
-pkgver=1.1.5
-pkgrel=6
-pkgdesc="A video/DVD ripper and encoder for the terminal/console"
-arch=('i686' 'x86_64')
-url="http://tcforge.berlios.de/"
-license=('GPL')
-depends=('imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
- 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec')
-makedepends=('nasm')
-options=('!libtool' '!makeflags')
-source=(http://download2.berlios.de/tcforge/${pkgname}-${pkgver}.tar.bz2
- http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
- transcode-1.1.5-jpeg-7.patch transcode-1.1.5-mpa.patch)
-md5sums=('41ac6b1c0fe30f3aab286e771fc31b9e'
- 'c0bd49a88f667c68c4430ad25bbed510'
- 'af4056b7530a6f147594f676849e7c7b'
- 'c299cfc6c4be6a5512d1a129f04e5450')
-sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26'
- 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
- '9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977'
- '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p0 < ../transcode-1.1.5-jpeg-7.patch
- patch -p1 < ../transcode-1.1.5-mpa.patch
-
- # building from here
- ./configure --prefix=/usr \
- --enable-sse=no --enable-sse2=no --enable-altivec=no --enable-mmx \
- --enable-lame --enable-ogg --enable-vorbis --enable-theora \
- --enable-libdv --enable-libxml2 --enable-v4l \
- --enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \
- --enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \
- --enable-xvid --enable-x264 --enable-alsa \
- --enable-libmpeg2 --enable-libmpeg2convert \
- --with-libxml2-prefix=/usr \
- --with-mjpegtools-prefix=/usr \
- --with-imagemagick-prefix=/usr \
- --with-libdv-includes=/usr \
- --with-libpostproc-includes=/usr/include/libpostproc \
- --with-ogg-prefix=/usr \
- --with-lame-libs=/usr \
- --with-lzo-libs=/usr/lib \
- --with-libavcodec-prefix=/usr \
- --with-libavcodec-includes=/usr/include \
- --with-libavcodec-libs=/usr/lib
-
- make
- ##############################################################################
- # this imports the latest subtitleripper sources and replaces the internal
- mkdir contrib
- mv "${srcdir}/subtitleripper" contrib/subrip
- # removes dependency on libppm, make it dependend on netpbm just failed, argh...
- cd contrib/subrip
- sed -e 's|^\(.*lppm.*\)$|#\1|' \
- -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \
- -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \
- -i Makefile
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- cd contrib/subrip
- install -m 755 pgm2txt "${pkgdir}/usr/bin/"
- install -m 755 srttool "${pkgdir}/usr/bin/"
- install -m 755 subtitle2pgm "${pkgdir}/usr/bin/"
- install -m 755 subtitle2vobsub "${pkgdir}/usr/bin/"
- install -m 755 vobsub2pgm "${pkgdir}/usr/bin/"
-}
diff --git a/staging/transcode/transcode-1.1.5-jpeg-7.patch b/staging/transcode/transcode-1.1.5-jpeg-7.patch
deleted file mode 100644
index 288932a61..000000000
--- a/staging/transcode/transcode-1.1.5-jpeg-7.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=294488
-
-Patch by: Salah Coronya
-
-Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling isn't set by default to FALSE anymore.
-
---- export/export_jpg.c
-+++ export/export_jpg.c
-@@ -91,6 +91,7 @@
-
- jpeg_set_quality(&encinfo, quality, TRUE);
- encinfo.raw_data_in = TRUE;
-+ encinfo.do_fancy_downsampling = FALSE;
- encinfo.in_color_space = JCS_YCbCr;
-
- encinfo.comp_info[0].h_samp_factor = 2;
diff --git a/staging/transcode/transcode-1.1.5-mpa.patch b/staging/transcode/transcode-1.1.5-mpa.patch
deleted file mode 100644
index e7fb0fc1c..000000000
--- a/staging/transcode/transcode-1.1.5-mpa.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- transcode-1.1.5-old/export/aud_aux.c 2010-07-04 12:44:31.867550180 -0500
-+++ transcode-1.1.5/export/aud_aux.c 2010-07-04 13:41:01.253292529 -0500
-@@ -347,6 +347,7 @@
- //-- set parameters (bitrate, channels and sample-rate) --
- //--------------------------------------------------------
- memset(&mpa_ctx, 0, sizeof(mpa_ctx)); // default all
-+ mpa_ctx.codec_type = CODEC_TYPE_AUDIO;
- mpa_ctx.bit_rate = vob->mp3bitrate * 1000; // bitrate dest.
- mpa_ctx.channels = vob->dm_chan; // channels
- mpa_ctx.sample_rate = vob->a_rate;
diff --git a/staging/xine-lib/PKGBUILD b/staging/xine-lib/PKGBUILD
deleted file mode 100644
index b2bb443c8..000000000
--- a/staging/xine-lib/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 137840 2011-09-12 01:59:41Z eric $
-# Maintainer: Eric BĂ©langer <eric@archlinux.org>
-
-pkgname=xine-lib
-pkgver=1.1.19
-pkgrel=5
-pkgdesc="A multimedia playback engine"
-arch=('i686' 'x86_64')
-url="http://www.xine-project.org"
-license=('LGPL' 'GPL')
-depends=('libgl' 'libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug')
-makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa'
- 'v4l-utils' 'vcdimager' 'jack' 'gdk-pixbuf2' 'libpulse' 'speex' 'aalib')
-optdepends=('imagemagick: for using the imagemagick plugin' \
- 'smbclient: for using the smb plugin' \
- 'jack: for using the jack plugin' \
- 'vcdimager: for using the vcd plugin' \
- 'gdk-pixbuf2: for using the gdk-pixbuf plugin' \
- 'mesa: for using the opengl plugin' \
- 'libpulse: for using the pulseaudio plugin' \
- 'speex: for using the speex plugin' \
- 'v4l-utils: for using the v4l plugin' \
- 'wavpack: for using the wavpack plugin' \
- 'faad2: for using the faad plugin' \
- 'libmng: for using the mng plugin' \
- 'aalib: for using the aalib plugin')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.bz2
- xine-lib-1.1.1-configure-no-mcpu-march.patch xine-lib-1.1.19-xvmc.patch)
-md5sums=('a410a0f0617e1d6309f0cbe907f73f8a'
- '9776df4eb54d2f1f68d8268adbc3b5c2'
- '8662fb124870b1dd7effe4ff5e2a2e3d')
-sha1sums=('5afcc28c5cf2bdaab99d951960f6587797e1e5a0'
- '121a8358d7919b2e51067412373f52848290338a'
- '920bf27e6e3523dfe4cc9c802ff713e9688a3f34')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p0 < ../xine-lib-1.1.1-configure-no-mcpu-march.patch
- patch -p0 < ../xine-lib-1.1.19-xvmc.patch
- sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \
- configure.ac src/input/input_v4l.c src/video_out/video_out_syncfb.h
-
- libtoolize --force --copy
- aclocal -I m4
- autoconf
- automake --add-missing
-
- ./configure --prefix=/usr --with-wavpack --with-external-ffmpeg --with-external-libfaad
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch b/staging/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch
deleted file mode 100644
index 4b6ba9e35..000000000
--- a/staging/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- m4/optimizations.m4.orig 2005-11-27 01:20:08.000000000 +0100
-+++ m4/optimizations.m4 2005-11-27 01:22:56.000000000 +0100
-@@ -161,10 +161,6 @@
- ;;
-
- esac
-- if test x"$archopt_val" != x; then
-- CFLAGS="$sarchopt=$archopt_val $CFLAGS"
-- DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
-- fi
- fi
- else
- dnl we have the Intel compiler
diff --git a/staging/xine-lib/xine-lib-1.1.19-xvmc.patch b/staging/xine-lib/xine-lib-1.1.19-xvmc.patch
deleted file mode 100644
index bef8b0bac..000000000
--- a/staging/xine-lib/xine-lib-1.1.19-xvmc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Quoting ChangeLog of X11's videoproto package:
-vldXvMC.h: stop uselessly including XvMClib.h
-
---- src/video_out/xxmc.h
-+++ src/video_out/xxmc.h
-@@ -77,10 +77,10 @@
- #include <X11/extensions/XShm.h>
- #include <X11/extensions/Xv.h>
- #include <X11/extensions/Xvlib.h>
-+#include <X11/extensions/XvMClib.h>
- #ifdef HAVE_VLDXVMC
- #include <X11/extensions/vldXvMC.h>
- #else
-- #include <X11/extensions/XvMClib.h>
- #include <X11/extensions/XvMC.h>
- #endif
-
diff --git a/testing/bitlbee/PKGBUILD b/testing/bitlbee/PKGBUILD
deleted file mode 100644
index b42fb6f80..000000000
--- a/testing/bitlbee/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 138148 2011-09-17 19:45:43Z bisson $
-# Contributor: FUBAR <mrfubar@gmail.com>
-# Contributor: simo <simo@archlinux.org>
-# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=bitlbee
-pkgver=3.0.3
-pkgrel=4
-pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
-arch=('i686' 'x86_64')
-url='http://www.bitlbee.org/'
-license=('GPL')
-depends=('openssl' 'glib2' 'libotr')
-optdepends=('xinetd: to run bitlbee through xinetd')
-source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
- 'xinetd'
- 'rc.d')
-sha1sums=('4140eb7aaa2c6a39fa059d19f8fbaec0d7a1ebff'
- '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
- 'be09d29af3853825778331df451f16ca9e452d03')
-
-backup=('etc/bitlbee/bitlbee.conf' 'etc/bitlbee/motd.txt' 'etc/xinetd.d/bitlbee')
-install=install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr \
- --etcdir=/etc/bitlbee \
- --pidfile=/var/run/bitlbee/bitlbee.pid \
- --ipcsocket=/var/run/bitlbee/bitlbee.sock \
- --systemdsystemunitdir=/lib/systemd/system \
- --ssl=openssl \
- --strip=0 \
- --otr=1 \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- install -o65 -g65 -dm770 "${pkgdir}"/var/lib/bitlbee
- install -Dm644 "${srcdir}"/xinetd "${pkgdir}"/etc/xinetd.d/bitlbee
- install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/bitlbee
-
- make DESTDIR="${pkgdir}" install
- make DESTDIR="${pkgdir}" install-etc
- make DESTDIR="${pkgdir}" install-dev
-}
diff --git a/testing/bitlbee/install b/testing/bitlbee/install
deleted file mode 100644
index 0e1caa93f..000000000
--- a/testing/bitlbee/install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
- echo '==> Bitlbee can run through xinetd or as a daemon for now.'
- getent group bitlbee &>/dev/null || groupadd -r -g 65 bitlbee >/dev/null
- getent passwd bitlbee &>/dev/null || useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null
- getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null
-}
diff --git a/testing/bitlbee/rc.d b/testing/bitlbee/rc.d
deleted file mode 100644
index bd9248173..000000000
--- a/testing/bitlbee/rc.d
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=bitlbee
-PID=$(pidof -o %PPID /usr/sbin/bitlbee)
-install -o bitlbee -g bitlbee -d -m 755 /var/run/bitlbee
-
-case "$1" in
-start)
- stat_busy "Starting $name daemon"
- [[ -z "$PID" ]] && {
- rm -f /var/run/bitlbee/bitlbee.pid
- su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee
- } && {
- add_daemon $name
- stat_done
- } || { stat_fail; exit 1; }
- ;;
-stop)
- stat_busy "Stopping $name daemon"
- [[ -n "$PID" ]] && {
- kill $PID &>/dev/null
- } && {
- rm -f /var/run/bitlbee/bitlbee.pid
- rm_daemon $name
- stat_done
- } || { stat_fail; exit 1; }
- ;;
-restart)
- $0 stop
- sleep 3
- $0 start
- ;;
-*)
- echo "usage: $0 {start|stop|restart}"
- exit 1
- ;;
-esac
diff --git a/testing/bitlbee/xinetd b/testing/bitlbee/xinetd
deleted file mode 100644
index d671a8cfc..000000000
--- a/testing/bitlbee/xinetd
+++ /dev/null
@@ -1,12 +0,0 @@
-service bitlbee
-{
- type = UNLISTED
- socket_type = stream
- protocol = tcp
- wait = no
- user = bitlbee
- group = bitlbee
- server = /usr/sbin/bitlbee
- port = 6667
- disable = yes
-}
diff --git a/testing/coreutils/PKGBUILD b/testing/coreutils/PKGBUILD
deleted file mode 100644
index 62bb2d221..000000000
--- a/testing/coreutils/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id: PKGBUILD 137548 2011-09-09 09:49:34Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=coreutils
-pkgver=8.13
-pkgrel=1
-pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://www.gnu.org/software/coreutils"
-groups=('base')
-depends=('glibc' 'shadow' 'pam' 'acl' 'gmp' 'libcap')
-replaces=('mktemp')
-backup=('etc/pam.d/su')
-install=${pkgname}.install
-options=('!emptydirs')
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
- coreutils-uname.patch
- coreutils-pam.patch
- su.pam)
-md5sums=('8e1675c6c336ff55557c698706a63d6c'
- 'c4fcca138b6abf6d443d48a6f0cd8833'
- 'aad79a2aa6d566c375d7bdd1b0767278'
- 'fa85e5cce5d723275b14365ba71a8aad')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- # added su wheel group pam patch (from fedora git)
- patch -Np1 -i ${srcdir}/coreutils-pam.patch
-
- # linux specific uname improvement (from gentoo portage)
- patch -Np1 -i ${srcdir}/coreutils-uname.patch
-
- autoreconf -v
- ./configure --prefix=/usr \
- --enable-install-program=su \
- --enable-no-install-program=groups,hostname,kill,uptime \
- --enable-pam
- make
-}
-
-check() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make RUN_EXPENSIVE_TESTS=yes check
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- cd ${pkgdir}/usr/bin
- install -dm755 ${pkgdir}/{bin,usr/sbin}
-
- # binaries required by FHS
- _fhs="cat chgrp chmod chown cp date dd df echo false ln ls \
- mkdir mknod mv pwd rm rmdir stty su sync true uname"
- mv ${_fhs} ${pkgdir}/bin
-
- # binaries required by various Arch scripts
- _bin="cut dir dircolors du install mkfifo readlink shred \
- sleep touch tr vdir"
- mv ${_bin} ${pkgdir}/bin
- ln -sf /bin/sleep ${pkgdir}/usr/bin/sleep
-
- mv chroot ${pkgdir}/usr/sbin
- install -Dm644 ${srcdir}/su.pam ${pkgdir}/etc/pam.d/su
-}
diff --git a/testing/coreutils/coreutils-pam.patch b/testing/coreutils/coreutils-pam.patch
deleted file mode 100644
index e61908f3f..000000000
--- a/testing/coreutils/coreutils-pam.patch
+++ /dev/null
@@ -1,428 +0,0 @@
-diff -urNp coreutils-8.4-orig/configure.ac coreutils-8.4/configure.ac
---- coreutils-8.4-orig/configure.ac 2010-01-11 18:20:42.000000000 +0100
-+++ coreutils-8.4/configure.ac 2010-02-12 10:17:46.000000000 +0100
-@@ -126,6 +126,13 @@ if test "$gl_gcc_warnings" = yes; then
- AC_SUBST([GNULIB_WARN_CFLAGS])
- fi
-
-+dnl Give the chance to enable PAM
-+AC_ARG_ENABLE(pam, dnl
-+[ --enable-pam Enable use of the PAM libraries],
-+[AC_DEFINE(USE_PAM, 1, [Define if you want to use PAM])
-+LIB_PAM="-ldl -lpam -lpam_misc"
-+AC_SUBST(LIB_PAM)])
-+
- AC_FUNC_FORK
-
- optional_bin_progs=
-diff -urNp coreutils-8.4-orig/doc/coreutils.texi coreutils-8.4/doc/coreutils.texi
---- coreutils-8.4-orig/doc/coreutils.texi 2010-01-03 18:06:20.000000000 +0100
-+++ coreutils-8.4/doc/coreutils.texi 2010-02-12 10:17:46.000000000 +0100
-@@ -15081,8 +15081,11 @@ to certain shells, etc.).
- @findex syslog
- @command{su} can optionally be compiled to use @code{syslog} to report
- failed, and optionally successful, @command{su} attempts. (If the system
--supports @code{syslog}.) However, GNU @command{su} does not check if the
--user is a member of the @code{wheel} group; see below.
-+supports @code{syslog}.)
-+
-+This version of @command{su} has support for using PAM for
-+authentication. You can edit @file{/etc/pam.d/su} to customize its
-+behaviour.
-
- The program accepts the following options. Also see @ref{Common options}.
-
-@@ -15124,6 +15127,8 @@ environment variables except @env{TERM},
- @env{PATH} to a compiled-in default value. Change to @var{user}'s home
- directory. Prepend @samp{-} to the shell's name, intended to make it
- read its login startup file(s).
-+Additionaly @env{DISPLAY} and @env{XAUTHORITY} environment variables
-+are preserved as well for PAM functionality.
-
- @item -m
- @itemx -p
-@@ -15163,33 +15168,6 @@ Exit status:
- the exit status of the subshell otherwise
- @end display
-
--@cindex wheel group, not supported
--@cindex group wheel, not supported
--@cindex fascism
--@subsection Why GNU @command{su} does not support the @samp{wheel} group
--
--(This section is by Richard Stallman.)
--
--@cindex Twenex
--@cindex MIT AI lab
--Sometimes a few of the users try to hold total power over all the
--rest. For example, in 1984, a few users at the MIT AI lab decided to
--seize power by changing the operator password on the Twenex system and
--keeping it secret from everyone else. (I was able to thwart this coup
--and give power back to the users by patching the kernel, but I
--wouldn't know how to do that in Unix.)
--
--However, occasionally the rulers do tell someone. Under the usual
--@command{su} mechanism, once someone learns the root password who
--sympathizes with the ordinary users, he or she can tell the rest. The
--``wheel group'' feature would make this impossible, and thus cement the
--power of the rulers.
--
--I'm on the side of the masses, not that of the rulers. If you are
--used to supporting the bosses and sysadmins in whatever they do, you
--might find this idea strange at first.
--
--
- @node timeout invocation
- @section @command{timeout}: Run a command with a time limit
-
-diff -urNp coreutils-8.4-orig/src/Makefile.am coreutils-8.4/src/Makefile.am
---- coreutils-8.4-orig/src/Makefile.am 2010-01-03 18:06:20.000000000 +0100
-+++ coreutils-8.4/src/Makefile.am 2010-02-12 10:17:46.000000000 +0100
-@@ -361,7 +361,7 @@ factor_LDADD += $(LIB_GMP)
- uptime_LDADD += $(GETLOADAVG_LIBS)
-
- # for crypt
--su_LDADD += $(LIB_CRYPT)
-+su_LDADD += $(LIB_CRYPT) @LIB_PAM@
-
- # for various ACL functions
- copy_LDADD += $(LIB_ACL)
-diff -urNp coreutils-8.4-orig/src/su.c coreutils-8.4/src/su.c
---- coreutils-8.4-orig/src/su.c 2010-02-12 10:15:15.000000000 +0100
-+++ coreutils-8.4/src/su.c 2010-02-12 10:24:29.000000000 +0100
-@@ -37,6 +37,16 @@
- restricts who can su to UID 0 accounts. RMS considers that to
- be fascist.
-
-+#ifdef USE_PAM
-+
-+ Actually, with PAM, su has nothing to do with whether or not a
-+ wheel group is enforced by su. RMS tries to restrict your access
-+ to a su which implements the wheel group, but PAM considers that
-+ to be fascist, and gives the user/sysadmin the opportunity to
-+ enforce a wheel group by proper editing of /etc/pam.conf
-+
-+#endif
-+
- Compile-time options:
- -DSYSLOG_SUCCESS Log successful su's (by default, to root) with syslog.
- -DSYSLOG_FAILURE Log failed su's (by default, to root) with syslog.
-@@ -53,6 +63,15 @@
- #include <pwd.h>
- #include <grp.h>
-
-+#ifdef USE_PAM
-+# include <signal.h>
-+# include <sys/wait.h>
-+# include <sys/fsuid.h>
-+# include <unistd.h>
-+# include <security/pam_appl.h>
-+# include <security/pam_misc.h>
-+#endif /* USE_PAM */
-+
- #include "system.h"
- #include "getpass.h"
-
-@@ -120,10 +139,17 @@
- /* The user to become if none is specified. */
- #define DEFAULT_USER "root"
-
-+#ifndef USE_PAM
- char *crypt (char const *key, char const *salt);
-+#endif
-
--static void run_shell (char const *, char const *, char **, size_t)
-+static void run_shell (char const *, char const *, char **, size_t,
-+ const struct passwd *)
-+#ifdef USE_PAM
-+ ;
-+#else
- ATTRIBUTE_NORETURN;
-+#endif
-
- /* If true, pass the `-f' option to the subshell. */
- static bool fast_startup;
-@@ -209,7 +235,26 @@ log_su (struct passwd const *pw, bool su
- }
- #endif
-
-+#ifdef USE_PAM
-+static pam_handle_t *pamh = NULL;
-+static int retval;
-+static struct pam_conv conv = {
-+ misc_conv,
-+ NULL
-+};
-+
-+#define PAM_BAIL_P if (retval) { \
-+ pam_end(pamh, PAM_SUCCESS); \
-+ return 0; \
-+}
-+#define PAM_BAIL_P_VOID if (retval) { \
-+ pam_end(pamh, PAM_SUCCESS); \
-+return; \
-+}
-+#endif
-+
- /* Ask the user for a password.
-+ If PAM is in use, let PAM ask for the password if necessary.
- Return true if the user gives the correct password for entry PW,
- false if not. Return true without asking for a password if run by UID 0
- or if PW has an empty password. */
-@@ -217,6 +262,44 @@ log_su (struct passwd const *pw, bool su
- static bool
- correct_password (const struct passwd *pw)
- {
-+#ifdef USE_PAM
-+ struct passwd *caller;
-+ char *tty_name, *ttyn;
-+ retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh);
-+ PAM_BAIL_P;
-+
-+ if (getuid() != 0 && !isatty(0)) {
-+ fprintf(stderr, "standard in must be a tty\n");
-+ exit(1);
-+ }
-+
-+ caller = getpwuid(getuid());
-+ if(caller != NULL && caller->pw_name != NULL) {
-+ retval = pam_set_item(pamh, PAM_RUSER, caller->pw_name);
-+ PAM_BAIL_P;
-+ }
-+
-+ ttyn = ttyname(0);
-+ if (ttyn) {
-+ if (strncmp(ttyn, "/dev/", 5) == 0)
-+ tty_name = ttyn+5;
-+ else
-+ tty_name = ttyn;
-+ retval = pam_set_item(pamh, PAM_TTY, tty_name);
-+ PAM_BAIL_P;
-+ }
-+ retval = pam_authenticate(pamh, 0);
-+ PAM_BAIL_P;
-+ retval = pam_acct_mgmt(pamh, 0);
-+ if (retval == PAM_NEW_AUTHTOK_REQD) {
-+ /* password has expired. Offer option to change it. */
-+ retval = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK);
-+ PAM_BAIL_P;
-+ }
-+ PAM_BAIL_P;
-+ /* must be authenticated if this point was reached */
-+ return 1;
-+#else /* !USE_PAM */
- char *unencrypted, *encrypted, *correct;
- #if HAVE_GETSPNAM && HAVE_STRUCT_SPWD_SP_PWDP
- /* Shadow passwd stuff for SVR3 and maybe other systems. */
-@@ -241,6 +324,7 @@ correct_password (const struct passwd *p
- encrypted = crypt (unencrypted, correct);
- memset (unencrypted, 0, strlen (unencrypted));
- return STREQ (encrypted, correct);
-+#endif /* !USE_PAM */
- }
-
- /* Update `environ' for the new shell based on PW, with SHELL being
-@@ -254,12 +338,18 @@ modify_environment (const struct passwd
- /* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH.
- Unset all other environment variables. */
- char const *term = getenv ("TERM");
-+ char const *display = getenv ("DISPLAY");
-+ char const *xauthority = getenv ("XAUTHORITY");
- if (term)
- term = xstrdup (term);
- environ = xmalloc ((6 + !!term) * sizeof (char *));
- environ[0] = NULL;
- if (term)
- xsetenv ("TERM", term);
-+ if (display)
-+ xsetenv ("DISPLAY", display);
-+ if (xauthority)
-+ xsetenv ("XAUTHORITY", xauthority);
- xsetenv ("HOME", pw->pw_dir);
- xsetenv ("SHELL", shell);
- xsetenv ("USER", pw->pw_name);
-@@ -292,8 +382,13 @@ change_identity (const struct passwd *pw
- {
- #ifdef HAVE_INITGROUPS
- errno = 0;
-- if (initgroups (pw->pw_name, pw->pw_gid) == -1)
-+ if (initgroups (pw->pw_name, pw->pw_gid) == -1) {
-+#ifdef USE_PAM
-+ pam_close_session(pamh, 0);
-+ pam_end(pamh, PAM_ABORT);
-+#endif
- error (EXIT_CANCELED, errno, _("cannot set groups"));
-+ }
- endgrent ();
- #endif
- if (setgid (pw->pw_gid))
-@@ -302,6 +397,31 @@ change_identity (const struct passwd *pw
- error (EXIT_CANCELED, errno, _("cannot set user id"));
- }
-
-+#ifdef USE_PAM
-+static int caught=0;
-+/* Signal handler for parent process later */
-+static void su_catch_sig(int sig)
-+{
-+ ++caught;
-+}
-+
-+int
-+pam_copyenv (pam_handle_t *pamh)
-+{
-+ char **env;
-+
-+ env = pam_getenvlist(pamh);
-+ if(env) {
-+ while(*env) {
-+ if (putenv (*env))
-+ xalloc_die ();
-+ env++;
-+ }
-+ }
-+ return(0);
-+}
-+#endif
-+
- /* Run SHELL, or DEFAULT_SHELL if SHELL is empty.
- If COMMAND is nonzero, pass it to the shell with the -c option.
- Pass ADDITIONAL_ARGS to the shell as more arguments; there
-@@ -309,17 +429,49 @@ change_identity (const struct passwd *pw
-
- static void
- run_shell (char const *shell, char const *command, char **additional_args,
-- size_t n_additional_args)
-+ size_t n_additional_args, const struct passwd *pw)
- {
- size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1;
- char const **args = xnmalloc (n_args, sizeof *args);
- size_t argno = 1;
-+#ifdef USE_PAM
-+ int child;
-+ sigset_t ourset;
-+ int status;
-+
-+ retval = pam_open_session(pamh,0);
-+ if (retval != PAM_SUCCESS) {
-+ fprintf (stderr, "could not open session\n");
-+ exit (1);
-+ }
-+
-+/* do this at the last possible moment, because environment variables may
-+ be passed even in the session phase
-+*/
-+ if(pam_copyenv(pamh) != PAM_SUCCESS)
-+ fprintf (stderr, "error copying PAM environment\n");
-+
-+ /* Credentials should be set in the parent */
-+ if (pam_setcred(pamh, PAM_ESTABLISH_CRED) != PAM_SUCCESS) {
-+ pam_close_session(pamh, 0);
-+ fprintf(stderr, "could not set PAM credentials\n");
-+ exit(1);
-+ }
-+
-+ child = fork();
-+ if (child == 0) { /* child shell */
-+ change_identity (pw);
-+ pam_end(pamh, 0);
-+#endif
-
- if (simulate_login)
- {
- char *arg0;
- char *shell_basename;
-
-+ if(chdir(pw->pw_dir))
-+ error(0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
-+
- shell_basename = last_component (shell);
- arg0 = xmalloc (strlen (shell_basename) + 2);
- arg0[0] = '-';
-@@ -344,6 +496,67 @@ run_shell (char const *shell, char const
- error (0, errno, "%s", shell);
- exit (exit_status);
- }
-+#ifdef USE_PAM
-+ } else if (child == -1) {
-+ fprintf(stderr, "can not fork user shell: %s", strerror(errno));
-+ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT);
-+ pam_close_session(pamh, 0);
-+ pam_end(pamh, PAM_ABORT);
-+ exit(1);
-+ }
-+ /* parent only */
-+ sigfillset(&ourset);
-+ if (sigprocmask(SIG_BLOCK, &ourset, NULL)) {
-+ fprintf(stderr, "%s: signal malfunction\n", PROGRAM_NAME);
-+ caught = 1;
-+ }
-+ if (!caught) {
-+ struct sigaction action;
-+ action.sa_handler = su_catch_sig;
-+ sigemptyset(&action.sa_mask);
-+ action.sa_flags = 0;
-+ sigemptyset(&ourset);
-+ if (sigaddset(&ourset, SIGTERM)
-+ || sigaddset(&ourset, SIGALRM)
-+ || sigaction(SIGTERM, &action, NULL)
-+ || sigprocmask(SIG_UNBLOCK, &ourset, NULL)) {
-+ fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME);
-+ caught = 1;
-+ }
-+ }
-+ if (!caught) {
-+ do {
-+ int pid;
-+
-+ pid = waitpid(-1, &status, WUNTRACED);
-+
-+ if (((pid_t)-1 != pid) && (0 != WIFSTOPPED (status))) {
-+ kill(getpid(), WSTOPSIG(status));
-+ /* once we get here, we must have resumed */
-+ kill(pid, SIGCONT);
-+ }
-+ } while (0 != WIFSTOPPED(status));
-+ }
-+
-+ if (caught) {
-+ fprintf(stderr, "\nSession terminated, killing shell...");
-+ kill (child, SIGTERM);
-+ }
-+ /* Not checking retval on this because we need to call close session */
-+ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT);
-+ retval = pam_close_session(pamh, 0);
-+ PAM_BAIL_P_VOID;
-+ retval = pam_end(pamh, PAM_SUCCESS);
-+ PAM_BAIL_P_VOID;
-+ if (caught) {
-+ sleep(2);
-+ kill(child, SIGKILL);
-+ fprintf(stderr, " ...killed.\n");
-+ exit(-1);
-+ }
-+ exit ((0 != WIFEXITED (status)) ? WEXITSTATUS (status)
-+ : WTERMSIG (status) + 128);
-+#endif /* USE_PAM */
- }
-
- /* Return true if SHELL is a restricted shell (one not returned by
-@@ -511,9 +724,9 @@ main (int argc, char **argv)
- shell = xstrdup (shell ? shell : pw->pw_shell);
- modify_environment (pw, shell);
-
-+#ifndef USE_PAM
- change_identity (pw);
-- if (simulate_login && chdir (pw->pw_dir) != 0)
-- error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
-+#endif
-
- /* error() flushes stderr, but does not check for write failure.
- Normally, we would catch this via our atexit() hook of
-@@ -523,5 +736,5 @@ main (int argc, char **argv)
- if (ferror (stderr))
- exit (EXIT_CANCELED);
-
-- run_shell (shell, command, argv + optind, MAX (0, argc - optind));
-+ run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw);
- }
diff --git a/testing/coreutils/coreutils-uname.patch b/testing/coreutils/coreutils-uname.patch
deleted file mode 100644
index b458abeba..000000000
--- a/testing/coreutils/coreutils-uname.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-On linux platforms, grok /proc/cpuinfo for the CPU/vendor info.
-
-Prob not suitable for upstream seeing as how it's 100% linux-specific
-http://lists.gnu.org/archive/html/bug-coreutils/2005-09/msg00063.html
-
-Patch originally by Carlos E. Gorges <carlos@techlinux.com.br>, but
-heavily reworked to suck less.
-
-To add support for additional platforms, check out the show_cpuinfo()
-func in the linux/arch/<ARCH>/ source tree of the kernel.
-
---- coreutils/src/uname.c
-+++ coreutils/src/uname.c
-@@ -50,6 +50,11 @@
- # include <mach-o/arch.h>
- #endif
-
-+#if defined(__linux__)
-+# define USE_PROCINFO
-+# define UNAME_HARDWARE_PLATFORM
-+#endif
-+
- #include "system.h"
- #include "error.h"
- #include "quote.h"
-@@ -138,6 +143,117 @@
- exit (status);
- }
-
-+#if defined(USE_PROCINFO)
-+
-+# if defined(__s390__) || defined(__s390x__)
-+# define CPUINFO_FILE "/proc/sysinfo"
-+# define CPUINFO_FORMAT "%64[^\t :]%*[ :]%256[^\n]%c"
-+# else
-+# define CPUINFO_FILE "/proc/cpuinfo"
-+# define CPUINFO_FORMAT "%64[^\t:]\t:%256[^\n]%c"
-+# endif
-+
-+# define PROCINFO_PROCESSOR 0
-+# define PROCINFO_HARDWARE_PLATFORM 1
-+
-+static void __eat_cpuinfo_space(char *buf)
-+{
-+ /* first eat trailing space */
-+ char *tmp = buf + strlen(buf) - 1;
-+ while (tmp > buf && isspace(*tmp))
-+ *tmp-- = '\0';
-+ /* then eat leading space */
-+ tmp = buf;
-+ while (*tmp && isspace(*tmp))
-+ tmp++;
-+ if (tmp != buf)
-+ memmove(buf, tmp, strlen(tmp)+1);
-+ /* finally collapse whitespace */
-+ tmp = buf;
-+ while (tmp[0] && tmp[1]) {
-+ if (isspace(tmp[0]) && isspace(tmp[1])) {
-+ memmove(tmp, tmp+1, strlen(tmp));
-+ continue;
-+ }
-+ ++tmp;
-+ }
-+}
-+
-+static int __linux_procinfo(int x, char *fstr, size_t s)
-+{
-+ FILE *fp;
-+
-+ char *procinfo_keys[] = {
-+ /* --processor --hardware-platform */
-+ #if defined(__alpha__)
-+ "cpu model", "system type"
-+ #elif defined(__arm__)
-+ "Processor", "Hardware"
-+ #elif defined(__avr32__)
-+ "processor", "cpu family"
-+ #elif defined(__bfin__)
-+ "CPU", "BOARD Name"
-+ #elif defined(__cris__)
-+ "cpu", "cpu model"
-+ #elif defined(__frv__)
-+ "CPU-Core", "System"
-+ #elif defined(__i386__) || defined(__x86_64__)
-+ "model name", "vendor_id"
-+ #elif defined(__ia64__)
-+ "family", "vendor"
-+ #elif defined(__hppa__)
-+ "cpu", "model"
-+ #elif defined(__m68k__)
-+ "CPU", "MMU"
-+ #elif defined(__mips__)
-+ "cpu model", "system type"
-+ #elif defined(__powerpc__) || defined(__powerpc64__)
-+ "cpu", "machine"
-+ #elif defined(__s390__) || defined(__s390x__)
-+ "Type", "Manufacturer"
-+ #elif defined(__sh__)
-+ "cpu type", "machine"
-+ #elif defined(sparc) || defined(__sparc__)
-+ "type", "cpu"
-+ #elif defined(__vax__)
-+ "cpu type", "cpu"
-+ #else
-+ "unknown", "unknown"
-+ #endif
-+ };
-+
-+ if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) {
-+ char key[65], value[257], eol, *ret = NULL;
-+
-+ while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) {
-+ __eat_cpuinfo_space(key);
-+ if (!strcmp(key, procinfo_keys[x])) {
-+ __eat_cpuinfo_space(value);
-+ ret = value;
-+ break;
-+ }
-+ if (eol != '\n') {
-+ /* we need two fscanf's here in case the previous
-+ * length limit caused us to read right up to the
-+ * newline ... doing "%*[^\n]\n" wont eat the newline
-+ */
-+ fscanf(fp, "%*[^\n]");
-+ fscanf(fp, "\n");
-+ }
-+ }
-+ fclose(fp);
-+
-+ if (ret) {
-+ strncpy(fstr, ret, s);
-+ return 0;
-+ }
-+ }
-+
-+ return -1;
-+}
-+
-+#endif
-+
- /* Print ELEMENT, preceded by a space if something has already been
- printed. */
-
-@@ -250,10 +344,14 @@ main (int argc, char **argv)
- if (toprint & PRINT_PROCESSOR)
- {
- char const *element = unknown;
--#if HAVE_SYSINFO && defined SI_ARCHITECTURE
-+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO)
- {
- static char processor[257];
-+#if defined(USE_PROCINFO)
-+ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor))
-+#else
- if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
-+#endif
- element = processor;
- }
- #endif
-@@ -306,9 +404,13 @@ main (int argc, char **argv)
- if (element == unknown)
- {
- static char hardware_platform[257];
-+#if defined(USE_PROCINFO)
-+ if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform))
-+#else
- size_t s = sizeof hardware_platform;
- static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM };
- if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0)
-+#endif
- element = hardware_platform;
- }
- #endif
diff --git a/testing/coreutils/coreutils.install b/testing/coreutils/coreutils.install
deleted file mode 100644
index 8caae6686..000000000
--- a/testing/coreutils/coreutils.install
+++ /dev/null
@@ -1,21 +0,0 @@
-infodir=usr/share/info
-filelist=(coreutils.info)
-
-post_install() {
- [ -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
-}
-
-post_upgrade() {
- post_install $1
-}
-
-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/coreutils/su.pam b/testing/coreutils/su.pam
deleted file mode 100644
index cf15f40f1..000000000
--- a/testing/coreutils/su.pam
+++ /dev/null
@@ -1,9 +0,0 @@
-#%PAM-1.0
-auth sufficient pam_rootok.so
-# Uncomment the following line to implicitly trust users in the "wheel" group.
-#auth sufficient pam_wheel.so trust use_uid
-# Uncomment the following line to require a user to be in the "wheel" group.
-#auth required pam_wheel.so use_uid
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD
deleted file mode 100644
index fe72fa227..000000000
--- a/testing/curl/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 137981 2011-09-13 20:49:30Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=curl
-pkgver=7.22.0
-pkgrel=1
-pkgdesc="An URL retrival utility and library"
-arch=('i686' 'x86_64')
-url="http://curl.haxx.se"
-license=('MIT')
-depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2')
-options=('!libtool')
-source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
- curlbuild.h)
-md5sums=('e8c36126d21c893f085aca233906b5cc'
- '1b061c348b63ea3e90c3f2c3af6a08d6'
- '751bd433ede935c8fae727377625a8ae')
-
-
-case $(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') in
- 8) _curlbuild=curlbuild-64.h ;;
- 4) _curlbuild=curlbuild-32.h ;;
- *) error "unsupported architecture: %s" "$CARCH"
- exit 1
- ;;
-esac
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure \
- --with-random=/dev/urandom \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --disable-dependency-tracking \
- --enable-ipv6 \
- --disable-ldaps \
- --disable-ldap \
- --enable-manual \
- --enable-versioned-symbols \
- --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
- --without-libidn \
- --enable-threaded-resolver
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
- install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4"
- mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
- install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
-}
diff --git a/testing/curl/curlbuild.h b/testing/curl/curlbuild.h
deleted file mode 100644
index b48862696..000000000
--- a/testing/curl/curlbuild.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-#include "curlbuild-32.h"
-#elif __WORDSIZE == 64
-#include "curlbuild-64.h"
-#else
-#error "Unknown word size"
-#endif
diff --git a/testing/dvdauthor/PKGBUILD b/testing/dvdauthor/PKGBUILD
deleted file mode 100644
index 92c590709..000000000
--- a/testing/dvdauthor/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 137862 2011-09-12 05:31:16Z eric $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Travis Willard <travisw@wmpub.ca>
-# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
-# Contributor: Nicolai Lissner <nlissne@linux01.gwdg.de>
-
-pkgname=dvdauthor
-pkgver=0.7.0
-pkgrel=2
-pkgdesc="DVD authoring tools"
-arch=('i686' 'x86_64')
-url="http://dvdauthor.sourceforge.net/"
-license=('GPL')
-depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('33a447fb98ab3293ac40f869eedc17ff')
-
-build() {
- cd "${srcdir}/${pkgname}"
- ./configure --prefix=/usr \
- --sysconfdir=/etc
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/file/PKGBUILD b/testing/file/PKGBUILD
deleted file mode 100644
index 3cb418c0f..000000000
--- a/testing/file/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 138133 2011-09-17 03:21:49Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=file
-pkgver=5.09
-pkgrel=1
-pkgdesc="File type identification utility"
-arch=('i686' 'x86_64')
-license=('custom')
-groups=('base')
-url="http://www.darwinsys.com/file/"
-depends=('glibc' 'zlib')
-options=('!libtool')
-source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('6fd7cd6c4281e68fe9ec6644ce0fac6f')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i 's#\$(datadir)/misc#\$(datadir)#' configure
-
- ./configure --prefix=/usr --datadir=/usr/share/file
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR=${pkgdir} install
- install -dm755 ${pkgdir}/usr/share/misc
- ln -s ../file/magic.mgc ${pkgdir}/usr/share/misc
-
- install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-}
diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD
deleted file mode 100644
index ced42f275..000000000
--- a/testing/glibc/PKGBUILD
+++ /dev/null
@@ -1,207 +0,0 @@
-# $Id: PKGBUILD 137534 2011-09-08 21:30:58Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: valgrind requires rebuilt with each new glibc version
-
-pkgname=glibc
-pkgver=2.14
-pkgrel=6
-_glibcdate=20110908
-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.13-dlclose-search-reset.patch
- glibc-2.14-libdl-crash.patch
- glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
- glibc-2.14-reexport-rpc-interface.patch
- glibc-2.14-reinstall-nis-rpc-headers.patch
- nscd
- locale.gen.txt
- locale-gen)
-md5sums=('069069eb9100cc7affd7ad884cb3c3e9'
- '4dadb9203b69a3210d53514bb46f41c3'
- '0c5540efc51c0b93996c51b57a8540ae'
- '40cd342e21f71f5e49e32622b25acc52'
- 'a3ac6f318d680347bb6e2805d42b73b2'
- 'b042647ea7d6f22ad319e12e796bd13e'
- '7d0154b7e17ea218c9fa953599d24cc4'
- '22d09c58718fb3d1d31c3a6c14ca6886'
- 'cea62cc6b903d222c5f26e05a3c0e0e6'
- '13728807283f111e5d9d38cf38e0a461'
- '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
-
- # https://bugzilla.redhat.com/show_bug.cgi?id=593675
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=2f811bf8 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.13-dlclose-search-reset.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
-
- # 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-avoid-assertion-on-empty-dns-answer.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 \
- --disable-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-dlclose-search-reset.patch b/testing/glibc/glibc-2.13-dlclose-search-reset.patch
deleted file mode 100644
index 3ad8b418a..000000000
--- a/testing/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/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-avoid-assertion-on-empty-dns-answer.patch b/testing/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
deleted file mode 100644
index ef91116e5..000000000
--- a/testing/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/testing/glibc/glibc-2.14-libdl-crash.patch b/testing/glibc/glibc-2.14-libdl-crash.patch
deleted file mode 100644
index ee29f8c20..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-__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/gzip/PKGBUILD b/testing/gzip/PKGBUILD
deleted file mode 100644
index 03aedd315..000000000
--- a/testing/gzip/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 137500 2011-09-08 00:49:17Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=gzip
-pkgver=1.4
-pkgrel=3
-pkgdesc="GNU compression utility"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/gzip/"
-license=('GPL3')
-groups=('base')
-depends=('glibc' 'bash')
-makedepends=('patch')
-install=gzip.install
-source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.gz)
-md5sums=('e381b8506210c794278f5527cba0e765')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # By default Gzip uses assembly code. While this may preform better,
- # it is not position independent. The DEFS environment variable is
- # set to use only C code.
- export DEFS="NO_ASM"
- ./configure --prefix=/usr
- make
-}
-
-check() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make check
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make prefix=${pkgdir}/usr install
-
- install -dm755 ${pkgdir}/bin
- mv ${pkgdir}/usr/bin/{gunzip,gzip,uncompress,zcat} ${pkgdir}/bin/
- cd $pkgdir/bin
-}
diff --git a/testing/gzip/gzip.install b/testing/gzip/gzip.install
deleted file mode 100644
index 24c8b8fb9..000000000
--- a/testing/gzip/gzip.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gzip.info)
-
-post_install() {
- [ -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
-}
-
-post_upgrade() {
- post_install $1
-}
-
-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/imagemagick/PKGBUILD b/testing/imagemagick/PKGBUILD
deleted file mode 100644
index fa7a555ef..000000000
--- a/testing/imagemagick/PKGBUILD
+++ /dev/null
@@ -1,81 +0,0 @@
-# $Id: PKGBUILD 137864 2011-09-12 05:31:18Z eric $
-# Maintainer: Eric BĂ©langer <eric@archlinux.org>
-
-pkgbase=imagemagick
-pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.2.5
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.imagemagick.org/"
-license=('custom')
-depends=('libltdl' 'lcms2' 'libxt' 'bzip2' 'xz' 'fontconfig' 'libxext' 'libjpeg-turbo')
-makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng')
-source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
- perlmagick.rpath.patch)
-md5sums=('ce0294e6bc7ca3ece03a432518143a29'
- 'ff9974decbfe9846f8e347239d87e4eb')
-sha1sums=('0af2f0fb913f390b0b25bc4e57b344b0d54c3560'
- '23405f80904b1de94ebd7bd6fe2a332471b8c283')
-
-build() {
- cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-
- sed '/AC_PATH_XTRA/d' -i configure.ac
- autoreconf
- patch -Np0 -i ../perlmagick.rpath.patch
-
- LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" \
- ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
- --enable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
- --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
- --with-perl --with-perl-options="INSTALLDIRS=vendor" \
- --without-gvc --without-djvu --without-autotrace --without-webp \
- --without-jbig --without-fpx --without-dps --without-fftw --without-lqr
- make
-}
-
-package_imagemagick() {
- pkgdesc="An image viewing/manipulation program"
- optdepends=('ghostscript: for Ghostscript support'
- 'openexr: for OpenEXR support'
- 'libwmf: for WMF support'
- 'librsvg: for SVG support'
- 'libxml2: for XML support'
- 'jasper: for JPEG-2000 support'
- 'libpng: for PNG support')
- backup=('etc/ImageMagick/coder.xml'
- 'etc/ImageMagick/colors.xml'
- 'etc/ImageMagick/delegates.xml'
- 'etc/ImageMagick/log.xml'
- 'etc/ImageMagick/magic.xml'
- 'etc/ImageMagick/mime.xml'
- 'etc/ImageMagick/policy.xml'
- 'etc/ImageMagick/sRGB.icm'
- 'etc/ImageMagick/thresholds.xml'
- 'etc/ImageMagick/type.xml'
- 'etc/ImageMagick/type-dejavu.xml'
- 'etc/ImageMagick/type-ghostscript.xml'
- 'etc/ImageMagick/type-windows.xml')
- options=('!makeflags' '!docs' 'libtool')
-
- cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
- make DESTDIR="${pkgdir}" install
- chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so"
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
- install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
-
-#Cleaning
- find "${pkgdir}" -name '*.bs' -delete
- rm -f "${pkgdir}"/usr/lib/*.la
-}
-
-package_imagemagick-doc() {
- pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)"
- depends=()
- options=('!makeflags')
-
- cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
- make DESTDIR="${pkgdir}" install-data-html
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE"
- install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE"
-}
diff --git a/testing/imagemagick/perlmagick.rpath.patch b/testing/imagemagick/perlmagick.rpath.patch
deleted file mode 100644
index 958c0f2ee..000000000
--- a/testing/imagemagick/perlmagick.rpath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig 2009-05-26 16:22:11.000000000 -0300
-+++ Makefile.in 2009-05-26 16:23:27.000000000 -0300
-@@ -10067,6 +10067,7 @@
-
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
-+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile
-
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install
diff --git a/testing/inkscape/PKGBUILD b/testing/inkscape/PKGBUILD
deleted file mode 100644
index fa56d8d80..000000000
--- a/testing/inkscape/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 137866 2011-09-12 05:31:21Z eric $
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=inkscape
-pkgver=0.48.2
-pkgrel=2
-pkgdesc='Vector graphics editor using the SVG file format'
-url='http://inkscape.sourceforge.net/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-makedepends=('boost' 'pkg-config' 'intltool')
-depends=('gc' 'gtkmm' 'poppler-glib' 'pyxml' 'libxslt' 'gsl' 'popt' 'python2'
- 'gtkspell' 'imagemagick' 'desktop-file-utils' 'hicolor-icon-theme')
-optdepends=('pstoedit: latex formulas'
- 'texlive-core: latex formulas'
- 'python2-numpy: some extensions'
- 'python-lxml: some extensions and filters'
- 'uniconvertor: reading/writing to some proprietary formats')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3')
-
-install=install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
- sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py
- sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp
- sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
- sed -i 's|"python"|"python2"|g' src/main.cpp
-
- ./configure --prefix=/usr \
- --with-python \
- --with-perl \
- --without-gnome-vfs \
- --with-xft \
- --enable-lcms \
- --enable-poppler-cairo \
- --disable-dependency-tracking \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/inkscape/install b/testing/inkscape/install
deleted file mode 100644
index 6e803bf1d..000000000
--- a/testing/inkscape/install
+++ /dev/null
@@ -1,13 +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/testing/iptables/PKGBUILD b/testing/iptables/PKGBUILD
deleted file mode 100644
index d856612e3..000000000
--- a/testing/iptables/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id: PKGBUILD 136877 2011-09-02 16:01:49Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Thomas Baechler <thomas@archlinux.org>
-
-pkgname=iptables
-pkgver=1.4.12.1
-pkgrel=1
-pkgdesc="A Linux kernel packet control tool"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.netfilter.org/projects/iptables/index.html"
-depends=('glibc' 'bash')
-makedepends=('linux-api-headers')
-options=('!libtool')
-source=(http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2
- iptables
- ip6tables
- empty.rules
- simple_firewall.rules
- iptables.conf.d
- empty-filter.rules
- empty-mangle.rules
- empty-nat.rules
- empty-raw.rules
- empty-security.rules)
-backup=(etc/conf.d/iptables)
-sha1sums=('86022c3b5129ad7105f5087ec1349e99cc5a9728'
- '5bb6fa526665cdd728c26f0f282f5a51f220cf88'
- '2db68906b603e5268736f48c8e251f3a49da1d75'
- '83b3363878e3660ce23b2ad325b53cbd6c796ecf'
- '9907f9e815592837abc7fa3264a401567b7606ab'
- 'cdb830137192bbe002c6d01058656bd053ed0ddd'
- 'd9f9f06b46b4187648e860afa0552335aafe3ce4'
- 'c45b738b5ec4cfb11611b984c21a83b91a2d58f3'
- '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6'
- '7db53bb882f62f6c677cc8559cff83d8bae2ef73'
- 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e')
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # http://bugs.archlinux.org/task/17046
- sed -i '87 i libxt_RATEEST.so: libxt_RATEEST.oo' extensions/GNUmakefile.in
- sed -i '88 i \\t${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -lm -shared ${LDFLAGS} -o $@ $<;\n' extensions/GNUmakefile.in
-
- # FS#25358: libxt_statistic.so undefined symbol: lround
- export LDFLAGS="-lm"
-
- ./configure --prefix=/usr \
- --libexecdir=/usr/lib/iptables --sysconfdir=/etc \
- --with-xtlibdir=/usr/lib/iptables \
- --enable-devel --enable-libipq
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- cd "${srcdir}"
- install -D -m755 iptables "${pkgdir}"/etc/rc.d/iptables
- install -D -m755 ip6tables "${pkgdir}"/etc/rc.d/ip6tables
- install -D -m644 empty.rules "${pkgdir}"/etc/iptables/empty.rules
- install -D -m644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules
- install -D -m644 iptables.conf.d "${pkgdir}"/etc/conf.d/iptables
-
- mkdir -p "${pkgdir}/var/lib/iptables"
- install -m644 empty-{filter,mangle,nat,raw,security}.rules ${pkgdir}/var/lib/iptables/
-}
diff --git a/testing/iptables/empty-filter.rules b/testing/iptables/empty-filter.rules
deleted file mode 100644
index 5a4de4876..000000000
--- a/testing/iptables/empty-filter.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-# Empty iptables filter table rule file
-*filter
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/empty-mangle.rules b/testing/iptables/empty-mangle.rules
deleted file mode 100644
index 49d493c4d..000000000
--- a/testing/iptables/empty-mangle.rules
+++ /dev/null
@@ -1,8 +0,0 @@
-# Empty iptables mangle table rules file
-*mangle
-:PREROUTING ACCEPT [0:0]
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-:POSTROUTING ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/empty-nat.rules b/testing/iptables/empty-nat.rules
deleted file mode 100644
index 437e96411..000000000
--- a/testing/iptables/empty-nat.rules
+++ /dev/null
@@ -1,7 +0,0 @@
-# Empty iptables nat table rules file
-*nat
-:PREROUTING ACCEPT [0:0]
-:INPUT ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-:POSTROUTING ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/empty-raw.rules b/testing/iptables/empty-raw.rules
deleted file mode 100644
index 8dc50d23e..000000000
--- a/testing/iptables/empty-raw.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-# Empty iptables raw table rules file
-*raw
-:PREROUTING ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/empty-security.rules b/testing/iptables/empty-security.rules
deleted file mode 100644
index 4531fa13f..000000000
--- a/testing/iptables/empty-security.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-# Empty iptables security table rules file
-*security
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/empty.rules b/testing/iptables/empty.rules
deleted file mode 100644
index e24e1aa30..000000000
--- a/testing/iptables/empty.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-# Empty iptables rule file
-*filter
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/ip6tables b/testing/iptables/ip6tables
deleted file mode 100755
index 2d119e3ed..000000000
--- a/testing/iptables/ip6tables
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables
-
-# Set defaults if settings are missing
-[ -z "$IP6TABLES_CONF" ] && IP6TABLES_CONF=/etc/iptables/ip6tables.rules
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- if [ ! -f "$IP6TABLES_CONF" ]; then
- echo "Cannot load ip6tables rules: $IP6TABLES_CONF is missing!" >&2
- exit 1
- fi
- stat_busy "Starting IP6 Tables"
- if [ "$IPTABLES_FORWARD" = "1" ]; then
- echo 1 >/proc/sys/net/ipv6/conf/default/forwarding
- echo 1 >/proc/sys/net/ipv6/conf/all/forwarding
- fi
- if ck_daemon ip6tables; then
- /usr/sbin/ip6tables-restore < $IP6TABLES_CONF
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon ip6tables
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- stop)
- stat_busy "Stopping IP6 Tables"
- if ! ck_daemon ip6tables; then
- fail=0
- for table in $(cat /proc/net/ip6_tables_names); do
- ip6tables-restore < /var/lib/iptables/empty-$table.rules
- [ $? -gt 0 ] && fail=1
- done
- if [ $fail -gt 0 ]; then
- stat_fail
- else
- rm_daemon ip6tables
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- save)
- stat_busy "Saving IP6 Tables"
- /usr/sbin/ip6tables-save >$IP6TABLES_CONF
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
- ;;
- *)
- echo "usage: $0 {start|stop|restart|save}"
-esac
-exit 0
diff --git a/testing/iptables/iptables b/testing/iptables/iptables
deleted file mode 100755
index fbb02face..000000000
--- a/testing/iptables/iptables
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables
-
-# Set defaults if settings are missing
-[ -z "$IPTABLES_CONF" ] && IPTABLES_CONF=/etc/iptables/iptables.rules
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- if [ ! -f "$IPTABLES_CONF" ]; then
- echo "Cannot load iptables rules: $IPTABLES_CONF is missing!" >&2
- exit 1
- fi
- stat_busy "Starting IP Tables"
- if [ "$IPTABLES_FORWARD" = "1" ]; then
- echo 1 >/proc/sys/net/ipv4/ip_forward
- fi
- if ck_daemon iptables; then
- /usr/sbin/iptables-restore < $IPTABLES_CONF
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon iptables
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- stop)
- stat_busy "Stopping IP Tables"
- if ! ck_daemon iptables; then
- fail=0
- for table in $(cat /proc/net/ip_tables_names); do
- iptables-restore < /var/lib/iptables/empty-$table.rules
- [ $? -gt 0 ] && fail=1
- done
- if [ $fail -gt 0 ]; then
- stat_fail
- else
- rm_daemon iptables
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- save)
- stat_busy "Saving IP Tables"
- /usr/sbin/iptables-save >$IPTABLES_CONF
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
- ;;
- *)
- echo "usage: $0 {start|stop|restart|save}"
-esac
-exit 0
diff --git a/testing/iptables/iptables.conf.d b/testing/iptables/iptables.conf.d
deleted file mode 100644
index 1c6cc7b5d..000000000
--- a/testing/iptables/iptables.conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-# Configuration for iptables rules
-IPTABLES_CONF=/etc/iptables/iptables.rules
-IP6TABLES_CONF=/etc/iptables/ip6tables.rules
-
-# Enable IP forwarding (both IPv4 and IPv6)
-# NOTE: this is not the recommended way to do this, and is supported only for
-# backward compatibility. Instead, use /etc/sysctl.conf and set the following
-# options:
-# * net.ipv4.ip_forward=1
-# * net.ipv6.conf.default.forwarding=1
-# * net.ipv6.conf.all.forwarding=1
-#IPTABLES_FORWARD=0
diff --git a/testing/iptables/simple_firewall.rules b/testing/iptables/simple_firewall.rules
deleted file mode 100644
index e1604cc36..000000000
--- a/testing/iptables/simple_firewall.rules
+++ /dev/null
@@ -1,11 +0,0 @@
-*filter
-:INPUT DROP [0:0]
-:FORWARD DROP [0:0]
-:OUTPUT ACCEPT [0:0]
--A INPUT -p icmp -j ACCEPT
--A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT
--A INPUT -i lo -j ACCEPT
--A INPUT -p tcp -j REJECT --reject-with tcp-reset
--A INPUT -p udp -j REJECT --reject-with icmp-port-unreachable
--A INPUT -j REJECT --reject-with icmp-proto-unreachable
-COMMIT
diff --git a/testing/libnl/PKGBUILD b/testing/libnl/PKGBUILD
deleted file mode 100644
index aad1e29fe..000000000
--- a/testing/libnl/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 137671 2011-09-10 11:33:31Z pierre $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=libnl
-pkgver=1.1
-pkgrel=3
-pkgdesc="Library for applications dealing with netlink sockets"
-arch=('i686' 'x86_64')
-url="http://www.infradead.org/~tgr/libnl/"
-license=('GPL')
-depends=('glibc')
-source=("http://www.infradead.org/~tgr/libnl/files/${pkgname}-${pkgver}.tar.gz"
- 'fix-compilation.patch')
-md5sums=('ae970ccd9144e132b68664f98e7ceeb1'
- 'e1f5e82c8aa1b3ad025c7b588178de1e')
-
-build() {
- cd ${srcdir}/libnl-${pkgver}
- patch -Np1 -i ${srcdir}/fix-compilation.patch
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd ${srcdir}/libnl-${pkgver}
- make DESTDIR=${pkgdir} install
-}
diff --git a/testing/libnl/fix-compilation.patch b/testing/libnl/fix-compilation.patch
deleted file mode 100644
index 891562a39..000000000
--- a/testing/libnl/fix-compilation.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libnl-1.1.orig/include/netlink-local.h 2008-01-14 16:48:45.000000000 +0100
-+++ libnl-1.1/include/netlink-local.h 2009-06-26 11:15:33.186011844 +0200
-@@ -26,6 +26,7 @@
- #include <sys/socket.h>
- #include <inttypes.h>
- #include <assert.h>
-+#include <limits.h>
-
- #include <arpa/inet.h>
- #include <netdb.h>
diff --git a/testing/libtool/PKGBUILD b/testing/libtool/PKGBUILD
deleted file mode 100644
index 80148151a..000000000
--- a/testing/libtool/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 137506 2011-09-08 07:11:50Z 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
-pkgrel=5
-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)
-md5sums=('4e6144439d95d7332dc50ace6dd24c55')
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-check() {
- cd ${srcdir}/${pkgbase}-${pkgver}
- make check
-}
-
-package_libtool() {
- depends=('sh' "libltdl=$pkgver" 'gcc=4.6.1')
- 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/make/PKGBUILD b/testing/make/PKGBUILD
deleted file mode 100644
index 36afda4cd..000000000
--- a/testing/make/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 137949 2011-09-13 03:04:32Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=make
-pkgver=3.82
-pkgrel=4
-pkgdesc="GNU make utility to maintain groups of programs"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/make"
-license=('GPL3')
-groups=('base-devel')
-depends=('glibc' 'sh')
-install=$pkgname.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2
- bug30612.patch
- bug30723.patch
- make-3.82-sort-blank.patch
- make-3.82-makeflags.patch)
-md5sums=('1a11100f3c63fcf5753818e59d63088f'
- 'c8f496b22191f9fb9420ab14c1a19a47'
- '662e6450e19a5acdaa5c9fcb8ad78dea'
- '7d01a99f389d8f08dec93ed479071ee4'
- 'bc12ad4d0c6e6c0e72d9fb61054f446b')
-
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- # http://savannah.gnu.org/bugs/?30612
- patch -Np1 -i $srcdir/bug30612.patch
-
- # http://savannah.gnu.org/bugs/?30723
- patch -Np1 -i $srcdir/bug30723.patch
-
- # https://bugs.archlinux.org/task/22733 (fix from Fedora)
- patch -Np1 -i $srcdir/make-3.82-sort-blank.patch
-
- # https://savannah.gnu.org/support/index.php?107487
- # https://savannah.gnu.org/bugs/?33873
- patch -Np0 -i $srcdir/make-3.82-makeflags.patch
-
- ./configure --prefix=/usr
- make
-}
-
-check() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make check
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-}
diff --git a/testing/make/bug30612.patch b/testing/make/bug30612.patch
deleted file mode 100644
index fb843bcd9..000000000
--- a/testing/make/bug30612.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c
---- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000
-+++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000
-@@ -1,3 +1,4 @@
-+
- /* Argument parsing and main program of GNU Make.
- Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
- 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-@@ -1138,7 +1139,7 @@
- a macro and some compilers (MSVC) don't like conditionals in macros. */
- {
- const char *features = "target-specific order-only second-expansion"
-- " else-if shortest-stem undefine"
-+ " else-if shortest-stem undefine oneshell"
- #ifndef NO_ARCHIVES
- " archives"
- #endif
-diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c
---- make-3.82-orig/read.c 2010-07-13 11:20:42.000000000 +1000
-+++ make-3.82-fix30612//read.c 2010-09-23 23:30:58.018855839 +1000
-@@ -3028,7 +3028,7 @@
- {
- /* This looks like the first element in an open archive group.
- A valid group MUST have ')' as the last character. */
-- const char *e = p + nlen;
-+ const char *e = p;
- do
- {
- e = next_token (e);
-@@ -3084,19 +3084,19 @@
- Go to the next item in the string. */
- if (flags & PARSEFS_NOGLOB)
- {
-- NEWELT (concat (2, prefix, tp));
-+ NEWELT (concat (2, prefix, tmpbuf));
- continue;
- }
-
- /* If we get here we know we're doing glob expansion.
- TP is a string in tmpbuf. NLEN is no longer used.
- We may need to do more work: after this NAME will be set. */
-- name = tp;
-+ name = tmpbuf;
-
- /* Expand tilde if applicable. */
-- if (tp[0] == '~')
-+ if (tmpbuf[0] == '~')
- {
-- tildep = tilde_expand (tp);
-+ tildep = tilde_expand (tmpbuf);
- if (tildep != 0)
- name = tildep;
- }
-@@ -3152,7 +3152,11 @@
- else
- {
- /* We got a chain of items. Attach them. */
-- (*newp)->next = found;
-+ if (*newp)
-+ (*newp)->next = found;
-+ else
-+ *newp = found;
-+
-
- /* Find and set the new end. Massage names if necessary. */
- while (1)
diff --git a/testing/make/bug30723.patch b/testing/make/bug30723.patch
deleted file mode 100644
index 84e7ebe7a..000000000
--- a/testing/make/bug30723.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur make-3.82-orig/main.c make-3.82-fix30723//main.c
---- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000
-+++ make-3.82-fix30723//main.c 2010-09-23 23:34:10.932188592 +1000
-@@ -2093,7 +2093,7 @@
- const char *pv = define_makeflags (1, 1);
- char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
- sprintf (p, "MAKEFLAGS=%s", pv);
-- putenv (p);
-+ putenv (allocated_variable_expand (p));
- }
-
- if (ISDB (DB_BASIC))
diff --git a/testing/make/make-3.82-makeflags.patch b/testing/make/make-3.82-makeflags.patch
deleted file mode 100644
index 3cba3c402..000000000
--- a/testing/make/make-3.82-makeflags.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: main.c
-===================================================================
-RCS file: /sources/make/make/main.c,v
-retrieving revision 1.246
-diff -u -r1.246 main.c
---- main.c 29 Aug 2010 23:05:27 -0000 1.246
-+++ main.c 27 Jul 2011 22:03:12 -0000
-@@ -2091,10 +2095,16 @@
-
- /* Reset makeflags in case they were changed. */
- {
-+ if (master_job_slots)
-+ {
-+ assert (job_slots == default_job_slots);
-+ job_slots = master_job_slots;
-+ }
- const char *pv = define_makeflags (1, 1);
- char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
- sprintf (p, "MAKEFLAGS=%s", pv);
- putenv (allocated_variable_expand (p));
-+ job_slots = default_job_slots;
- }
-
- if (ISDB (DB_BASIC))
-@@ -2825,9 +2852,11 @@
- && (*(unsigned int *) cs->value_ptr ==
- *(unsigned int *) cs->noarg_value))
- ADD_FLAG ("", 0); /* Optional value omitted; see below. */
-+#if 0
- else if (cs->c == 'j')
- /* Special case for `-j'. */
- ADD_FLAG ("1", 1);
-+#endif
- else
- {
- char *buf = alloca (30);
diff --git a/testing/make/make-3.82-sort-blank.patch b/testing/make/make-3.82-sort-blank.patch
deleted file mode 100644
index 2e73f5b7c..000000000
--- a/testing/make/make-3.82-sort-blank.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urp make-3.82/function.c make-3.82-pm/function.c
---- make-3.82/function.c 2010-07-13 03:20:39.000000000 +0200
-+++ make-3.82-pm/function.c 2010-10-27 01:43:27.000000000 +0200
-@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c
- {
- char c = *(t++);
-
-- if (! isspace ((unsigned char)c))
-+ if (! isblank ((unsigned char)c))
- continue;
-
- ++wordi;
-
-- while (isspace ((unsigned char)*t))
-+ while (isblank ((unsigned char)*t))
- ++t;
- }
diff --git a/testing/make/make.install b/testing/make/make.install
deleted file mode 100644
index 6cf8b0dc4..000000000
--- a/testing/make/make.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(make.info make.info-1 make.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/mdadm/PKGBUILD b/testing/mdadm/PKGBUILD
deleted file mode 100644
index 755373823..000000000
--- a/testing/mdadm/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 138013 2011-09-14 09:45:11Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-pkgname=mdadm
-pkgver=3.2.2
-pkgrel=4
-pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.cse.unsw.edu.au/~neilb/source/mdadm/"
-groups=('base')
-conflicts=('mkinitcpio<0.7')
-depends=('glibc')
-backup=('etc/mdadm.conf')
-source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
- mdadm
- mdadm.conf
- mdadm_install
- mdadm_hook
- mdadm_udev_install
- disable-werror.patch
- linux-3.0.patch)
-install=mdadm.install
-replaces=('raidtools')
-md5sums=('12ee2fbf3beddb60601fb7a4c4905651'
- '6df172c8f77b280018cf87eb3d313f29'
- '00cbed931db4f15b6ce49e3e7d433966'
- '9b01e96b6c3c218fb61628c9281fe688'
- 'c8c0713f5c7da51822ee6f3911473a1c'
- 'cd258e1bf430c02a25f40b4329df9f57'
- '4ad87b74a4bc9a34621280abe0e0c3e4'
- 'c499b3edbf2c400c8a1984e18c7ce7fa')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- patch -Np0 -i ../disable-werror.patch
- patch -Np1 -i ../linux-3.0.patch
- make CXFLAGS="$CFLAGS"
- # build static mdassemble for Arch's initramfs
- make MDASSEMBLE_AUTO=1 mdassemble
-
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make INSTALL=/bin/install DESTDIR=$pkgdir install
- install -D -m755 mdassemble $pkgdir/sbin/mdassemble
- install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf
- install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm
- install -D -m644 ../mdadm_install $pkgdir/lib/initcpio/install/mdadm
- install -D -m644 ../mdadm_hook $pkgdir/lib/initcpio/hooks/mdadm
- install -D -m644 ../mdadm_udev_install $pkgdir/lib/initcpio/install/mdadm_udev
- # symlink for backward compatibility
- ln -sf /lib/initcpio/hooks/mdadm $pkgdir/lib/initcpio/hooks/raid
-}
diff --git a/testing/mdadm/disable-werror.patch b/testing/mdadm/disable-werror.patch
deleted file mode 100644
index 50a33f19d..000000000
--- a/testing/mdadm/disable-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.old 2011-06-17 09:38:03.269238332 +0200
-+++ Makefile 2011-06-17 09:38:14.122398837 +0200
-@@ -42,7 +42,7 @@
-
- CC = $(CROSS_COMPILE)gcc
- CXFLAGS = -ggdb
--CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
-+CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter
- ifdef WARN_UNUSED
- CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O
- endif
diff --git a/testing/mdadm/linux-3.0.patch b/testing/mdadm/linux-3.0.patch
deleted file mode 100644
index cd9d5473c..000000000
--- a/testing/mdadm/linux-3.0.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From f161d047eed634b3380262767f955eb888502e88 Mon Sep 17 00:00:00 2001
-From: NeilBrown <neilb@suse.de>
-Date: Fri, 17 Jun 2011 22:49:24 +1000
-Subject: [PATCH 1/1] util: correctly parse shorter linux version numbers.
-
-The next version of Linux might be 3.0. If it is, get_linux_version
-will fail.
-So make it more robust.
-
-Reported-by: Namhyung Kim <namhyung@gmail.com>
-Reported-by: Milan Broz <mbroz@redhat.com>
-Signed-off-by: NeilBrown <neilb@suse.de>
----
- util.c | 10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/util.c b/util.c
-index 10bbe56..55d171a 100644
---- a/util.c
-+++ b/util.c
-@@ -146,16 +146,16 @@ int get_linux_version()
- {
- struct utsname name;
- char *cp;
-- int a,b,c;
-+ int a = 0, b = 0,c = 0;
- if (uname(&name) <0)
- return -1;
-
- cp = name.release;
- a = strtoul(cp, &cp, 10);
-- if (*cp != '.') return -1;
-- b = strtoul(cp+1, &cp, 10);
-- if (*cp != '.') return -1;
-- c = strtoul(cp+1, NULL, 10);
-+ if (*cp == '.')
-+ b = strtoul(cp+1, &cp, 10);
-+ if (*cp == '.')
-+ c = strtoul(cp+1, &cp, 10);
-
- return (a*1000000)+(b*1000)+c;
- }
---
-1.7.2.3
-
diff --git a/testing/mdadm/mdadm b/testing/mdadm/mdadm
deleted file mode 100755
index e196f3642..000000000
--- a/testing/mdadm/mdadm
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /sbin/mdadm`
-case "$1" in
- start)
- stat_busy "Starting mdadm RAID Monitor"
- if [ -z "$PID" ]; then
- /sbin/mdadm --monitor --scan -i /var/run/mdadm.pid -f
- fi
- if [ ! -z "$PID" -o $? -gt 0 ]; then
- stat_fail
- else
- add_daemon mdadm
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping mdadm RAID Monitor"
- [ ! -z "$PID" ] && kill $PID &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon mdadm
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/testing/mdadm/mdadm.conf b/testing/mdadm/mdadm.conf
deleted file mode 100644
index 57bd4c683..000000000
--- a/testing/mdadm/mdadm.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-# mdadm configuration file
-#
-# mdadm will function properly without the use of a configuration file,
-# but this file is useful for keeping track of arrays and member disks.
-# In general, a mdadm.conf file is created, and updated, after arrays
-# are created. This is the opposite behavior of /etc/raidtab which is
-# created prior to array construction.
-#
-#
-# the config file takes two types of lines:
-#
-# DEVICE lines specify a list of devices of where to look for
-# potential member disks
-#
-# ARRAY lines specify information about how to identify arrays so
-# so that they can be activated
-#
-
-
-# You can have more than one device line and use wild cards. The first
-# example includes SCSI the first partition of SCSI disks /dev/sdb,
-# /dev/sdc, /dev/sdd, /dev/sdj, /dev/sdk, and /dev/sdl. The second
-# line looks for array slices on IDE disks.
-#
-#DEVICE /dev/sd[bcdjkl]1
-#DEVICE /dev/hda1 /dev/hdb1
-#
-# The designation "partitions" will scan all partitions found in
-# /proc/partitions
-DEVICE partitions
-
-
-# ARRAY lines specify an array to assemble and a method of identification.
-# Arrays can currently be identified by using a UUID, superblock minor number,
-# or a listing of devices.
-#
-# super-minor is usually the minor number of the metadevice
-# UUID is the Universally Unique Identifier for the array
-# Each can be obtained using
-#
-# mdadm -D <md>
-#
-# To capture the UUIDs for all your RAID arrays to this file, run these:
-# to get a list of running arrays:
-# # mdadm -D --scan >>/etc/mdadm.conf
-# to get a list from superblocks:
-# # mdadm -E --scan >>/etc/mdadm.conf
-#
-#ARRAY /dev/md0 UUID=3aaa0122:29827cfa:5331ad66:ca767371
-#ARRAY /dev/md1 super-minor=1
-#ARRAY /dev/md2 devices=/dev/hda1,/dev/hdb1
-#
-# ARRAY lines can also specify a "spare-group" for each array. mdadm --monitor
-# will then move a spare between arrays in a spare-group if one array has a
-# failed drive but no spare
-#ARRAY /dev/md4 uuid=b23f3c6d:aec43a9f:fd65db85:369432df spare-group=group1
-#ARRAY /dev/md5 uuid=19464854:03f71b1b:e0df2edd:246cc977 spare-group=group1
-#
-
-
-# When used in --follow (aka --monitor) mode, mdadm needs a
-# mail address and/or a program. To start mdadm's monitor mode, add
-# "mdadm" to your DAEMONS array in /etc/rc.conf
-#
-# If the lines are not found, mdadm will exit quietly
-#MAILADDR root@mydomain.tld
-#PROGRAM /usr/sbin/handle-mdadm-events
diff --git a/testing/mdadm/mdadm.install b/testing/mdadm/mdadm.install
deleted file mode 100644
index e8404c260..000000000
--- a/testing/mdadm/mdadm.install
+++ /dev/null
@@ -1,10 +0,0 @@
-# arg 1: the new package version
-# arg 2: the old package version
-
-post_upgrade() {
- if [ "$(vercmp $2 2.6.8-2)" -lt 0 -a "$(grep raid_partitions /etc/mkinitcpio.conf)" ]; then
- echo "Attention mdadm update:"
- echo "raid_partitions hook has been replaced by the more powerfull mdadm hook."
- echo "Please update your /etc/mkinitcpio.conf accordingly."
- fi
-}
diff --git a/testing/mdadm/mdadm_hook b/testing/mdadm/mdadm_hook
deleted file mode 100755
index 7b2dc1ad1..000000000
--- a/testing/mdadm/mdadm_hook
+++ /dev/null
@@ -1,44 +0,0 @@
-# vim: set ft=sh:
-run_hook ()
-{
- input="$(cat /proc/cmdline)"
- mdconfig="/etc/mdadm.conf"
- # for partitionable raid, we need to load md_mod first!
- modprobe md_mod 2>/dev/null
- # If md is specified on commandline, create config file from those parameters.
- if [ "$(echo $input | grep "md=")" ]; then
- #Create initial mdadm.conf
- # scan all devices in /proc/partitions
- echo DEVICE partitions > $mdconfig
- for i in $input; do
- case $i in
- # raid
- md=[0-9]*,/*)
- device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=||g')"
- array="$(echo $i | cut -d, -f2-)"
- echo "ARRAY /dev/$device devices=$array" >> $mdconfig
- ;;
- # partitionable raid
- md=d[0-9]*,/*)
- device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=|_|g')"
- array="$(echo $i | cut -d, -f2-)"
- echo "ARRAY /dev/$device devices=$array" >> $mdconfig
- ;;
- # raid UUID
- md=[0-9]*,[0-9,a-z]*)
- device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=||g')"
- array="$(echo $i | cut -d, -f2-)"
- echo "ARRAY /dev/$device UUID=$array" >> $mdconfig
- ;;
- # partitionable raid UUID
- md=d[0-9]*,[0-9,a-z]*)
- device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=|_|g')"
- array="$(echo $i | cut -d, -f2-)"
- echo "ARRAY /dev/$device UUID=$array" >> $mdconfig
- ;;
- esac
- done
- fi
- # assemble everything
- [ -e $mdconfig ] && /sbin/mdassemble
-}
diff --git a/testing/mdadm/mdadm_install b/testing/mdadm/mdadm_install
deleted file mode 100644
index b53258676..000000000
--- a/testing/mdadm/mdadm_install
+++ /dev/null
@@ -1,45 +0,0 @@
-# vim: set ft=sh:
-
-build()
-{
- MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") "
- BINARIES=""
- FILES=""
- SCRIPT="mdadm"
- # check if a custom mdadm.conf exists
- if grep -q ^ARRAY /etc/mdadm.conf; then
- echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays."
- add_file "/etc/mdadm.conf"
- fi
- add_binary "/sbin/mdassemble"
-}
-
-help ()
-{
-cat<<HELPEOF
- This hook loads the necessary modules for any raid root device,
- and assembles the raid device when run.
-
- If arrays are defined in /etc/mdadm.conf, the file will be used instead
- of command line assembling.
-
- Command Line Setup:
- - for raid arrays with persistent superblocks:
- md=<md device no.>,dev0,dev1,...,devn
- md=<md device no.>,uuid
- - for partitionable raid arrays with persistent superblocks:
- md=d<md device no.>,dev0,dev1,...,devn
- md=d<md device no.>,uuid
-
- Parameters:
- - <md device no.> = the number of the md device:
- 0 means md0, 1 means md1, ...
- - <dev0-devn>: e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1
- or 0900878d:f95f6057:c39a36e9:55efa60a
- Examples:
- - md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1
- This will setup 2 md partitionable arrays.
- - md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1
- This will setup 2 md arrays with persistent superblocks.
-HELPEOF
-}
diff --git a/testing/mdadm/mdadm_udev_install b/testing/mdadm/mdadm_udev_install
deleted file mode 100644
index 9fc161624..000000000
--- a/testing/mdadm/mdadm_udev_install
+++ /dev/null
@@ -1,23 +0,0 @@
-# vim: set ft=sh:
-
-build()
-{
- MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") "
- BINARIES=""
- FILES=""
- SCRIPT=""
- # check if a custom mdadm.conf exists
- if grep -q ^ARRAY /etc/mdadm.conf; then
- echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays."
- add_file "/etc/mdadm.conf"
- fi
- add_binary "/sbin/mdadm"
- add_file "/lib/udev/rules.d/64-md-raid.rules"
-}
-
-help ()
-{
-cat<<HELPEOF
- This hook loads raid arrays with udev.
-HELPEOF
-}
diff --git a/testing/mkinitcpio-nfs-utils/PKGBUILD b/testing/mkinitcpio-nfs-utils/PKGBUILD
deleted file mode 100644
index c52986246..000000000
--- a/testing/mkinitcpio-nfs-utils/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 137669 2011-09-10 11:25:12Z pierre $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=mkinitcpio-nfs-utils
-pkgver=0.2
-pkgrel=2
-pkgdesc="ipconfig and nfsmount tools for NFS root support in mkinitcpio"
-arch=('i686' 'x86_64')
-url="http://www.archlinux.org/"
-license=('GPL2')
-depends=('glibc')
-source=(ftp://ftp.archlinux.org/other/mkinitcpio/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('3f2839f21a420cd732d34e58f84534acdb7fc29f69381dbba3f00e3424201cd3')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make
-}
-
-package() {
- cd "$srcdir/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/obex-data-server/PKGBUILD b/testing/obex-data-server/PKGBUILD
deleted file mode 100644
index 83bbebe27..000000000
--- a/testing/obex-data-server/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 137868 2011-09-12 05:31:23Z eric $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-# Contributor: Keerthi <keerthi.linux@gmail.com>
-
-pkgname=obex-data-server
-pkgver=0.4.6
-pkgrel=2
-pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality"
-arch=('i686' 'x86_64')
-url="http://wiki.muiline.com/obex-data-server"
-license=('GPL')
-depends=('dbus-glib' 'openobex' 'imagemagick')
-source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz")
-md5sums=('961ca5db6fe9c97024e133cc6203cc4d')
-
-build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --sysconfdir=/etc
- make
-}
-
-package() {
- cd "${srcdir}"/${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD
deleted file mode 100644
index fc418dc49..000000000
--- a/testing/openssh/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 137315 2011-09-07 00:54:51Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=openssh
-pkgver=5.9p1
-pkgrel=3
-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')
-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/openssl/PKGBUILD b/testing/openssl/PKGBUILD
deleted file mode 100644
index 0b843b9f5..000000000
--- a/testing/openssl/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# $Id: PKGBUILD 137205 2011-09-06 17:23:24Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=openssl
-_ver=1.0.0e
-# use a pacman compatible version scheme
-pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=1
-pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
-arch=('i686' 'x86_64')
-url='https://www.openssl.org'
-license=('custom:BSD')
-depends=('perl')
-optdepends=('ca-certificates')
-options=('!makeflags')
-backup=('etc/ssl/openssl.cnf')
-source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"
- 'fix-manpages.patch'
- 'no-rpath.patch'
- 'ca-dir.patch')
-md5sums=('7040b89c4c58c7a1016c0dfa6e821c86'
- '5bbc0655bda2af95bc8eb568963ce8ba'
- 'dc78d3d06baffc16217519242ce92478'
- '3bf51be3a1bbd262be46dc619f92aa90')
-
-# keep an upgrade path for older installations
-PKGEXT='.pkg.tar.gz'
-
-build() {
- cd $srcdir/$pkgname-$_ver
-
- if [ "${CARCH}" == 'x86_64' ]; then
- openssltarget='linux-x86_64'
- elif [ "${CARCH}" == 'i686' ]; then
- openssltarget='linux-elf'
- fi
-
- # avoid conflicts with other man pages
- # see http://www.linuxfromscratch.org/patches/downloads/openssl/
- patch -p1 -i $srcdir/fix-manpages.patch
- # remove rpath: http://bugs.archlinux.org/task/14367
- patch -p0 -i $srcdir/no-rpath.patch
- # set ca dir to /etc/ssl by default
- patch -p0 -i $srcdir/ca-dir.patch
- # mark stack as non-executable: http://bugs.archlinux.org/task/12434
- ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
- shared zlib enable-md2 \
- "${openssltarget}" \
- -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}"
-
- make depend
- make
-}
-
-check() {
- cd $srcdir/$pkgname-$_ver
- # the test fails due to missing write permissions in /etc/ssl
- # revert this patch for make test
- patch -p0 -R -i $srcdir/ca-dir.patch
- make test
- patch -p0 -i $srcdir/ca-dir.patch
-}
-
-package() {
- cd $srcdir/$pkgname-$_ver
- make INSTALL_PREFIX=$pkgdir MANDIR=/usr/share/man install
- install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/testing/openssl/ca-dir.patch b/testing/openssl/ca-dir.patch
deleted file mode 100644
index 41d1386d3..000000000
--- a/testing/openssl/ca-dir.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- apps/CA.pl.in 2006-04-28 02:30:49.000000000 +0200
-+++ apps/CA.pl.in 2010-04-01 00:35:02.600553509 +0200
-@@ -53,7 +53,7 @@
- $X509="$openssl x509";
- $PKCS12="$openssl pkcs12";
-
--$CATOP="./demoCA";
-+$CATOP="/etc/ssl";
- $CAKEY="cakey.pem";
- $CAREQ="careq.pem";
- $CACERT="cacert.pem";
---- apps/CA.sh 2009-10-15 19:27:47.000000000 +0200
-+++ apps/CA.sh 2010-04-01 00:35:02.600553509 +0200
-@@ -68,7 +68,7 @@
- X509="$OPENSSL x509"
- PKCS12="openssl pkcs12"
-
--if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi
-+if [ -z "$CATOP" ] ; then CATOP=/etc/ssl ; fi
- CAKEY=./cakey.pem
- CAREQ=./careq.pem
- CACERT=./cacert.pem
---- apps/openssl.cnf 2009-04-04 20:09:43.000000000 +0200
-+++ apps/openssl.cnf 2010-04-01 00:35:02.607220681 +0200
-@@ -39,7 +39,7 @@
- ####################################################################
- [ CA_default ]
-
--dir = ./demoCA # Where everything is kept
-+dir = /etc/ssl # Where everything is kept
- certs = $dir/certs # Where the issued certs are kept
- crl_dir = $dir/crl # Where the issued crl are kept
- database = $dir/index.txt # database index file.
diff --git a/testing/openssl/fix-manpages.patch b/testing/openssl/fix-manpages.patch
deleted file mode 100644
index 0a300f3b9..000000000
--- a/testing/openssl/fix-manpages.patch
+++ /dev/null
@@ -1,1920 +0,0 @@
-Submitted By: Robert Connolly <robert at linuxfromscratch dot org>
-Date: 2005-11-13
-Initial Package Version: 0.9.8a
-Upstream Status: Submitted upstream
-Origin: Anderson Lizardo
-Description: This patch fixes conflicts between man pages
- installed by OpenSSL and those found on other
- packages (particulary Shadow, Perl, and
- Man-pages). It also fixes syntax errors on some
- POD files that generates slightly broken man
- pages. Rediffed for 1.0.0a by Ken Moffat
-
-diff -Naur openssl-1.0.0a.orig//crypto/rand/md_rand.c openssl-1.0.0a/crypto/rand/md_rand.c
---- openssl-1.0.0a.orig//crypto/rand/md_rand.c 2009-01-03 09:25:32.000000000 +0000
-+++ openssl-1.0.0a/crypto/rand/md_rand.c 2010-09-01 19:36:31.604126440 +0100
-@@ -196,7 +196,7 @@
- int do_not_lock;
-
- /*
-- * (Based on the rand(3) manpage)
-+ * (Based on the openssl_rand(3) manpage)
- *
- * The input is chopped up into units of 20 bytes (or less for
- * the last block). Each of these blocks is run through the hash
-@@ -361,7 +361,7 @@
- num_ceil = (1 + (num-1)/(MD_DIGEST_LENGTH/2)) * (MD_DIGEST_LENGTH/2);
-
- /*
-- * (Based on the rand(3) manpage:)
-+ * (Based on the openssl_rand(3) manpage)
- *
- * For each group of 10 bytes (or less), we do the following:
- *
-diff -Naur openssl-1.0.0a.orig//doc/apps/openssl-passwd.pod openssl-1.0.0a/doc/apps/openssl-passwd.pod
---- openssl-1.0.0a.orig//doc/apps/openssl-passwd.pod 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.0a/doc/apps/openssl-passwd.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -0,0 +1,82 @@
-+=pod
-+
-+=head1 NAME
-+
-+openssl-passwd - compute password hashes
-+
-+=head1 SYNOPSIS
-+
-+B<openssl passwd>
-+[B<-crypt>]
-+[B<-1>]
-+[B<-apr1>]
-+[B<-salt> I<string>]
-+[B<-in> I<file>]
-+[B<-stdin>]
-+[B<-noverify>]
-+[B<-quiet>]
-+[B<-table>]
-+{I<password>}
-+
-+=head1 DESCRIPTION
-+
-+The B<passwd> command computes the hash of a password typed at
-+run-time or the hash of each password in a list. The password list is
-+taken from the named file for option B<-in file>, from stdin for
-+option B<-stdin>, or from the command line, or from the terminal otherwise.
-+The Unix standard algorithm B<crypt> and the MD5-based BSD password
-+algorithm B<1> and its Apache variant B<apr1> are available.
-+
-+=head1 OPTIONS
-+
-+=over 4
-+
-+=item B<-crypt>
-+
-+Use the B<crypt> algorithm (default).
-+
-+=item B<-1>
-+
-+Use the MD5 based BSD password algorithm B<1>.
-+
-+=item B<-apr1>
-+
-+Use the B<apr1> algorithm (Apache variant of the BSD algorithm).
-+
-+=item B<-salt> I<string>
-+
-+Use the specified salt.
-+When reading a password from the terminal, this implies B<-noverify>.
-+
-+=item B<-in> I<file>
-+
-+Read passwords from I<file>.
-+
-+=item B<-stdin>
-+
-+Read passwords from B<stdin>.
-+
-+=item B<-noverify>
-+
-+Don't verify when reading a password from the terminal.
-+
-+=item B<-quiet>
-+
-+Don't output warnings when passwords given at the command line are truncated.
-+
-+=item B<-table>
-+
-+In the output list, prepend the cleartext password and a TAB character
-+to each password hash.
-+
-+=back
-+
-+=head1 EXAMPLES
-+
-+B<openssl passwd -crypt -salt xx password> prints B<xxj31ZMTZzkVA>.
-+
-+B<openssl passwd -1 -salt xxxxxxxx password> prints B<$1$xxxxxxxx$UYCIxa628.9qXjpQCjM4a.>.
-+
-+B<openssl passwd -apr1 -salt xxxxxxxx password> prints B<$apr1$xxxxxxxx$dxHfLAsjHkDRmG83UXe8K0>.
-+
-+=cut
-diff -Naur openssl-1.0.0a.orig//doc/apps/openssl.pod openssl-1.0.0a/doc/apps/openssl.pod
---- openssl-1.0.0a.orig//doc/apps/openssl.pod 2010-01-21 18:46:28.000000000 +0000
-+++ openssl-1.0.0a/doc/apps/openssl.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -163,7 +163,7 @@
-
- Online Certificate Status Protocol utility.
-
--=item L<B<passwd>|passwd(1)>
-+=item L<B<passwd>|openssl-passwd(1)>
-
- Generation of hashed passwords.
-
-@@ -401,7 +401,7 @@
- L<dhparam(1)|dhparam(1)>, L<dsa(1)|dsa(1)>, L<dsaparam(1)|dsaparam(1)>,
- L<enc(1)|enc(1)>, L<gendsa(1)|gendsa(1)>, L<genpkey(1)|genpkey(1)>,
- L<genrsa(1)|genrsa(1)>, L<nseq(1)|nseq(1)>, L<openssl(1)|openssl(1)>,
--L<passwd(1)|passwd(1)>,
-+L<openssl-passwd(1)|openssl-passwd(1)>,
- L<pkcs12(1)|pkcs12(1)>, L<pkcs7(1)|pkcs7(1)>, L<pkcs8(1)|pkcs8(1)>,
- L<rand(1)|rand(1)>, L<req(1)|req(1)>, L<rsa(1)|rsa(1)>,
- L<rsautl(1)|rsautl(1)>, L<s_client(1)|s_client(1)>,
-diff -Naur openssl-1.0.0a.orig//doc/apps/passwd.pod openssl-1.0.0a/doc/apps/passwd.pod
---- openssl-1.0.0a.orig//doc/apps/passwd.pod 2002-10-04 13:59:00.000000000 +0100
-+++ openssl-1.0.0a/doc/apps/passwd.pod 1970-01-01 01:00:00.000000000 +0100
-@@ -1,82 +0,0 @@
--=pod
--
--=head1 NAME
--
--passwd - compute password hashes
--
--=head1 SYNOPSIS
--
--B<openssl passwd>
--[B<-crypt>]
--[B<-1>]
--[B<-apr1>]
--[B<-salt> I<string>]
--[B<-in> I<file>]
--[B<-stdin>]
--[B<-noverify>]
--[B<-quiet>]
--[B<-table>]
--{I<password>}
--
--=head1 DESCRIPTION
--
--The B<passwd> command computes the hash of a password typed at
--run-time or the hash of each password in a list. The password list is
--taken from the named file for option B<-in file>, from stdin for
--option B<-stdin>, or from the command line, or from the terminal otherwise.
--The Unix standard algorithm B<crypt> and the MD5-based BSD password
--algorithm B<1> and its Apache variant B<apr1> are available.
--
--=head1 OPTIONS
--
--=over 4
--
--=item B<-crypt>
--
--Use the B<crypt> algorithm (default).
--
--=item B<-1>
--
--Use the MD5 based BSD password algorithm B<1>.
--
--=item B<-apr1>
--
--Use the B<apr1> algorithm (Apache variant of the BSD algorithm).
--
--=item B<-salt> I<string>
--
--Use the specified salt.
--When reading a password from the terminal, this implies B<-noverify>.
--
--=item B<-in> I<file>
--
--Read passwords from I<file>.
--
--=item B<-stdin>
--
--Read passwords from B<stdin>.
--
--=item B<-noverify>
--
--Don't verify when reading a password from the terminal.
--
--=item B<-quiet>
--
--Don't output warnings when passwords given at the command line are truncated.
--
--=item B<-table>
--
--In the output list, prepend the cleartext password and a TAB character
--to each password hash.
--
--=back
--
--=head1 EXAMPLES
--
--B<openssl passwd -crypt -salt xx password> prints B<xxj31ZMTZzkVA>.
--
--B<openssl passwd -1 -salt xxxxxxxx password> prints B<$1$xxxxxxxx$UYCIxa628.9qXjpQCjM4a.>.
--
--B<openssl passwd -apr1 -salt xxxxxxxx password> prints B<$apr1$xxxxxxxx$dxHfLAsjHkDRmG83UXe8K0>.
--
--=cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/BN_generate_prime.pod openssl-1.0.0a/doc/crypto/BN_generate_prime.pod
---- openssl-1.0.0a.orig//doc/crypto/BN_generate_prime.pod 2003-01-13 13:18:22.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/BN_generate_prime.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -90,7 +90,7 @@
-
- =head1 SEE ALSO
-
--L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>
-+L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/bn.pod openssl-1.0.0a/doc/crypto/bn.pod
---- openssl-1.0.0a.orig//doc/crypto/bn.pod 2008-07-03 20:59:24.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/bn.pod 2010-09-01 19:36:31.620125025 +0100
-@@ -167,7 +167,7 @@
- =head1 SEE ALSO
-
- L<bn_internal(3)|bn_internal(3)>,
--L<dh(3)|dh(3)>, L<err(3)|err(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>,
-+L<dh(3)|dh(3)>, L<openssl_err(3)|openssl_err(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>,
- L<BN_new(3)|BN_new(3)>, L<BN_CTX_new(3)|BN_CTX_new(3)>,
- L<BN_copy(3)|BN_copy(3)>, L<BN_swap(3)|BN_swap(3)>, L<BN_num_bytes(3)|BN_num_bytes(3)>,
- L<BN_add(3)|BN_add(3)>, L<BN_add_word(3)|BN_add_word(3)>,
-diff -Naur openssl-1.0.0a.orig//doc/crypto/BN_rand.pod openssl-1.0.0a/doc/crypto/BN_rand.pod
---- openssl-1.0.0a.orig//doc/crypto/BN_rand.pod 2002-09-25 14:33:26.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/BN_rand.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -45,7 +45,7 @@
-
- =head1 SEE ALSO
-
--L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>,
-+L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<RAND_add(3)|RAND_add(3)>, L<RAND_bytes(3)|RAND_bytes(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/CONF_modules_free.pod openssl-1.0.0a/doc/crypto/CONF_modules_free.pod
---- openssl-1.0.0a.orig//doc/crypto/CONF_modules_free.pod 2006-12-21 21:13:27.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/CONF_modules_free.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -37,7 +37,7 @@
- =head1 SEE ALSO
-
- L<conf(5)|conf(5)>, L<OPENSSL_config(3)|OPENSSL_config(3)>,
--L<CONF_modules_load_file(3), CONF_modules_load_file(3)>
-+L<CONF_modules_load_file(3)|CONF_modules_load_file(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/CONF_modules_load_file.pod openssl-1.0.0a/doc/crypto/CONF_modules_load_file.pod
---- openssl-1.0.0a.orig//doc/crypto/CONF_modules_load_file.pod 2004-03-02 13:31:32.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/CONF_modules_load_file.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -51,7 +51,7 @@
- =head1 SEE ALSO
-
- L<conf(5)|conf(5)>, L<OPENSSL_config(3)|OPENSSL_config(3)>,
--L<CONF_free(3), CONF_free(3)>, L<err(3),err(3)>
-+L<CONF_free(3)|CONF_free(3)>, L<openssl_err(3)|openssl_err(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/crypto.pod openssl-1.0.0a/doc/crypto/crypto.pod
---- openssl-1.0.0a.orig//doc/crypto/crypto.pod 2002-10-06 13:59:25.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/crypto.pod 2010-09-01 19:36:31.620125025 +0100
-@@ -46,7 +46,7 @@
-
- =item AUXILIARY FUNCTIONS
-
--L<err(3)|err(3)>, L<threads(3)|threads(3)>, L<rand(3)|rand(3)>,
-+L<openssl_err(3)|openssl_err(3)>, L<openssl_threads(3)|openssl_threads(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<OPENSSL_VERSION_NUMBER(3)|OPENSSL_VERSION_NUMBER(3)>
-
- =item INPUT/OUTPUT, DATA ENCODING
-diff -Naur openssl-1.0.0a.orig//doc/crypto/des.pod openssl-1.0.0a/doc/crypto/des.pod
---- openssl-1.0.0a.orig//doc/crypto/des.pod 2003-10-01 16:02:45.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/des.pod 2010-09-01 19:36:31.620125025 +0100
-@@ -115,7 +115,7 @@
- the key; it is used to speed the encryption process.
-
- DES_random_key() generates a random key. The PRNG must be seeded
--prior to using this function (see L<rand(3)|rand(3)>). If the PRNG
-+prior to using this function (see L<openssl_rand(3)|openssl_rand(3)>). If the PRNG
- could not generate a secure key, 0 is returned.
-
- Before a DES key can be used, it must be converted into the
-@@ -317,7 +317,7 @@
-
- =head1 SEE ALSO
-
--crypt(3), L<des_modes(7)|des_modes(7)>, L<evp(3)|evp(3)>, L<rand(3)|rand(3)>
-+crypt(3), L<des_modes(7)|des_modes(7)>, L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/DH_generate_key.pod openssl-1.0.0a/doc/crypto/DH_generate_key.pod
---- openssl-1.0.0a.orig//doc/crypto/DH_generate_key.pod 2002-09-25 14:33:27.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/DH_generate_key.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -40,7 +40,7 @@
-
- =head1 SEE ALSO
-
--L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<DH_size(3)|DH_size(3)>
-+L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<DH_size(3)|DH_size(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/DH_generate_parameters.pod openssl-1.0.0a/doc/crypto/DH_generate_parameters.pod
---- openssl-1.0.0a.orig//doc/crypto/DH_generate_parameters.pod 2002-09-25 14:33:27.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/DH_generate_parameters.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -59,7 +59,7 @@
-
- =head1 SEE ALSO
-
--L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>,
-+L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<DH_free(3)|DH_free(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/dh.pod openssl-1.0.0a/doc/crypto/dh.pod
---- openssl-1.0.0a.orig//doc/crypto/dh.pod 2002-08-05 17:27:01.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/dh.pod 2010-09-01 19:36:31.620125025 +0100
-@@ -67,8 +67,8 @@
-
- =head1 SEE ALSO
-
--L<dhparam(1)|dhparam(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<err(3)|err(3)>,
--L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, L<engine(3)|engine(3)>,
-+L<dhparam(1)|dhparam(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<openssl_err(3)|openssl_err(3)>,
-+L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, L<engine(3)|engine(3)>,
- L<DH_set_method(3)|DH_set_method(3)>, L<DH_new(3)|DH_new(3)>,
- L<DH_get_ex_new_index(3)|DH_get_ex_new_index(3)>,
- L<DH_generate_parameters(3)|DH_generate_parameters(3)>,
-diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_do_sign.pod openssl-1.0.0a/doc/crypto/DSA_do_sign.pod
---- openssl-1.0.0a.orig//doc/crypto/DSA_do_sign.pod 2002-09-25 14:33:27.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/DSA_do_sign.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -36,7 +36,7 @@
-
- =head1 SEE ALSO
-
--L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>,
-+L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<DSA_SIG_new(3)|DSA_SIG_new(3)>,
- L<DSA_sign(3)|DSA_sign(3)>
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_generate_key.pod openssl-1.0.0a/doc/crypto/DSA_generate_key.pod
---- openssl-1.0.0a.orig//doc/crypto/DSA_generate_key.pod 2002-09-25 14:33:27.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/DSA_generate_key.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -24,7 +24,7 @@
-
- =head1 SEE ALSO
-
--L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>,
-+L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<DSA_generate_parameters(3)|DSA_generate_parameters(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_generate_parameters.pod openssl-1.0.0a/doc/crypto/DSA_generate_parameters.pod
---- openssl-1.0.0a.orig//doc/crypto/DSA_generate_parameters.pod 2002-09-25 14:33:27.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/DSA_generate_parameters.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -90,7 +90,7 @@
-
- =head1 SEE ALSO
-
--L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>,
-+L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<DSA_free(3)|DSA_free(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/dsa.pod openssl-1.0.0a/doc/crypto/dsa.pod
---- openssl-1.0.0a.orig//doc/crypto/dsa.pod 2002-08-05 17:27:01.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/dsa.pod 2010-09-01 19:36:31.620125025 +0100
-@@ -100,7 +100,7 @@
-
- =head1 SEE ALSO
-
--L<bn(3)|bn(3)>, L<dh(3)|dh(3)>, L<err(3)|err(3)>, L<rand(3)|rand(3)>,
-+L<bn(3)|bn(3)>, L<dh(3)|dh(3)>, L<openssl_err(3)|openssl_err(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<rsa(3)|rsa(3)>, L<sha(3)|sha(3)>, L<engine(3)|engine(3)>,
- L<DSA_new(3)|DSA_new(3)>,
- L<DSA_size(3)|DSA_size(3)>,
-diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_sign.pod openssl-1.0.0a/doc/crypto/DSA_sign.pod
---- openssl-1.0.0a.orig//doc/crypto/DSA_sign.pod 2002-09-25 14:33:27.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/DSA_sign.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -55,7 +55,7 @@
-
- =head1 SEE ALSO
-
--L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>,
-+L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<DSA_do_sign(3)|DSA_do_sign(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/engine.pod openssl-1.0.0a/doc/crypto/engine.pod
---- openssl-1.0.0a.orig//doc/crypto/engine.pod 2007-11-19 09:18:03.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/engine.pod 2010-09-01 19:36:31.620125025 +0100
-@@ -594,6 +594,6 @@
-
- =head1 SEE ALSO
-
--L<rsa(3)|rsa(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, L<rand(3)|rand(3)>
-+L<rsa(3)|rsa(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, L<openssl_rand(3)|openssl_rand(3)>
-
- =cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_clear_error.pod openssl-1.0.0a/doc/crypto/ERR_clear_error.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_clear_error.pod 2000-02-01 01:36:58.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_clear_error.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -20,7 +20,7 @@
-
- =head1 SEE ALSO
-
--L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_error_string.pod openssl-1.0.0a/doc/crypto/ERR_error_string.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_error_string.pod 2004-11-14 15:11:37.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_error_string.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -60,7 +60,7 @@
-
- =head1 SEE ALSO
-
--L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>,
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>,
- L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>,
- L<SSL_load_error_strings(3)|SSL_load_error_strings(3)>
- L<ERR_print_errors(3)|ERR_print_errors(3)>
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_get_error.pod openssl-1.0.0a/doc/crypto/ERR_get_error.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_get_error.pod 2002-11-29 14:21:54.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_get_error.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -61,7 +61,7 @@
-
- =head1 SEE ALSO
-
--L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>,
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>,
- L<ERR_GET_LIB(3)|ERR_GET_LIB(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_GET_LIB.pod openssl-1.0.0a/doc/crypto/ERR_GET_LIB.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_GET_LIB.pod 2000-02-01 01:36:58.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_GET_LIB.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -41,7 +41,7 @@
-
- =head1 SEE ALSO
-
--L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_load_crypto_strings.pod openssl-1.0.0a/doc/crypto/ERR_load_crypto_strings.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_load_crypto_strings.pod 2000-02-24 11:55:08.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_load_crypto_strings.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -35,7 +35,7 @@
-
- =head1 SEE ALSO
-
--L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_load_strings.pod openssl-1.0.0a/doc/crypto/ERR_load_strings.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_load_strings.pod 2000-02-24 11:55:08.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_load_strings.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -43,7 +43,7 @@
-
- =head1 SEE ALSO
-
--L<err(3)|err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)>
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/err.pod openssl-1.0.0a/doc/crypto/err.pod
---- openssl-1.0.0a.orig//doc/crypto/err.pod 2002-07-10 20:35:46.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/err.pod 1970-01-01 01:00:00.000000000 +0100
-@@ -1,187 +0,0 @@
--=pod
--
--=head1 NAME
--
--err - error codes
--
--=head1 SYNOPSIS
--
-- #include <openssl/err.h>
--
-- unsigned long ERR_get_error(void);
-- unsigned long ERR_peek_error(void);
-- unsigned long ERR_get_error_line(const char **file, int *line);
-- unsigned long ERR_peek_error_line(const char **file, int *line);
-- unsigned long ERR_get_error_line_data(const char **file, int *line,
-- const char **data, int *flags);
-- unsigned long ERR_peek_error_line_data(const char **file, int *line,
-- const char **data, int *flags);
--
-- int ERR_GET_LIB(unsigned long e);
-- int ERR_GET_FUNC(unsigned long e);
-- int ERR_GET_REASON(unsigned long e);
--
-- void ERR_clear_error(void);
--
-- char *ERR_error_string(unsigned long e, char *buf);
-- const char *ERR_lib_error_string(unsigned long e);
-- const char *ERR_func_error_string(unsigned long e);
-- const char *ERR_reason_error_string(unsigned long e);
--
-- void ERR_print_errors(BIO *bp);
-- void ERR_print_errors_fp(FILE *fp);
--
-- void ERR_load_crypto_strings(void);
-- void ERR_free_strings(void);
--
-- void ERR_remove_state(unsigned long pid);
--
-- void ERR_put_error(int lib, int func, int reason, const char *file,
-- int line);
-- void ERR_add_error_data(int num, ...);
--
-- void ERR_load_strings(int lib,ERR_STRING_DATA str[]);
-- unsigned long ERR_PACK(int lib, int func, int reason);
-- int ERR_get_next_error_library(void);
--
--=head1 DESCRIPTION
--
--When a call to the OpenSSL library fails, this is usually signalled
--by the return value, and an error code is stored in an error queue
--associated with the current thread. The B<err> library provides
--functions to obtain these error codes and textual error messages.
--
--The L<ERR_get_error(3)|ERR_get_error(3)> manpage describes how to
--access error codes.
--
--Error codes contain information about where the error occurred, and
--what went wrong. L<ERR_GET_LIB(3)|ERR_GET_LIB(3)> describes how to
--extract this information. A method to obtain human-readable error
--messages is described in L<ERR_error_string(3)|ERR_error_string(3)>.
--
--L<ERR_clear_error(3)|ERR_clear_error(3)> can be used to clear the
--error queue.
--
--Note that L<ERR_remove_state(3)|ERR_remove_state(3)> should be used to
--avoid memory leaks when threads are terminated.
--
--=head1 ADDING NEW ERROR CODES TO OPENSSL
--
--See L<ERR_put_error(3)> if you want to record error codes in the
--OpenSSL error system from within your application.
--
--The remainder of this section is of interest only if you want to add
--new error codes to OpenSSL or add error codes from external libraries.
--
--=head2 Reporting errors
--
--Each sub-library has a specific macro XXXerr() that is used to report
--errors. Its first argument is a function code B<XXX_F_...>, the second
--argument is a reason code B<XXX_R_...>. Function codes are derived
--from the function names; reason codes consist of textual error
--descriptions. For example, the function ssl23_read() reports a
--"handshake failure" as follows:
--
-- SSLerr(SSL_F_SSL23_READ, SSL_R_SSL_HANDSHAKE_FAILURE);
--
--Function and reason codes should consist of upper case characters,
--numbers and underscores only. The error file generation script translates
--function codes into function names by looking in the header files
--for an appropriate function name, if none is found it just uses
--the capitalized form such as "SSL23_READ" in the above example.
--
--The trailing section of a reason code (after the "_R_") is translated
--into lower case and underscores changed to spaces.
--
--When you are using new function or reason codes, run B<make errors>.
--The necessary B<#define>s will then automatically be added to the
--sub-library's header file.
--
--Although a library will normally report errors using its own specific
--XXXerr macro, another library's macro can be used. This is normally
--only done when a library wants to include ASN1 code which must use
--the ASN1err() macro.
--
--=head2 Adding new libraries
--
--When adding a new sub-library to OpenSSL, assign it a library number
--B<ERR_LIB_XXX>, define a macro XXXerr() (both in B<err.h>), add its
--name to B<ERR_str_libraries[]> (in B<crypto/err/err.c>), and add
--C<ERR_load_XXX_strings()> to the ERR_load_crypto_strings() function
--(in B<crypto/err/err_all.c>). Finally, add an entry
--
-- L XXX xxx.h xxx_err.c
--
--to B<crypto/err/openssl.ec>, and add B<xxx_err.c> to the Makefile.
--Running B<make errors> will then generate a file B<xxx_err.c>, and
--add all error codes used in the library to B<xxx.h>.
--
--Additionally the library include file must have a certain form.
--Typically it will initially look like this:
--
-- #ifndef HEADER_XXX_H
-- #define HEADER_XXX_H
--
-- #ifdef __cplusplus
-- extern "C" {
-- #endif
--
-- /* Include files */
--
-- #include <openssl/bio.h>
-- #include <openssl/x509.h>
--
-- /* Macros, structures and function prototypes */
--
--
-- /* BEGIN ERROR CODES */
--
--The B<BEGIN ERROR CODES> sequence is used by the error code
--generation script as the point to place new error codes, any text
--after this point will be overwritten when B<make errors> is run.
--The closing #endif etc will be automatically added by the script.
--
--The generated C error code file B<xxx_err.c> will load the header
--files B<stdio.h>, B<openssl/err.h> and B<openssl/xxx.h> so the
--header file must load any additional header files containing any
--definitions it uses.
--
--=head1 USING ERROR CODES IN EXTERNAL LIBRARIES
--
--It is also possible to use OpenSSL's error code scheme in external
--libraries. The library needs to load its own codes and call the OpenSSL
--error code insertion script B<mkerr.pl> explicitly to add codes to
--the header file and generate the C error code file. This will normally
--be done if the external library needs to generate new ASN1 structures
--but it can also be used to add more general purpose error code handling.
--
--TBA more details
--
--=head1 INTERNALS
--
--The error queues are stored in a hash table with one B<ERR_STATE>
--entry for each pid. ERR_get_state() returns the current thread's
--B<ERR_STATE>. An B<ERR_STATE> can hold up to B<ERR_NUM_ERRORS> error
--codes. When more error codes are added, the old ones are overwritten,
--on the assumption that the most recent errors are most important.
--
--Error strings are also stored in hash table. The hash tables can
--be obtained by calling ERR_get_err_state_table(void) and
--ERR_get_string_table(void) respectively.
--
--=head1 SEE ALSO
--
--L<CRYPTO_set_id_callback(3)|CRYPTO_set_id_callback(3)>,
--L<CRYPTO_set_locking_callback(3)|CRYPTO_set_locking_callback(3)>,
--L<ERR_get_error(3)|ERR_get_error(3)>,
--L<ERR_GET_LIB(3)|ERR_GET_LIB(3)>,
--L<ERR_clear_error(3)|ERR_clear_error(3)>,
--L<ERR_error_string(3)|ERR_error_string(3)>,
--L<ERR_print_errors(3)|ERR_print_errors(3)>,
--L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>,
--L<ERR_remove_state(3)|ERR_remove_state(3)>,
--L<ERR_put_error(3)|ERR_put_error(3)>,
--L<ERR_load_strings(3)|ERR_load_strings(3)>,
--L<SSL_get_error(3)|SSL_get_error(3)>
--
--=cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_print_errors.pod openssl-1.0.0a/doc/crypto/ERR_print_errors.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_print_errors.pod 2000-02-01 01:36:59.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_print_errors.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -38,7 +38,7 @@
-
- =head1 SEE ALSO
-
--L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>,
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>,
- L<ERR_get_error(3)|ERR_get_error(3)>,
- L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>,
- L<SSL_load_error_strings(3)|SSL_load_error_strings(3)>
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_put_error.pod openssl-1.0.0a/doc/crypto/ERR_put_error.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_put_error.pod 2000-02-24 11:55:08.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_put_error.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -34,7 +34,7 @@
-
- =head1 SEE ALSO
-
--L<err(3)|err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)>
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_remove_state.pod openssl-1.0.0a/doc/crypto/ERR_remove_state.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_remove_state.pod 2000-05-19 08:54:42.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/ERR_remove_state.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -25,7 +25,7 @@
-
- =head1 SEE ALSO
-
--L<err(3)|err(3)>
-+L<openssl_err(3)|openssl_err(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_BytesToKey.pod openssl-1.0.0a/doc/crypto/EVP_BytesToKey.pod
---- openssl-1.0.0a.orig//doc/crypto/EVP_BytesToKey.pod 2004-11-25 17:47:30.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/EVP_BytesToKey.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -59,7 +59,7 @@
-
- =head1 SEE ALSO
-
--L<evp(3)|evp(3)>, L<rand(3)|rand(3)>,
-+L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_OpenInit.pod openssl-1.0.0a/doc/crypto/EVP_OpenInit.pod
---- openssl-1.0.0a.orig//doc/crypto/EVP_OpenInit.pod 2000-09-23 08:16:14.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/EVP_OpenInit.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -54,7 +54,7 @@
-
- =head1 SEE ALSO
-
--L<evp(3)|evp(3)>, L<rand(3)|rand(3)>,
-+L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>,
- L<EVP_SealInit(3)|EVP_SealInit(3)>
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_SealInit.pod openssl-1.0.0a/doc/crypto/EVP_SealInit.pod
---- openssl-1.0.0a.orig//doc/crypto/EVP_SealInit.pod 2005-03-29 18:50:08.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/EVP_SealInit.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -74,7 +74,7 @@
-
- =head1 SEE ALSO
-
--L<evp(3)|evp(3)>, L<rand(3)|rand(3)>,
-+L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>,
- L<EVP_OpenInit(3)|EVP_OpenInit(3)>
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_SignInit.pod openssl-1.0.0a/doc/crypto/EVP_SignInit.pod
---- openssl-1.0.0a.orig//doc/crypto/EVP_SignInit.pod 2006-07-12 13:31:29.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/EVP_SignInit.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -89,7 +89,7 @@
- =head1 SEE ALSO
-
- L<EVP_VerifyInit(3)|EVP_VerifyInit(3)>,
--L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>,
-+L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<openssl_err(3)|openssl_err(3)>,
- L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>,
- L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>,
- L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)>
-diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_VerifyInit.pod openssl-1.0.0a/doc/crypto/EVP_VerifyInit.pod
---- openssl-1.0.0a.orig//doc/crypto/EVP_VerifyInit.pod 2006-07-12 13:31:30.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/EVP_VerifyInit.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -80,7 +80,7 @@
-
- L<evp(3)|evp(3)>,
- L<EVP_SignInit(3)|EVP_SignInit(3)>,
--L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>,
-+L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<openssl_err(3)|openssl_err(3)>,
- L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>,
- L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>,
- L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)>
-diff -Naur openssl-1.0.0a.orig//doc/crypto/OPENSSL_config.pod openssl-1.0.0a/doc/crypto/OPENSSL_config.pod
---- openssl-1.0.0a.orig//doc/crypto/OPENSSL_config.pod 2005-06-03 00:19:56.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/OPENSSL_config.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -73,7 +73,7 @@
- =head1 SEE ALSO
-
- L<conf(5)|conf(5)>, L<CONF_load_modules_file(3)|CONF_load_modules_file(3)>,
--L<CONF_modules_free(3),CONF_modules_free(3)>
-+L<CONF_modules_free(3)|CONF_modules_free(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/openssl_err.pod openssl-1.0.0a/doc/crypto/openssl_err.pod
---- openssl-1.0.0a.orig//doc/crypto/openssl_err.pod 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/openssl_err.pod 2010-09-01 19:36:31.624124669 +0100
-@@ -0,0 +1,187 @@
-+=pod
-+
-+=head1 NAME
-+
-+openssl_err - error codes
-+
-+=head1 SYNOPSIS
-+
-+ #include <openssl/err.h>
-+
-+ unsigned long ERR_get_error(void);
-+ unsigned long ERR_peek_error(void);
-+ unsigned long ERR_get_error_line(const char **file, int *line);
-+ unsigned long ERR_peek_error_line(const char **file, int *line);
-+ unsigned long ERR_get_error_line_data(const char **file, int *line,
-+ const char **data, int *flags);
-+ unsigned long ERR_peek_error_line_data(const char **file, int *line,
-+ const char **data, int *flags);
-+
-+ int ERR_GET_LIB(unsigned long e);
-+ int ERR_GET_FUNC(unsigned long e);
-+ int ERR_GET_REASON(unsigned long e);
-+
-+ void ERR_clear_error(void);
-+
-+ char *ERR_error_string(unsigned long e, char *buf);
-+ const char *ERR_lib_error_string(unsigned long e);
-+ const char *ERR_func_error_string(unsigned long e);
-+ const char *ERR_reason_error_string(unsigned long e);
-+
-+ void ERR_print_errors(BIO *bp);
-+ void ERR_print_errors_fp(FILE *fp);
-+
-+ void ERR_load_crypto_strings(void);
-+ void ERR_free_strings(void);
-+
-+ void ERR_remove_state(unsigned long pid);
-+
-+ void ERR_put_error(int lib, int func, int reason, const char *file,
-+ int line);
-+ void ERR_add_error_data(int num, ...);
-+
-+ void ERR_load_strings(int lib,ERR_STRING_DATA str[]);
-+ unsigned long ERR_PACK(int lib, int func, int reason);
-+ int ERR_get_next_error_library(void);
-+
-+=head1 DESCRIPTION
-+
-+When a call to the OpenSSL library fails, this is usually signalled
-+by the return value, and an error code is stored in an error queue
-+associated with the current thread. The B<err> library provides
-+functions to obtain these error codes and textual error messages.
-+
-+The L<ERR_get_error(3)|ERR_get_error(3)> manpage describes how to
-+access error codes.
-+
-+Error codes contain information about where the error occurred, and
-+what went wrong. L<ERR_GET_LIB(3)|ERR_GET_LIB(3)> describes how to
-+extract this information. A method to obtain human-readable error
-+messages is described in L<ERR_error_string(3)|ERR_error_string(3)>.
-+
-+L<ERR_clear_error(3)|ERR_clear_error(3)> can be used to clear the
-+error queue.
-+
-+Note that L<ERR_remove_state(3)|ERR_remove_state(3)> should be used to
-+avoid memory leaks when threads are terminated.
-+
-+=head1 ADDING NEW ERROR CODES TO OPENSSL
-+
-+See L<ERR_put_error(3)> if you want to record error codes in the
-+OpenSSL error system from within your application.
-+
-+The remainder of this section is of interest only if you want to add
-+new error codes to OpenSSL or add error codes from external libraries.
-+
-+=head2 Reporting errors
-+
-+Each sub-library has a specific macro XXXerr() that is used to report
-+errors. Its first argument is a function code B<XXX_F_...>, the second
-+argument is a reason code B<XXX_R_...>. Function codes are derived
-+from the function names; reason codes consist of textual error
-+descriptions. For example, the function ssl23_read() reports a
-+"handshake failure" as follows:
-+
-+ SSLerr(SSL_F_SSL23_READ, SSL_R_SSL_HANDSHAKE_FAILURE);
-+
-+Function and reason codes should consist of upper case characters,
-+numbers and underscores only. The error file generation script translates
-+function codes into function names by looking in the header files
-+for an appropriate function name, if none is found it just uses
-+the capitalized form such as "SSL23_READ" in the above example.
-+
-+The trailing section of a reason code (after the "_R_") is translated
-+into lower case and underscores changed to spaces.
-+
-+When you are using new function or reason codes, run B<make errors>.
-+The necessary B<#define>s will then automatically be added to the
-+sub-library's header file.
-+
-+Although a library will normally report errors using its own specific
-+XXXerr macro, another library's macro can be used. This is normally
-+only done when a library wants to include ASN1 code which must use
-+the ASN1err() macro.
-+
-+=head2 Adding new libraries
-+
-+When adding a new sub-library to OpenSSL, assign it a library number
-+B<ERR_LIB_XXX>, define a macro XXXerr() (both in B<err.h>), add its
-+name to B<ERR_str_libraries[]> (in B<crypto/err/err.c>), and add
-+C<ERR_load_XXX_strings()> to the ERR_load_crypto_strings() function
-+(in B<crypto/err/err_all.c>). Finally, add an entry
-+
-+ L XXX xxx.h xxx_err.c
-+
-+to B<crypto/err/openssl.ec>, and add B<xxx_err.c> to the Makefile.
-+Running B<make errors> will then generate a file B<xxx_err.c>, and
-+add all error codes used in the library to B<xxx.h>.
-+
-+Additionally the library include file must have a certain form.
-+Typically it will initially look like this:
-+
-+ #ifndef HEADER_XXX_H
-+ #define HEADER_XXX_H
-+
-+ #ifdef __cplusplus
-+ extern "C" {
-+ #endif
-+
-+ /* Include files */
-+
-+ #include <openssl/bio.h>
-+ #include <openssl/x509.h>
-+
-+ /* Macros, structures and function prototypes */
-+
-+
-+ /* BEGIN ERROR CODES */
-+
-+The B<BEGIN ERROR CODES> sequence is used by the error code
-+generation script as the point to place new error codes, any text
-+after this point will be overwritten when B<make errors> is run.
-+The closing #endif etc will be automatically added by the script.
-+
-+The generated C error code file B<xxx_err.c> will load the header
-+files B<stdio.h>, B<openssl/err.h> and B<openssl/xxx.h> so the
-+header file must load any additional header files containing any
-+definitions it uses.
-+
-+=head1 USING ERROR CODES IN EXTERNAL LIBRARIES
-+
-+It is also possible to use OpenSSL's error code scheme in external
-+libraries. The library needs to load its own codes and call the OpenSSL
-+error code insertion script B<mkerr.pl> explicitly to add codes to
-+the header file and generate the C error code file. This will normally
-+be done if the external library needs to generate new ASN1 structures
-+but it can also be used to add more general purpose error code handling.
-+
-+TBA more details
-+
-+=head1 INTERNALS
-+
-+The error queues are stored in a hash table with one B<ERR_STATE>
-+entry for each pid. ERR_get_state() returns the current thread's
-+B<ERR_STATE>. An B<ERR_STATE> can hold up to B<ERR_NUM_ERRORS> error
-+codes. When more error codes are added, the old ones are overwritten,
-+on the assumption that the most recent errors are most important.
-+
-+Error strings are also stored in hash table. The hash tables can
-+be obtained by calling ERR_get_err_state_table(void) and
-+ERR_get_string_table(void) respectively.
-+
-+=head1 SEE ALSO
-+
-+L<CRYPTO_set_id_callback(3)|CRYPTO_set_id_callback(3)>,
-+L<CRYPTO_set_locking_callback(3)|CRYPTO_set_locking_callback(3)>,
-+L<ERR_get_error(3)|ERR_get_error(3)>,
-+L<ERR_GET_LIB(3)|ERR_GET_LIB(3)>,
-+L<ERR_clear_error(3)|ERR_clear_error(3)>,
-+L<ERR_error_string(3)|ERR_error_string(3)>,
-+L<ERR_print_errors(3)|ERR_print_errors(3)>,
-+L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>,
-+L<ERR_remove_state(3)|ERR_remove_state(3)>,
-+L<ERR_put_error(3)|ERR_put_error(3)>,
-+L<ERR_load_strings(3)|ERR_load_strings(3)>,
-+L<SSL_get_error(3)|SSL_get_error(3)>
-+
-+=cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/openssl_rand.pod openssl-1.0.0a/doc/crypto/openssl_rand.pod
---- openssl-1.0.0a.orig//doc/crypto/openssl_rand.pod 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/openssl_rand.pod 2010-09-01 19:36:31.624124669 +0100
-@@ -0,0 +1,175 @@
-+=pod
-+
-+=head1 NAME
-+
-+openssl_rand - pseudo-random number generator
-+
-+=head1 SYNOPSIS
-+
-+ #include <openssl/rand.h>
-+
-+ int RAND_set_rand_engine(ENGINE *engine);
-+
-+ int RAND_bytes(unsigned char *buf, int num);
-+ int RAND_pseudo_bytes(unsigned char *buf, int num);
-+
-+ void RAND_seed(const void *buf, int num);
-+ void RAND_add(const void *buf, int num, int entropy);
-+ int RAND_status(void);
-+
-+ int RAND_load_file(const char *file, long max_bytes);
-+ int RAND_write_file(const char *file);
-+ const char *RAND_file_name(char *file, size_t num);
-+
-+ int RAND_egd(const char *path);
-+
-+ void RAND_set_rand_method(const RAND_METHOD *meth);
-+ const RAND_METHOD *RAND_get_rand_method(void);
-+ RAND_METHOD *RAND_SSLeay(void);
-+
-+ void RAND_cleanup(void);
-+
-+ /* For Win32 only */
-+ void RAND_screen(void);
-+ int RAND_event(UINT, WPARAM, LPARAM);
-+
-+=head1 DESCRIPTION
-+
-+Since the introduction of the ENGINE API, the recommended way of controlling
-+default implementations is by using the ENGINE API functions. The default
-+B<RAND_METHOD>, as set by RAND_set_rand_method() and returned by
-+RAND_get_rand_method(), is only used if no ENGINE has been set as the default
-+"rand" implementation. Hence, these two functions are no longer the recommened
-+way to control defaults.
-+
-+If an alternative B<RAND_METHOD> implementation is being used (either set
-+directly or as provided by an ENGINE module), then it is entirely responsible
-+for the generation and management of a cryptographically secure PRNG stream. The
-+mechanisms described below relate solely to the software PRNG implementation
-+built in to OpenSSL and used by default.
-+
-+These functions implement a cryptographically secure pseudo-random
-+number generator (PRNG). It is used by other library functions for
-+example to generate random keys, and applications can use it when they
-+need randomness.
-+
-+A cryptographic PRNG must be seeded with unpredictable data such as
-+mouse movements or keys pressed at random by the user. This is
-+described in L<RAND_add(3)|RAND_add(3)>. Its state can be saved in a seed file
-+(see L<RAND_load_file(3)|RAND_load_file(3)>) to avoid having to go through the
-+seeding process whenever the application is started.
-+
-+L<RAND_bytes(3)|RAND_bytes(3)> describes how to obtain random data from the
-+PRNG.
-+
-+=head1 INTERNALS
-+
-+The RAND_SSLeay() method implements a PRNG based on a cryptographic
-+hash function.
-+
-+The following description of its design is based on the SSLeay
-+documentation:
-+
-+First up I will state the things I believe I need for a good RNG.
-+
-+=over 4
-+
-+=item 1
-+
-+A good hashing algorithm to mix things up and to convert the RNG 'state'
-+to random numbers.
-+
-+=item 2
-+
-+An initial source of random 'state'.
-+
-+=item 3
-+
-+The state should be very large. If the RNG is being used to generate
-+4096 bit RSA keys, 2 2048 bit random strings are required (at a minimum).
-+If your RNG state only has 128 bits, you are obviously limiting the
-+search space to 128 bits, not 2048. I'm probably getting a little
-+carried away on this last point but it does indicate that it may not be
-+a bad idea to keep quite a lot of RNG state. It should be easier to
-+break a cipher than guess the RNG seed data.
-+
-+=item 4
-+
-+Any RNG seed data should influence all subsequent random numbers
-+generated. This implies that any random seed data entered will have
-+an influence on all subsequent random numbers generated.
-+
-+=item 5
-+
-+When using data to seed the RNG state, the data used should not be
-+extractable from the RNG state. I believe this should be a
-+requirement because one possible source of 'secret' semi random
-+data would be a private key or a password. This data must
-+not be disclosed by either subsequent random numbers or a
-+'core' dump left by a program crash.
-+
-+=item 6
-+
-+Given the same initial 'state', 2 systems should deviate in their RNG state
-+(and hence the random numbers generated) over time if at all possible.
-+
-+=item 7
-+
-+Given the random number output stream, it should not be possible to determine
-+the RNG state or the next random number.
-+
-+=back
-+
-+The algorithm is as follows.
-+
-+There is global state made up of a 1023 byte buffer (the 'state'), a
-+working hash value ('md'), and a counter ('count').
-+
-+Whenever seed data is added, it is inserted into the 'state' as
-+follows.
-+
-+The input is chopped up into units of 20 bytes (or less for
-+the last block). Each of these blocks is run through the hash
-+function as follows: The data passed to the hash function
-+is the current 'md', the same number of bytes from the 'state'
-+(the location determined by in incremented looping index) as
-+the current 'block', the new key data 'block', and 'count'
-+(which is incremented after each use).
-+The result of this is kept in 'md' and also xored into the
-+'state' at the same locations that were used as input into the
-+hash function. I
-+believe this system addresses points 1 (hash function; currently
-+SHA-1), 3 (the 'state'), 4 (via the 'md'), 5 (by the use of a hash
-+function and xor).
-+
-+When bytes are extracted from the RNG, the following process is used.
-+For each group of 10 bytes (or less), we do the following:
-+
-+Input into the hash function the local 'md' (which is initialized from
-+the global 'md' before any bytes are generated), the bytes that are to
-+be overwritten by the random bytes, and bytes from the 'state'
-+(incrementing looping index). From this digest output (which is kept
-+in 'md'), the top (up to) 10 bytes are returned to the caller and the
-+bottom 10 bytes are xored into the 'state'.
-+
-+Finally, after we have finished 'num' random bytes for the caller,
-+'count' (which is incremented) and the local and global 'md' are fed
-+into the hash function and the results are kept in the global 'md'.
-+
-+I believe the above addressed points 1 (use of SHA-1), 6 (by hashing
-+into the 'state' the 'old' data from the caller that is about to be
-+overwritten) and 7 (by not using the 10 bytes given to the caller to
-+update the 'state', but they are used to update 'md').
-+
-+So of the points raised, only 2 is not addressed (but see
-+L<RAND_add(3)|RAND_add(3)>).
-+
-+=head1 SEE ALSO
-+
-+L<BN_rand(3)|BN_rand(3)>, L<RAND_add(3)|RAND_add(3)>,
-+L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_egd(3)|RAND_egd(3)>,
-+L<RAND_bytes(3)|RAND_bytes(3)>,
-+L<RAND_set_rand_method(3)|RAND_set_rand_method(3)>,
-+L<RAND_cleanup(3)|RAND_cleanup(3)>
-+
-+=cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/openssl_threads.pod openssl-1.0.0a/doc/crypto/openssl_threads.pod
---- openssl-1.0.0a.orig//doc/crypto/openssl_threads.pod 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/openssl_threads.pod 2010-09-01 19:36:31.624124669 +0100
-@@ -0,0 +1,175 @@
-+=pod
-+
-+=head1 NAME
-+
-+CRYPTO_set_locking_callback, CRYPTO_set_id_callback, CRYPTO_num_locks,
-+CRYPTO_set_dynlock_create_callback, CRYPTO_set_dynlock_lock_callback,
-+CRYPTO_set_dynlock_destroy_callback, CRYPTO_get_new_dynlockid,
-+CRYPTO_destroy_dynlockid, CRYPTO_lock - OpenSSL thread support
-+
-+=head1 SYNOPSIS
-+
-+ #include <openssl/crypto.h>
-+
-+ void CRYPTO_set_locking_callback(void (*locking_function)(int mode,
-+ int n, const char *file, int line));
-+
-+ void CRYPTO_set_id_callback(unsigned long (*id_function)(void));
-+
-+ int CRYPTO_num_locks(void);
-+
-+
-+ /* struct CRYPTO_dynlock_value needs to be defined by the user */
-+ struct CRYPTO_dynlock_value;
-+
-+ void CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value *
-+ (*dyn_create_function)(char *file, int line));
-+ void CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function)
-+ (int mode, struct CRYPTO_dynlock_value *l,
-+ const char *file, int line));
-+ void CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function)
-+ (struct CRYPTO_dynlock_value *l, const char *file, int line));
-+
-+ int CRYPTO_get_new_dynlockid(void);
-+
-+ void CRYPTO_destroy_dynlockid(int i);
-+
-+ void CRYPTO_lock(int mode, int n, const char *file, int line);
-+
-+ #define CRYPTO_w_lock(type) \
-+ CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-+ #define CRYPTO_w_unlock(type) \
-+ CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-+ #define CRYPTO_r_lock(type) \
-+ CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-+ #define CRYPTO_r_unlock(type) \
-+ CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-+ #define CRYPTO_add(addr,amount,type) \
-+ CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)
-+
-+=head1 DESCRIPTION
-+
-+OpenSSL can safely be used in multi-threaded applications provided
-+that at least two callback functions are set.
-+
-+locking_function(int mode, int n, const char *file, int line) is
-+needed to perform locking on shared data structures.
-+(Note that OpenSSL uses a number of global data structures that
-+will be implicitly shared whenever multiple threads use OpenSSL.)
-+Multi-threaded applications will crash at random if it is not set.
-+
-+locking_function() must be able to handle up to CRYPTO_num_locks()
-+different mutex locks. It sets the B<n>-th lock if B<mode> &
-+B<CRYPTO_LOCK>, and releases it otherwise.
-+
-+B<file> and B<line> are the file number of the function setting the
-+lock. They can be useful for debugging.
-+
-+id_function(void) is a function that returns a thread ID, for example
-+pthread_self() if it returns an integer (see NOTES below). It isn't
-+needed on Windows nor on platforms where getpid() returns a different
-+ID for each thread (see NOTES below).
-+
-+Additionally, OpenSSL supports dynamic locks, and sometimes, some parts
-+of OpenSSL need it for better performance. To enable this, the following
-+is required:
-+
-+=over 4
-+
-+=item *
-+Three additional callback function, dyn_create_function, dyn_lock_function
-+and dyn_destroy_function.
-+
-+=item *
-+A structure defined with the data that each lock needs to handle.
-+
-+=back
-+
-+struct CRYPTO_dynlock_value has to be defined to contain whatever structure
-+is needed to handle locks.
-+
-+dyn_create_function(const char *file, int line) is needed to create a
-+lock. Multi-threaded applications might crash at random if it is not set.
-+
-+dyn_lock_function(int mode, CRYPTO_dynlock *l, const char *file, int line)
-+is needed to perform locking off dynamic lock numbered n. Multi-threaded
-+applications might crash at random if it is not set.
-+
-+dyn_destroy_function(CRYPTO_dynlock *l, const char *file, int line) is
-+needed to destroy the lock l. Multi-threaded applications might crash at
-+random if it is not set.
-+
-+CRYPTO_get_new_dynlockid() is used to create locks. It will call
-+dyn_create_function for the actual creation.
-+
-+CRYPTO_destroy_dynlockid() is used to destroy locks. It will call
-+dyn_destroy_function for the actual destruction.
-+
-+CRYPTO_lock() is used to lock and unlock the locks. mode is a bitfield
-+describing what should be done with the lock. n is the number of the
-+lock as returned from CRYPTO_get_new_dynlockid(). mode can be combined
-+from the following values. These values are pairwise exclusive, with
-+undefined behaviour if misused (for example, CRYPTO_READ and CRYPTO_WRITE
-+should not be used together):
-+
-+ CRYPTO_LOCK 0x01
-+ CRYPTO_UNLOCK 0x02
-+ CRYPTO_READ 0x04
-+ CRYPTO_WRITE 0x08
-+
-+=head1 RETURN VALUES
-+
-+CRYPTO_num_locks() returns the required number of locks.
-+
-+CRYPTO_get_new_dynlockid() returns the index to the newly created lock.
-+
-+The other functions return no values.
-+
-+=head1 NOTES
-+
-+You can find out if OpenSSL was configured with thread support:
-+
-+ #define OPENSSL_THREAD_DEFINES
-+ #include <openssl/opensslconf.h>
-+ #if defined(OPENSSL_THREADS)
-+ // thread support enabled
-+ #else
-+ // no thread support
-+ #endif
-+
-+Also, dynamic locks are currently not used internally by OpenSSL, but
-+may do so in the future.
-+
-+Defining id_function(void) has it's own issues. Generally speaking,
-+pthread_self() should be used, even on platforms where getpid() gives
-+different answers in each thread, since that may depend on the machine
-+the program is run on, not the machine where the program is being
-+compiled. For instance, Red Hat 8 Linux and earlier used
-+LinuxThreads, whose getpid() returns a different value for each
-+thread. Red Hat 9 Linux and later use NPTL, which is
-+Posix-conformant, and has a getpid() that returns the same value for
-+all threads in a process. A program compiled on Red Hat 8 and run on
-+Red Hat 9 will therefore see getpid() returning the same value for
-+all threads.
-+
-+There is still the issue of platforms where pthread_self() returns
-+something other than an integer. This is a bit unusual, and this
-+manual has no cookbook solution for that case.
-+
-+=head1 EXAMPLES
-+
-+B<crypto/threads/mttest.c> shows examples of the callback functions on
-+Solaris, Irix and Win32.
-+
-+=head1 HISTORY
-+
-+CRYPTO_set_locking_callback() and CRYPTO_set_id_callback() are
-+available in all versions of SSLeay and OpenSSL.
-+CRYPTO_num_locks() was added in OpenSSL 0.9.4.
-+All functions dealing with dynamic locks were added in OpenSSL 0.9.5b-dev.
-+
-+=head1 SEE ALSO
-+
-+L<crypto(3)|crypto(3)>
-+
-+=cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_add.pod openssl-1.0.0a/doc/crypto/RAND_add.pod
---- openssl-1.0.0a.orig//doc/crypto/RAND_add.pod 2000-03-22 15:30:03.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/RAND_add.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -65,7 +65,7 @@
-
- =head1 SEE ALSO
-
--L<rand(3)|rand(3)>, L<RAND_egd(3)|RAND_egd(3)>,
-+L<openssl_rand(3)|openssl_rand(3)>, L<RAND_egd(3)|RAND_egd(3)>,
- L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_bytes.pod openssl-1.0.0a/doc/crypto/RAND_bytes.pod
---- openssl-1.0.0a.orig//doc/crypto/RAND_bytes.pod 2007-09-24 12:01:18.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/RAND_bytes.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -38,7 +38,7 @@
-
- =head1 SEE ALSO
-
--L<rand(3)|rand(3)>, L<ERR_get_error(3)|ERR_get_error(3)>,
-+L<openssl_rand(3)|openssl_rand(3)>, L<ERR_get_error(3)|ERR_get_error(3)>,
- L<RAND_add(3)|RAND_add(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_cleanup.pod openssl-1.0.0a/doc/crypto/RAND_cleanup.pod
---- openssl-1.0.0a.orig//doc/crypto/RAND_cleanup.pod 2000-01-27 01:25:06.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/RAND_cleanup.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -20,7 +20,7 @@
-
- =head1 SEE ALSO
-
--L<rand(3)|rand(3)>
-+L<openssl_rand(3)|openssl_rand(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_egd.pod openssl-1.0.0a/doc/crypto/RAND_egd.pod
---- openssl-1.0.0a.orig//doc/crypto/RAND_egd.pod 2008-11-10 11:26:44.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/RAND_egd.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -72,7 +72,7 @@
-
- =head1 SEE ALSO
-
--L<rand(3)|rand(3)>, L<RAND_add(3)|RAND_add(3)>,
-+L<openssl_rand(3)|openssl_rand(3)>, L<RAND_add(3)|RAND_add(3)>,
- L<RAND_cleanup(3)|RAND_cleanup(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_load_file.pod openssl-1.0.0a/doc/crypto/RAND_load_file.pod
---- openssl-1.0.0a.orig//doc/crypto/RAND_load_file.pod 2001-03-21 15:25:56.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/RAND_load_file.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -43,7 +43,7 @@
-
- =head1 SEE ALSO
-
--L<rand(3)|rand(3)>, L<RAND_add(3)|RAND_add(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)>
-+L<openssl_rand(3)|openssl_rand(3)>, L<RAND_add(3)|RAND_add(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/rand.pod openssl-1.0.0a/doc/crypto/rand.pod
---- openssl-1.0.0a.orig//doc/crypto/rand.pod 2002-08-05 17:27:01.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/rand.pod 1970-01-01 01:00:00.000000000 +0100
-@@ -1,175 +0,0 @@
--=pod
--
--=head1 NAME
--
--rand - pseudo-random number generator
--
--=head1 SYNOPSIS
--
-- #include <openssl/rand.h>
--
-- int RAND_set_rand_engine(ENGINE *engine);
--
-- int RAND_bytes(unsigned char *buf, int num);
-- int RAND_pseudo_bytes(unsigned char *buf, int num);
--
-- void RAND_seed(const void *buf, int num);
-- void RAND_add(const void *buf, int num, int entropy);
-- int RAND_status(void);
--
-- int RAND_load_file(const char *file, long max_bytes);
-- int RAND_write_file(const char *file);
-- const char *RAND_file_name(char *file, size_t num);
--
-- int RAND_egd(const char *path);
--
-- void RAND_set_rand_method(const RAND_METHOD *meth);
-- const RAND_METHOD *RAND_get_rand_method(void);
-- RAND_METHOD *RAND_SSLeay(void);
--
-- void RAND_cleanup(void);
--
-- /* For Win32 only */
-- void RAND_screen(void);
-- int RAND_event(UINT, WPARAM, LPARAM);
--
--=head1 DESCRIPTION
--
--Since the introduction of the ENGINE API, the recommended way of controlling
--default implementations is by using the ENGINE API functions. The default
--B<RAND_METHOD>, as set by RAND_set_rand_method() and returned by
--RAND_get_rand_method(), is only used if no ENGINE has been set as the default
--"rand" implementation. Hence, these two functions are no longer the recommened
--way to control defaults.
--
--If an alternative B<RAND_METHOD> implementation is being used (either set
--directly or as provided by an ENGINE module), then it is entirely responsible
--for the generation and management of a cryptographically secure PRNG stream. The
--mechanisms described below relate solely to the software PRNG implementation
--built in to OpenSSL and used by default.
--
--These functions implement a cryptographically secure pseudo-random
--number generator (PRNG). It is used by other library functions for
--example to generate random keys, and applications can use it when they
--need randomness.
--
--A cryptographic PRNG must be seeded with unpredictable data such as
--mouse movements or keys pressed at random by the user. This is
--described in L<RAND_add(3)|RAND_add(3)>. Its state can be saved in a seed file
--(see L<RAND_load_file(3)|RAND_load_file(3)>) to avoid having to go through the
--seeding process whenever the application is started.
--
--L<RAND_bytes(3)|RAND_bytes(3)> describes how to obtain random data from the
--PRNG.
--
--=head1 INTERNALS
--
--The RAND_SSLeay() method implements a PRNG based on a cryptographic
--hash function.
--
--The following description of its design is based on the SSLeay
--documentation:
--
--First up I will state the things I believe I need for a good RNG.
--
--=over 4
--
--=item 1
--
--A good hashing algorithm to mix things up and to convert the RNG 'state'
--to random numbers.
--
--=item 2
--
--An initial source of random 'state'.
--
--=item 3
--
--The state should be very large. If the RNG is being used to generate
--4096 bit RSA keys, 2 2048 bit random strings are required (at a minimum).
--If your RNG state only has 128 bits, you are obviously limiting the
--search space to 128 bits, not 2048. I'm probably getting a little
--carried away on this last point but it does indicate that it may not be
--a bad idea to keep quite a lot of RNG state. It should be easier to
--break a cipher than guess the RNG seed data.
--
--=item 4
--
--Any RNG seed data should influence all subsequent random numbers
--generated. This implies that any random seed data entered will have
--an influence on all subsequent random numbers generated.
--
--=item 5
--
--When using data to seed the RNG state, the data used should not be
--extractable from the RNG state. I believe this should be a
--requirement because one possible source of 'secret' semi random
--data would be a private key or a password. This data must
--not be disclosed by either subsequent random numbers or a
--'core' dump left by a program crash.
--
--=item 6
--
--Given the same initial 'state', 2 systems should deviate in their RNG state
--(and hence the random numbers generated) over time if at all possible.
--
--=item 7
--
--Given the random number output stream, it should not be possible to determine
--the RNG state or the next random number.
--
--=back
--
--The algorithm is as follows.
--
--There is global state made up of a 1023 byte buffer (the 'state'), a
--working hash value ('md'), and a counter ('count').
--
--Whenever seed data is added, it is inserted into the 'state' as
--follows.
--
--The input is chopped up into units of 20 bytes (or less for
--the last block). Each of these blocks is run through the hash
--function as follows: The data passed to the hash function
--is the current 'md', the same number of bytes from the 'state'
--(the location determined by in incremented looping index) as
--the current 'block', the new key data 'block', and 'count'
--(which is incremented after each use).
--The result of this is kept in 'md' and also xored into the
--'state' at the same locations that were used as input into the
--hash function. I
--believe this system addresses points 1 (hash function; currently
--SHA-1), 3 (the 'state'), 4 (via the 'md'), 5 (by the use of a hash
--function and xor).
--
--When bytes are extracted from the RNG, the following process is used.
--For each group of 10 bytes (or less), we do the following:
--
--Input into the hash function the local 'md' (which is initialized from
--the global 'md' before any bytes are generated), the bytes that are to
--be overwritten by the random bytes, and bytes from the 'state'
--(incrementing looping index). From this digest output (which is kept
--in 'md'), the top (up to) 10 bytes are returned to the caller and the
--bottom 10 bytes are xored into the 'state'.
--
--Finally, after we have finished 'num' random bytes for the caller,
--'count' (which is incremented) and the local and global 'md' are fed
--into the hash function and the results are kept in the global 'md'.
--
--I believe the above addressed points 1 (use of SHA-1), 6 (by hashing
--into the 'state' the 'old' data from the caller that is about to be
--overwritten) and 7 (by not using the 10 bytes given to the caller to
--update the 'state', but they are used to update 'md').
--
--So of the points raised, only 2 is not addressed (but see
--L<RAND_add(3)|RAND_add(3)>).
--
--=head1 SEE ALSO
--
--L<BN_rand(3)|BN_rand(3)>, L<RAND_add(3)|RAND_add(3)>,
--L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_egd(3)|RAND_egd(3)>,
--L<RAND_bytes(3)|RAND_bytes(3)>,
--L<RAND_set_rand_method(3)|RAND_set_rand_method(3)>,
--L<RAND_cleanup(3)|RAND_cleanup(3)>
--
--=cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_set_rand_method.pod openssl-1.0.0a/doc/crypto/RAND_set_rand_method.pod
---- openssl-1.0.0a.orig//doc/crypto/RAND_set_rand_method.pod 2007-11-19 09:18:03.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/RAND_set_rand_method.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -67,7 +67,7 @@
-
- =head1 SEE ALSO
-
--L<rand(3)|rand(3)>, L<engine(3)|engine(3)>
-+L<openssl_rand(3)|openssl_rand(3)>, L<engine(3)|engine(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_blinding_on.pod openssl-1.0.0a/doc/crypto/RSA_blinding_on.pod
---- openssl-1.0.0a.orig//doc/crypto/RSA_blinding_on.pod 2000-02-24 11:55:10.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/RSA_blinding_on.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -34,7 +34,7 @@
-
- =head1 SEE ALSO
-
--L<rsa(3)|rsa(3)>, L<rand(3)|rand(3)>
-+L<rsa(3)|rsa(3)>, L<openssl_rand(3)|openssl_rand(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_generate_key.pod openssl-1.0.0a/doc/crypto/RSA_generate_key.pod
---- openssl-1.0.0a.orig//doc/crypto/RSA_generate_key.pod 2002-09-25 14:33:27.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/RSA_generate_key.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -59,7 +59,7 @@
-
- =head1 SEE ALSO
-
--L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>,
-+L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>,
- L<RSA_free(3)|RSA_free(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/rsa.pod openssl-1.0.0a/doc/crypto/rsa.pod
---- openssl-1.0.0a.orig//doc/crypto/rsa.pod 2002-08-04 22:08:36.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/rsa.pod 2010-09-01 19:36:31.624124669 +0100
-@@ -108,7 +108,7 @@
- =head1 SEE ALSO
-
- L<rsa(1)|rsa(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>,
--L<rand(3)|rand(3)>, L<engine(3)|engine(3)>, L<RSA_new(3)|RSA_new(3)>,
-+L<openssl_rand(3)|openssl_rand(3)>, L<engine(3)|engine(3)>, L<RSA_new(3)|RSA_new(3)>,
- L<RSA_public_encrypt(3)|RSA_public_encrypt(3)>,
- L<RSA_sign(3)|RSA_sign(3)>, L<RSA_size(3)|RSA_size(3)>,
- L<RSA_generate_key(3)|RSA_generate_key(3)>,
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_public_encrypt.pod openssl-1.0.0a/doc/crypto/RSA_public_encrypt.pod
---- openssl-1.0.0a.orig//doc/crypto/RSA_public_encrypt.pod 2004-03-23 21:01:34.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/RSA_public_encrypt.pod 2010-09-01 19:36:31.620125025 +0100
-@@ -73,7 +73,7 @@
-
- =head1 SEE ALSO
-
--L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>,
-+L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>,
- L<RSA_size(3)|RSA_size(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod openssl-1.0.0a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod
---- openssl-1.0.0a.orig//doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod 2002-09-25 14:33:28.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod 2010-09-01 19:36:31.620125025 +0100
-@@ -48,7 +48,7 @@
- =head1 SEE ALSO
-
- L<ERR_get_error(3)|ERR_get_error(3)>, L<objects(3)|objects(3)>,
--L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, L<RSA_sign(3)|RSA_sign(3)>,
-+L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, L<RSA_sign(3)|RSA_sign(3)>,
- L<RSA_verify(3)|RSA_verify(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/threads.pod openssl-1.0.0a/doc/crypto/threads.pod
---- openssl-1.0.0a.orig//doc/crypto/threads.pod 2009-10-01 00:40:52.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/threads.pod 1970-01-01 01:00:00.000000000 +0100
-@@ -1,210 +0,0 @@
--=pod
--
--=head1 NAME
--
--CRYPTO_THREADID_set_callback, CRYPTO_THREADID_get_callback,
--CRYPTO_THREADID_current, CRYPTO_THREADID_cmp, CRYPTO_THREADID_cpy,
--CRYPTO_THREADID_hash, CRYPTO_set_locking_callback, CRYPTO_num_locks,
--CRYPTO_set_dynlock_create_callback, CRYPTO_set_dynlock_lock_callback,
--CRYPTO_set_dynlock_destroy_callback, CRYPTO_get_new_dynlockid,
--CRYPTO_destroy_dynlockid, CRYPTO_lock - OpenSSL thread support
--
--=head1 SYNOPSIS
--
-- #include <openssl/crypto.h>
--
-- /* Don't use this structure directly. */
-- typedef struct crypto_threadid_st
-- {
-- void *ptr;
-- unsigned long val;
-- } CRYPTO_THREADID;
-- /* Only use CRYPTO_THREADID_set_[numeric|pointer]() within callbacks */
-- void CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val);
-- void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr);
-- int CRYPTO_THREADID_set_callback(void (*threadid_func)(CRYPTO_THREADID *));
-- void (*CRYPTO_THREADID_get_callback(void))(CRYPTO_THREADID *);
-- void CRYPTO_THREADID_current(CRYPTO_THREADID *id);
-- int CRYPTO_THREADID_cmp(const CRYPTO_THREADID *a,
-- const CRYPTO_THREADID *b);
-- void CRYPTO_THREADID_cpy(CRYPTO_THREADID *dest,
-- const CRYPTO_THREADID *src);
-- unsigned long CRYPTO_THREADID_hash(const CRYPTO_THREADID *id);
--
-- int CRYPTO_num_locks(void);
--
-- /* struct CRYPTO_dynlock_value needs to be defined by the user */
-- struct CRYPTO_dynlock_value;
--
-- void CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value *
-- (*dyn_create_function)(char *file, int line));
-- void CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function)
-- (int mode, struct CRYPTO_dynlock_value *l,
-- const char *file, int line));
-- void CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function)
-- (struct CRYPTO_dynlock_value *l, const char *file, int line));
--
-- int CRYPTO_get_new_dynlockid(void);
--
-- void CRYPTO_destroy_dynlockid(int i);
--
-- void CRYPTO_lock(int mode, int n, const char *file, int line);
--
-- #define CRYPTO_w_lock(type) \
-- CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-- #define CRYPTO_w_unlock(type) \
-- CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-- #define CRYPTO_r_lock(type) \
-- CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-- #define CRYPTO_r_unlock(type) \
-- CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-- #define CRYPTO_add(addr,amount,type) \
-- CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)
--
--=head1 DESCRIPTION
--
--OpenSSL can safely be used in multi-threaded applications provided
--that at least two callback functions are set, locking_function and
--threadid_func.
--
--locking_function(int mode, int n, const char *file, int line) is
--needed to perform locking on shared data structures.
--(Note that OpenSSL uses a number of global data structures that
--will be implicitly shared whenever multiple threads use OpenSSL.)
--Multi-threaded applications will crash at random if it is not set.
--
--locking_function() must be able to handle up to CRYPTO_num_locks()
--different mutex locks. It sets the B<n>-th lock if B<mode> &
--B<CRYPTO_LOCK>, and releases it otherwise.
--
--B<file> and B<line> are the file number of the function setting the
--lock. They can be useful for debugging.
--
--threadid_func(CRYPTO_THREADID *id) is needed to record the currently-executing
--thread's identifier into B<id>. The implementation of this callback should not
--fill in B<id> directly, but should use CRYPTO_THREADID_set_numeric() if thread
--IDs are numeric, or CRYPTO_THREADID_set_pointer() if they are pointer-based.
--If the application does not register such a callback using
--CRYPTO_THREADID_set_callback(), then a default implementation is used - on
--Windows and BeOS this uses the system's default thread identifying APIs, and on
--all other platforms it uses the address of B<errno>. The latter is satisfactory
--for thread-safety if and only if the platform has a thread-local error number
--facility.
--
--Once threadid_func() is registered, or if the built-in default implementation is
--to be used;
--
--=over 4
--
--=item *
--CRYPTO_THREADID_current() records the currently-executing thread ID into the
--given B<id> object.
--
--=item *
--CRYPTO_THREADID_cmp() compares two thread IDs (returning zero for equality, ie.
--the same semantics as memcmp()).
--
--=item *
--CRYPTO_THREADID_cpy() duplicates a thread ID value,
--
--=item *
--CRYPTO_THREADID_hash() returns a numeric value usable as a hash-table key. This
--is usually the exact numeric or pointer-based thread ID used internally, however
--this also handles the unusual case where pointers are larger than 'long'
--variables and the platform's thread IDs are pointer-based - in this case, mixing
--is done to attempt to produce a unique numeric value even though it is not as
--wide as the platform's true thread IDs.
--
--=back
--
--Additionally, OpenSSL supports dynamic locks, and sometimes, some parts
--of OpenSSL need it for better performance. To enable this, the following
--is required:
--
--=over 4
--
--=item *
--Three additional callback function, dyn_create_function, dyn_lock_function
--and dyn_destroy_function.
--
--=item *
--A structure defined with the data that each lock needs to handle.
--
--=back
--
--struct CRYPTO_dynlock_value has to be defined to contain whatever structure
--is needed to handle locks.
--
--dyn_create_function(const char *file, int line) is needed to create a
--lock. Multi-threaded applications might crash at random if it is not set.
--
--dyn_lock_function(int mode, CRYPTO_dynlock *l, const char *file, int line)
--is needed to perform locking off dynamic lock numbered n. Multi-threaded
--applications might crash at random if it is not set.
--
--dyn_destroy_function(CRYPTO_dynlock *l, const char *file, int line) is
--needed to destroy the lock l. Multi-threaded applications might crash at
--random if it is not set.
--
--CRYPTO_get_new_dynlockid() is used to create locks. It will call
--dyn_create_function for the actual creation.
--
--CRYPTO_destroy_dynlockid() is used to destroy locks. It will call
--dyn_destroy_function for the actual destruction.
--
--CRYPTO_lock() is used to lock and unlock the locks. mode is a bitfield
--describing what should be done with the lock. n is the number of the
--lock as returned from CRYPTO_get_new_dynlockid(). mode can be combined
--from the following values. These values are pairwise exclusive, with
--undefined behaviour if misused (for example, CRYPTO_READ and CRYPTO_WRITE
--should not be used together):
--
-- CRYPTO_LOCK 0x01
-- CRYPTO_UNLOCK 0x02
-- CRYPTO_READ 0x04
-- CRYPTO_WRITE 0x08
--
--=head1 RETURN VALUES
--
--CRYPTO_num_locks() returns the required number of locks.
--
--CRYPTO_get_new_dynlockid() returns the index to the newly created lock.
--
--The other functions return no values.
--
--=head1 NOTES
--
--You can find out if OpenSSL was configured with thread support:
--
-- #define OPENSSL_THREAD_DEFINES
-- #include <openssl/opensslconf.h>
-- #if defined(OPENSSL_THREADS)
-- // thread support enabled
-- #else
-- // no thread support
-- #endif
--
--Also, dynamic locks are currently not used internally by OpenSSL, but
--may do so in the future.
--
--=head1 EXAMPLES
--
--B<crypto/threads/mttest.c> shows examples of the callback functions on
--Solaris, Irix and Win32.
--
--=head1 HISTORY
--
--CRYPTO_set_locking_callback() is
--available in all versions of SSLeay and OpenSSL.
--CRYPTO_num_locks() was added in OpenSSL 0.9.4.
--All functions dealing with dynamic locks were added in OpenSSL 0.9.5b-dev.
--B<CRYPTO_THREADID> and associated functions were introduced in OpenSSL 1.0.0
--to replace (actually, deprecate) the previous CRYPTO_set_id_callback(),
--CRYPTO_get_id_callback(), and CRYPTO_thread_id() functions which assumed
--thread IDs to always be represented by 'unsigned long'.
--
--=head1 SEE ALSO
--
--L<crypto(3)|crypto(3)>
--
--=cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/X509_NAME_ENTRY_get_object.pod openssl-1.0.0a/doc/crypto/X509_NAME_ENTRY_get_object.pod
---- openssl-1.0.0a.orig//doc/crypto/X509_NAME_ENTRY_get_object.pod 2006-05-14 12:27:59.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/X509_NAME_ENTRY_get_object.pod 2010-09-01 19:36:31.620125025 +0100
-@@ -65,7 +65,7 @@
- =head1 SEE ALSO
-
- L<ERR_get_error(3)|ERR_get_error(3)>, L<d2i_X509_NAME(3)|d2i_X509_NAME(3)>,
--L<OBJ_nid2obj(3),OBJ_nid2obj(3)>
-+L<OBJ_nid2obj(3)|OBJ_nid2obj(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/ssl/SSL_get_error.pod openssl-1.0.0a/doc/ssl/SSL_get_error.pod
---- openssl-1.0.0a.orig//doc/ssl/SSL_get_error.pod 2005-03-30 12:50:14.000000000 +0100
-+++ openssl-1.0.0a/doc/ssl/SSL_get_error.pod 2010-09-01 19:36:40.259360162 +0100
-@@ -105,7 +105,7 @@
-
- =head1 SEE ALSO
-
--L<ssl(3)|ssl(3)>, L<err(3)|err(3)>
-+L<ssl(3)|ssl(3)>, L<openssl_err(3)|openssl_err(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/ssl/SSL_want.pod openssl-1.0.0a/doc/ssl/SSL_want.pod
---- openssl-1.0.0a.orig//doc/ssl/SSL_want.pod 2005-03-30 12:50:14.000000000 +0100
-+++ openssl-1.0.0a/doc/ssl/SSL_want.pod 2010-09-01 19:36:40.259360162 +0100
-@@ -72,6 +72,6 @@
-
- =head1 SEE ALSO
-
--L<ssl(3)|ssl(3)>, L<err(3)|err(3)>, L<SSL_get_error(3)|SSL_get_error(3)>
-+L<ssl(3)|ssl(3)>, L<openssl_err(3)|openssl_err(3)>, L<SSL_get_error(3)|SSL_get_error(3)>
-
- =cut
-diff -Naur openssl-1.0.0a.orig//FAQ openssl-1.0.0a/FAQ
---- openssl-1.0.0a.orig//FAQ 2010-06-01 14:31:36.000000000 +0100
-+++ openssl-1.0.0a/FAQ 2010-09-01 19:39:19.677244857 +0100
-@@ -724,7 +724,7 @@
- CRYPTO_set_id_callback(), for all versions of OpenSSL up to and
- including 0.9.8[abc...]. As of version 1.0.0, CRYPTO_set_id_callback()
- and associated APIs are deprecated by CRYPTO_THREADID_set_callback()
--and friends. This is described in the threads(3) manpage.
-+and friends. This is described in the openssl_threads(3) manpage.
-
- * I've compiled a program under Windows and it crashes: why?
-
diff --git a/testing/openssl/no-rpath.patch b/testing/openssl/no-rpath.patch
deleted file mode 100644
index ebd95e23d..000000000
--- a/testing/openssl/no-rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.shared.no-rpath 2005-06-23 22:47:54.000000000 +0200
-+++ Makefile.shared 2005-11-16 22:35:37.000000000 +0100
-@@ -153,7 +153,7 @@
- NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
-
--DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(CFLAGS)"
-
- #This is rather special. It's a special target with which one can link
- #applications without bothering with any features that have anything to
diff --git a/testing/psiconv/PKGBUILD b/testing/psiconv/PKGBUILD
deleted file mode 100644
index e144caea3..000000000
--- a/testing/psiconv/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 137870 2011-09-12 05:31:25Z eric $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=psiconv
-pkgver=0.9.8
-pkgrel=8
-pkgdesc="Converts Psion 5(MX) files to more commonly used file formats"
-arch=('i686' 'x86_64')
-url="http://software.frodo.looijaard.name/psiconv/"
-license=('GPL')
-depends=('imagemagick')
-makedepends=('bc')
-backup=('etc/psiconv/psiconv.conf')
-options=('!libtool')
-source=(http://software.frodo.looijaard.name/${pkgname}/files/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8d7548e3c6b9cd408544736133728acd')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-}
diff --git a/testing/pstoedit/PKGBUILD b/testing/pstoedit/PKGBUILD
deleted file mode 100644
index d1d411976..000000000
--- a/testing/pstoedit/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 137872 2011-09-12 05:31:26Z eric $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Tobias Powalowski <t.powa@gmx.de>
-
-pkgname=pstoedit
-pkgver=3.60
-pkgrel=2
-pkgdesc="Translates PostScript and PDF graphics into other vector formats"
-arch=('i686' 'x86_64')
-url="http://www.pstoedit.net/"
-license=('GPL')
-depends=('gcc-libs' 'plotutils' 'gd' 'imagemagick')
-makedepends=('ghostscript')
-options=('!libtool' '!makeflags')
-source=("http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz"
- 'pstoedit-3.50-parallel.patch' 'pstoedit-3.50-plugin-close.patch')
-sha1sums=('649ade3d873429548eb6dd9f3e13cb79a8d6a1a2'
- '6e278b164d3e59fbb11e7fd5ae8ffb038932d69a'
- '54bbe019de66eb4cb8525371462595d21fbd074e')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- sed -i 's/-pedantic//' configure
-
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/pstoedit/pstoedit-3.50-parallel.patch b/testing/pstoedit/pstoedit-3.50-parallel.patch
deleted file mode 100644
index 4f1f73b04..000000000
--- a/testing/pstoedit/pstoedit-3.50-parallel.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d6178df..66f377b 100755
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -86,6 +86,7 @@ libp2edrvstd_la_SOURCES= \
- $(sample_drivers_src)
- libp2edrvstd_la_LIBADD=-L. libpstoedit.la
- libp2edrvstd_la_LDFLAGS=-no-undefined -module
-+libp2edrvstd_la_DEPENDENCIES = libpstoedit.la
-
- #libp2edrvplugins_la_SOURCES=drvmif.cpp drvcgm.cpp drvrtf.cpp drvwwmf.cpp
- #libp2edrvplugins_la_LIBADD=
-@@ -95,15 +96,18 @@ libp2edrvstd_la_LDFLAGS=-no-undefined -module
- libp2edrvlplot_la_SOURCES=drvlplot.cpp drvlplot.h initlibrary.cpp
- libp2edrvlplot_la_LIBADD=$(LIBPLOTTER_LDFLAGS) -L. libpstoedit.la
- libp2edrvlplot_la_LDFLAGS=-no-undefined -module
-+libp2edrvlplot_la_DEPENDENCIES = libpstoedit.la
-
- libp2edrvswf_la_SOURCES=drvswf.cpp drvswf.h initlibrary.cpp
- libp2edrvswf_la_LIBADD=$(LIBMING_LDFLAGS) -L. libpstoedit.la
- libp2edrvswf_la_LDFLAGS=-no-undefined -module
-+libp2edrvswf_la_DEPENDENCIES = libpstoedit.la
-
- # note the __ stand for ++ - automake treats all no alphanums chars as _
- libp2edrvmagick___la_SOURCES=drvmagick++.cpp drvmagick++.h initlibrary.cpp
- libp2edrvmagick___la_LIBADD=-L. libpstoedit.la
- libp2edrvmagick___la_LDFLAGS=-no-undefined ${LIBMAGICK_LDFLAGS} -module
-+libp2edrvmagick___la_DEPENDENCIES = libpstoedit.la
- # moved to configure.ac because needed only for g++ libp2edrvmagick___la_CPPFLAGS=$(LIBMAGICK_CFLAGS) $(AM_CPPFLAGS) -Wno-long-long
-
- if USE_EMFBYSOURCE
-@@ -113,6 +117,7 @@ else
- libp2edrvwmf_la_SOURCES=drvwmf.cpp drvwmf.h initlibrary.cpp
- libp2edrvwmf_la_LDFLAGS=-no-undefined $(LIBEMF_LDFLAGS) -L. libpstoedit.la -module
- endif
-+libp2edrvwmf_la_DEPENDENCIES = libpstoedit.la
-
- libpstoedit_la_SOURCES = \
- dynload.cpp dynload.h \
-@@ -135,6 +140,7 @@ libpstoedit_la_LDFLAGS = -no-undefined
-
- pstoedit_SOURCES = cmdmain.cpp
- pstoedit_LDFLAGS = -no-undefined -L. libpstoedit.la ${LIBLD_LDFLAGS}
-+pstoedit_DEPENDENCIES = libpstoedit.la
-
- pkginclude_HEADERS = \
- pstoedit.h \
diff --git a/testing/pstoedit/pstoedit-3.50-plugin-close.patch b/testing/pstoedit/pstoedit-3.50-plugin-close.patch
deleted file mode 100644
index 6787d6aef..000000000
--- a/testing/pstoedit/pstoedit-3.50-plugin-close.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugzilla.redhat.com/507035
-
-diff --git a/src/dynload.cpp b/src/dynload.cpp
-index c0db355..7c073ef 100644
---- a/src/dynload.cpp
-+++ b/src/dynload.cpp
-@@ -147,7 +147,6 @@ void DynLoader::close()
-
- DynLoader::~DynLoader()
- {
-- close();
- libname=0;
- }
-
diff --git a/testing/sysvinit/PKGBUILD b/testing/sysvinit/PKGBUILD
deleted file mode 100644
index 59201d756..000000000
--- a/testing/sysvinit/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 136463 2011-08-29 20:29:35Z tomegun $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=sysvinit
-pkgver=2.88
-pkgrel=3
-pkgdesc="Linux System V Init"
-arch=('i686' 'x86_64')
-url="http://savannah.nongnu.org/projects/sysvinit"
-license=('GPL')
-groups=('base')
-depends=('shadow' 'util-linux' 'coreutils' 'glibc' 'awk')
-install=sysvinit.install
-source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgname}-${pkgver}dsf.tar.bz2)
-md5sums=('6eda8a97b86e0a6f59dabbf25202aa6f')
-sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}dsf"
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}dsf"
- make ROOT="${pkgdir}" install
-
- # mountpoint is now provided by util-linux instead
- cd "${pkgdir}"
- rm bin/mountpoint
- rm usr/share/man/man1/mountpoint.1
-}
diff --git a/testing/sysvinit/sysvinit.install b/testing/sysvinit/sysvinit.install
deleted file mode 100644
index 2f0e62e74..000000000
--- a/testing/sysvinit/sysvinit.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_upgrade() {
- [ -x sbin/init ] && sbin/init u
-}
diff --git a/testing/transcode/PKGBUILD b/testing/transcode/PKGBUILD
deleted file mode 100644
index 47ad04c18..000000000
--- a/testing/transcode/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 137874 2011-09-12 05:31:29Z eric $
-# Maintainer:
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: roberto <roberto@archlinux.org>
-
-pkgname=transcode
-_sripver=0.3-4
-pkgver=1.1.5
-pkgrel=6
-pkgdesc="A video/DVD ripper and encoder for the terminal/console"
-arch=('i686' 'x86_64')
-url="http://tcforge.berlios.de/"
-license=('GPL')
-depends=('imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
- 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec')
-makedepends=('nasm')
-options=('!libtool' '!makeflags')
-source=(http://download2.berlios.de/tcforge/${pkgname}-${pkgver}.tar.bz2
- http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
- transcode-1.1.5-jpeg-7.patch transcode-1.1.5-mpa.patch)
-md5sums=('41ac6b1c0fe30f3aab286e771fc31b9e'
- 'c0bd49a88f667c68c4430ad25bbed510'
- 'af4056b7530a6f147594f676849e7c7b'
- 'c299cfc6c4be6a5512d1a129f04e5450')
-sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26'
- 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
- '9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977'
- '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p0 < ../transcode-1.1.5-jpeg-7.patch
- patch -p1 < ../transcode-1.1.5-mpa.patch
-
- # building from here
- ./configure --prefix=/usr \
- --enable-sse=no --enable-sse2=no --enable-altivec=no --enable-mmx \
- --enable-lame --enable-ogg --enable-vorbis --enable-theora \
- --enable-libdv --enable-libxml2 --enable-v4l \
- --enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \
- --enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \
- --enable-xvid --enable-x264 --enable-alsa \
- --enable-libmpeg2 --enable-libmpeg2convert \
- --with-libxml2-prefix=/usr \
- --with-mjpegtools-prefix=/usr \
- --with-imagemagick-prefix=/usr \
- --with-libdv-includes=/usr \
- --with-libpostproc-includes=/usr/include/libpostproc \
- --with-ogg-prefix=/usr \
- --with-lame-libs=/usr \
- --with-lzo-libs=/usr/lib \
- --with-libavcodec-prefix=/usr \
- --with-libavcodec-includes=/usr/include \
- --with-libavcodec-libs=/usr/lib
-
- make
- ##############################################################################
- # this imports the latest subtitleripper sources and replaces the internal
- mkdir contrib
- mv "${srcdir}/subtitleripper" contrib/subrip
- # removes dependency on libppm, make it dependend on netpbm just failed, argh...
- cd contrib/subrip
- sed -e 's|^\(.*lppm.*\)$|#\1|' \
- -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \
- -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \
- -i Makefile
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- cd contrib/subrip
- install -m 755 pgm2txt "${pkgdir}/usr/bin/"
- install -m 755 srttool "${pkgdir}/usr/bin/"
- install -m 755 subtitle2pgm "${pkgdir}/usr/bin/"
- install -m 755 subtitle2vobsub "${pkgdir}/usr/bin/"
- install -m 755 vobsub2pgm "${pkgdir}/usr/bin/"
-}
diff --git a/testing/transcode/transcode-1.1.5-jpeg-7.patch b/testing/transcode/transcode-1.1.5-jpeg-7.patch
deleted file mode 100644
index 288932a61..000000000
--- a/testing/transcode/transcode-1.1.5-jpeg-7.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=294488
-
-Patch by: Salah Coronya
-
-Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling isn't set by default to FALSE anymore.
-
---- export/export_jpg.c
-+++ export/export_jpg.c
-@@ -91,6 +91,7 @@
-
- jpeg_set_quality(&encinfo, quality, TRUE);
- encinfo.raw_data_in = TRUE;
-+ encinfo.do_fancy_downsampling = FALSE;
- encinfo.in_color_space = JCS_YCbCr;
-
- encinfo.comp_info[0].h_samp_factor = 2;
diff --git a/testing/transcode/transcode-1.1.5-mpa.patch b/testing/transcode/transcode-1.1.5-mpa.patch
deleted file mode 100644
index e7fb0fc1c..000000000
--- a/testing/transcode/transcode-1.1.5-mpa.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- transcode-1.1.5-old/export/aud_aux.c 2010-07-04 12:44:31.867550180 -0500
-+++ transcode-1.1.5/export/aud_aux.c 2010-07-04 13:41:01.253292529 -0500
-@@ -347,6 +347,7 @@
- //-- set parameters (bitrate, channels and sample-rate) --
- //--------------------------------------------------------
- memset(&mpa_ctx, 0, sizeof(mpa_ctx)); // default all
-+ mpa_ctx.codec_type = CODEC_TYPE_AUDIO;
- mpa_ctx.bit_rate = vob->mp3bitrate * 1000; // bitrate dest.
- mpa_ctx.channels = vob->dm_chan; // channels
- mpa_ctx.sample_rate = vob->a_rate;
diff --git a/testing/wget/PKGBUILD b/testing/wget/PKGBUILD
deleted file mode 100644
index d37af779d..000000000
--- a/testing/wget/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 138166 2011-09-17 22:43:36Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=wget
-pkgver=1.13.4
-pkgrel=1
-pkgdesc="A network utility to retrieve files from the Web"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/wget/wget.html"
-license=('GPL3')
-groups=('base')
-depends=('glibc' 'openssl')
-optdepends=('ca-certificates: HTTPS downloads')
-backup=('etc/wgetrc')
-install=wget.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('7f518b3a71e9efd330e9a0c3714f8463')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # Note : We do not build with --enable-nls, because there is a bug in wget causing
- # international domain names to be not properly converted to punycode if
- # the current locale is a UTF-8 one
- # See : http://lists.gnu.org/archive/html/bug-wget/2011-02/msg00026.html
-
- ./configure -with-ssl=openssl --prefix=/usr --sysconfdir=/etc
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- cat >> "$pkgdir/etc/wgetrc" <<EOF
-
-# default root certs location
-ca_certificate=/etc/ssl/certs/ca-certificates.crt
-EOF
-
- # remove IRI option from wgetrc as it does not work (see above)
- sed -i '118,120d' $pkgdir/etc/wgetrc
-
-}
diff --git a/testing/wget/wget.install b/testing/wget/wget.install
deleted file mode 100644
index 8eb6a2c3f..000000000
--- a/testing/wget/wget.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(wget.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file $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 $infodir/dir 2> /dev/null
- done
-}
diff --git a/testing/xine-lib/PKGBUILD b/testing/xine-lib/PKGBUILD
deleted file mode 100644
index 21da5910d..000000000
--- a/testing/xine-lib/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 137876 2011-09-12 05:31:30Z eric $
-# Maintainer: Eric BĂ©langer <eric@archlinux.org>
-
-pkgname=xine-lib
-pkgver=1.1.19
-pkgrel=5
-pkgdesc="A multimedia playback engine"
-arch=('i686' 'x86_64')
-url="http://www.xine-project.org"
-license=('LGPL' 'GPL')
-depends=('libgl' 'libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug')
-makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa'
- 'v4l-utils' 'vcdimager' 'jack' 'gdk-pixbuf2' 'libpulse' 'speex' 'aalib')
-optdepends=('imagemagick: for using the imagemagick plugin' \
- 'smbclient: for using the smb plugin' \
- 'jack: for using the jack plugin' \
- 'vcdimager: for using the vcd plugin' \
- 'gdk-pixbuf2: for using the gdk-pixbuf plugin' \
- 'mesa: for using the opengl plugin' \
- 'libpulse: for using the pulseaudio plugin' \
- 'speex: for using the speex plugin' \
- 'v4l-utils: for using the v4l plugin' \
- 'wavpack: for using the wavpack plugin' \
- 'faad2: for using the faad plugin' \
- 'libmng: for using the mng plugin' \
- 'aalib: for using the aalib plugin')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.bz2
- xine-lib-1.1.1-configure-no-mcpu-march.patch xine-lib-1.1.19-xvmc.patch)
-md5sums=('a410a0f0617e1d6309f0cbe907f73f8a'
- '9776df4eb54d2f1f68d8268adbc3b5c2'
- '8662fb124870b1dd7effe4ff5e2a2e3d')
-sha1sums=('5afcc28c5cf2bdaab99d951960f6587797e1e5a0'
- '121a8358d7919b2e51067412373f52848290338a'
- '920bf27e6e3523dfe4cc9c802ff713e9688a3f34')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p0 < ../xine-lib-1.1.1-configure-no-mcpu-march.patch
- patch -p0 < ../xine-lib-1.1.19-xvmc.patch
- sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \
- configure.ac src/input/input_v4l.c src/video_out/video_out_syncfb.h
-
- libtoolize --force --copy
- aclocal -I m4
- autoconf
- automake --add-missing
-
- ./configure --prefix=/usr --with-wavpack --with-external-ffmpeg --with-external-libfaad
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch b/testing/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch
deleted file mode 100644
index 4b6ba9e35..000000000
--- a/testing/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- m4/optimizations.m4.orig 2005-11-27 01:20:08.000000000 +0100
-+++ m4/optimizations.m4 2005-11-27 01:22:56.000000000 +0100
-@@ -161,10 +161,6 @@
- ;;
-
- esac
-- if test x"$archopt_val" != x; then
-- CFLAGS="$sarchopt=$archopt_val $CFLAGS"
-- DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
-- fi
- fi
- else
- dnl we have the Intel compiler
diff --git a/testing/xine-lib/xine-lib-1.1.19-xvmc.patch b/testing/xine-lib/xine-lib-1.1.19-xvmc.patch
deleted file mode 100644
index bef8b0bac..000000000
--- a/testing/xine-lib/xine-lib-1.1.19-xvmc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Quoting ChangeLog of X11's videoproto package:
-vldXvMC.h: stop uselessly including XvMClib.h
-
---- src/video_out/xxmc.h
-+++ src/video_out/xxmc.h
-@@ -77,10 +77,10 @@
- #include <X11/extensions/XShm.h>
- #include <X11/extensions/Xv.h>
- #include <X11/extensions/Xvlib.h>
-+#include <X11/extensions/XvMClib.h>
- #ifdef HAVE_VLDXVMC
- #include <X11/extensions/vldXvMC.h>
- #else
-- #include <X11/extensions/XvMClib.h>
- #include <X11/extensions/XvMC.h>
- #endif
-
diff --git a/testing/ypbind-mt/PKGBUILD b/testing/ypbind-mt/PKGBUILD
deleted file mode 100644
index e433f4cf3..000000000
--- a/testing/ypbind-mt/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 137945 2011-09-12 22:18:20Z tomegun $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=ypbind-mt
-pkgver=1.33
-pkgrel=3
-pkgdesc='Linux NIS daemon'
-url='http://www.linux-nis.org/nis/ypbind-mt/'
-license=('GPL2')
-arch=('i686' 'x86_64')
-makedepends=('networkmanager')
-depends=('rpcbind' 'openslp' 'dbus-glib')
-optdepends=('yp-tools: to set a domain name')
-backup=('etc/yp.conf' 'etc/conf.d/ypbind' 'etc/conf.d/nisdomainname')
-source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz"
- 'nisdomainname.conf'
- 'ypbind.conf'
- 'ypbind')
-sha1sums=('49f578d15aa5d4f4130a2e96cd9c0e519263fc88'
- 'eb00aecc0679e25a36b007e797f4468b40cb3e8e'
- '07dee386d001fb9e9e6b76dda8af5b2092e5a4a2'
- '112fc2aedfe3f761325b69647b7938bc1be5bfcd')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure \
- --prefix=/usr \
- --enable-dbus-nm \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- install -D -m644 etc/yp.conf "${pkgdir}"/etc/yp.conf
- install -D -m755 ../ypbind "${pkgdir}"/etc/rc.d/ypbind
- install -D -m644 ../ypbind.conf "${pkgdir}"/etc/conf.d/ypbind
- install -D -m644 ../nisdomainname.conf "${pkgdir}"/etc/conf.d/nisdomainname
- install -d -m755 "${pkgdir}"/var/yp/binding
-}
diff --git a/testing/ypbind-mt/nisdomainname.conf b/testing/ypbind-mt/nisdomainname.conf
deleted file mode 100644
index bbbbf8fc7..000000000
--- a/testing/ypbind-mt/nisdomainname.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# NIS domain to be set in /etc/rc.d/ypbind
-#
-NISDOMAINNAME=""
diff --git a/testing/ypbind-mt/ypbind b/testing/ypbind-mt/ypbind
deleted file mode 100755
index 6a5ef11e3..000000000
--- a/testing/ypbind-mt/ypbind
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-. /etc/conf.d/ypbind
-. /etc/conf.d/nisdomainname
-
-name=ypbind
-PID=$(pidof -o %PPID /usr/sbin/ypbind)
-
-case "$1" in
-start)
- stat_busy "Starting $name daemon"
- [[ -n $NISDOMAINNAME ]] && /usr/bin/domainname "$NISDOMAINNAME" &>/dev/null
- [[ -z "$PID" ]] && /usr/sbin/ypbind $YPBIND_ARGS &>/dev/null \
- && { add_daemon $name; stat_done; } \
- || { stat_fail; exit 1; }
- ;;
-stop)
- stat_busy "Stopping $name daemon"
- [[ -n "$PID" ]] && kill $PID &>/dev/null \
- && { rm_daemon $name; stat_done; } \
- || { stat_fail; exit 1; }
- ;;
-restart)
- $0 stop
- sleep 1
- $0 start
- ;;
-*)
- echo "usage: $0 {start|stop|restart}"
- exit 1
- ;;
-esac
diff --git a/testing/ypbind-mt/ypbind.conf b/testing/ypbind-mt/ypbind.conf
deleted file mode 100644
index fd0ebd491..000000000
--- a/testing/ypbind-mt/ypbind.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to ypbind
-#
-YPBIND_ARGS=""