diff --git a/app-admin/389-console/389-console-1.1.6.ebuild b/app-admin/389-console/389-console-1.1.6.ebuild index 662cb0ccc40d..f04c1eb9355e 100644 --- a/app-admin/389-console/389-console-1.1.6.ebuild +++ b/app-admin/389-console/389-console-1.1.6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/389-console/389-console-1.1.6.ebuild,v 1.2 2010/10/17 10:10:27 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/389-console/389-console-1.1.6.ebuild,v 1.3 2012/01/26 18:58:41 lxnay Exp $ EAPI="2" @@ -10,7 +10,8 @@ inherit java-pkg-2 eutils java-ant-2 DESCRIPTION="A Java based console for remote management 389 server" HOMEPAGE="http://port389.org/" -SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2" +SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2 + http://dev.gentoo.org/~lxnay/${PN}/fedora.png" LICENSE="LGPL-2.1" SLOT="1.1" @@ -49,6 +50,6 @@ src_install() { --pkg_args "-Djava.util.prefs.systemRoot=\"\$HOME/.${PN}\" -Djava.util.prefs.userRoot=\"\$HOME/.${PN}\"" \ || die - doicon "${FILESDIR}"/fedora.png || die "doicon failed" + doicon "${DISTDIR}"/fedora.png || die "doicon failed" make_desktop_entry ${PN} "Port389 Management Console" fedora System } diff --git a/app-admin/389-console/389-console-1.1.7.ebuild b/app-admin/389-console/389-console-1.1.7.ebuild index c28bb2e68ea8..e191bd6018fb 100644 --- a/app-admin/389-console/389-console-1.1.7.ebuild +++ b/app-admin/389-console/389-console-1.1.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/389-console/389-console-1.1.7.ebuild,v 1.1 2011/08/14 09:29:12 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/389-console/389-console-1.1.7.ebuild,v 1.2 2012/01/26 18:58:41 lxnay Exp $ EAPI="2" @@ -10,7 +10,8 @@ inherit java-pkg-2 eutils java-ant-2 DESCRIPTION="A Java based console for remote management 389 server" HOMEPAGE="http://port389.org/" -SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2" +SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2 + http://dev.gentoo.org/~lxnay/${PN}/fedora.png" LICENSE="LGPL-2.1" SLOT="1.1" @@ -49,6 +50,6 @@ src_install() { --pkg_args "-Djava.util.prefs.systemRoot=\"\$HOME/.${PN}\" -Djava.util.prefs.userRoot=\"\$HOME/.${PN}\"" \ || die - doicon "${FILESDIR}"/fedora.png || die "doicon failed" + doicon "${DISTDIR}"/fedora.png || die "doicon failed" make_desktop_entry ${PN} "Port389 Management Console" fedora System } diff --git a/app-admin/389-console/Manifest b/app-admin/389-console/Manifest index 058784ab8c17..400e1e40da5e 100644 --- a/app-admin/389-console/Manifest +++ b/app-admin/389-console/Manifest @@ -1,2 +1,3 @@ DIST 389-console-1.1.6.tar.bz2 113307 RMD160 8fdf7f4f6349b8796295a5e323aeecb5840f9db4 SHA1 06f7128bc86d1429c6fd0a920ecbb0bac9799206 SHA256 8b5a4c250df29224f2f833395555c9a8ba4b4ed2a90fa1e9f4b36026d7c28fbb DIST 389-console-1.1.7.tar.bz2 112970 RMD160 a50e3ca3fbde03e61b68944931a6dc2b15129a9c SHA1 87ae48c131b2964f9dac97e011a8a8fb61d3a8a4 SHA256 dcaf63654ec4c6986b9a3b10d79d8e0592f334fd42d34869b0b767bbffd01a05 +DIST fedora.png 11606 RMD160 766c23052bd3f6d323e80f4b702e47e31d8b7671 SHA1 61bb2229f459323809bfa4768a0b9928c06bcb63 SHA256 88318e1704924c7d33aac3e37c195f99d29eb6f6f6235f254f254881257bbb0e diff --git a/app-admin/389-console/files/fedora.png b/app-admin/389-console/files/fedora.png deleted file mode 100644 index 830fe0888b40..000000000000 Binary files a/app-admin/389-console/files/fedora.png and /dev/null differ diff --git a/app-admin/webmin/webmin-1.580.ebuild b/app-admin/webmin/webmin-1.580.ebuild index c250f2ceba96..0ba753ab91bf 100644 --- a/app-admin/webmin/webmin-1.580.ebuild +++ b/app-admin/webmin/webmin-1.580.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.580.ebuild,v 1.1 2012/01/24 20:54:42 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.580.ebuild,v 1.2 2012/01/26 22:00:54 mr_bones_ Exp $ EAPI="3" @@ -181,7 +181,6 @@ pkg_config(){ # and thus resetting all Webmin. Deletes the specific Webmin cron jobs too. local _reset="none" - # If in interactive mode ask user what should we do if [[ "${INTERACTIVE}" = "yes" ]]; then einfo diff --git a/app-backup/spideroak-bin/Manifest b/app-backup/spideroak-bin/Manifest index cb4dbe04b192..7577cb874af3 100644 --- a/app-backup/spideroak-bin/Manifest +++ b/app-backup/spideroak-bin/Manifest @@ -4,3 +4,5 @@ DIST spideroak-bin-4.1.9860_amd64.deb 24201826 RMD160 3527477a9b85b69f04ec21f116 DIST spideroak-bin-4.1.9860_x86.deb 23635590 RMD160 bc423c3b5713986ddfec292340cb82e33dad7360 SHA1 93a658745d2248d39518690d5a0e588b1eac67e3 SHA256 2850bddf8a227e14b6b4fc1590e3a1c49ee5a31d23d154610785daaf1aa52df1 DIST spideroak-bin-4.2.9907_amd64.deb 24566024 RMD160 12dc82098d4fe0eac78364e3569c12cb20b186fe SHA1 cd54a68f479697a50bd61fdb674d927b44157ca6 SHA256 185138252059328f576da06643c46585194a59a2f76af8769fc0dfb1674e492f DIST spideroak-bin-4.2.9907_x86.deb 23966688 RMD160 cf7878bcc513b0bf2bd05879215f693117bb716d SHA1 41d4a06f4cdb53c6c3e7aa38de2d94de44053e57 SHA256 bf2de114d41fa2cd86abdf03663c51669f9f4051c6c2e436768cb8411668efda +DIST spideroak-bin-4.2.9913_amd64.deb 24566640 RMD160 2ce797732ca6e157c7a2e93cede44cc18aec6fd8 SHA1 141de5c7fa4b17c9cc2fd074336a80f00da649b7 SHA256 4d0491e8b52503fa4cd5cf38cf235a946c9b9d28e1b01c5d2f02c2cdb97a6bff +DIST spideroak-bin-4.2.9913_x86.deb 23969878 RMD160 c083bb88033eda8600b190e57f063c94cf1e48b5 SHA1 1d9a2d3450a8ec737740c3a4308082679bf5479d SHA256 0e460c1d89c9284201b6537dcee5ae4078de422f5f426202ca24f28b59bd1a61 diff --git a/app-backup/spideroak-bin/files/headless.patch b/app-backup/spideroak-bin/files/headless.patch new file mode 100644 index 000000000000..e1b6c4601e61 --- /dev/null +++ b/app-backup/spideroak-bin/files/headless.patch @@ -0,0 +1,9 @@ +diff -Naur usr/bin/SpiderOak usr/bin/SpiderOak +--- usr/bin/SpiderOak 2012-01-21 19:32:02.000000000 -0500 ++++ usr/bin/SpiderOak 2012-01-21 19:32:57.000000000 -0500 +@@ -3,4 +3,4 @@ + LD_LIBRARY_PATH="/opt/SpiderOak:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH + QT_PLUGIN_PATH= ; export QT_PLUGIN_PATH +-exec "/opt/SpiderOak/SpiderOak" "$@" ++exec "/opt/SpiderOak/SpiderOak" --headless "$@" diff --git a/app-backup/spideroak-bin/files/opt-path.patch b/app-backup/spideroak-bin/files/opt-path.patch new file mode 100644 index 000000000000..adee3e174f3a --- /dev/null +++ b/app-backup/spideroak-bin/files/opt-path.patch @@ -0,0 +1,12 @@ +diff -Naur a/usr/bin/SpiderOak b/usr/bin/SpiderOak +--- a/usr/bin/SpiderOak 2011-12-26 16:27:35.000000000 -0500 ++++ b/usr/bin/SpiderOak 2012-01-09 10:04:03.000000000 -0500 +@@ -1,6 +1,6 @@ + #!/bin/sh + +-LD_LIBRARY_PATH="/usr/lib/SpiderOak:$LD_LIBRARY_PATH" ++LD_LIBRARY_PATH="/opt/SpiderOak:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH + QT_PLUGIN_PATH= ; export QT_PLUGIN_PATH +-exec "/usr/lib/SpiderOak/SpiderOak" "$@" ++exec "/opt/SpiderOak/SpiderOak" "$@" diff --git a/app-backup/spideroak-bin/metadata.xml b/app-backup/spideroak-bin/metadata.xml index 2dbb3caef80f..12671503d090 100644 --- a/app-backup/spideroak-bin/metadata.xml +++ b/app-backup/spideroak-bin/metadata.xml @@ -16,8 +16,9 @@ Anthony G. Basile - Build without graphic frontend - Use bundled pycurl - Use bundled Qt4 libraries + Build without graphic frontend + Use bundled pycurl + Use bundled Qt4 libraries + Use the system libraries rather than bundled diff --git a/app-backup/spideroak-bin/spideroak-bin-4.2.9913.ebuild b/app-backup/spideroak-bin/spideroak-bin-4.2.9913.ebuild new file mode 100644 index 000000000000..cd5e1342bf62 --- /dev/null +++ b/app-backup/spideroak-bin/spideroak-bin-4.2.9913.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.2.9913.ebuild,v 1.1 2012/01/26 17:31:11 blueness Exp $ + +EAPI="4" + +inherit eutils versionator + +REV=$(get_version_component_range 3) +SRC_URI_BASE="https://spideroak.com/directdownload?platform=ubuntulucid" + +DESCRIPTION="An easy, secure and consolidated free online backup, storage, access and sharing system." +HOMEPAGE="https://spideroak.com" +SRC_URI="x86? ( ${SRC_URI_BASE}&arch=i386&revision=${REV} -> ${P}_x86.deb ) + amd64? ( ${SRC_URI_BASE}&arch=x86_64&revision=${REV} -> ${P}_amd64.deb )" +RESTRICT="mirror strip" + +LICENSE="spideroak" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dbus headless system-libs" + +SSL_SLOT="0.9.8" + +DEPEND="" +RDEPEND=" + dbus? ( sys-apps/dbus ) + !headless? ( + media-libs/fontconfig + media-libs/freetype:2 + dev-libs/glib:2 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXrender + x11-libs/libXt + ) + system-libs? ( + dev-libs/openssl:$SSL_SLOT + net-misc/curl + >=sys-devel/gcc-4 + dev-libs/glib:2 + dev-libs/libpcre + media-libs/libpng:1.2 + x11-libs/qt-core + x11-libs/qt-gui + dev-db/sqlite:3 + net-libs/libssh2 + sys-libs/zlib + dev-lang/python:2.7 + dev-python/pycurl + ) +" + +S=${WORKDIR} + +QA_PREBUILT="*" + +src_unpack() { + unpack ${A} + unpack ./data.tar.gz + rm -f control.tar.gz data.tar.gz debian-binary + rm -f usr/share/doc/spideroak/copyright +} + +src_prepare() { + epatch "${FILESDIR}"/opt-path.patch + use headless && epatch "${FILESDIR}"/headless.patch + + # Remove bundled libraries/plugins/python interpreter. Please keep this + # mapping in sync with the RDEPEND system-libs? ( atoms ) above, and the + # list of deleted files below + # + # libcrypto.so.0.$SSL_SLOT => dev-libs/openssl:$SSL_SLOT + # libssl.so.$SSL_SLOT => dev-libs/openssl:$SSL_SLOT + # libcurl.so* => net-misc/curl + # libexpat.so* => dev-libs/expat + # libgcc_s.so => >=sys-devel/gcc-4 + # libstdc++.so* => >=sys-devel/gcc-4 + # libpcre.so* => dev-libs/libpcre + # libpng12* => media-libs/libpng:1.2 + # libQt*.so* => x11-libs/qt-core x11-libs/qt-gui + # libsqlite3.so* => dev-db/sqlite:3 + # libssh2.so* => net-libs/libssh2 + # libz.so* => sys-libs/zlib + # + # pycurl.so => dev-python/pycurl + # + # usr/lib/SpiderOak/py pyexpat.so => dev-lang/python:2.7 + # + if use system-libs; then + for lib in \ + libcrypto.so.$SSL_SLOT \ + libssl.so.$SSL_SLOT \ + libcurl.so* \ + libexpat.so* \ + libgcc_s.so* \ + libpcre.so* \ + libpng12* \ + libQt*.so* \ + libsqlite3.so* \ + libssh2.so* \ + libstdc++.so* \ + libz.so* \ + pycurl.so \ + pyexpat.so + do + rm usr/lib/SpiderOak/$lib || die "rm $lib failed" + done + + # Remove bundled python interpreter => dev-lang/python:2.7 + rm usr/lib/SpiderOak/py || die "rm py failed" + fi +} + +src_install() { + #install the executable script + exeinto /usr/bin + doexe usr/bin/SpiderOak + + #install the prebundled libraries + dodir /opt + cp -pPR usr/lib/SpiderOak "${ED}"/opt/ + + #install the config files + rm -rf etc/apt + use dbus || rm -rf etc/dbus-1 + insinto / + doins -r etc + + #install the changelog + insinto /usr/share/doc/${P} + doins usr/share/doc/spideroak/changelog.gz + + if ! use headless ; then + domenu usr/share/applications/spideroak.desktop + doicon usr/share/pixmaps/spideroak.png + fi +} + +pkg_postinst() { + if use headless; then + einfo "For instructions on running SpiderOak without a GUI, please read the FAQ:" + einfo " https://spideroak.com/faq/questions/62/how_do_i_install_spideroak_on_a_headless_linux_server/" + einfo " https://spideroak.com/faq/questions/67/how_can_i_use_spideroak_from_the_commandline/" + fi + if use system-libs; then + einfo "You have chosen to use your system libraries rather than the libraries that SpiderOak" + einfo "bundles with their software. The advantage to doing so is that it reduce the size of" + einfo "the package on your hard drive. However, upstream discourages this: see bug #398313." + fi +} diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index 7049d9628f46..87ca25b3ccfe 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -1,3 +1,2 @@ DIST qemu-0.11.1.tar.gz 3830070 RMD160 4da00fa6c01d7ff6af0ee781bc9260da577ea7d3 SHA1 7b983cd18f44c6e7627532b662f010389d3bcdff SHA256 2ecd2fc0af2ce5d96067ae82cc98a08275c596de53fc929484bedee1d6e7893a -DIST qemu-0.14.0.tar.gz 5439695 RMD160 1409264387e4cfe45143e10dd77b2574935e2d78 SHA1 cf8d916436d4b8775289399648e1f0ca9d867d18 SHA256 ba21e84d7853217830e167dae9999cdbff481189c6a0bb600ac7fb7201453108 DIST qemu-1.0.tar.gz 10848714 RMD160 3a60aef6cfebba6896bdb12c99525da5456172fd SHA1 7dcb1b3516554d6d899d7488cd444dbb7721fcee SHA256 47674b7da559d5e1b44cc401af9ac5ad962d14e9eede12567b13e4b841989737 diff --git a/app-emulation/qemu/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch b/app-emulation/qemu/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch new file mode 100644 index 000000000000..bd2bdc7425df --- /dev/null +++ b/app-emulation/qemu/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch @@ -0,0 +1,37 @@ +From d0ed2d2e8e863a9a64c9fc9c08fa68bee546ad00 Mon Sep 17 00:00:00 2001 +From: Anthony Liguori +Date: Mon, 23 Jan 2012 07:30:43 -0600 +Subject: [PATCH 26/26] e1000: bounds packet size against buffer size + +Otherwise we can write beyond the buffer and corrupt memory. This is tracked +as CVE-2012-0029. + +Signed-off-by: Anthony Liguori +--- + hw/e1000.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/hw/e1000.c b/hw/e1000.c +index 986ed9c..e164d79 100644 +--- a/hw/e1000.c ++++ b/hw/e1000.c +@@ -466,6 +466,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) + bytes = split_size; + if (tp->size + bytes > msh) + bytes = msh - tp->size; ++ ++ bytes = MIN(sizeof(tp->data) - tp->size, bytes); + pci_dma_read(&s->dev, addr, tp->data + tp->size, bytes); + if ((sz = tp->size + bytes) >= hdr && tp->size < hdr) + memmove(tp->header, tp->data, hdr); +@@ -481,6 +483,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) + // context descriptor TSE is not set, while data descriptor TSE is set + DBGOUT(TXERR, "TCP segmentaion Error\n"); + } else { ++ split_size = MIN(sizeof(tp->data) - tp->size, split_size); + pci_dma_read(&s->dev, addr, tp->data + tp->size, split_size); + tp->size += split_size; + } +-- +1.7.7.6 + diff --git a/app-emulation/qemu/qemu-0.14.0.ebuild b/app-emulation/qemu/qemu-0.14.0.ebuild deleted file mode 100644 index 0eee361742f8..000000000000 --- a/app-emulation/qemu/qemu-0.14.0.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.14.0.ebuild,v 1.4 2012/01/22 08:00:09 slyfox Exp $ - -EAPI="2" - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="git://git.qemu.org/qemu.git" - GIT_ECLASS="git" -fi - -inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs - -if [[ ${PV} = *9999* ]]; then - SRC_URI="" - KEYWORDS="" -else - SRC_URI="http://download.savannah.gnu.org/releases/qemu/${P}.tar.gz" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -fi - -DESCRIPTION="QEMU emulator and ABI wrapper" -HOMEPAGE="http://www.qemu.org" - -LICENSE="GPL-2" -SLOT="0" -# xen is disabled until the deps are fixed -IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses \ -png pulseaudio qemu-ifup sasl sdl ssl static vde" - -COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64" -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb" -IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus" - -for target in ${IUSE_SOFTMMU_TARGETS}; do - IUSE="${IUSE} +qemu_softmmu_targets_${target}" -done - -for target in ${IUSE_USER_TARGETS}; do - IUSE="${IUSE} +qemu_user_targets_${target}" -done - -RESTRICT="test" - -RDEPEND=" - !app-emulation/qemu-kvm - !app-emulation/qemu-user - sys-apps/pciutils - >=sys-apps/util-linux-2.16.0 - sys-libs/zlib - aio? ( dev-libs/libaio ) - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - bluetooth? ( net-wireless/bluez ) - brltty? ( app-accessibility/brltty ) - curl? ( net-misc/curl ) - esd? ( media-sound/esound ) - fdt? ( >=sys-apps/dtc-1.2.0 ) - jpeg? ( virtual/jpeg ) - ncurses? ( sys-libs/ncurses ) - png? ( media-libs/libpng ) - pulseaudio? ( media-sound/pulseaudio ) - qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) - sasl? ( dev-libs/cyrus-sasl ) - sdl? ( >=media-libs/libsdl-1.2.11[X] ) - ssl? ( net-libs/gnutls ) - vde? ( net-misc/vde ) -" - -DEPEND="${RDEPEND} - app-text/texi2html - >=sys-kernel/linux-headers-2.6.29 - ssl? ( dev-util/pkgconfig ) -" - -pkg_setup() { - use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64" -} - -src_prepare() { - # prevent docs to get automatically installed - sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die - # Alter target makefiles to accept CFLAGS set via flag-o - sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ - Makefile Makefile.target || die - # append CFLAGS while linking - sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die -} - -src_configure() { - local conf_opts audio_opts user_targets - - for target in ${IUSE_SOFTMMU_TARGETS} ; do - use "qemu_softmmu_targets_${target}" && \ - softmmu_targets="${softmmu_targets} ${target}-softmmu" - done - - for target in ${IUSE_USER_TARGETS} ; do - use "qemu_user_targets_${target}" && \ - user_targets="${user_targets} ${target}-linux-user" - done - - if [ -z "${softmmu_targets}" ]; then - conf_opts="${conf_opts} --disable-system" - else - einfo "Building the following softmmu targets: ${softmmu_targets}" - fi - - if [ ! -z "${user_targets}" ]; then - einfo "Building the following user targets: ${user_targets}" - conf_opts="${conf_opts} --enable-linux-user" - else - conf_opts="${conf_opts} --disable-linux-user" - fi - - # Fix QA issues. QEMU needs executable heaps and we need to mark it as such - conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap" - - # Add support for static builds - use static && conf_opts="${conf_opts} --static" - - # Fix the $(prefix)/etc issue - conf_opts="${conf_opts} --sysconfdir=/etc" - - #config options - conf_opts="${conf_opts} $(use_enable aio linux-aio)" - conf_opts="${conf_opts} $(use_enable bluetooth bluez)" - conf_opts="${conf_opts} $(use_enable brltty brlapi)" - conf_opts="${conf_opts} $(use_enable curl)" - conf_opts="${conf_opts} $(use_enable fdt)" - conf_opts="${conf_opts} $(use_enable hardened user-pie)" - conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)" - conf_opts="${conf_opts} $(use_enable ncurses curses)" - conf_opts="${conf_opts} $(use_enable png vnc-png)" - conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)" - conf_opts="${conf_opts} $(use_enable sdl)" - conf_opts="${conf_opts} $(use_enable ssl vnc-tls)" - conf_opts="${conf_opts} $(use_enable vde)" - conf_opts="${conf_opts} --disable-xen" - conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user" - - # audio options - audio_opts="oss" - use alsa && audio_opts="alsa ${audio_opts}" - use esd && audio_opts="esd ${audio_opts}" - use pulseaudio && audio_opts="pa ${audio_opts}" - use sdl && audio_opts="sdl ${audio_opts}" - ./configure --prefix=/usr \ - --disable-strip \ - --disable-werror \ - --disable-kvm \ - --enable-nptl \ - --enable-uuid \ - ${conf_opts} \ - --audio-drv-list="${audio_opts}" \ - --target-list="${softmmu_targets} ${user_targets}" \ - --cc="$(tc-getCC)" \ - --host-cc="$(tc-getBUILD_CC)" \ - || die "configure failed" - - # this is for qemu upstream's threaded support which is - # in development and broken - # the kvm project has its own support for threaded IO - # which is always on and works - # --enable-io-thread \ -} - -src_compile() { - # Restricting parallel build until we get a patch to fix this - emake || die -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - if [ ! -z "${softmmu_targets}" ]; then - exeinto /etc/qemu - use qemu-ifup && { doexe \ - "${FILESDIR}/qemu-ifup" \ - "${FILESDIR}/qemu-ifdown" \ - || die "qemu interface scripts missing" ; } - fi - - dodoc Changelog MAINTAINERS TODO pci-ids.txt || die - newdoc pc-bios/README README.pc-bios || die - dohtml qemu-doc.html qemu-tech.html || die -} - -pkg_postinst() { - use qemu-ifup || return - elog "You will need the Universal TUN/TAP driver compiled into your" - elog "kernel or loaded as a module to use the virtual network device" - elog "if using -net tap. You will also need support for 802.1d" - elog "Ethernet Bridging and a configured bridge if using the provided" - elog "qemu-ifup script from /etc/qemu." - echo -} diff --git a/app-emulation/qemu/qemu-1.0-r1.ebuild b/app-emulation/qemu/qemu-1.0-r2.ebuild similarity index 91% rename from app-emulation/qemu/qemu-1.0-r1.ebuild rename to app-emulation/qemu/qemu-1.0-r2.ebuild index 053c3dc4f5b1..5bbdb5886da9 100644 --- a/app-emulation/qemu/qemu-1.0-r1.ebuild +++ b/app-emulation/qemu/qemu-1.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.0-r1.ebuild,v 1.1 2012/01/23 21:15:03 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.0-r2.ebuild,v 1.1 2012/01/26 19:01:15 slyfox Exp $ EAPI=4 @@ -63,18 +63,22 @@ RDEPEND=" ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) - qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) + qemu-ifup? ( + sys-apps/iproute2 + net-misc/bridge-utils + ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) - spice? ( >=app-emulation/spice-0.9.0 - >=app-emulation/spice-protocol-0.8.1 ) + spice? ( + >=app-emulation/spice-0.9.0 + >=app-emulation/spice-protocol-0.8.1 + ) ssl? ( net-libs/gnutls ) usbredir? ( sys-apps/usbredir ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen-tools ) - " DEPEND="${RDEPEND} @@ -122,6 +126,11 @@ pkg_setup() { } src_prepare() { + # bug #400595 / CVE-2012-0029 + epatch "${FILESDIR}"/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch + + # prevent docs to get automatically installed + sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die # Alter target makefiles to accept CFLAGS set via flag-o sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ Makefile Makefile.target || die @@ -218,10 +227,7 @@ src_configure() { } src_install() { - emake \ - DESTDIR="${D}" \ - docdir="${EPREFIX}"/usr/share/doc/"${PF}" \ - install || die "make install failed" + emake DESTDIR="${D}" install || die "make install failed" if [[ -n ${softmmu_targets} ]]; then if use qemu-ifup; then @@ -229,6 +235,10 @@ src_install() { doexe "${FILESDIR}"/qemu-if{up,down} fi fi + + dodoc Changelog MAINTAINERS TODO pci-ids.txt || die + newdoc pc-bios/README README.pc-bios || die + dohtml qemu-doc.html qemu-tech.html || die } pkg_postinst() { diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 28c28d615882..e44fb7fa3ba6 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.12 2012/01/23 21:34:33 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.13 2012/01/26 19:01:15 slyfox Exp $ EAPI=4 @@ -22,7 +22,7 @@ HOMEPAGE="http://www.qemu.org" LICENSE="GPL-2" SLOT="0" -IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses nss +IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg kvm ncurses nss opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde +vhost-net xattr xen" @@ -123,9 +123,13 @@ QA_WX_LOAD="${QA_PRESTRIPPED} pkg_setup() { use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64" + + use kvm && ewarn "You have enabled USE=kvm feature. Please consider using app-emulation/qemu-kvm" } src_prepare() { + # prevent docs to get automatically installed + sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die # Alter target makefiles to accept CFLAGS set via flag-o sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ Makefile Makefile.target || die @@ -206,7 +210,7 @@ src_configure() { --sysconfdir="${EPREFIX}"/etc \ --disable-strip \ --disable-werror \ - --disable-kvm \ + $(use_enable kvm) \ --disable-libiscsi \ --enable-nptl \ --enable-uuid \ @@ -222,10 +226,7 @@ src_configure() { } src_install() { - emake \ - DESTDIR="${D}" \ - docdir="${EPREFIX}"/usr/share/doc/"${PF}" \ - install || die "make install failed" + emake DESTDIR="${D}" install || die "make install failed" if [[ -n ${softmmu_targets} ]]; then if use qemu-ifup; then @@ -233,6 +234,10 @@ src_install() { doexe "${FILESDIR}"/qemu-if{up,down} fi fi + + dodoc Changelog MAINTAINERS TODO pci-ids.txt + newdoc pc-bios/README README.pc-bios + dohtml qemu-doc.html qemu-tech.html } pkg_postinst() { diff --git a/app-i18n/atokx2/atokx2-17.0-r2.ebuild b/app-i18n/atokx2/atokx2-17.0-r2.ebuild index cd96e3b6d2d1..25b293fa8732 100644 --- a/app-i18n/atokx2/atokx2-17.0-r2.ebuild +++ b/app-i18n/atokx2/atokx2-17.0-r2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx2/atokx2-17.0-r2.ebuild,v 1.8 2011/07/08 11:01:49 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx2/atokx2-17.0-r2.ebuild,v 1.9 2012/01/26 21:46:39 ulm Exp $ EAPI="1" -inherit eutils +inherit cdrom eutils DESCRIPTION="ATOK for Linux - The most famous Japanese Input Method Engine" HOMEPAGE="http://www.justsystem.co.jp/linux/atok.html" @@ -17,7 +17,6 @@ LICENSE="ATOK MIT" SLOT="0" KEYWORDS="-* ~x86" IUSE="" -PROPERTIES="interactive" RESTRICT="strip mirror" DEPEND=">=x11-libs/gtk+-2.2:2 diff --git a/app-i18n/atokx2/atokx2-17.0.ebuild b/app-i18n/atokx2/atokx2-17.0.ebuild index eee722771564..ec03df5fe123 100644 --- a/app-i18n/atokx2/atokx2-17.0.ebuild +++ b/app-i18n/atokx2/atokx2-17.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx2/atokx2-17.0.ebuild,v 1.9 2011/07/08 11:01:49 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx2/atokx2-17.0.ebuild,v 1.10 2012/01/26 21:46:39 ulm Exp $ EAPI="1" -inherit eutils +inherit cdrom eutils DESCRIPTION="ATOK for Linux - The most famous Japanese Input Method Engine" HOMEPAGE="http://www.justsystem.co.jp/linux/atok.html" @@ -16,7 +16,6 @@ LICENSE="ATOK MIT" SLOT="0" KEYWORDS="-* x86" IUSE="" -PROPERTIES="interactive" RESTRICT="strip" DEPEND=">=x11-libs/gtk+-2.2:2 diff --git a/app-i18n/atokx3/atokx3-3.0.0-r6.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r6.ebuild index bf61b8b08b8e..059ed6324ac6 100644 --- a/app-i18n/atokx3/atokx3-3.0.0-r6.ebuild +++ b/app-i18n/atokx3/atokx3-3.0.0-r6.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r6.ebuild,v 1.2 2011/03/27 10:43:48 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r6.ebuild,v 1.3 2012/01/26 21:47:04 ulm Exp $ EAPI="1" -inherit eutils multilib +inherit cdrom eutils multilib MY_UPDATE_P="${PN}up2" MY_UPDATE_GTK="${PN}gtk216" @@ -22,7 +22,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -PROPERTIES="interactive" RESTRICT="strip mirror binchecks" RDEPEND="!app-i18n/atokx2 diff --git a/app-i18n/atokx3/atokx3-3.0.0-r7.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r7.ebuild index 50c869326f9d..e524160d45e3 100644 --- a/app-i18n/atokx3/atokx3-3.0.0-r7.ebuild +++ b/app-i18n/atokx3/atokx3-3.0.0-r7.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r7.ebuild,v 1.2 2011/03/27 10:43:48 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r7.ebuild,v 1.3 2012/01/26 21:47:04 ulm Exp $ EAPI="3" -inherit eutils multilib + +inherit cdrom eutils multilib MY_UPDATE_P="${PN}up2" MY_UPDATE_GTK="${PN}gtk216" @@ -21,7 +22,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -PROPERTIES="interactive" RESTRICT="strip mirror binchecks" RDEPEND="!app-i18n/atokx2 diff --git a/app-text/epdfview/epdfview-0.1.8.ebuild b/app-text/epdfview/epdfview-0.1.8.ebuild index eb72d6cd6295..31eaf5518958 100644 --- a/app-text/epdfview/epdfview-0.1.8.ebuild +++ b/app-text/epdfview/epdfview-0.1.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.8.ebuild,v 1.2 2011/08/07 17:04:16 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.8.ebuild,v 1.3 2012/01/26 21:14:22 hwoarang Exp $ EAPI=4 inherit fdo-mime @@ -11,7 +11,7 @@ SRC_URI="http://trac.emma-soft.com/epdfview/chrome/site/releases/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="cups nls test" RDEPEND=">=app-text/poppler-0.12.3-r3[cairo] diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest index be44da8909a9..1d8cd402e9f7 100644 --- a/app-text/sigil/Manifest +++ b/app-text/sigil/Manifest @@ -1,2 +1,3 @@ DIST Sigil-0.4.2-Code.zip 10104606 RMD160 c0834a04cdc67f8d066e4a66c43973a6013866e0 SHA1 67464f521c1b11641812b6959549a842546b4f8d SHA256 78490b43e071e840e191c3553b7d2041798b37b6aacc068b8334f9a851b2f65a DIST Sigil-0.4.905-Code.zip 12336033 RMD160 3c8f475a57027c5d2dfeb9f0f348a54246f93f70 SHA1 db9ef0abf4f0dff94cf882515f7aa59541de756c SHA256 55055550050074ddc36f95a0c1efc00fbad19eba1b13d528be134476087c09cd +DIST Sigil-0.5.0-Code.zip 12396113 RMD160 737f34b95b165a7af6c72b44daf08103d47b6b26 SHA1 4139602b0c39db72f6317f39c13b35cd0f86238d SHA256 e91c48df313540e08d651b73f48d3a78685976916beb794caba1f96f5a61d9de diff --git a/app-text/sigil/sigil-0.5.0.ebuild b/app-text/sigil/sigil-0.5.0.ebuild new file mode 100644 index 000000000000..3ffbe73a1373 --- /dev/null +++ b/app-text/sigil/sigil-0.5.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/sigil/sigil-0.5.0.ebuild,v 1.1 2012/01/26 23:04:46 sbriesen Exp $ + +EAPI=4 +CMAKE_BUILD_TYPE="Release" + +inherit eutils cmake-utils + +MY_P="Sigil-${PV}-Code" + +DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format." +HOMEPAGE="http://code.google.com/p/sigil/" +SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.zip" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + >=x11-libs/qt-xmlpatterns-4.7.2 + >=x11-libs/qt-webkit-4.7.2 + >=x11-libs/qt-svg-4.7.2 + >=x11-libs/qt-gui-4.7.2" +RDEPEND="${DEPEND}" + +S="${WORKDIR}" + +DOCS=( ChangeLog README ) + +src_prepare() { + # use standard naming + mv -f README.txt README + mv -f ChangeLog.txt ChangeLog + edos2unix ChangeLog README +} diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest index f4785bfbb8fc..c604950e9056 100644 --- a/dev-java/maven-bin/Manifest +++ b/dev-java/maven-bin/Manifest @@ -5,5 +5,6 @@ DIST apache-maven-2.2.1-bin.tar.bz2 2839688 RMD160 25d523d3dc86cf4695b0e343cf0f6 DIST apache-maven-3.0-bin.tar.gz 2899256 RMD160 eacd100b1ac8291d0ae32a5e10914596d1d9de77 SHA1 996f29b5a19e8145cb00926c68a0200dac554205 SHA256 046a0c7661ca85ac6cef6ac6c7cc2175b77bc5ee915e30897afba6c38fdb27a2 DIST apache-maven-3.0.2-bin.tar.gz 2968629 RMD160 26214da3e72cd8b9ea0fea0bb81e740b94ae0463 SHA1 eedd18952c373824c32b2fa891569bdf3776f650 SHA256 c7a70e37cbd564a6025288e381e6ad56e20ae2fa537b2eddf3b9e3bc644b0814 DIST apache-maven-3.0.3-bin.tar.gz 3054807 RMD160 f222733f32badab75c11e0ed3fbca2e594de7328 SHA1 cfd1f5ef8ebb2f09a9446159842cf7cfa1a3ccd6 SHA256 b845479bd5d6d821210d3530c65da628a118abedd176492741e1d9bc5e400e2a +DIST apache-maven-3.0.4-bin.tar.gz 4873043 RMD160 c55335fb5c10380db64e6b56ee26cd6f42307a72 SHA1 0de5dc162bafde3fcb0a6b009cfeea81a042523b SHA256 d35a876034c08cb7e20ea2fbcf168bcad4dff5801abad82d48055517513faa2f DIST maven-1.0.2.tar.gz 6060686 RMD160 3d94fad30086f462eb3dd238803d274346ef9e2f SHA1 2978ffff5526dad371b560acb052cc78b6a2cb6b SHA256 8895c3bc0cce94e03aede40322e7485c8c458ad88f377d8170986c18e8f34c83 DIST maven-1.1.tar.gz 7625074 RMD160 82ef869218ac42d9132fc74316f0e8a5edcf9431 SHA1 d9174675f0e846a225278949869fa2d979fa7f3b SHA256 6913083d2db1d32ee5e18db7280be0f8ce36224aba3595690e85054f2ad5e731 diff --git a/dev-java/maven-bin/maven-bin-3.0.4.ebuild b/dev-java/maven-bin/maven-bin-3.0.4.ebuild new file mode 100644 index 000000000000..cba52aa09425 --- /dev/null +++ b/dev-java/maven-bin/maven-bin-3.0.4.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.0.4.ebuild,v 1.1 2012/01/26 16:42:40 fordfrog Exp $ + +EAPI="4" + +inherit java-pkg-2 + +MY_PN=apache-${PN%%-bin} +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Project Management and Comprehension Tool for Java" +SRC_URI="mirror://apache/maven/binaries/${MY_P}-bin.tar.gz" +HOMEPAGE="http://maven.apache.org/" + +LICENSE="Apache-2.0" +SLOT="3.0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +DEPEND="app-admin/eselect-maven" +RDEPEND=">=virtual/jdk-1.5 + ${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +MAVEN=${PN}-${SLOT} +MAVEN_SHARE="/usr/share/${MAVEN}" + +src_unpack() { + unpack ${A} + + rm -v "${S}"/bin/*.bat || die + chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die +} + +# TODO we should use jars from packages, instead of what is bundled +src_install() { + dodir "${MAVEN_SHARE}" + cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy" + + java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar + + dodoc NOTICE.txt README.txt + + dodir /usr/bin + dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT} + + # bug #342901 + echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die + doenvd "${T}/25${MAVEN}" +} + +pkg_postinst() { + eselect maven update mvn-${SLOT} +} + +pkg_postrm() { + eselect maven update +} diff --git a/dev-lang/maude/Manifest b/dev-lang/maude/Manifest index b6e6cd91e9f9..f282b5defedc 100644 --- a/dev-lang/maude/Manifest +++ b/dev-lang/maude/Manifest @@ -1,4 +1,6 @@ DIST Maude-2.3.tar.gz 1441239 RMD160 8c6b67d257468b4910631f4d6d0f2c3a0ff8d995 SHA1 68fbe7f76db1a5a5bb748cb751c5015d60c476d0 SHA256 67e88d8440fafc67e1121139de496c70844279291e37ba9bee369d113a92fddb DIST Maude-2.5.tar.gz 1574038 RMD160 2e40f9f69dc7bf95169fb645e7d89484f5deb5b8 SHA1 647af9722bbe02e918fe21fc859915ea928a4d03 SHA256 dc5d4a6426b48a2b9810335a69a14064843f457f89cf9fd941ff1411fdb27b99 +DIST Maude-2.6.tar.gz 1600026 RMD160 a9387701016e04ba4a256c3db8c9f10195147183 SHA1 3f1ec2f39a22942bb096102d1d8d6eed4510483e SHA256 a5ba79bf3d30565c874e80b3531b51a7e835b600e86cac82508a6eb9e15f4aa0 DIST maude-2.3.0-extras.tar.bz2 2871587 RMD160 dd61d0cfa517d29031e55300376b32fd3173bfba SHA1 fcc6f8dab0c26d7bfe03a4bcf37417f6c315cd3f SHA256 0dd0d71cb5a1463c9888303c1ed74c6d373d6aa60a9a45660e92f3308730a54d DIST maude-2.5.0-extras.tar.bz2 3202095 RMD160 5f112dda206467302ea2eadccaddc10d09b07ce0 SHA1 f8bf90adf2f82aa40153e539f0132d9f3c57fd69 SHA256 4eaa9c7ddea3742aef90e5de16aec193e2f2821d9d3b28759b889d219add54c4 +DIST maude-2.6-extras.tar.xz 3157004 RMD160 b43df8f34d134745375ef9fedd0481d2e81f47c9 SHA1 80bc6612a36bbb172132b3aacd0af17e85c346e0 SHA256 64cd72026c345ff1c1edeca64f9a9fce8067e6df5eccdaeee4bfe7a0f07d3102 diff --git a/dev-lang/maude/maude-2.6.ebuild b/dev-lang/maude/maude-2.6.ebuild new file mode 100644 index 000000000000..75226874aa44 --- /dev/null +++ b/dev-lang/maude/maude-2.6.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/maude-2.6.ebuild,v 1.1 2012/01/26 17:51:48 jlec Exp $ + +EAPI=4 + +AUTOTOOLS_AUTORECONF=true + +inherit autotools-utils eutils toolchain-funcs versionator + +MY_PN="${PN/m/M}" +MY_PV=$(get_version_component_range 1-2) + +DESCRIPTION="Maude - A high-level specification language" +HOMEPAGE="http://maude.cs.uiuc.edu/" +SRC_URI=" + http://maude.cs.uiuc.edu/download/current/${MY_PN}-${MY_PV}.tar.gz + http://dev.gentoo.org/~jlec/distfiles/${P}-extras.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="doc" + +RDEPEND=" + >=dev-libs/gmp-4.1.3 + dev-libs/libsigsegv + dev-libs/libtecla + sci-libs/buddy" +DEPEND="${RDEPEND} + sys-devel/bison + sys-devel/flex" + +S="${WORKDIR}"/${MY_PN}-${MY_PV} + +PATCHES=( + "${FILESDIR}"/${PN}-2.5.0-prll.patch +) + +src_configure() { + local myeconfargs=( + --datadir="${EPREFIX}/usr/share/${PN}" + ) + autotools-utils_src_configure +} + +src_install() { + autotools-utils_src_install + + insinto /usr/share/${PN} + doins -r src/Main/*.maude \ + || die "failed to install data files" + + # Sets the full maude library path. + doenvd "${FILESDIR}"/23maude || die + + # install full maude + cd "${WORKDIR}"/${P}-extras + doins full-maude.maude || die + + # install docs and examples + if use doc; then + insinto /usr/share/doc/${P} + doins -r pdfs/* || die "failed to install pdf files" + + insinto /usr/share/${PN}/ + doins -r manual-examples primer-examples \ + || die "failed to install example files" + fi +} diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 10a3a93c9cbd..a3f941832901 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -1,22 +1,5 @@ -DIST php-5.3.8.tar.bz2 11190060 RMD160 f18a18e2dfd7ea7885760eec2a05b3c4a15ad9db SHA1 8f29029e092f262876bfdd2ce56f6867e2b74b85 SHA256 a1dd06fd5593e97d9a5bd9818d6501d28d3ee8f09b83f0ec78f7cdfc060f3ea2 DIST php-5.3.9.tar.bz2 11704944 RMD160 428ed51982637f092c43369cf5cfb284d58da3f6 SHA1 fe0626735c3d9dd370cef9bdcfe9506629449f51 SHA256 4bc54e1aa9010f09d2c6597844c984adecf9e1153c913a853c7725905ddb4dd7 -DIST php-5.3.9RC1.tar.bz2 11230477 RMD160 d00734de38b5cc2e719f5f80ac609e4362f6dfad SHA1 34306d0a7926a21ba15ee29ab37bbab44633b3fa SHA256 6d76af052c1575765d9bf03d8963415d437209fd790f74d85b523799f1dd718d -DIST php-5.3.9RC2.tar.bz2 11415643 RMD160 2051cd223e30b49c93cd4282c4f4c51b45909547 SHA1 6699803c03f789cf9d311a9a0daab9d14515d5be SHA256 aac16a868056d2a19cb44b5b5732efb974a30dadc000d729c6374f3208005634 -DIST php-5.3.9RC3.tar.bz2 11438806 RMD160 c81ef1da6f1b269af772e3731cc93e7d00082edb SHA1 0667cb87857b294bd5cc912b139dba2b45f346ed SHA256 eb54bd0f42125086c7ee9ae82bf8155e80a8d084a56584b17bf6c6ab08c7ae33 -DIST php-5.3.9RC4.tar.bz2 11711811 RMD160 30041f935004fd423db399f657dae4c85063e777 SHA1 e01f3ef8e2a60d62cd878a988ba9ce075b0ac0a9 SHA256 06b4bace4fef8df10e91a0407b369bf6597b1ec6d3e861d8faa71eb57891ada4 -DIST php-5.4.0RC3.tar.bz2 11444398 RMD160 9549bbeb1fd719f6c3d20bda7ede23c5059805a3 SHA1 875e36522020ddab5b2b82efefe49de3979ef650 SHA256 23f9bac36ff7a3ce9f367e313c2b89a03483238d44ff8a590ae829c7ee1fc748 -DIST php-5.4.0RC4.tar.bz2 11437821 RMD160 f360e34753f4fbf53bd9727b6e2a2ba43e48ed56 SHA1 dd5884bed553334d1fa36a90c088cde05ed1ecbf SHA256 7d51d2f141b93e6e3b043d14dddbcbca550abbeddf442e4aa05b993cdbfd707c -DIST php-5.4.0RC5.tar.bz2 11450622 RMD160 afa69be764c921ce6e5b9b135758b3b8a27d0658 SHA1 290ff90415dc9d78d349a52ff9ebe69bf81e442d SHA256 660298da371f4827714aad10f1e28e19fcae290c6abb7478207bfbcef0827028 DIST php-5.4.0RC6.tar.bz2 11439696 RMD160 5104a36ca5f7f0e425af43e8144ca2b56980ce8a SHA1 b2da77d0c0cb08d579ada7372427d907e0b8a913 SHA256 f09a8627aade37f40aafe637f1a041e2b8c6dc9d64f2e613d92f1864e7e0db95 -DIST php-patchset-5.3.8-r0.tar.bz2 7518 RMD160 3b9fc4063202b0a83b76a8c0f5bcfeb2ab358a50 SHA1 8b20057a68c9f6f4554ab96a884e874707fcd2e5 SHA256 a4677d75648529ccec61fc0edaa2684ad72c0b15bc81dc0770a6cbc927337686 DIST php-patchset-5.3.9-r0.tar.bz2 7515 RMD160 b0f9951ab905e7eee2314ad09cf2af458a1c312d SHA1 9cd9d9624165329fe6b776aaa6686768de526403 SHA256 0224215adeee798109ef5ea5ab27543ba2687620d181b046464c2a49fa143029 -DIST php-patchset-5.3.9_rc1-r0.tar.bz2 7522 RMD160 4bf3d9bb26d86858ab26be0aa0466eaef4001553 SHA1 cd0dd6704b0c0b04cc1c78027efdfbcc5a9d182c SHA256 95863c23bd9a72013729dcdd005dc585ad5b3d689082503a3702f20df514362f -DIST php-patchset-5.3.9_rc2-r0.tar.bz2 7515 RMD160 c3aca464d04df468fc8aaf6237be49bd891822b8 SHA1 228617dba2801397a5b51ca66fc9c90cf224a768 SHA256 afa2d477c630c2bdd2c3cd5eec24d7eb3e3a7cfd9819b4f4f328c1aad5335612 -DIST php-patchset-5.3.9_rc3-r0.tar.bz2 7510 RMD160 fbfb4ea98d88e32a04743238c3f293528f16deec SHA1 fa9d8d551c2b6062850a7495823f9346c68f358c SHA256 24a61a4bc14f76897a810f7b691f1ccfcf8225a92cb0d174f4e1b82c53df15e2 -DIST php-patchset-5.3.9_rc4-r0.tar.bz2 7517 RMD160 8e36f129dbb02ba47b1e7b55bbabc9a609ce40e0 SHA1 a19e19bc235f656a320aae921632a4cf83aded2e SHA256 36c1ea905d0ec167b48bd62fb494ef188b99331c6167ef94ba1fd446ea29a6d0 -DIST php-patchset-5.4.0_rc3-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea -DIST php-patchset-5.4.0_rc4-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea -DIST php-patchset-5.4.0_rc5-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea DIST php-patchset-5.4.0_rc6-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea -DIST suhosin-patch-5.3.7-0.9.10.patch.gz 41175 RMD160 19f789bf49a5fed2cd88b199fd8ac5d1ffa9bdc8 SHA1 3c38e873584b8f9e325a813cc9b197a342595099 SHA256 0a0dac0e4343596f2bfcef27dcf7180524b78bb1d2d2ca878370a7d0f8313d26 DIST suhosin-patch-5.3.9-0.9.10-gentoo.patch.gz 42028 RMD160 bcb3cf4fb983a67c83985fe1ddcf4f543b53d110 SHA1 fd3253e49e180345410bb14ecb1a7e924e300a97 SHA256 1d334e82d922eaa0415d3d3fe5bf3cf2a4ca6481dd528a73771d26b52d999454 diff --git a/dev-lang/php/php-5.3.8.ebuild b/dev-lang/php/php-5.3.8.ebuild deleted file mode 100644 index 15cdb1c503cd..000000000000 --- a/dev-lang/php/php-5.3.8.ebuild +++ /dev/null @@ -1,414 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.8.ebuild,v 1.12 2011/12/14 22:48:49 mabi Exp $ - -EAPI=4 - -PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid" - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool - -SUHOSIN_VERSION="5.3.7-0.9.10" -FPM_VERSION="builtin" -EXPECTED_TEST_FAILURES="" - -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86" - -function php_get_uri () -{ - case "${1}" in - "php-pre") - echo "http://downloads.php.net/ilia/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "suhosin") - echo "http://download.suhosin.org/${2}" - ;; - "olemarkus") - echo "http://olemarkus.org/~olemarkus/gentoo/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_RELEASE="php" -PHP_P="${PN}-${PHP_PV}" - -PHP_PATCHSET_LOC="olemarkus" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_PATCHSET="0" -PHP_PATCHSET_URI=" - $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" - -PHP_FPM_INIT_VER="4" -PHP_FPM_CONF_VER="1" - -if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then - # in some cases we use our own suhosin patch (very recent version, - # patch conflicts, etc.) - SUHOSIN_TYPE="gentoo" -else - SUHOSIN_TYPE="suhosin" -fi - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; - SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" -fi - -SRC_URI=" - ${PHP_SRC_URI} - ${PHP_PATCHSET_URI}" - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SRC_URI="${SRC_URI} - suhosin? ( ${SUHOSIN_URI} )" -fi - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -SLOT="$(get_version_component_range 1-2)" -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# Gentoo-specific, common features -IUSE="kolab" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk - crypt +ctype curl curlwrappers db2 dbmaker debug doc empress - empress-bcs enchant esoob exif frontbase +fileinfo +filter firebird - flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile - interbase intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql mysqlnd mysqli nls oci8 - oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm - readline recode sapdb +session sharedext sharedmem - +simplexml snmp soap sockets solid spell sqlite sqlite3 ssl - sybase-ct sysvipc tidy +tokenizer truetype unicode wddx - +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" - -# Enable suhosin if available -[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" - -DEPEND="!dev-lang/php:5 - >=app-admin/eselect-php-0.6.2 - >=dev-libs/libpcre-8.12[unicode] - adabas? ( >=dev-db/unixODBC-1.8.13 ) - apache2? ( www-servers/apache[threads=] ) - berkdb? ( =sys-libs/db-4* ) - birdstep? ( >=dev-db/unixODBC-1.8.13 ) - bzip2? ( app-arch/bzip2 ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( !gd-external? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - db2? ( >=dev-db/unixODBC-1.8.13 ) - dbmaker? ( >=dev-db/unixODBC-1.8.13 ) - empress? ( >=dev-db/unixODBC-1.8.13 ) - empress-bcs? ( >=dev-db/unixODBC-1.8.13 ) - enchant? ( app-text/enchant ) - esoob? ( >=dev-db/unixODBC-1.8.13 ) - exif? ( !gd? ( !gd-external? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) - gd-external? ( media-libs/gd ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - kolab? ( >=net-libs/c-client-2004g-r1 ) - ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) ) - ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - !mysqlnd? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql-base ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sapdb? ( >=dev-db/unixODBC-1.8.13 ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - solid? ( >=dev-db/unixODBC-1.8.13 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) - sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( !gd-external? ( - virtual/jpeg media-libs/libpng sys-libs/zlib ) ) - ) - unicode? ( dev-libs/oniguruma ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg - media-libs/libpng sys-libs/zlib - ) - xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( || ( gd gd-external ) ) - cjk? ( || ( gd gd-external ) ) - exif? ( || ( gd gd-external ) ) - - xpm? ( gd ) - gd? ( zlib !gd-external ) - gd-external? ( !gd ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xsl? ( xml ) - ldap-sasl? ( ldap !oci8 ) - adabas? ( odbc ) - birdstep? ( odbc ) - dbmaker? ( odbc ) - empress-bcs? ( empress ) - empress? ( odbc ) - esoob? ( odbc ) - db2? ( odbc ) - sapdb? ( odbc ) - solid? ( odbc ) - kolab? ( imap ) - mhash? ( hash ) - phar? ( hash ) - mysqlnd? ( || ( - mysql - mysqli - pdo - ) ) - - oci8? ( !oci8-instant-client !ldap-sasl ) - oci8-instant-client? ( !oci8 ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - firebird? ( !interbase ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -DEPEND="${DEPEND} - enchant? ( !dev-php/pecl-enchant ) - fileinfo? ( ! [version] [eval] -# Main eblit engine -eblit-core() { - [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" - local e v func=$1 ver=$2 eval_=$3 - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" - return 0 - fi - done - return 1 -} - -# eblit-include -# Usage: [--skip] [version] -# Includes an "eblit" -- a chunk of common code among ebuilds in a given -# package so that its functions can be sourced and utilized within the -# ebuild. -eblit-include() { - local skipable=false r=0 - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - [[ -z $1 ]] && die "Usage: eblit-include [version]" - eblit-core $1 $2 - r="$?" - ${skipable} && return 0 - [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe -# Usage: -# Runs a function if it is defined in an eblit -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run -# Usage: [version] -# Runs a function defined in an eblit -eblit-run() { - eblit-include --skip common "v2" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -# eblit-pkg -# Usage: [version] -# Includes the given functions AND evals them so they're included in the binpkgs -eblit-pkg() { - [[ -z $1 ]] && die "Usage: eblit-pkg [version]" - eblit-core $1 $2 1 -} - -eblit-pkg pkg_setup v2 - -src_prepare() { eblit-run src_prepare v3 ; } -src_configure() { eblit-run src_configure v2 ; } -src_compile() { eblit-run src_compile v1 ; } -src_install() { eblit-run src_install v2 ; } -src_test() { eblit-run src_test v1 ; } - -#Do not use eblit for this because it will not get sourced when installing from -#binary package (bug #380845) -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - APACHE2_MOD_CONF="70_mod_php5" - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in /etc/make.conf" - ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" - - # check for not yet migrated old style config dirs - ls "${ROOT}"/etc/php/*-php5 &>/dev/null - if [[ $? -eq 0 ]]; then - ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" - ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" - fi - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog - - if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then - ewarn "The suhosin USE flag now only installs the suhosin patch!" - ewarn "If you want the suhosin extension, make sure you install" - ewarn " dev-php/suhosin" - ewarn - fi -} diff --git a/dev-lang/php/php-5.3.9_rc1.ebuild b/dev-lang/php/php-5.3.9_rc1.ebuild deleted file mode 100644 index a2530e1ae8c6..000000000000 --- a/dev-lang/php/php-5.3.9_rc1.ebuild +++ /dev/null @@ -1,414 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.9_rc1.ebuild,v 1.4 2011/12/14 22:48:49 mabi Exp $ - -EAPI=4 - -PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid" - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool - -SUHOSIN_VERSION="5.3.7-0.9.10" -FPM_VERSION="builtin" -EXPECTED_TEST_FAILURES="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -function php_get_uri () -{ - case "${1}" in - "php-pre") - echo "http://downloads.php.net/johannes/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "suhosin") - echo "http://download.suhosin.org/${2}" - ;; - "olemarkus") - echo "http://olemarkus.org/~olemarkus/gentoo/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_RELEASE="php-pre" -PHP_P="${PN}-${PHP_PV}" - -PHP_PATCHSET_LOC="olemarkus" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_PATCHSET="0" -PHP_PATCHSET_URI=" - $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" - -PHP_FPM_INIT_VER="4" -PHP_FPM_CONF_VER="1" - -if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then - # in some cases we use our own suhosin patch (very recent version, - # patch conflicts, etc.) - SUHOSIN_TYPE="gentoo" -else - SUHOSIN_TYPE="suhosin" -fi - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; - SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" -fi - -SRC_URI=" - ${PHP_SRC_URI} - ${PHP_PATCHSET_URI}" - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SRC_URI="${SRC_URI} - suhosin? ( ${SUHOSIN_URI} )" -fi - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -SLOT="$(get_version_component_range 1-2)" -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# Gentoo-specific, common features -IUSE="kolab" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk - crypt +ctype curl curlwrappers db2 dbmaker debug doc empress - empress-bcs enchant esoob exif frontbase +fileinfo +filter firebird - flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile - interbase intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql mysqlnd mysqli nls oci8 - oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm - readline recode sapdb +session sharedext sharedmem - +simplexml snmp soap sockets solid spell sqlite sqlite3 ssl - sybase-ct sysvipc tidy +tokenizer truetype unicode wddx - +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" - -# Enable suhosin if available -[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" - -DEPEND="!dev-lang/php:5 - >=app-admin/eselect-php-0.6.2 - >=dev-libs/libpcre-8.12[unicode] - adabas? ( >=dev-db/unixODBC-1.8.13 ) - apache2? ( www-servers/apache[threads=] ) - berkdb? ( =sys-libs/db-4* ) - birdstep? ( >=dev-db/unixODBC-1.8.13 ) - bzip2? ( app-arch/bzip2 ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( !gd-external? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - db2? ( >=dev-db/unixODBC-1.8.13 ) - dbmaker? ( >=dev-db/unixODBC-1.8.13 ) - empress? ( >=dev-db/unixODBC-1.8.13 ) - empress-bcs? ( >=dev-db/unixODBC-1.8.13 ) - enchant? ( app-text/enchant ) - esoob? ( >=dev-db/unixODBC-1.8.13 ) - exif? ( !gd? ( !gd-external? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) - gd-external? ( media-libs/gd ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - kolab? ( >=net-libs/c-client-2004g-r1 ) - ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) ) - ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - !mysqlnd? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql-base ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sapdb? ( >=dev-db/unixODBC-1.8.13 ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - solid? ( >=dev-db/unixODBC-1.8.13 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) - sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( !gd-external? ( - virtual/jpeg media-libs/libpng sys-libs/zlib ) ) - ) - unicode? ( dev-libs/oniguruma ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg - media-libs/libpng sys-libs/zlib - ) - xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( || ( gd gd-external ) ) - cjk? ( || ( gd gd-external ) ) - exif? ( || ( gd gd-external ) ) - - xpm? ( gd ) - gd? ( zlib !gd-external ) - gd-external? ( !gd ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xsl? ( xml ) - ldap-sasl? ( ldap !oci8 ) - adabas? ( odbc ) - birdstep? ( odbc ) - dbmaker? ( odbc ) - empress-bcs? ( empress ) - empress? ( odbc ) - esoob? ( odbc ) - db2? ( odbc ) - sapdb? ( odbc ) - solid? ( odbc ) - kolab? ( imap ) - mhash? ( hash ) - phar? ( hash ) - mysqlnd? ( || ( - mysql - mysqli - pdo - ) ) - - oci8? ( !oci8-instant-client !ldap-sasl ) - oci8-instant-client? ( !oci8 ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - firebird? ( !interbase ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -DEPEND="${DEPEND} - enchant? ( !dev-php/pecl-enchant ) - fileinfo? ( ! [version] [eval] -# Main eblit engine -eblit-core() { - [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" - local e v func=$1 ver=$2 eval_=$3 - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" - return 0 - fi - done - return 1 -} - -# eblit-include -# Usage: [--skip] [version] -# Includes an "eblit" -- a chunk of common code among ebuilds in a given -# package so that its functions can be sourced and utilized within the -# ebuild. -eblit-include() { - local skipable=false r=0 - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - [[ -z $1 ]] && die "Usage: eblit-include [version]" - eblit-core $1 $2 - r="$?" - ${skipable} && return 0 - [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe -# Usage: -# Runs a function if it is defined in an eblit -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run -# Usage: [version] -# Runs a function defined in an eblit -eblit-run() { - eblit-include --skip common "v2" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -# eblit-pkg -# Usage: [version] -# Includes the given functions AND evals them so they're included in the binpkgs -eblit-pkg() { - [[ -z $1 ]] && die "Usage: eblit-pkg [version]" - eblit-core $1 $2 1 -} - -eblit-pkg pkg_setup v2 - -src_prepare() { eblit-run src_prepare v3 ; } -src_configure() { eblit-run src_configure v2 ; } -src_compile() { eblit-run src_compile v1 ; } -src_install() { eblit-run src_install v2 ; } -src_test() { eblit-run src_test v1 ; } - -#Do not use eblit for this because it will not get sourced when installing from -#binary package (bug #380845) -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - APACHE2_MOD_CONF="70_mod_php5" - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in /etc/make.conf" - ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" - - # check for not yet migrated old style config dirs - ls "${ROOT}"/etc/php/*-php5 &>/dev/null - if [[ $? -eq 0 ]]; then - ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" - ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" - fi - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog - - if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then - ewarn "The suhosin USE flag now only installs the suhosin patch!" - ewarn "If you want the suhosin extension, make sure you install" - ewarn " dev-php/suhosin" - ewarn - fi -} diff --git a/dev-lang/php/php-5.3.9_rc2.ebuild b/dev-lang/php/php-5.3.9_rc2.ebuild deleted file mode 100644 index dd7ff88c664f..000000000000 --- a/dev-lang/php/php-5.3.9_rc2.ebuild +++ /dev/null @@ -1,414 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.9_rc2.ebuild,v 1.3 2011/12/14 22:48:49 mabi Exp $ - -EAPI=4 - -PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid" - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool - -SUHOSIN_VERSION="5.3.7-0.9.10" -FPM_VERSION="builtin" -EXPECTED_TEST_FAILURES="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -function php_get_uri () -{ - case "${1}" in - "php-pre") - echo "http://downloads.php.net/johannes/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "suhosin") - echo "http://download.suhosin.org/${2}" - ;; - "olemarkus") - echo "http://olemarkus.org/~olemarkus/gentoo/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_RELEASE="php-pre" -PHP_P="${PN}-${PHP_PV}" - -PHP_PATCHSET_LOC="olemarkus" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_PATCHSET="0" -PHP_PATCHSET_URI=" - $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" - -PHP_FPM_INIT_VER="4" -PHP_FPM_CONF_VER="1" - -if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then - # in some cases we use our own suhosin patch (very recent version, - # patch conflicts, etc.) - SUHOSIN_TYPE="gentoo" -else - SUHOSIN_TYPE="suhosin" -fi - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; - SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" -fi - -SRC_URI=" - ${PHP_SRC_URI} - ${PHP_PATCHSET_URI}" - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SRC_URI="${SRC_URI} - suhosin? ( ${SUHOSIN_URI} )" -fi - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -SLOT="$(get_version_component_range 1-2)" -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# Gentoo-specific, common features -IUSE="kolab" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk - crypt +ctype curl curlwrappers db2 dbmaker debug doc empress - empress-bcs enchant esoob exif frontbase +fileinfo +filter firebird - flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile - interbase intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql mysqlnd mysqli nls oci8 - oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm - readline recode sapdb +session sharedext sharedmem - +simplexml snmp soap sockets solid spell sqlite sqlite3 ssl - sybase-ct sysvipc tidy +tokenizer truetype unicode wddx - +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" - -# Enable suhosin if available -[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" - -DEPEND="!dev-lang/php:5 - >=app-admin/eselect-php-0.6.2 - >=dev-libs/libpcre-8.12[unicode] - adabas? ( >=dev-db/unixODBC-1.8.13 ) - apache2? ( www-servers/apache[threads=] ) - berkdb? ( =sys-libs/db-4* ) - birdstep? ( >=dev-db/unixODBC-1.8.13 ) - bzip2? ( app-arch/bzip2 ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( !gd-external? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - db2? ( >=dev-db/unixODBC-1.8.13 ) - dbmaker? ( >=dev-db/unixODBC-1.8.13 ) - empress? ( >=dev-db/unixODBC-1.8.13 ) - empress-bcs? ( >=dev-db/unixODBC-1.8.13 ) - enchant? ( app-text/enchant ) - esoob? ( >=dev-db/unixODBC-1.8.13 ) - exif? ( !gd? ( !gd-external? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) - gd-external? ( media-libs/gd ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - kolab? ( >=net-libs/c-client-2004g-r1 ) - ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) ) - ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - !mysqlnd? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql-base ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sapdb? ( >=dev-db/unixODBC-1.8.13 ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - solid? ( >=dev-db/unixODBC-1.8.13 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) - sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( !gd-external? ( - virtual/jpeg media-libs/libpng sys-libs/zlib ) ) - ) - unicode? ( dev-libs/oniguruma ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg - media-libs/libpng sys-libs/zlib - ) - xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( || ( gd gd-external ) ) - cjk? ( || ( gd gd-external ) ) - exif? ( || ( gd gd-external ) ) - - xpm? ( gd ) - gd? ( zlib !gd-external ) - gd-external? ( !gd ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xsl? ( xml ) - ldap-sasl? ( ldap !oci8 ) - adabas? ( odbc ) - birdstep? ( odbc ) - dbmaker? ( odbc ) - empress-bcs? ( empress ) - empress? ( odbc ) - esoob? ( odbc ) - db2? ( odbc ) - sapdb? ( odbc ) - solid? ( odbc ) - kolab? ( imap ) - mhash? ( hash ) - phar? ( hash ) - mysqlnd? ( || ( - mysql - mysqli - pdo - ) ) - - oci8? ( !oci8-instant-client !ldap-sasl ) - oci8-instant-client? ( !oci8 ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - firebird? ( !interbase ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -DEPEND="${DEPEND} - enchant? ( !dev-php/pecl-enchant ) - fileinfo? ( ! [version] [eval] -# Main eblit engine -eblit-core() { - [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" - local e v func=$1 ver=$2 eval_=$3 - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" - return 0 - fi - done - return 1 -} - -# eblit-include -# Usage: [--skip] [version] -# Includes an "eblit" -- a chunk of common code among ebuilds in a given -# package so that its functions can be sourced and utilized within the -# ebuild. -eblit-include() { - local skipable=false r=0 - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - [[ -z $1 ]] && die "Usage: eblit-include [version]" - eblit-core $1 $2 - r="$?" - ${skipable} && return 0 - [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe -# Usage: -# Runs a function if it is defined in an eblit -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run -# Usage: [version] -# Runs a function defined in an eblit -eblit-run() { - eblit-include --skip common "v2" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -# eblit-pkg -# Usage: [version] -# Includes the given functions AND evals them so they're included in the binpkgs -eblit-pkg() { - [[ -z $1 ]] && die "Usage: eblit-pkg [version]" - eblit-core $1 $2 1 -} - -eblit-pkg pkg_setup v2 - -src_prepare() { eblit-run src_prepare v3 ; } -src_configure() { eblit-run src_configure v2 ; } -src_compile() { eblit-run src_compile v1 ; } -src_install() { eblit-run src_install v2 ; } -src_test() { eblit-run src_test v1 ; } - -#Do not use eblit for this because it will not get sourced when installing from -#binary package (bug #380845) -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - APACHE2_MOD_CONF="70_mod_php5" - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in /etc/make.conf" - ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" - - # check for not yet migrated old style config dirs - ls "${ROOT}"/etc/php/*-php5 &>/dev/null - if [[ $? -eq 0 ]]; then - ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" - ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" - fi - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog - - if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then - ewarn "The suhosin USE flag now only installs the suhosin patch!" - ewarn "If you want the suhosin extension, make sure you install" - ewarn " dev-php/suhosin" - ewarn - fi -} diff --git a/dev-lang/php/php-5.3.9_rc3.ebuild b/dev-lang/php/php-5.3.9_rc3.ebuild deleted file mode 100644 index 972ae6a942dc..000000000000 --- a/dev-lang/php/php-5.3.9_rc3.ebuild +++ /dev/null @@ -1,390 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.9_rc3.ebuild,v 1.3 2011/12/17 19:25:19 olemarkus Exp $ - -EAPI=4 - -PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid" - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool - -SUHOSIN_VERSION="5.3.7-0.9.10" -FPM_VERSION="builtin" -EXPECTED_TEST_FAILURES="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -function php_get_uri () -{ - case "${1}" in - "php-pre") - echo "http://downloads.php.net/johannes/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "suhosin") - echo "http://download.suhosin.org/${2}" - ;; - "olemarkus") - echo "http://olemarkus.org/~olemarkus/gentoo/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_RELEASE="php-pre" -PHP_P="${PN}-${PHP_PV}" - -PHP_PATCHSET_LOC="olemarkus" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_PATCHSET="0" -PHP_PATCHSET_URI=" - $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" - -PHP_FPM_INIT_VER="4" -PHP_FPM_CONF_VER="1" - -if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then - # in some cases we use our own suhosin patch (very recent version, - # patch conflicts, etc.) - SUHOSIN_TYPE="gentoo" -else - SUHOSIN_TYPE="suhosin" -fi - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; - SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" -fi - -SRC_URI=" - ${PHP_SRC_URI} - ${PHP_PATCHSET_URI}" - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SRC_URI="${SRC_URI} - suhosin? ( ${SUHOSIN_URI} )" -fi - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -SLOT="$(get_version_component_range 1-2)" -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# Gentoo-specific, common features -IUSE="kolab" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk - crypt +ctype curl curlwrappers debug doc - enchant exif frontbase +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql mysqlnd mysqli nls - oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm - readline recode +session sharedmem - +simplexml snmp soap sockets spell sqlite sqlite3 ssl - sybase-ct sysvipc tidy +tokenizer truetype unicode wddx - +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" - -# Enable suhosin if available -[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" - -DEPEND="!dev-lang/php:5 - >=app-admin/eselect-php-0.6.2 - >=dev-libs/libpcre-8.12[unicode] - apache2? ( www-servers/apache[threads=] ) - berkdb? ( =sys-libs/db-4* ) - bzip2? ( app-arch/bzip2 ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - kolab? ( >=net-libs/c-client-2004g-r1 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - !mysqlnd? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql-base ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) - sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg media-libs/libpng sys-libs/zlib ) - ) - unicode? ( dev-libs/oniguruma ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg - media-libs/libpng sys-libs/zlib - ) - xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( gd ) - cjk? ( gd ) - exif? ( gd ) - - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xsl? ( xml ) - ldap-sasl? ( ldap ) - kolab? ( imap ) - mhash? ( hash ) - phar? ( hash ) - mysqlnd? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -DEPEND="${DEPEND} - enchant? ( !dev-php5/pecl-enchant ) - fileinfo? ( ! [version] [eval] -# Main eblit engine -eblit-core() { - [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" - local e v func=$1 ver=$2 eval_=$3 - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" - return 0 - fi - done - return 1 -} - -# eblit-include -# Usage: [--skip] [version] -# Includes an "eblit" -- a chunk of common code among ebuilds in a given -# package so that its functions can be sourced and utilized within the -# ebuild. -eblit-include() { - local skipable=false r=0 - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - [[ -z $1 ]] && die "Usage: eblit-include [version]" - eblit-core $1 $2 - r="$?" - ${skipable} && return 0 - [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe -# Usage: -# Runs a function if it is defined in an eblit -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run -# Usage: [version] -# Runs a function defined in an eblit -eblit-run() { - eblit-include --skip common "v2" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -# eblit-pkg -# Usage: [version] -# Includes the given functions AND evals them so they're included in the binpkgs -eblit-pkg() { - [[ -z $1 ]] && die "Usage: eblit-pkg [version]" - eblit-core $1 $2 1 -} - -eblit-pkg pkg_setup v3 - -src_prepare() { eblit-run src_prepare v3 ; } -src_configure() { eblit-run src_configure v53 ; } -src_compile() { eblit-run src_compile v1 ; } -src_install() { eblit-run src_install v3 ; } -src_test() { eblit-run src_test v1 ; } - -#Do not use eblit for this because it will not get sourced when installing from -#binary package (bug #380845) -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - APACHE2_MOD_CONF="70_mod_php5" - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in /etc/make.conf" - ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" - - # check for not yet migrated old style config dirs - ls "${ROOT}"/etc/php/*-php5 &>/dev/null - if [[ $? -eq 0 ]]; then - ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" - ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" - fi - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog - - if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then - ewarn "The suhosin USE flag now only installs the suhosin patch!" - ewarn "If you want the suhosin extension, make sure you install" - ewarn " dev-php5/suhosin" - ewarn - fi -} diff --git a/dev-lang/php/php-5.3.9_rc4.ebuild b/dev-lang/php/php-5.3.9_rc4.ebuild deleted file mode 100644 index 167517925062..000000000000 --- a/dev-lang/php/php-5.3.9_rc4.ebuild +++ /dev/null @@ -1,390 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.9_rc4.ebuild,v 1.1 2011/12/24 08:54:00 olemarkus Exp $ - -EAPI=4 - -PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid" - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool - -SUHOSIN_VERSION="5.3.7-0.9.10" -FPM_VERSION="builtin" -EXPECTED_TEST_FAILURES="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -function php_get_uri () -{ - case "${1}" in - "php-pre") - echo "http://downloads.php.net/johannes/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "suhosin") - echo "http://download.suhosin.org/${2}" - ;; - "olemarkus") - echo "http://olemarkus.org/~olemarkus/gentoo/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_RELEASE="php-pre" -PHP_P="${PN}-${PHP_PV}" - -PHP_PATCHSET_LOC="olemarkus" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_PATCHSET="0" -PHP_PATCHSET_URI=" - $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" - -PHP_FPM_INIT_VER="4" -PHP_FPM_CONF_VER="1" - -if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then - # in some cases we use our own suhosin patch (very recent version, - # patch conflicts, etc.) - SUHOSIN_TYPE="gentoo" -else - SUHOSIN_TYPE="suhosin" -fi - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; - SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" -fi - -SRC_URI=" - ${PHP_SRC_URI} - ${PHP_PATCHSET_URI}" - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SRC_URI="${SRC_URI} - suhosin? ( ${SUHOSIN_URI} )" -fi - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -SLOT="$(get_version_component_range 1-2)" -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# Gentoo-specific, common features -IUSE="kolab" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk - crypt +ctype curl curlwrappers debug doc - enchant exif frontbase +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql mysqlnd mysqli nls - oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm - readline recode +session sharedmem - +simplexml snmp soap sockets spell sqlite sqlite3 ssl - sybase-ct sysvipc tidy +tokenizer truetype unicode wddx - +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" - -# Enable suhosin if available -[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" - -DEPEND="!dev-lang/php:5 - >=app-admin/eselect-php-0.6.2 - >=dev-libs/libpcre-8.12[unicode] - apache2? ( www-servers/apache[threads=] ) - berkdb? ( =sys-libs/db-4* ) - bzip2? ( app-arch/bzip2 ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - kolab? ( >=net-libs/c-client-2004g-r1 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - !mysqlnd? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql-base ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) - sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg media-libs/libpng sys-libs/zlib ) - ) - unicode? ( dev-libs/oniguruma ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg - media-libs/libpng sys-libs/zlib - ) - xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( gd ) - cjk? ( gd ) - exif? ( gd ) - - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xsl? ( xml ) - ldap-sasl? ( ldap ) - kolab? ( imap ) - mhash? ( hash ) - phar? ( hash ) - mysqlnd? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -DEPEND="${DEPEND} - enchant? ( !dev-php5/pecl-enchant ) - fileinfo? ( ! [version] [eval] -# Main eblit engine -eblit-core() { - [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" - local e v func=$1 ver=$2 eval_=$3 - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" - return 0 - fi - done - return 1 -} - -# eblit-include -# Usage: [--skip] [version] -# Includes an "eblit" -- a chunk of common code among ebuilds in a given -# package so that its functions can be sourced and utilized within the -# ebuild. -eblit-include() { - local skipable=false r=0 - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - [[ -z $1 ]] && die "Usage: eblit-include [version]" - eblit-core $1 $2 - r="$?" - ${skipable} && return 0 - [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe -# Usage: -# Runs a function if it is defined in an eblit -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run -# Usage: [version] -# Runs a function defined in an eblit -eblit-run() { - eblit-include --skip common "v2" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -# eblit-pkg -# Usage: [version] -# Includes the given functions AND evals them so they're included in the binpkgs -eblit-pkg() { - [[ -z $1 ]] && die "Usage: eblit-pkg [version]" - eblit-core $1 $2 1 -} - -eblit-pkg pkg_setup v3 - -src_prepare() { eblit-run src_prepare v3 ; } -src_configure() { eblit-run src_configure v53 ; } -src_compile() { eblit-run src_compile v1 ; } -src_install() { eblit-run src_install v3 ; } -src_test() { eblit-run src_test v1 ; } - -#Do not use eblit for this because it will not get sourced when installing from -#binary package (bug #380845) -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - APACHE2_MOD_CONF="70_mod_php5" - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in /etc/make.conf" - ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" - - # check for not yet migrated old style config dirs - ls "${ROOT}"/etc/php/*-php5 &>/dev/null - if [[ $? -eq 0 ]]; then - ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" - ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" - fi - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog - - if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then - ewarn "The suhosin USE flag now only installs the suhosin patch!" - ewarn "If you want the suhosin extension, make sure you install" - ewarn " dev-php5/suhosin" - ewarn - fi -} diff --git a/dev-lang/php/php-5.4.0_rc3.ebuild b/dev-lang/php/php-5.4.0_rc3.ebuild deleted file mode 100644 index c8ace2928aa9..000000000000 --- a/dev-lang/php/php-5.4.0_rc3.ebuild +++ /dev/null @@ -1,390 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_rc3.ebuild,v 1.5 2011/12/18 09:00:26 olemarkus Exp $ - -EAPI=4 - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool - -SUHOSIN_VERSION="" -FPM_VERSION="builtin" -EXPECTED_TEST_FAILURES="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -function php_get_uri () -{ - case "${1}" in - "php-stas") - echo "http://downloads.php.net/stas/${2}" - ;; - "php-pre") - echo "http://downloads.php.net/johannes/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "suhosin") - echo "http://download.suhosin.org/${2}" - ;; - "olemarkus") - echo "http://olemarkus.org/~olemarkus/gentoo/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_PV="${PHP_PV/_alpha/alpha}" -PHP_PV="${PHP_PV/_beta/beta}" -PHP_RELEASE="php-stas" -PHP_P="${PN}-${PHP_PV}" - -PHP_PATCHSET_LOC="olemarkus" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_PATCHSET="0" -PHP_PATCHSET_URI=" - $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" - -PHP_FPM_INIT_VER="4" -PHP_FPM_CONF_VER="1" - -if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then - # in some cases we use our own suhosin patch (very recent version, - # patch conflicts, etc.) - SUHOSIN_TYPE="gentoo" -else - SUHOSIN_TYPE="suhosin" -fi - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; - SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" -fi - -SRC_URI=" - ${PHP_SRC_URI} - ${PHP_PATCHSET_URI}" - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SRC_URI="${SRC_URI} - suhosin? ( ${SUHOSIN_URI} )" -fi - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -SLOT="$(get_version_component_range 1-2)" -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# Gentoo-specific, common features -IUSE="kolab" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk - crypt +ctype curl curlwrappers debug doc - enchant exif frontbase +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql mysqlnd mysqli nls - oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm - readline recode +session sharedmem - +simplexml snmp soap sockets spell sqlite3 ssl - sybase-ct sysvipc tidy +tokenizer truetype unicode wddx - +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" - -# Enable suhosin if available -[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" - -DEPEND="!dev-lang/php:5 - >=app-admin/eselect-php-0.6.2 - >=dev-libs/libpcre-8.12[unicode] - apache2? ( www-servers/apache[threads=] ) - berkdb? ( =sys-libs/db-4* ) - bzip2? ( app-arch/bzip2 ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - kolab? ( >=net-libs/c-client-2004g-r1 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - !mysqlnd? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql-base ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite3? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg media-libs/libpng sys-libs/zlib ) - ) - unicode? ( dev-libs/oniguruma ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg - media-libs/libpng sys-libs/zlib - ) - xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( gd ) - cjk? ( gd ) - exif? ( gd ) - - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xsl? ( xml ) - ldap-sasl? ( ldap ) - kolab? ( imap ) - mhash? ( hash ) - phar? ( hash ) - mysqlnd? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -DEPEND="${DEPEND} - enchant? ( !dev-php/pecl-enchant ) - fileinfo? ( ! [version] [eval] -# Main eblit engine -eblit-core() { - [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" - local e v func=$1 ver=$2 eval_=$3 - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" - return 0 - fi - done - return 1 -} - -# eblit-include -# Usage: [--skip] [version] -# Includes an "eblit" -- a chunk of common code among ebuilds in a given -# package so that its functions can be sourced and utilized within the -# ebuild. -eblit-include() { - local skipable=false r=0 - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - [[ -z $1 ]] && die "Usage: eblit-include [version]" - eblit-core $1 $2 - r="$?" - ${skipable} && return 0 - [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe -# Usage: -# Runs a function if it is defined in an eblit -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run -# Usage: [version] -# Runs a function defined in an eblit -eblit-run() { - eblit-include --skip common v2 - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -# eblit-pkg -# Usage: [version] -# Includes the given functions AND evals them so they're included in the binpkgs -eblit-pkg() { - [[ -z $1 ]] && die "Usage: eblit-pkg [version]" - eblit-core $1 $2 1 -} - -eblit-pkg pkg_setup v3 - -src_prepare() { eblit-run src_prepare v4 ; } -src_configure() { eblit-run src_configure v54 ; } -src_compile() { eblit-run src_compile v2 ; } -src_install() { eblit-run src_install v3 ; } -src_test() { eblit-run src_test v1 ; } - -#Do not use eblit for this because it will not get sourced when installing from -#binary package (bug #380845) -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - APACHE2_MOD_CONF="70_mod_php5" - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in /etc/make.conf" - ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" - - # check for not yet migrated old style config dirs - ls "${ROOT}"/etc/php/*-php5 &>/dev/null - if [[ $? -eq 0 ]]; then - ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" - ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" - fi - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog - - if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then - ewarn "The suhosin USE flag now only installs the suhosin patch!" - ewarn "If you want the suhosin extension, make sure you install" - ewarn " dev-php/suhosin" - ewarn - fi -} diff --git a/dev-lang/php/php-5.4.0_rc4.ebuild b/dev-lang/php/php-5.4.0_rc4.ebuild deleted file mode 100644 index 34ffb24ca98e..000000000000 --- a/dev-lang/php/php-5.4.0_rc4.ebuild +++ /dev/null @@ -1,390 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_rc4.ebuild,v 1.1 2011/12/24 08:54:00 olemarkus Exp $ - -EAPI=4 - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool - -SUHOSIN_VERSION="" -FPM_VERSION="builtin" -EXPECTED_TEST_FAILURES="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -function php_get_uri () -{ - case "${1}" in - "php-stas") - echo "http://downloads.php.net/stas/${2}" - ;; - "php-pre") - echo "http://downloads.php.net/johannes/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "suhosin") - echo "http://download.suhosin.org/${2}" - ;; - "olemarkus") - echo "http://olemarkus.org/~olemarkus/gentoo/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_PV="${PHP_PV/_alpha/alpha}" -PHP_PV="${PHP_PV/_beta/beta}" -PHP_RELEASE="php-stas" -PHP_P="${PN}-${PHP_PV}" - -PHP_PATCHSET_LOC="olemarkus" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_PATCHSET="0" -PHP_PATCHSET_URI=" - $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" - -PHP_FPM_INIT_VER="4" -PHP_FPM_CONF_VER="1" - -if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then - # in some cases we use our own suhosin patch (very recent version, - # patch conflicts, etc.) - SUHOSIN_TYPE="gentoo" -else - SUHOSIN_TYPE="suhosin" -fi - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; - SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" -fi - -SRC_URI=" - ${PHP_SRC_URI} - ${PHP_PATCHSET_URI}" - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SRC_URI="${SRC_URI} - suhosin? ( ${SUHOSIN_URI} )" -fi - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -SLOT="$(get_version_component_range 1-2)" -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# Gentoo-specific, common features -IUSE="kolab" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk - crypt +ctype curl curlwrappers debug doc - enchant exif frontbase +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql mysqlnd mysqli nls - oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm - readline recode +session sharedmem - +simplexml snmp soap sockets spell sqlite3 ssl - sybase-ct sysvipc tidy +tokenizer truetype unicode wddx - +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" - -# Enable suhosin if available -[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" - -DEPEND="!dev-lang/php:5 - >=app-admin/eselect-php-0.6.2 - >=dev-libs/libpcre-8.12[unicode] - apache2? ( www-servers/apache[threads=] ) - berkdb? ( =sys-libs/db-4* ) - bzip2? ( app-arch/bzip2 ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - kolab? ( >=net-libs/c-client-2004g-r1 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - !mysqlnd? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql-base ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite3? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg media-libs/libpng sys-libs/zlib ) - ) - unicode? ( dev-libs/oniguruma ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg - media-libs/libpng sys-libs/zlib - ) - xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( gd ) - cjk? ( gd ) - exif? ( gd ) - - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xsl? ( xml ) - ldap-sasl? ( ldap ) - kolab? ( imap ) - mhash? ( hash ) - phar? ( hash ) - mysqlnd? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -DEPEND="${DEPEND} - enchant? ( !dev-php/pecl-enchant ) - fileinfo? ( ! [version] [eval] -# Main eblit engine -eblit-core() { - [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" - local e v func=$1 ver=$2 eval_=$3 - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" - return 0 - fi - done - return 1 -} - -# eblit-include -# Usage: [--skip] [version] -# Includes an "eblit" -- a chunk of common code among ebuilds in a given -# package so that its functions can be sourced and utilized within the -# ebuild. -eblit-include() { - local skipable=false r=0 - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - [[ -z $1 ]] && die "Usage: eblit-include [version]" - eblit-core $1 $2 - r="$?" - ${skipable} && return 0 - [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe -# Usage: -# Runs a function if it is defined in an eblit -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run -# Usage: [version] -# Runs a function defined in an eblit -eblit-run() { - eblit-include --skip common v2 - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -# eblit-pkg -# Usage: [version] -# Includes the given functions AND evals them so they're included in the binpkgs -eblit-pkg() { - [[ -z $1 ]] && die "Usage: eblit-pkg [version]" - eblit-core $1 $2 1 -} - -eblit-pkg pkg_setup v3 - -src_prepare() { eblit-run src_prepare v4 ; } -src_configure() { eblit-run src_configure v54 ; } -src_compile() { eblit-run src_compile v2 ; } -src_install() { eblit-run src_install v3 ; } -src_test() { eblit-run src_test v1 ; } - -#Do not use eblit for this because it will not get sourced when installing from -#binary package (bug #380845) -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - APACHE2_MOD_CONF="70_mod_php5" - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in /etc/make.conf" - ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" - - # check for not yet migrated old style config dirs - ls "${ROOT}"/etc/php/*-php5 &>/dev/null - if [[ $? -eq 0 ]]; then - ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" - ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" - fi - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog - - if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then - ewarn "The suhosin USE flag now only installs the suhosin patch!" - ewarn "If you want the suhosin extension, make sure you install" - ewarn " dev-php/suhosin" - ewarn - fi -} diff --git a/dev-lang/php/php-5.4.0_rc5.ebuild b/dev-lang/php/php-5.4.0_rc5.ebuild deleted file mode 100644 index e17d20dbd726..000000000000 --- a/dev-lang/php/php-5.4.0_rc5.ebuild +++ /dev/null @@ -1,390 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_rc5.ebuild,v 1.1 2012/01/06 20:54:59 olemarkus Exp $ - -EAPI=4 - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool - -SUHOSIN_VERSION="" -FPM_VERSION="builtin" -EXPECTED_TEST_FAILURES="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -function php_get_uri () -{ - case "${1}" in - "php-stas") - echo "http://downloads.php.net/stas/${2}" - ;; - "php-pre") - echo "http://downloads.php.net/johannes/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "suhosin") - echo "http://download.suhosin.org/${2}" - ;; - "olemarkus") - echo "http://olemarkus.org/~olemarkus/gentoo/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_PV="${PHP_PV/_alpha/alpha}" -PHP_PV="${PHP_PV/_beta/beta}" -PHP_RELEASE="php-stas" -PHP_P="${PN}-${PHP_PV}" - -PHP_PATCHSET_LOC="olemarkus" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_PATCHSET="0" -PHP_PATCHSET_URI=" - $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" - -PHP_FPM_INIT_VER="4" -PHP_FPM_CONF_VER="1" - -if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then - # in some cases we use our own suhosin patch (very recent version, - # patch conflicts, etc.) - SUHOSIN_TYPE="gentoo" -else - SUHOSIN_TYPE="suhosin" -fi - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; - SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" -fi - -SRC_URI=" - ${PHP_SRC_URI} - ${PHP_PATCHSET_URI}" - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SRC_URI="${SRC_URI} - suhosin? ( ${SUHOSIN_URI} )" -fi - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -SLOT="$(get_version_component_range 1-2)" -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# Gentoo-specific, common features -IUSE="kolab" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk - crypt +ctype curl curlwrappers debug doc - enchant exif frontbase +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql mysqlnd mysqli nls - oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm - readline recode +session sharedmem - +simplexml snmp soap sockets spell sqlite3 ssl - sybase-ct sysvipc tidy +tokenizer truetype unicode wddx - +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" - -# Enable suhosin if available -[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" - -DEPEND="!dev-lang/php:5 - >=app-admin/eselect-php-0.6.2 - >=dev-libs/libpcre-8.12[unicode] - apache2? ( www-servers/apache[threads=] ) - berkdb? ( =sys-libs/db-4* ) - bzip2? ( app-arch/bzip2 ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - kolab? ( >=net-libs/c-client-2004g-r1 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - !mysqlnd? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql-base ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite3? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg media-libs/libpng sys-libs/zlib ) - ) - unicode? ( dev-libs/oniguruma ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg - media-libs/libpng sys-libs/zlib - ) - xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( gd ) - cjk? ( gd ) - exif? ( gd ) - - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xsl? ( xml ) - ldap-sasl? ( ldap ) - kolab? ( imap ) - mhash? ( hash ) - phar? ( hash ) - mysqlnd? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -DEPEND="${DEPEND} - enchant? ( !dev-php/pecl-enchant ) - fileinfo? ( ! [version] [eval] -# Main eblit engine -eblit-core() { - [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" - local e v func=$1 ver=$2 eval_=$3 - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" - return 0 - fi - done - return 1 -} - -# eblit-include -# Usage: [--skip] [version] -# Includes an "eblit" -- a chunk of common code among ebuilds in a given -# package so that its functions can be sourced and utilized within the -# ebuild. -eblit-include() { - local skipable=false r=0 - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - [[ -z $1 ]] && die "Usage: eblit-include [version]" - eblit-core $1 $2 - r="$?" - ${skipable} && return 0 - [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe -# Usage: -# Runs a function if it is defined in an eblit -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run -# Usage: [version] -# Runs a function defined in an eblit -eblit-run() { - eblit-include --skip common v2 - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -# eblit-pkg -# Usage: [version] -# Includes the given functions AND evals them so they're included in the binpkgs -eblit-pkg() { - [[ -z $1 ]] && die "Usage: eblit-pkg [version]" - eblit-core $1 $2 1 -} - -eblit-pkg pkg_setup v3 - -src_prepare() { eblit-run src_prepare v4 ; } -src_configure() { eblit-run src_configure v54 ; } -src_compile() { eblit-run src_compile v2 ; } -src_install() { eblit-run src_install v3 ; } -src_test() { eblit-run src_test v1 ; } - -#Do not use eblit for this because it will not get sourced when installing from -#binary package (bug #380845) -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - APACHE2_MOD_CONF="70_mod_php5" - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in /etc/make.conf" - ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" - - # check for not yet migrated old style config dirs - ls "${ROOT}"/etc/php/*-php5 &>/dev/null - if [[ $? -eq 0 ]]; then - ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" - ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" - fi - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog - - if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then - ewarn "The suhosin USE flag now only installs the suhosin patch!" - ewarn "If you want the suhosin extension, make sure you install" - ewarn " dev-php/suhosin" - ewarn - fi -} diff --git a/dev-libs/libebml/libebml-1.2.2.ebuild b/dev-libs/libebml/libebml-1.2.2.ebuild index e64608a029fa..5153b040c49c 100644 --- a/dev-libs/libebml/libebml-1.2.2.ebuild +++ b/dev-libs/libebml/libebml-1.2.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-1.2.2.ebuild,v 1.1 2011/09/26 00:15:31 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-1.2.2.ebuild,v 1.2 2012/01/26 20:28:46 hwoarang Exp $ EAPI=4 @@ -12,7 +12,7 @@ SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos" IUSE="debug static-libs" S="${WORKDIR}/${P}/make/linux" diff --git a/dev-libs/libexplain/Manifest b/dev-libs/libexplain/Manifest index 76f6038e98b7..638cf53c0ecb 100644 --- a/dev-libs/libexplain/Manifest +++ b/dev-libs/libexplain/Manifest @@ -1,2 +1,3 @@ DIST libexplain-0.49.D001.tar.gz 4477127 RMD160 e71bf8854bbcd7ba3e94de8434557e5192060fe8 SHA1 93aba2641ad61810b62eccd2d58f762d880edde7 SHA256 c6792f1ddf304cf1af2f7aaf03340ec4aee6d73a97b52a066e153bd967fbbedb DIST libexplain-0.50.D001.tar.gz 4484874 RMD160 80f90e363f12e0f9aaa04f4cd7639b478dc1c057 SHA1 dcf3a7a92370195810b96ae033f08b6e5794cf99 SHA256 7ffbf63ed820becdc26ed43f9299978f80a1edf617768b37cbdf99c80b57aaa6 +DIST libexplain-0.51.D001.tar.gz 4485218 RMD160 059f4fbe520ed9bacdf5098dcbef006c33759e1d SHA1 e8e1fd2b7a607fa823d6b13285c406e4e1197041 SHA256 2f49e8bc6c4b11c7d603e1d5b041fdf99712becc8cc67be475fe60272566681c diff --git a/dev-libs/libexplain/libexplain-0.51.ebuild b/dev-libs/libexplain/libexplain-0.51.ebuild new file mode 100644 index 000000000000..e21ee2d2ee9a --- /dev/null +++ b/dev-libs/libexplain/libexplain-0.51.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libexplain/libexplain-0.51.ebuild,v 1.1 2012/01/26 22:45:38 radhermit Exp $ + +EAPI=4 +inherit autotools-utils + +MY_P="${P}.D001" + +DESCRIPTION="Library which may be used to explain Unix and Linux system call errors" +HOMEPAGE="http://libexplain.sourceforge.net/" +SRC_URI="http://libexplain.sourceforge.net/${MY_P}.tar.gz" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +LICENSE="GPL-3" +IUSE="static-libs" + +DEPEND=" + >=sys-kernel/linux-headers-2.6.35 + sys-libs/libcap + >=sys-libs/glibc-2.11" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/${MY_P} + +DOCS=( README ) + +AUTOTOOLS_IN_SOURCE_BUILD=1 + +PATCHES=( + "${FILESDIR}"/${PN}-0.45-configure.patch +) + +src_prepare() { + # Portage incompatible test + sed \ + -e '/t0524a/d' \ + -e '/t0363a/d' \ + -i Makefile.in || die + + cp "${S}"/etc/configure.ac "${S}" + + autotools-utils_src_prepare + eautoreconf +} diff --git a/dev-php/securimage/Manifest b/dev-php/securimage/Manifest new file mode 100644 index 000000000000..a9d062542dd7 --- /dev/null +++ b/dev-php/securimage/Manifest @@ -0,0 +1 @@ +DIST securimage-3.0.1.tar.gz 1107713 RMD160 a8318e67e58e7524b8c9811f61a08db7c7c2ba66 SHA1 80fbe07f55d29a4abb93fdd47e46185f656f5493 SHA256 f507c4e11c753cb40d6c3703ee513048a51b28ee85f4ab85f199d77d8013433a diff --git a/dev-php/securimage/metadata.xml b/dev-php/securimage/metadata.xml new file mode 100644 index 000000000000..548448307c18 --- /dev/null +++ b/dev-php/securimage/metadata.xml @@ -0,0 +1,8 @@ + + + + + binki@gentoo.org + Nathan Phillip Brink + + diff --git a/dev-php/securimage/securimage-3.0.1.ebuild b/dev-php/securimage/securimage-3.0.1.ebuild new file mode 100644 index 000000000000..9126bcd8e5bf --- /dev/null +++ b/dev-php/securimage/securimage-3.0.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-php/securimage/securimage-3.0.1.ebuild,v 1.1 2012/01/26 22:00:46 binki Exp $ + +EAPI=4 + +DESCRIPTION="PHP captcha creator and validator library" +HOMEPAGE="http://phpcaptcha.org/" +SRC_URI="http://phpcaptcha.org/${P}.tar.gz + ftp://mirror.ohnopub.net/mirror/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND="virtual/httpd-php" + +S=${WORKDIR}/${PN} + +src_install() +{ + # Grab all PHP files except the examples. + set *.php + local php_files=${@/*example*/} + + insinto /usr/share/php/${PN} + doins -r ${php_files} *.{ttf,swf} audio backgrounds database images words + + dodoc README* *example* +} diff --git a/games-fps/quake3-defrag/quake3-defrag-1.91.20.ebuild b/games-fps/quake3-defrag/quake3-defrag-1.91.20.ebuild index 0c896f301d97..95a0d94b254a 100644 --- a/games-fps/quake3-defrag/quake3-defrag-1.91.20.ebuild +++ b/games-fps/quake3-defrag/quake3-defrag-1.91.20.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-defrag/quake3-defrag-1.91.20.ebuild,v 1.2 2012/01/26 14:57:09 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-defrag/quake3-defrag-1.91.20.ebuild,v 1.3 2012/01/26 15:50:49 ago Exp $ EAPI=2 @@ -26,7 +26,7 @@ SRC_URI="http://q3defrag.org/files/defrag/defrag_${PV}.zip http://www.german-defrag.de/files/defrag/defragpak11.zip" LICENSE="freedist" -KEYWORDS="~amd64 ~ppc x86" +KEYWORDS="amd64 ~ppc x86" IUSE="dedicated opengl" src_unpack() { diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest index a77aabd9447c..ff95ce758596 100644 --- a/games-kids/gcompris/Manifest +++ b/games-kids/gcompris/Manifest @@ -1,2 +1,2 @@ -DIST gcompris-11.12.tar.gz 149436786 RMD160 0f26cc9bd3dd8d4a7f1c8d99c46659d60e1942d9 SHA1 121ded747cb9c0019564577faa951d28f7cb4e36 SHA256 ab57e7c96df66114f7298947f6725364f4a8b811f1bb1e9470cbd63eea9e6d81 +DIST gcompris-12.01.tar.gz 149465806 RMD160 ce578e8ca494b85300fe0046d1fd111c79a1084d SHA1 c1e3a98e1e2ac7397a8da6bc176c112008008dbe SHA256 77e5a4901550dfcad632277437b6895a65a553225224c8a78f2bd5b7b459aa91 DIST gcompris-9.6.1.tar.gz 145196483 RMD160 de8e3b530f97307fa6d745facf785204886b452d SHA1 b0a410ad87cdf087e5f238bcfc0ed87a0ce7ab5c SHA256 ffc3c127ff628c57f6a113bb1c568541bf4fc2f1e4242315d8a3fa7a5111f4e9 diff --git a/games-kids/gcompris/files/gcompris-11.12-build.patch b/games-kids/gcompris/files/gcompris-12.01-build.patch similarity index 100% rename from games-kids/gcompris/files/gcompris-11.12-build.patch rename to games-kids/gcompris/files/gcompris-12.01-build.patch diff --git a/games-kids/gcompris/gcompris-11.12.ebuild b/games-kids/gcompris/gcompris-12.01.ebuild similarity index 95% rename from games-kids/gcompris/gcompris-11.12.ebuild rename to games-kids/gcompris/gcompris-12.01.ebuild index 8d359b6b3a6a..f7a942963b38 100644 --- a/games-kids/gcompris/gcompris-11.12.ebuild +++ b/games-kids/gcompris/gcompris-12.01.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-11.12.ebuild,v 1.1 2011/12/21 07:21:29 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-12.01.ebuild,v 1.1 2012/01/26 15:42:53 mr_bones_ Exp $ EAPI=2 diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest index ec9037338c9c..b7be86680432 100644 --- a/games-util/pyfa/Manifest +++ b/games-util/pyfa/Manifest @@ -1,2 +1,2 @@ -DIST pyfa-1.1-crucible-src.tar.bz2 3981253 RMD160 6c5778faa6c22c3cc6ffe49acd49dac46c8cc7ef SHA1 d57b3a0b0197d0d0d50f32341eb0a1a1dd4e984e SHA256 473f573546c71d5c76b1a57eede29e611bb7eb0b48316bc3c59a3d921084a942 DIST pyfa-1.1.1-crucible-src.tar.bz2 4067326 RMD160 91b8417765758e2b12cec89a6c97fe4294a1a0ab SHA1 ad7452142acb07cd42d5ce032edf6b6cfb8d5e86 SHA256 e8ade754d85cf5a9a9718cd2ae696e9182c0e19fbefc79432edd6d2362161807 +DIST pyfa-1.1.2-crucible-src.tar.bz2 4034641 RMD160 deb3467c6b23652005d18670e0b147d64e07da8a SHA1 4e25ec9b68ce8390f43a1548ad57939b0cf79688 SHA256 f0b976a0975a91217850a1b4549a00fbb4bfe5d2cd427d543adca8348e32210f diff --git a/games-util/pyfa/pyfa-1.1.ebuild b/games-util/pyfa/pyfa-1.1.2.ebuild similarity index 78% rename from games-util/pyfa/pyfa-1.1.ebuild rename to games-util/pyfa/pyfa-1.1.2.ebuild index d89ed0fe65c1..1a5ea3113a42 100644 --- a/games-util/pyfa/pyfa-1.1.ebuild +++ b/games-util/pyfa/pyfa-1.1.2.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.ebuild,v 1.1 2011/11/30 18:33:25 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.2.ebuild,v 1.1 2012/01/26 19:44:51 tetromino Exp $ EAPI="4" PYTHON_DEPEND="2:2.6" PYTHON_USE_WITH="sqlite threads" -inherit eutils python +inherit eutils gnome2-utils python if [[ ${PV/_rc*/} == ${PV} ]] ; then MY_PV=${PV}-crucible-src @@ -57,14 +57,23 @@ src_install() { insinto /usr/share/${PN} doins -r staticdata dodoc readme.txt - doicon icons/${PN}.png + insinto /usr/share/icons/hicolor/32x32/apps + doins icons/pyfa.png + insinto /usr/share/icons/hicolor/64x64/apps + newins icons/pyfa64.png pyfa.png domenu "${FILESDIR}/${PN}.desktop" } +pkg_preinst() { + gnome2_icon_savelist +} + pkg_postinst() { + gnome2_icon_cache_update python_mod_optimize ${PN} } pkg_postrm() { + gnome2_icon_cache_update python_mod_cleanup ${PN} } diff --git a/games-util/xboxdrv/Manifest b/games-util/xboxdrv/Manifest index aa3d31330a5c..be39f3f397a9 100644 --- a/games-util/xboxdrv/Manifest +++ b/games-util/xboxdrv/Manifest @@ -1,4 +1,2 @@ -DIST xboxdrv-linux-0.7.1.tar.bz2 229920 RMD160 eaecfd974bc418569044f2bcc62791ecb78627f7 SHA1 5401c3551fd1e1f42c84aa948932d2ebcf981b5d SHA256 5c74e92ec0de125b1c010c9af349e2254bfb39065c73f595e2487e0d613f4341 -DIST xboxdrv-linux-0.7.3.tar.bz2 243248 RMD160 6c6145c386cd1af63b1ea8ef14810d133fcf0c24 SHA1 0865eac94759d46f0a6395ce6e7a84e707a6930e SHA256 bdc567eb773a27b58a4616fada259a6c3447020e2d34a924d9832466831671d1 -DIST xboxdrv-linux-0.8.0.tar.bz2 252136 RMD160 6f7e3cd4c235e70dcdb8464cc73f06b94bf93bc9 SHA1 78ce719d1490f7acfc9459492d79b89011a958b4 SHA256 5554bcae20b3826cef3c9b4c2e4c1d7d712f08032e3fee779c043304cc9dd450 DIST xboxdrv-linux-0.8.2.tar.bz2 262158 RMD160 0fb276d0b9a422e8ff391e63af79dba08f05f725 SHA1 5b451c971cf22290158c98cf4bed63010e7b27b5 SHA256 552e3bcc62cd9930f332d523c9a6e31d8099161d5a22fc20aabb1e25fc739033 +DIST xboxdrv-linux-0.8.4.tar.bz2 264484 RMD160 23d3c6251f980c774ca48128e6747db41b8a09cc SHA1 fd403c7b7d126b1347bfa8da96639f3f668b91bd SHA256 01611a1add7f26d6b59e02fe869bbbdb2ad4358c922c85c446c2019f87ff519c diff --git a/games-util/xboxdrv/files/xboxdrv-0.8.0-scons-blows.patch b/games-util/xboxdrv/files/xboxdrv-0.8.0-scons-blows.patch deleted file mode 100644 index 460413af12cf..000000000000 --- a/games-util/xboxdrv/files/xboxdrv-0.8.0-scons-blows.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- SConstruct.orig 2011-05-27 17:12:23.710420793 -0400 -+++ SConstruct 2011-05-27 17:12:41.975696140 -0400 -@@ -153,7 +153,7 @@ - Glob('src/axisevent/*.cpp') + - Glob('src/buttonevent/*.cpp') + - Glob('src/modifier/*.cpp')) --env.Append(LIBS = libxboxdrv) -+env.Prepend(LIBS = libxboxdrv) - - env.Program('xboxdrv', Glob('src/main/main.cpp')) - diff --git a/games-util/xboxdrv/xboxdrv-0.7.1.ebuild b/games-util/xboxdrv/xboxdrv-0.7.1.ebuild deleted file mode 100644 index 80ad247c68f6..000000000000 --- a/games-util/xboxdrv/xboxdrv-0.7.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/xboxdrv/xboxdrv-0.7.1.ebuild,v 1.3 2011/04/11 14:19:09 phajdan.jr Exp $ - -EAPI=2 -inherit scons-utils toolchain-funcs linux-info - -MY_P=${PN}-linux-${PV} -DESCRIPTION="Userspace Xbox 360 Controller driver" -HOMEPAGE="http://pingus.seul.org/~grumbel/xboxdrv/" -SRC_URI="http://pingus.seul.org/~grumbel/xboxdrv/${MY_P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="dev-libs/boost - sys-fs/udev - virtual/libusb:1 - x11-libs/libX11" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -S=${WORKDIR}/${MY_P} - -CONFIG_CHECK="~INPUT_EVDEV ~INPUT_JOYDEV ~INPUT_UINPUT ~!JOYSTICK_XPAD" - -src_compile() { - escons \ - BUILD=custom \ - CXX="$(tc-getCXX)" \ - CXXFLAGS="-Wall ${CXXFLAGS}" \ - LINKFLAGS="${LDFLAGS}" \ - || die "scons failed" -} - -src_install() { - dobin xboxdrv || die "dobin failed" - - insinto /etc/hal/fdi/policy - newins hal/xboxdrv_policy.fdi 99-xboxdrv.fdi || die "newins failed" - insinto /etc/hal/fdi/preprobe - newins hal/xboxdrv_preprobe.fdi 99-xboxdrv.fdi || die "newins failed" - - doman doc/xboxdrv.1 - dodoc AUTHORS NEWS PROTOCOL README TODO -} diff --git a/games-util/xboxdrv/xboxdrv-0.8.0.ebuild b/games-util/xboxdrv/xboxdrv-0.8.0.ebuild deleted file mode 100644 index 3c41ee7101d0..000000000000 --- a/games-util/xboxdrv/xboxdrv-0.8.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/xboxdrv/xboxdrv-0.8.0.ebuild,v 1.3 2011/07/21 10:36:10 maekke Exp $ - -EAPI=2 -inherit eutils scons-utils toolchain-funcs linux-info - -MY_P=${PN}-linux-${PV} -DESCRIPTION="Userspace Xbox 360 Controller driver" -HOMEPAGE="http://pingus.seul.org/~grumbel/xboxdrv/" -SRC_URI="http://pingus.seul.org/~grumbel/xboxdrv/${MY_P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="dev-libs/boost - sys-fs/udev - sys-apps/dbus - dev-libs/glib:2 - virtual/libusb:1 - x11-libs/libX11" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -S=${WORKDIR}/${MY_P} - -CONFIG_CHECK="~INPUT_EVDEV ~INPUT_JOYDEV ~INPUT_UINPUT ~!JOYSTICK_XPAD" - -src_prepare() { - epatch "${FILESDIR}"/${P}-scons-blows.patch -} - -src_compile() { - escons \ - BUILD=custom \ - CXX="$(tc-getCXX)" \ - CXXFLAGS="-Wall ${CXXFLAGS}" \ - LINKFLAGS="${LDFLAGS}" \ - || die "scons failed" -} - -src_install() { - dobin xboxdrv || die "dobin failed" - - insinto /etc/hal/fdi/policy - newins hal/xboxdrv_policy.fdi 99-xboxdrv.fdi || die "newins failed" - insinto /etc/hal/fdi/preprobe - newins hal/xboxdrv_preprobe.fdi 99-xboxdrv.fdi || die "newins failed" - - doman doc/xboxdrv.1 - dodoc AUTHORS NEWS PROTOCOL README TODO -} diff --git a/games-util/xboxdrv/xboxdrv-0.7.3.ebuild b/games-util/xboxdrv/xboxdrv-0.8.4.ebuild similarity index 70% rename from games-util/xboxdrv/xboxdrv-0.7.3.ebuild rename to games-util/xboxdrv/xboxdrv-0.8.4.ebuild index d1a6d04cbca3..fb8a70861a4e 100644 --- a/games-util/xboxdrv/xboxdrv-0.7.3.ebuild +++ b/games-util/xboxdrv/xboxdrv-0.8.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/xboxdrv/xboxdrv-0.7.3.ebuild,v 1.1 2011/05/07 22:06:04 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-util/xboxdrv/xboxdrv-0.8.4.ebuild,v 1.1 2012/01/26 18:26:59 mr_bones_ Exp $ EAPI=2 inherit scons-utils toolchain-funcs linux-info @@ -17,6 +17,8 @@ IUSE="" RDEPEND="dev-libs/boost sys-fs/udev + sys-apps/dbus + dev-libs/glib:2 virtual/libusb:1 x11-libs/libX11" DEPEND="${RDEPEND} @@ -32,17 +34,11 @@ src_compile() { CXX="$(tc-getCXX)" \ CXXFLAGS="-Wall ${CXXFLAGS}" \ LINKFLAGS="${LDFLAGS}" \ - || die "scons failed" + || die } src_install() { - dobin xboxdrv || die "dobin failed" - - insinto /etc/hal/fdi/policy - newins hal/xboxdrv_policy.fdi 99-xboxdrv.fdi || die "newins failed" - insinto /etc/hal/fdi/preprobe - newins hal/xboxdrv_preprobe.fdi 99-xboxdrv.fdi || die "newins failed" - + dobin xboxdrv || die doman doc/xboxdrv.1 dodoc AUTHORS NEWS PROTOCOL README TODO } diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.8.0.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.8.0-r1.ebuild similarity index 90% rename from kde-base/kdepim-common-libs/kdepim-common-libs-4.8.0.ebuild rename to kde-base/kdepim-common-libs/kdepim-common-libs-4.8.0-r1.ebuild index d0aabf64a5fe..3958c570cfd0 100644 --- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.8.0.ebuild +++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.8.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/kdepim-common-libs-4.8.0.ebuild,v 1.1 2012/01/25 18:17:11 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/kdepim-common-libs-4.8.0-r1.ebuild,v 1.1 2012/01/26 16:54:08 johu Exp $ EAPI=4 @@ -30,6 +30,8 @@ add_blocker libkdepim add_blocker libkleo add_blocker libkpgp add_blocker kaddressbook '<4.4.90' +# kdepim-wizards removed since 4.8.0 +add_blocker kdepim-wizards add_blocker kmail '<4.4.80' add_blocker korganizer '<4.5.67' diff --git a/kde-base/kdepimlibs/kdepimlibs-4.8.0.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.8.0.ebuild index 3724bccc15c4..71845d3bccba 100644 --- a/kde-base/kdepimlibs/kdepimlibs-4.8.0.ebuild +++ b/kde-base/kdepimlibs/kdepimlibs-4.8.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.8.0.ebuild,v 1.1 2012/01/25 18:16:54 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.8.0.ebuild,v 1.2 2012/01/26 15:54:56 johu Exp $ EAPI=4 @@ -62,6 +62,7 @@ src_configure() { $(cmake-utils_use_with semantic-desktop SharedDesktopOntologies) $(cmake-utils_use_with semantic-desktop Soprano) $(cmake-utils_use_with semantic-desktop Nepomuk) + $(cmake-utils_use !semantic-desktop KALARM_USE_KRESOURCES) $(cmake-utils_use_with prison Prison) ) diff --git a/mail-client/thunderbird-bin/thunderbird-bin-9.0.1.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-9.0.1.ebuild index ddc6420b0272..c6b5cc444ef9 100644 --- a/mail-client/thunderbird-bin/thunderbird-bin-9.0.1.ebuild +++ b/mail-client/thunderbird-bin/thunderbird-bin-9.0.1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-9.0.1.ebuild,v 1.3 2012/01/12 15:30:41 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-9.0.1.ebuild,v 1.4 2012/01/26 15:01:17 nirbheek Exp $ EAPI="3" -inherit eutils multilib mozextension pax-utils fdo-mime gnome2-utils +inherit eutils multilib mozextension pax-utils fdo-mime gnome2-utils nsplugins # Can be updated using scripts/get_langs.sh from mozilla overlay LANGS=(ar be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr @@ -125,8 +125,8 @@ EOF "${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \ die "failed to cp thunderbird-gentoo-default-prefs.js" - ln -sfn "/usr/$(get_libdir)/nsbrowser/plugins" \ - "${D}${MOZILLA_FIVE_HOME}/plugins" || die + # Plugins dir + share_plugins_dir pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container} } diff --git a/media-libs/libogg/libogg-1.3.0.ebuild b/media-libs/libogg/libogg-1.3.0.ebuild index 042e92c8163a..1936464492b1 100644 --- a/media-libs/libogg/libogg-1.3.0.ebuild +++ b/media-libs/libogg/libogg-1.3.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/libogg-1.3.0.ebuild,v 1.1 2011/08/22 06:47:46 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/libogg-1.3.0.ebuild,v 1.2 2012/01/26 20:27:33 hwoarang Exp $ EAPI=4 @@ -10,7 +10,7 @@ SRC_URI="http://downloads.xiph.org/releases/ogg/${P}.tar.xz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="static-libs" DOCS=( AUTHORS CHANGES ) diff --git a/media-sound/qmpdclient/qmpdclient-1.2.2.ebuild b/media-sound/qmpdclient/qmpdclient-1.2.2.ebuild index 97f3b9fdaaea..4b9abf0f2159 100644 --- a/media-sound/qmpdclient/qmpdclient-1.2.2.ebuild +++ b/media-sound/qmpdclient/qmpdclient-1.2.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/qmpdclient-1.2.2.ebuild,v 1.1 2011/06/15 19:14:44 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/qmpdclient-1.2.2.ebuild,v 1.2 2012/01/26 21:10:57 hwoarang Exp $ EAPI=4 inherit fdo-mime cmake-utils @@ -12,7 +12,7 @@ SRC_URI="http://dump.bitcheese.net/files/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="debug" DEPEND="x11-libs/qt-gui:4[dbus] diff --git a/metadata/cache/app-admin/389-console-1.1.6 b/metadata/cache/app-admin/389-console-1.1.6 index ebe682fb2e91..9bad5599be7c 100644 --- a/metadata/cache/app-admin/389-console-1.1.6 +++ b/metadata/cache/app-admin/389-console-1.1.6 @@ -1,7 +1,7 @@ >=virtual/jdk-1.6 dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 app-admin/389-admin-console >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 app-admin/389-admin-console >=dev-java/java-config-2.1.9-r1 1.1 -http://directory.fedoraproject.org/sources/389-console-1.1.6.tar.bz2 +http://directory.fedoraproject.org/sources/389-console-1.1.6.tar.bz2 http://dev.gentoo.org/~lxnay/389-console/fedora.png http://port389.org/ LGPL-2.1 diff --git a/metadata/cache/app-admin/389-console-1.1.7 b/metadata/cache/app-admin/389-console-1.1.7 index 6ec494a77388..98c48e3765fd 100644 --- a/metadata/cache/app-admin/389-console-1.1.7 +++ b/metadata/cache/app-admin/389-console-1.1.7 @@ -1,7 +1,7 @@ >=virtual/jdk-1.6 dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 app-admin/389-admin-console >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 app-admin/389-admin-console >=dev-java/java-config-2.1.9-r1 1.1 -http://directory.fedoraproject.org/sources/389-console-1.1.7.tar.bz2 +http://directory.fedoraproject.org/sources/389-console-1.1.7.tar.bz2 http://dev.gentoo.org/~lxnay/389-console/fedora.png http://port389.org/ LGPL-2.1 diff --git a/metadata/cache/app-backup/spideroak-bin-4.2.9913 b/metadata/cache/app-backup/spideroak-bin-4.2.9913 new file mode 100644 index 000000000000..3a1996701c61 --- /dev/null +++ b/metadata/cache/app-backup/spideroak-bin-4.2.9913 @@ -0,0 +1,22 @@ + +dbus? ( sys-apps/dbus ) !headless? ( media-libs/fontconfig media-libs/freetype:2 dev-libs/glib:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXrender x11-libs/libXt ) system-libs? ( dev-libs/openssl:0.9.8 net-misc/curl >=sys-devel/gcc-4 dev-libs/glib:2 dev-libs/libpcre media-libs/libpng:1.2 x11-libs/qt-core x11-libs/qt-gui dev-db/sqlite:3 net-libs/libssh2 sys-libs/zlib dev-lang/python:2.7 dev-python/pycurl ) +0 +x86? ( https://spideroak.com/directdownload?platform=ubuntulucid&arch=i386&revision=9913 -> spideroak-bin-4.2.9913_x86.deb ) amd64? ( https://spideroak.com/directdownload?platform=ubuntulucid&arch=x86_64&revision=9913 -> spideroak-bin-4.2.9913_amd64.deb ) +mirror strip +https://spideroak.com +spideroak +An easy, secure and consolidated free online backup, storage, access and sharing system. +~amd64 ~x86 +eutils multilib portability toolchain-funcs user versionator +dbus headless system-libs + + + +4 + +install postinst prepare unpack + + + + + diff --git a/metadata/cache/app-emulation/qemu-0.14.0 b/metadata/cache/app-emulation/qemu-0.14.0 deleted file mode 100644 index be8ff6418ee3..000000000000 --- a/metadata/cache/app-emulation/qemu-0.14.0 +++ /dev/null @@ -1,22 +0,0 @@ -!app-emulation/qemu-kvm !app-emulation/qemu-user sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( net-misc/curl ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) app-text/texi2html >=sys-kernel/linux-headers-2.6.29 ssl? ( dev-util/pkgconfig ) -!app-emulation/qemu-kvm !app-emulation/qemu-user sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( net-misc/curl ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) -0 -http://download.savannah.gnu.org/releases/qemu/qemu-0.14.0.tar.gz -test -http://www.qemu.org -GPL-2 -QEMU emulator and ABI wrapper -~amd64 ~ppc ~ppc64 ~x86 -eutils flag-o-matic linux-info multilib portability toolchain-funcs user versionator -+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses png pulseaudio qemu-ifup sasl sdl ssl static vde +qemu_softmmu_targets_i386 +qemu_softmmu_targets_x86_64 +qemu_softmmu_targets_arm +qemu_softmmu_targets_cris +qemu_softmmu_targets_m68k +qemu_softmmu_targets_microblaze +qemu_softmmu_targets_mips +qemu_softmmu_targets_mipsel +qemu_softmmu_targets_ppc +qemu_softmmu_targets_ppc64 +qemu_softmmu_targets_sh4 +qemu_softmmu_targets_sh4eb +qemu_softmmu_targets_sparc +qemu_softmmu_targets_sparc64 +qemu_softmmu_targets_mips64 +qemu_softmmu_targets_mips64el +qemu_softmmu_targets_ppcemb +qemu_user_targets_i386 +qemu_user_targets_x86_64 +qemu_user_targets_arm +qemu_user_targets_cris +qemu_user_targets_m68k +qemu_user_targets_microblaze +qemu_user_targets_mips +qemu_user_targets_mipsel +qemu_user_targets_ppc +qemu_user_targets_ppc64 +qemu_user_targets_sh4 +qemu_user_targets_sh4eb +qemu_user_targets_sparc +qemu_user_targets_sparc64 +qemu_user_targets_alpha +qemu_user_targets_armeb +qemu_user_targets_ppc64abi32 +qemu_user_targets_sparc32plus - - - -2 - -compile configure install postinst prepare setup - - - - - diff --git a/metadata/cache/app-emulation/qemu-1.0-r1 b/metadata/cache/app-emulation/qemu-1.0-r2 similarity index 100% rename from metadata/cache/app-emulation/qemu-1.0-r1 rename to metadata/cache/app-emulation/qemu-1.0-r2 diff --git a/metadata/cache/app-emulation/qemu-9999 b/metadata/cache/app-emulation/qemu-9999 index af290c23e4de..c888e9caa00f 100644 --- a/metadata/cache/app-emulation/qemu-9999 +++ b/metadata/cache/app-emulation/qemu-9999 @@ -8,7 +8,7 @@ GPL-2 QEMU emulator and ABI wrapper eutils flag-o-matic git-2 linux-info multilib portability toolchain-funcs user versionator -+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses nss opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde +vhost-net xattr xen +qemu_softmmu_targets_i386 +qemu_softmmu_targets_x86_64 +qemu_softmmu_targets_alpha +qemu_softmmu_targets_arm +qemu_softmmu_targets_cris +qemu_softmmu_targets_m68k +qemu_softmmu_targets_microblaze +qemu_softmmu_targets_microblazeel +qemu_softmmu_targets_mips +qemu_softmmu_targets_mipsel +qemu_softmmu_targets_ppc +qemu_softmmu_targets_ppc64 +qemu_softmmu_targets_sh4 +qemu_softmmu_targets_sh4eb +qemu_softmmu_targets_sparc +qemu_softmmu_targets_sparc64 +qemu_softmmu_targets_s390x +qemu_softmmu_targets_lm32 +qemu_softmmu_targets_mips64 +qemu_softmmu_targets_mips64el +qemu_softmmu_targets_ppcemb +qemu_softmmu_targets_xtensa +qemu_softmmu_targets_xtensaeb +qemu_user_targets_i386 +qemu_user_targets_x86_64 +qemu_user_targets_alpha +qemu_user_targets_arm +qemu_user_targets_cris +qemu_user_targets_m68k +qemu_user_targets_microblaze +qemu_user_targets_microblazeel +qemu_user_targets_mips +qemu_user_targets_mipsel +qemu_user_targets_ppc +qemu_user_targets_ppc64 +qemu_user_targets_sh4 +qemu_user_targets_sh4eb +qemu_user_targets_sparc +qemu_user_targets_sparc64 +qemu_user_targets_s390x +qemu_user_targets_armeb +qemu_user_targets_ppc64abi32 +qemu_user_targets_sparc32plus +qemu_user_targets_unicore32 ++aio alsa bluetooth brltty curl esd fdt hardened jpeg kvm ncurses nss opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde +vhost-net xattr xen +qemu_softmmu_targets_i386 +qemu_softmmu_targets_x86_64 +qemu_softmmu_targets_alpha +qemu_softmmu_targets_arm +qemu_softmmu_targets_cris +qemu_softmmu_targets_m68k +qemu_softmmu_targets_microblaze +qemu_softmmu_targets_microblazeel +qemu_softmmu_targets_mips +qemu_softmmu_targets_mipsel +qemu_softmmu_targets_ppc +qemu_softmmu_targets_ppc64 +qemu_softmmu_targets_sh4 +qemu_softmmu_targets_sh4eb +qemu_softmmu_targets_sparc +qemu_softmmu_targets_sparc64 +qemu_softmmu_targets_s390x +qemu_softmmu_targets_lm32 +qemu_softmmu_targets_mips64 +qemu_softmmu_targets_mips64el +qemu_softmmu_targets_ppcemb +qemu_softmmu_targets_xtensa +qemu_softmmu_targets_xtensaeb +qemu_user_targets_i386 +qemu_user_targets_x86_64 +qemu_user_targets_alpha +qemu_user_targets_arm +qemu_user_targets_cris +qemu_user_targets_m68k +qemu_user_targets_microblaze +qemu_user_targets_microblazeel +qemu_user_targets_mips +qemu_user_targets_mipsel +qemu_user_targets_ppc +qemu_user_targets_ppc64 +qemu_user_targets_sh4 +qemu_user_targets_sh4eb +qemu_user_targets_sparc +qemu_user_targets_sparc64 +qemu_user_targets_s390x +qemu_user_targets_armeb +qemu_user_targets_ppc64abi32 +qemu_user_targets_sparc32plus +qemu_user_targets_unicore32 diff --git a/metadata/cache/app-i18n/atokx2-17.0 b/metadata/cache/app-i18n/atokx2-17.0 index 926fb1999415..d9dfc6affde2 100644 --- a/metadata/cache/app-i18n/atokx2-17.0 +++ b/metadata/cache/app-i18n/atokx2-17.0 @@ -7,7 +7,7 @@ http://www.justsystem.co.jp/linux/atok.html ATOK MIT ATOK for Linux - The most famous Japanese Input Method Engine -* x86 -eutils multilib portability toolchain-funcs user +cdrom eutils multilib portability toolchain-funcs user diff --git a/metadata/cache/app-i18n/atokx2-17.0-r2 b/metadata/cache/app-i18n/atokx2-17.0-r2 index 789021daf45a..c1e89a4bd2eb 100644 --- a/metadata/cache/app-i18n/atokx2-17.0-r2 +++ b/metadata/cache/app-i18n/atokx2-17.0-r2 @@ -7,7 +7,7 @@ http://www.justsystem.co.jp/linux/atok.html ATOK MIT ATOK for Linux - The most famous Japanese Input Method Engine -* ~x86 -eutils multilib portability toolchain-funcs user +cdrom eutils multilib portability toolchain-funcs user diff --git a/metadata/cache/app-i18n/atokx3-3.0.0-r6 b/metadata/cache/app-i18n/atokx3-3.0.0-r6 index 59bd71f6f801..67dd0c34ed7f 100644 --- a/metadata/cache/app-i18n/atokx3-3.0.0-r6 +++ b/metadata/cache/app-i18n/atokx3-3.0.0-r6 @@ -7,7 +7,7 @@ http://www.justsystems.com/jp/products/atok_linux/ ATOK MIT ATOK X3 for Linux - The most famous Japanese Input Method Engine ~amd64 ~x86 -eutils multilib portability toolchain-funcs user +cdrom eutils multilib portability toolchain-funcs user diff --git a/metadata/cache/app-i18n/atokx3-3.0.0-r7 b/metadata/cache/app-i18n/atokx3-3.0.0-r7 index 97efb5188386..371a3195ae6f 100644 --- a/metadata/cache/app-i18n/atokx3-3.0.0-r7 +++ b/metadata/cache/app-i18n/atokx3-3.0.0-r7 @@ -7,7 +7,7 @@ http://www.justsystems.com/jp/products/atok_linux/ ATOK MIT ATOK X3 for Linux - The most famous Japanese Input Method Engine ~amd64 ~x86 -eutils multilib portability toolchain-funcs user +cdrom eutils multilib portability toolchain-funcs user diff --git a/metadata/cache/app-text/epdfview-0.1.8 b/metadata/cache/app-text/epdfview-0.1.8 index 35fd53c6ccad..a0a06921a7ba 100644 --- a/metadata/cache/app-text/epdfview-0.1.8 +++ b/metadata/cache/app-text/epdfview-0.1.8 @@ -6,7 +6,7 @@ test http://trac.emma-soft.com/epdfview/ GPL-2 Lightweight PDF viewer using Poppler and GTK+ libraries. -~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd +amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd fdo-mime cups nls test diff --git a/metadata/cache/app-text/sigil-0.5.0 b/metadata/cache/app-text/sigil-0.5.0 new file mode 100644 index 000000000000..e39f8ca954b4 --- /dev/null +++ b/metadata/cache/app-text/sigil-0.5.0 @@ -0,0 +1,22 @@ +>=x11-libs/qt-xmlpatterns-4.7.2 >=x11-libs/qt-webkit-4.7.2 >=x11-libs/qt-svg-4.7.2 >=x11-libs/qt-gui-4.7.2 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) +>=x11-libs/qt-xmlpatterns-4.7.2 >=x11-libs/qt-webkit-4.7.2 >=x11-libs/qt-svg-4.7.2 >=x11-libs/qt-gui-4.7.2 +0 +http://sigil.googlecode.com/files/Sigil-0.5.0-Code.zip + +http://code.google.com/p/sigil/ +GPL-3 +Sigil is a multi-platform WYSIWYG ebook editor for ePub format. +~amd64 ~x86 +base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user + + + + +4 + +compile configure install prepare test unpack + + + + + diff --git a/metadata/cache/dev-java/maven-bin-3.0.4 b/metadata/cache/dev-java/maven-bin-3.0.4 new file mode 100644 index 000000000000..c6f4e5774fd3 --- /dev/null +++ b/metadata/cache/dev-java/maven-bin-3.0.4 @@ -0,0 +1,22 @@ +app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1 +>=virtual/jdk-1.5 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1 +3.0 +mirror://apache/maven/binaries/apache-maven-3.0.4-bin.tar.gz + +http://maven.apache.org/ +Apache-2.0 +Project Management and Comprehension Tool for Java +~amd64 ~ppc ~x86 +eutils java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator +elibc_FreeBSD + + + +4 + +compile install postinst postrm preinst prepare setup unpack + + + + + diff --git a/metadata/cache/dev-lang/maude-2.6 b/metadata/cache/dev-lang/maude-2.6 new file mode 100644 index 000000000000..85190b4e5a93 --- /dev/null +++ b/metadata/cache/dev-lang/maude-2.6 @@ -0,0 +1,22 @@ +>=dev-libs/gmp-4.1.3 dev-libs/libsigsegv dev-libs/libtecla sci-libs/buddy sys-devel/bison sys-devel/flex || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +>=dev-libs/gmp-4.1.3 dev-libs/libsigsegv dev-libs/libtecla sci-libs/buddy +0 +http://maude.cs.uiuc.edu/download/current/Maude-2.6.tar.gz http://dev.gentoo.org/~jlec/distfiles/maude-2.6-extras.tar.xz + +http://maude.cs.uiuc.edu/ +GPL-2 +Maude - A high-level specification language +~amd64 ~ppc ~x86 +autotools autotools-utils eutils libtool multilib portability toolchain-funcs user versionator +doc + + + +4 + +compile configure install prepare test + + + + + diff --git a/metadata/cache/dev-libs/libebml-1.2.2 b/metadata/cache/dev-libs/libebml-1.2.2 index 78c7dab07c72..32e08daa3c64 100644 --- a/metadata/cache/dev-libs/libebml-1.2.2 +++ b/metadata/cache/dev-libs/libebml-1.2.2 @@ -6,7 +6,7 @@ http://www.bunkus.org/videotools/mkvtoolnix/sources/libebml-1.2.2.tar.bz2 http://www.matroska.org/ LGPL-2.1 Extensible binary format library (kinda like XML) -~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos +~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos eutils multilib portability toolchain-funcs user debug static-libs diff --git a/metadata/cache/dev-libs/libexplain-0.51 b/metadata/cache/dev-libs/libexplain-0.51 new file mode 100644 index 000000000000..569d0bde212c --- /dev/null +++ b/metadata/cache/dev-libs/libexplain-0.51 @@ -0,0 +1,22 @@ +>=sys-kernel/linux-headers-2.6.35 sys-libs/libcap >=sys-libs/glibc-2.11 +>=sys-kernel/linux-headers-2.6.35 sys-libs/libcap >=sys-libs/glibc-2.11 +0 +http://libexplain.sourceforge.net/libexplain-0.51.D001.tar.gz + +http://libexplain.sourceforge.net/ +GPL-3 +Library which may be used to explain Unix and Linux system call errors +~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux +autotools autotools-utils eutils libtool multilib portability toolchain-funcs user +static-libs + + + +4 + +compile configure install prepare test + + + + + diff --git a/metadata/cache/dev-php/securimage-3.0.1 b/metadata/cache/dev-php/securimage-3.0.1 new file mode 100644 index 000000000000..d20c2b024e37 --- /dev/null +++ b/metadata/cache/dev-php/securimage-3.0.1 @@ -0,0 +1,22 @@ + +virtual/httpd-php +0 +http://phpcaptcha.org/securimage-3.0.1.tar.gz ftp://mirror.ohnopub.net/mirror/securimage/securimage-3.0.1.tar.gz + +http://phpcaptcha.org/ +BSD +PHP captcha creator and validator library +~amd64 + + + + + +4 + +install + + + + + diff --git a/metadata/cache/games-fps/quake3-defrag-1.91.20 b/metadata/cache/games-fps/quake3-defrag-1.91.20 index 129d14190942..5d3bd00972ca 100644 --- a/metadata/cache/games-fps/quake3-defrag-1.91.20 +++ b/metadata/cache/games-fps/quake3-defrag-1.91.20 @@ -6,7 +6,7 @@ mirror strip http://cggdev.org/ freedist Quake III Defrag - Trickjumping challenges for Quake III -~amd64 ~ppc x86 +amd64 ~ppc x86 base eutils games games-mods multilib portability toolchain-funcs user dedicated opengl dedicated opengl diff --git a/metadata/cache/games-kids/gcompris-11.12 b/metadata/cache/games-kids/gcompris-12.01 similarity index 96% rename from metadata/cache/games-kids/gcompris-11.12 rename to metadata/cache/games-kids/gcompris-12.01 index 895bc4dfb013..6881d8bcda68 100644 --- a/metadata/cache/games-kids/gcompris-11.12 +++ b/metadata/cache/games-kids/gcompris-12.01 @@ -1,7 +1,7 @@ x11-libs/gtk+:2 gnome-base/librsvg[gtk] media-libs/gstreamer:0.10 media-libs/gst-plugins-good media-plugins/gst-plugins-ogg media-plugins/gst-plugins-alsa media-plugins/gst-plugins-vorbis media-libs/sdl-mixer media-libs/libsdl dev-libs/libxml2 dev-libs/popt virtual/libintl games-board/gnuchess dev-db/sqlite:3 gnet? ( net-libs/gnet:2 ) python? ( dev-python/pygtk ) gnome-base/gnome-common dev-perl/XML-Parser sys-devel/gettext sys-apps/texinfo app-text/texi2html dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) python? ( || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] ) ) x11-libs/gtk+:2 gnome-base/librsvg[gtk] media-libs/gstreamer:0.10 media-libs/gst-plugins-good media-plugins/gst-plugins-ogg media-plugins/gst-plugins-alsa media-plugins/gst-plugins-vorbis media-libs/sdl-mixer media-libs/libsdl dev-libs/libxml2 dev-libs/popt virtual/libintl games-board/gnuchess dev-db/sqlite:3 gnet? ( net-libs/gnet:2 ) python? ( dev-python/pygtk ) media-gfx/tuxpaint sci-electronics/gnucap >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) python? ( || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] ) ) 0 -mirror://sourceforge/gcompris/gcompris-11.12.tar.gz +mirror://sourceforge/gcompris/gcompris-12.01.tar.gz http://gcompris.net/ GPL-3 diff --git a/metadata/cache/games-util/pyfa-1.1 b/metadata/cache/games-util/pyfa-1.1.2 similarity index 55% rename from metadata/cache/games-util/pyfa-1.1 rename to metadata/cache/games-util/pyfa-1.1.2 index fac654cc1375..b1732c0d64d2 100644 --- a/metadata/cache/games-util/pyfa-1.1 +++ b/metadata/cache/games-util/pyfa-1.1.2 @@ -1,20 +1,20 @@ ->=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] ) +>=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] ) dev-python/sqlalchemy >=dev-python/wxpython-2.8 graph? ( dev-python/matplotlib[wxwidgets] dev-python/numpy ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] ) 0 -http://dl.evefit.org/stable/1.1/pyfa-1.1-crucible-src.tar.bz2 +http://dl.evefit.org/stable/1.1.2/pyfa-1.1.2-crucible-src.tar.bz2 http://www.evefit.org/Pyfa GPL-3 LGPL-2.1 CCPL-Attribution-2.5 free-noncomm Python Fitting Assistant - a ship fitting application for EVE Online ~amd64 ~x86 -eutils multilib portability python toolchain-funcs user +eutils gnome2-utils multilib portability python toolchain-funcs user +graph 4 -install postinst postrm prepare setup +install postinst postrm preinst prepare setup diff --git a/metadata/cache/games-util/xboxdrv-0.7.1 b/metadata/cache/games-util/xboxdrv-0.7.1 deleted file mode 100644 index c6deccca8daa..000000000000 --- a/metadata/cache/games-util/xboxdrv-0.7.1 +++ /dev/null @@ -1,22 +0,0 @@ -dev-libs/boost sys-fs/udev virtual/libusb:1 x11-libs/libX11 dev-util/pkgconfig dev-util/scons -dev-libs/boost sys-fs/udev virtual/libusb:1 x11-libs/libX11 -0 -http://pingus.seul.org/~grumbel/xboxdrv/xboxdrv-linux-0.7.1.tar.bz2 - -http://pingus.seul.org/~grumbel/xboxdrv/ -GPL-3 -Userspace Xbox 360 Controller driver -amd64 x86 -eutils linux-info multilib portability scons-utils toolchain-funcs user versionator - - - - -2 - -compile install setup - - - - - diff --git a/metadata/cache/games-util/xboxdrv-0.7.3 b/metadata/cache/games-util/xboxdrv-0.7.3 deleted file mode 100644 index 12c19eff5747..000000000000 --- a/metadata/cache/games-util/xboxdrv-0.7.3 +++ /dev/null @@ -1,22 +0,0 @@ -dev-libs/boost sys-fs/udev virtual/libusb:1 x11-libs/libX11 dev-util/pkgconfig dev-util/scons -dev-libs/boost sys-fs/udev virtual/libusb:1 x11-libs/libX11 -0 -http://pingus.seul.org/~grumbel/xboxdrv/xboxdrv-linux-0.7.3.tar.bz2 - -http://pingus.seul.org/~grumbel/xboxdrv/ -GPL-3 -Userspace Xbox 360 Controller driver -~amd64 ~x86 -eutils linux-info multilib portability scons-utils toolchain-funcs user versionator - - - - -2 - -compile install setup - - - - - diff --git a/metadata/cache/games-util/xboxdrv-0.8.0 b/metadata/cache/games-util/xboxdrv-0.8.4 similarity index 79% rename from metadata/cache/games-util/xboxdrv-0.8.0 rename to metadata/cache/games-util/xboxdrv-0.8.4 index 9c66a10f2433..72879e2531d7 100644 --- a/metadata/cache/games-util/xboxdrv-0.8.0 +++ b/metadata/cache/games-util/xboxdrv-0.8.4 @@ -1,12 +1,12 @@ dev-libs/boost sys-fs/udev sys-apps/dbus dev-libs/glib:2 virtual/libusb:1 x11-libs/libX11 dev-util/pkgconfig dev-util/scons dev-libs/boost sys-fs/udev sys-apps/dbus dev-libs/glib:2 virtual/libusb:1 x11-libs/libX11 0 -http://pingus.seul.org/~grumbel/xboxdrv/xboxdrv-linux-0.8.0.tar.bz2 +http://pingus.seul.org/~grumbel/xboxdrv/xboxdrv-linux-0.8.4.tar.bz2 http://pingus.seul.org/~grumbel/xboxdrv/ GPL-3 Userspace Xbox 360 Controller driver -amd64 x86 +~amd64 ~x86 eutils linux-info multilib portability scons-utils toolchain-funcs user versionator @@ -14,7 +14,7 @@ eutils linux-info multilib portability scons-utils toolchain-funcs user versiona 2 -compile install prepare setup +compile install setup diff --git a/metadata/cache/kde-base/kdepim-common-libs-4.8.0 b/metadata/cache/kde-base/kdepim-common-libs-4.8.0-r1 similarity index 72% rename from metadata/cache/kde-base/kdepim-common-libs-4.8.0 rename to metadata/cache/kde-base/kdepim-common-libs-4.8.0-r1 index f8b5f593d706..114f75ea6fdd 100644 --- a/metadata/cache/kde-base/kdepim-common-libs-4.8.0 +++ b/metadata/cache/kde-base/kdepim-common-libs-4.8.0-r1 @@ -1,5 +1,5 @@ app-crypt/gpgme >=app-office/akonadi-server-1.3.60 >=dev-libs/shared-desktop-ontologies-0.6.50 >=kde-base/kdepimlibs-4.8.0:4[aqua=,semantic-desktop] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility,kde] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.0:4[aqua=] -app-crypt/gpgme >=app-office/akonadi-server-1.3.60 >=dev-libs/shared-desktop-ontologies-0.6.50 >=kde-base/kdepimlibs-4.8.0:4[aqua=,semantic-desktop] app-crypt/gnupg >=kde-base/kdepim-runtime-4.8.0:4[aqua=] !kde-base/akonadi:4 !kde-base/libkdepim:4 !kde-base/libkleo:4 !kde-base/libkpgp:4 !=kde-base/oxygen-icons-4.8.0:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility,kde] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.0:4[aqua=] +app-crypt/gpgme >=app-office/akonadi-server-1.3.60 >=dev-libs/shared-desktop-ontologies-0.6.50 >=kde-base/kdepimlibs-4.8.0:4[aqua=,semantic-desktop] app-crypt/gnupg >=kde-base/kdepim-runtime-4.8.0:4[aqua=] !kde-base/akonadi:4 !kde-base/libkdepim:4 !kde-base/libkleo:4 !kde-base/libkpgp:4 !=kde-base/oxygen-icons-4.8.0:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility,kde] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.0:4[aqua=] 4 mirror://kde/stable/4.8.0/src/kdepim-4.8.0.tar.bz2 test diff --git a/metadata/cache/media-libs/libogg-1.3.0 b/metadata/cache/media-libs/libogg-1.3.0 index ee27eb6ef9fb..e1d29ccf3b4d 100644 --- a/metadata/cache/media-libs/libogg-1.3.0 +++ b/metadata/cache/media-libs/libogg-1.3.0 @@ -6,7 +6,7 @@ http://downloads.xiph.org/releases/ogg/libogg-1.3.0.tar.xz http://xiph.org/ogg/ BSD the Ogg media file format library -~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd +~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd static-libs diff --git a/metadata/cache/media-sound/qmpdclient-1.2.2 b/metadata/cache/media-sound/qmpdclient-1.2.2 index ff8e0a21022d..1a6f12e19a3b 100644 --- a/metadata/cache/media-sound/qmpdclient-1.2.2 +++ b/metadata/cache/media-sound/qmpdclient-1.2.2 @@ -6,7 +6,7 @@ http://dump.bitcheese.net/files/qmpdclient-1.2.2.tar.bz2 http://bitcheese.net/wiki/QMPDClient GPL-2 QMPDClient with NBL additions, such as lyrics' display -~amd64 ~ppc ~x86 +amd64 ~ppc ~x86 base cmake-utils eutils fdo-mime flag-o-matic multilib portability toolchain-funcs user debug diff --git a/metadata/cache/net-analyzer/bwping-1.4 b/metadata/cache/net-analyzer/bwping-1.4 index 8f2ea1e92e41..9d330c554380 100644 --- a/metadata/cache/net-analyzer/bwping-1.4 +++ b/metadata/cache/net-analyzer/bwping-1.4 @@ -6,7 +6,7 @@ mirror://sourceforge/bwping/1.4/bwping-1.4.tar.gz http://bwping.sourceforge.net/ BSD A tool to measure bandwidth and RTT between two hosts using ICMP -~amd64 ~sparc ~x86 ~x86-fbsd +amd64 ~sparc ~x86 ~x86-fbsd autotools eutils libtool multilib portability toolchain-funcs user diff --git a/metadata/cache/net-dns/idnkit-1.0-r2 b/metadata/cache/net-dns/idnkit-1.0-r2 index bf778b0b391b..1d9114228ae4 100644 --- a/metadata/cache/net-dns/idnkit-1.0-r2 +++ b/metadata/cache/net-dns/idnkit-1.0-r2 @@ -6,7 +6,7 @@ http://www.nic.ad.jp/ja/idn/idnkit/download/sources/idnkit-1.0-src.tar.gz http://www.nic.ad.jp/ja/idn/idnkit/download/ JNIC Toolkit for Internationalized Domain Names (IDN) -~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd +~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd autotools eutils fixheadtails libtool multilib portability toolchain-funcs user static-libs diff --git a/metadata/cache/net-dns/pdns-2.9.22.6 b/metadata/cache/net-dns/pdns-2.9.22.6 new file mode 100644 index 000000000000..497852f8b0db --- /dev/null +++ b/metadata/cache/net-dns/pdns-2.9.22.6 @@ -0,0 +1,22 @@ +mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ldap? ( >=net-nds/openldap-2.0.27-r4 ) sqlite? ( =dev-db/sqlite-2.8* ) sqlite3? ( =dev-db/sqlite-3* ) opendbx? ( dev-db/opendbx ) !static? ( >=dev-libs/boost-1.31 ) static? ( >=dev-libs/boost-1.31[static-libs] ) doc? ( app-doc/doxygen ) +mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ldap? ( >=net-nds/openldap-2.0.27-r4 ) sqlite? ( =dev-db/sqlite-2.8* ) sqlite3? ( =dev-db/sqlite-3* ) opendbx? ( dev-db/opendbx ) !static? ( >=dev-libs/boost-1.31 ) +0 +http://downloads.powerdns.com/releases/pdns-2.9.22.6.tar.gz + +http://www.powerdns.com/ +GPL-2 +The PowerDNS Daemon +~amd64 ~x86 +eutils multilib portability toolchain-funcs user +debug doc ldap mysql postgres sqlite sqlite3 static opendbx + + + +2 + +compile configure install postinst preinst prepare + + + + + diff --git a/metadata/cache/net-misc/curl-7.21.4 b/metadata/cache/net-misc/curl-7.21.4 index 394e64f4da4e..c3e58db71c5b 100644 --- a/metadata/cache/net-misc/curl-7.21.4 +++ b/metadata/cache/net-misc/curl-7.21.4 @@ -1,4 +1,4 @@ -ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.4.0 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) test? ( sys-apps/diffutils dev-lang/perl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.4.0 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.4.0 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) 0 http://curl.haxx.se/download/curl-7.21.4.tar.bz2 diff --git a/metadata/cache/net-misc/curl-7.21.6 b/metadata/cache/net-misc/curl-7.21.6 index 5b3950bbf5ea..5644dfc25933 100644 --- a/metadata/cache/net-misc/curl-7.21.6 +++ b/metadata/cache/net-misc/curl-7.21.6 @@ -1,4 +1,4 @@ -ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.4.0 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) test? ( sys-apps/diffutils dev-lang/perl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.4.0 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.4.0 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) 0 http://curl.haxx.se/download/curl-7.21.6.tar.bz2 diff --git a/metadata/cache/net-misc/curl-7.21.7 b/metadata/cache/net-misc/curl-7.21.7 index d0601c718c43..f536d3732a3c 100644 --- a/metadata/cache/net-misc/curl-7.21.7 +++ b/metadata/cache/net-misc/curl-7.21.7 @@ -1,4 +1,4 @@ -ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) test? ( sys-apps/diffutils dev-lang/perl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) 0 http://curl.haxx.se/download/curl-7.21.7.tar.bz2 diff --git a/metadata/cache/net-misc/curl-7.21.7-r2 b/metadata/cache/net-misc/curl-7.21.7-r2 index 138142f4f235..bce0d8353282 100644 --- a/metadata/cache/net-misc/curl-7.21.7-r2 +++ b/metadata/cache/net-misc/curl-7.21.7-r2 @@ -1,4 +1,4 @@ -ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) sys-apps/ed test? ( sys-apps/diffutils dev-lang/perl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) sys-apps/ed dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) 0 http://curl.haxx.se/download/curl-7.21.7.tar.bz2 diff --git a/metadata/cache/net-misc/curl-7.22.0 b/metadata/cache/net-misc/curl-7.22.0 index f794308ad404..1d65a0fd97ab 100644 --- a/metadata/cache/net-misc/curl-7.22.0 +++ b/metadata/cache/net-misc/curl-7.22.0 @@ -1,4 +1,4 @@ -ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) ssl? ( !gnutls? ( dev-libs/openssl ) ) nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) sys-apps/ed test? ( sys-apps/diffutils dev-lang/perl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) ssl? ( !gnutls? ( dev-libs/openssl ) ) nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) sys-apps/ed dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) ssl? ( !gnutls? ( dev-libs/openssl ) ) nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) 0 http://curl.haxx.se/download/curl-7.22.0.tar.bz2 diff --git a/metadata/cache/net-misc/curl-7.23.1 b/metadata/cache/net-misc/curl-7.23.1 index 9ba8645dd09f..d087864b4500 100644 --- a/metadata/cache/net-misc/curl-7.23.1 +++ b/metadata/cache/net-misc/curl-7.23.1 @@ -1,4 +1,4 @@ -ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) ssl? ( !gnutls? ( dev-libs/openssl ) ) nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) sys-apps/ed test? ( sys-apps/diffutils dev-lang/perl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) ssl? ( !gnutls? ( dev-libs/openssl ) ) nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) sys-apps/ed dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) ssl? ( !gnutls? ( dev-libs/openssl ) ) nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) 0 http://curl.haxx.se/download/curl-7.23.1.tar.bz2 diff --git a/metadata/cache/net-misc/curl-7.24.0 b/metadata/cache/net-misc/curl-7.24.0 new file mode 100644 index 000000000000..9d6799069266 --- /dev/null +++ b/metadata/cache/net-misc/curl-7.24.0 @@ -0,0 +1,22 @@ +ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) ssl? ( !gnutls? ( dev-libs/openssl ) ) nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) sys-apps/ed dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) ssl? ( !gnutls? ( dev-libs/openssl ) ) nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) +0 +http://curl.haxx.se/download/curl-7.24.0.tar.bz2 + +http://curl.haxx.se/ +MIT +A Client that groks URLs +~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +autotools eutils libtool multilib portability prefix toolchain-funcs user +ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads +threads? ( !ares ) nss? ( !gnutls ) + + +4 + +compile configure install prepare + + + + + diff --git a/metadata/cache/net-p2p/transmission-2.31 b/metadata/cache/net-p2p/transmission-2.31 deleted file mode 100644 index ee754b4f3400..000000000000 --- a/metadata/cache/net-p2p/transmission-2.31 +++ /dev/null @@ -1,22 +0,0 @@ -sys-libs/zlib >=dev-libs/libevent-2.0.10 >=dev-libs/openssl-0.9.4 || ( >=net-misc/curl-7.16.3[ssl] >=net-misc/curl-7.16.3[gnutls] ) gtk? ( >=dev-libs/glib-2.28:2 >=x11-libs/gtk+-2.12:2 >=dev-libs/dbus-glib-0.70 libnotify? ( >=x11-libs/libnotify-0.4.3 ) libcanberra? ( >=media-libs/libcanberra-0.10 ) ) qt4? ( x11-libs/qt-gui:4[dbus] ) >=sys-devel/libtool-2.2.6b sys-devel/gettext >=dev-util/intltool-0.40 dev-util/pkgconfig sys-apps/sed >=sys-apps/sed-4 -sys-libs/zlib >=dev-libs/libevent-2.0.10 >=dev-libs/openssl-0.9.4 || ( >=net-misc/curl-7.16.3[ssl] >=net-misc/curl-7.16.3[gnutls] ) gtk? ( >=dev-libs/glib-2.28:2 >=x11-libs/gtk+-2.12:2 >=dev-libs/dbus-glib-0.70 libnotify? ( >=x11-libs/libnotify-0.4.3 ) libcanberra? ( >=media-libs/libcanberra-0.10 ) ) qt4? ( x11-libs/qt-gui:4[dbus] ) -0 -http://download.transmissionbt.com/transmission/files/transmission-2.31.tar.xz - -http://www.transmissionbt.com/ -MIT GPL-2 -A Fast, Easy and Free BitTorrent client -~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd -base eutils fdo-mime gnome2-utils multilib portability qt4-r2 toolchain-funcs user -gtk kde libnotify libcanberra qt4 utp - - - -4 - -compile configure install postinst postrm preinst prepare setup unpack - - - - - diff --git a/metadata/cache/net-p2p/transmission-2.31-r1 b/metadata/cache/net-p2p/transmission-2.31-r1 deleted file mode 100644 index 5857890f82ec..000000000000 --- a/metadata/cache/net-p2p/transmission-2.31-r1 +++ /dev/null @@ -1,22 +0,0 @@ -sys-libs/zlib >=dev-libs/libevent-2.0.10 >=dev-libs/openssl-0.9.4 || ( >=net-misc/curl-7.16.3[ssl] >=net-misc/curl-7.16.3[gnutls] ) net-libs/miniupnpc gtk? ( >=dev-libs/glib-2.28:2 >=x11-libs/gtk+-2.12:2 >=dev-libs/dbus-glib-0.70 libnotify? ( >=x11-libs/libnotify-0.4.3 ) libcanberra? ( >=media-libs/libcanberra-0.10 ) ) qt4? ( x11-libs/qt-gui:4[dbus] ) >=sys-devel/libtool-2.2.6b sys-devel/gettext >=dev-util/intltool-0.40 dev-util/pkgconfig sys-apps/sed >=sys-apps/sed-4 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool -sys-libs/zlib >=dev-libs/libevent-2.0.10 >=dev-libs/openssl-0.9.4 || ( >=net-misc/curl-7.16.3[ssl] >=net-misc/curl-7.16.3[gnutls] ) net-libs/miniupnpc gtk? ( >=dev-libs/glib-2.28:2 >=x11-libs/gtk+-2.12:2 >=dev-libs/dbus-glib-0.70 libnotify? ( >=x11-libs/libnotify-0.4.3 ) libcanberra? ( >=media-libs/libcanberra-0.10 ) ) qt4? ( x11-libs/qt-gui:4[dbus] ) -0 -http://download.transmissionbt.com/transmission/files/transmission-2.31.tar.xz - -http://www.transmissionbt.com/ -MIT GPL-2 -A Fast, Easy and Free BitTorrent client -~amd64 ~x86 -autotools base eutils fdo-mime gnome2-utils libtool multilib portability qt4-r2 toolchain-funcs user -gtk kde libnotify libcanberra qt4 utp - - - -4 - -compile configure install postinst postrm preinst prepare setup unpack - - - - - diff --git a/metadata/cache/net-p2p/transmission-2.33 b/metadata/cache/net-p2p/transmission-2.33 deleted file mode 100644 index 21f916b7d6a1..000000000000 --- a/metadata/cache/net-p2p/transmission-2.33 +++ /dev/null @@ -1,22 +0,0 @@ -sys-libs/zlib >=dev-libs/libevent-2.0.10 >=dev-libs/openssl-0.9.4 || ( >=net-misc/curl-7.16.3[ssl] >=net-misc/curl-7.16.3[gnutls] ) net-libs/miniupnpc gtk? ( >=dev-libs/glib-2.28:2 >=x11-libs/gtk+-2.12:2 >=dev-libs/dbus-glib-0.70 libnotify? ( >=x11-libs/libnotify-0.4.3 ) libcanberra? ( >=media-libs/libcanberra-0.10 ) ) qt4? ( x11-libs/qt-gui:4[dbus] ) >=sys-devel/libtool-2.2.6b nls? ( sys-devel/gettext >=dev-util/intltool-0.40 ) dev-util/pkgconfig sys-apps/sed >=sys-apps/sed-4 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool -sys-libs/zlib >=dev-libs/libevent-2.0.10 >=dev-libs/openssl-0.9.4 || ( >=net-misc/curl-7.16.3[ssl] >=net-misc/curl-7.16.3[gnutls] ) net-libs/miniupnpc gtk? ( >=dev-libs/glib-2.28:2 >=x11-libs/gtk+-2.12:2 >=dev-libs/dbus-glib-0.70 libnotify? ( >=x11-libs/libnotify-0.4.3 ) libcanberra? ( >=media-libs/libcanberra-0.10 ) ) qt4? ( x11-libs/qt-gui:4[dbus] ) -0 -http://download.transmissionbt.com/transmission/files/transmission-2.33.tar.xz - -http://www.transmissionbt.com/ -MIT GPL-2 -A Fast, Easy and Free BitTorrent client -~amd64 ~x86 -autotools base eutils fdo-mime gnome2-utils libtool multilib portability qt4-r2 toolchain-funcs user -gtk kde libnotify libcanberra nls qt4 utp -gtk? ( nls ) - - -4 - -compile configure install postinst postrm preinst prepare setup unpack - - - - - diff --git a/metadata/cache/net-p2p/transmission-2.33-r1 b/metadata/cache/net-p2p/transmission-2.33-r1 deleted file mode 100644 index 21f916b7d6a1..000000000000 --- a/metadata/cache/net-p2p/transmission-2.33-r1 +++ /dev/null @@ -1,22 +0,0 @@ -sys-libs/zlib >=dev-libs/libevent-2.0.10 >=dev-libs/openssl-0.9.4 || ( >=net-misc/curl-7.16.3[ssl] >=net-misc/curl-7.16.3[gnutls] ) net-libs/miniupnpc gtk? ( >=dev-libs/glib-2.28:2 >=x11-libs/gtk+-2.12:2 >=dev-libs/dbus-glib-0.70 libnotify? ( >=x11-libs/libnotify-0.4.3 ) libcanberra? ( >=media-libs/libcanberra-0.10 ) ) qt4? ( x11-libs/qt-gui:4[dbus] ) >=sys-devel/libtool-2.2.6b nls? ( sys-devel/gettext >=dev-util/intltool-0.40 ) dev-util/pkgconfig sys-apps/sed >=sys-apps/sed-4 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool -sys-libs/zlib >=dev-libs/libevent-2.0.10 >=dev-libs/openssl-0.9.4 || ( >=net-misc/curl-7.16.3[ssl] >=net-misc/curl-7.16.3[gnutls] ) net-libs/miniupnpc gtk? ( >=dev-libs/glib-2.28:2 >=x11-libs/gtk+-2.12:2 >=dev-libs/dbus-glib-0.70 libnotify? ( >=x11-libs/libnotify-0.4.3 ) libcanberra? ( >=media-libs/libcanberra-0.10 ) ) qt4? ( x11-libs/qt-gui:4[dbus] ) -0 -http://download.transmissionbt.com/transmission/files/transmission-2.33.tar.xz - -http://www.transmissionbt.com/ -MIT GPL-2 -A Fast, Easy and Free BitTorrent client -~amd64 ~x86 -autotools base eutils fdo-mime gnome2-utils libtool multilib portability qt4-r2 toolchain-funcs user -gtk kde libnotify libcanberra nls qt4 utp -gtk? ( nls ) - - -4 - -compile configure install postinst postrm preinst prepare setup unpack - - - - - diff --git a/metadata/cache/net-p2p/transmission-2.42 b/metadata/cache/net-p2p/transmission-2.42 deleted file mode 100644 index b35a449801dd..000000000000 --- a/metadata/cache/net-p2p/transmission-2.42 +++ /dev/null @@ -1,22 +0,0 @@ ->=dev-libs/libevent-2.0.10 >=dev-libs/openssl-0.9.4 >=net-misc/curl-7.16.3[ssl] >=net-libs/miniupnpc-1.6 net-libs/libnatpmp sys-libs/zlib gtk? ( >=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.28:2 dev-libs/libappindicator:0 >=x11-libs/gtk+-2.22:2 ) gtk3? ( >=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.28:2 dev-libs/libappindicator:3 >=x11-libs/gtk+-3.2:3 ) qt4? ( x11-libs/qt-gui:4[dbus] ) dev-util/intltool dev-util/pkgconfig sys-apps/sed sys-devel/gettext >=sys-devel/libtool-2.2.6b nls? ( >=dev-util/intltool-0.40 sys-devel/gettext ) >=sys-apps/sed-4 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool ->=dev-libs/libevent-2.0.10 >=dev-libs/openssl-0.9.4 >=net-misc/curl-7.16.3[ssl] >=net-libs/miniupnpc-1.6 net-libs/libnatpmp sys-libs/zlib gtk? ( >=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.28:2 dev-libs/libappindicator:0 >=x11-libs/gtk+-2.22:2 ) gtk3? ( >=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.28:2 dev-libs/libappindicator:3 >=x11-libs/gtk+-3.2:3 ) qt4? ( x11-libs/qt-gui:4[dbus] ) -0 -http://download.transmissionbt.com/transmission/files/transmission-2.42.tar.xz - -http://www.transmissionbt.com/ -MIT GPL-2 -A Fast, Easy and Free BitTorrent client -~amd64 ~x86 -autotools base eutils fdo-mime gnome2-utils libtool multilib portability qt4-r2 toolchain-funcs user -gtk gtk3 kde nls qt4 utp -gtk? ( nls !gtk3 ) gtk3? ( nls !gtk ) - - -4 - -compile configure install postinst postrm preinst prepare setup unpack - - - - - diff --git a/metadata/cache/net-p2p/transmission-2.42-r1 b/metadata/cache/net-p2p/transmission-2.42-r1 new file mode 100644 index 000000000000..bd52cfbc1f35 --- /dev/null +++ b/metadata/cache/net-p2p/transmission-2.42-r1 @@ -0,0 +1,22 @@ +>=dev-libs/libevent-2.0.10 dev-libs/openssl:0 >=net-misc/curl-7.16.3[ssl] >=net-libs/miniupnpc-1.6 net-libs/libnatpmp sys-libs/zlib gtk? ( >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.28 >=x11-libs/gtk+-3.2:3 ayatana? ( dev-libs/libappindicator:3 ) ) qt4? ( x11-libs/qt-gui:4[dbus] ) dev-util/intltool dev-util/pkgconfig sys-apps/sed sys-devel/gettext >=sys-devel/libtool-2.2.6b nls? ( >=dev-util/intltool-0.40 sys-devel/gettext ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-apps/sed-4 +>=dev-libs/libevent-2.0.10 dev-libs/openssl:0 >=net-misc/curl-7.16.3[ssl] >=net-libs/miniupnpc-1.6 net-libs/libnatpmp sys-libs/zlib gtk? ( >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.28 >=x11-libs/gtk+-3.2:3 ayatana? ( dev-libs/libappindicator:3 ) ) qt4? ( x11-libs/qt-gui:4[dbus] ) +0 +http://download.transmissionbt.com/transmission/files/transmission-2.42.tar.xz http://dev.gentoo.org/~ssuominen/transmission-2.42-patchset-1.tar.xz + +http://www.transmissionbt.com/ +GPL-2 MIT +A Fast, Easy and Free BitTorrent client +~amd64 ~x86 +autotools base eutils fdo-mime gnome2-utils libtool multilib portability qt4-r2 toolchain-funcs user +ayatana gtk kde nls qt4 +ayatana? ( gtk ) gtk? ( nls ) + + +4 + +compile configure install postinst postrm preinst prepare setup unpack + + + + + diff --git a/metadata/cache/sci-chemistry/chemtool-1.6.12 b/metadata/cache/sci-chemistry/chemtool-1.6.12 index 7cde8ee4341f..782e098778c6 100644 --- a/metadata/cache/sci-chemistry/chemtool-1.6.12 +++ b/metadata/cache/sci-chemistry/chemtool-1.6.12 @@ -1,5 +1,5 @@ -media-gfx/transfig x11-libs/gtk+:2 x86? ( media-libs/libemf ) dev-util/pkgconfig -media-gfx/transfig x11-libs/gtk+:2 x86? ( media-libs/libemf ) +dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango x86? ( media-libs/libemf ) dev-util/pkgconfig +dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango x86? ( media-libs/libemf ) 0 http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool-1.6.12.tar.gz diff --git a/metadata/cache/sci-chemistry/chemtool-1.6.12-r1 b/metadata/cache/sci-chemistry/chemtool-1.6.12-r1 index 481609f90eeb..4df77be4b890 100644 --- a/metadata/cache/sci-chemistry/chemtool-1.6.12-r1 +++ b/metadata/cache/sci-chemistry/chemtool-1.6.12-r1 @@ -1,5 +1,5 @@ -media-gfx/transfig x11-libs/gtk+:2 emf? ( media-libs/libemf ) dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool -media-gfx/transfig x11-libs/gtk+:2 emf? ( media-libs/libemf ) +dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango emf? ( media-libs/libemf ) dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango emf? ( media-libs/libemf ) 0 http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool-1.6.12.tar.gz diff --git a/metadata/cache/sci-chemistry/chemtool-1.6.13 b/metadata/cache/sci-chemistry/chemtool-1.6.13 new file mode 100644 index 000000000000..0cce029f0ab4 --- /dev/null +++ b/metadata/cache/sci-chemistry/chemtool-1.6.13 @@ -0,0 +1,22 @@ +dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango emf? ( media-libs/libemf ) dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango emf? ( media-libs/libemf ) +0 +http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool-1.6.13.tar.gz + +http://ruby.chemie.uni-freiburg.de/~martin/chemtool/ +GPL-2 +A GTK program for drawing organic molecules +~amd64 ~ppc ~x86 +autotools autotools-utils eutils libtool multilib portability toolchain-funcs user +emf gnome nls + + + +4 + +compile configure install prepare test + + + + + diff --git a/metadata/cache/sci-chemistry/jmol-11.0.3-r1 b/metadata/cache/sci-chemistry/jmol-11.0.3-r1 index 9506a10a0e27..27d9749b363b 100644 --- a/metadata/cache/sci-chemistry/jmol-11.0.3-r1 +++ b/metadata/cache/sci-chemistry/jmol-11.0.3-r1 @@ -1,12 +1,12 @@ >=virtual/jdk-1.4 !client-only? ( >=app-admin/webapp-config-1.50.15 ) dev-java/commons-cli:1 dev-java/itext:0 sci-libs/jmol-acme:0 sci-libs/vecmath-objectclub:0 >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 >=dev-java/ant-core-1.7.0 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 >=virtual/jre-1.4 dev-java/commons-cli:1 dev-java/itext:0 sci-libs/jmol-acme:0 sci-libs/vecmath-objectclub:0 >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 0 -mirror://sourceforge/jmol/jmol-11.0.3-full.tar.gz +mirror://sourceforge/jmol/jmol-11.0.3-full.tar.gz http://dev.gentoo.org/~jlec/jmol-selfSignedCertificate.store.tar http://jmol.sourceforge.net/ LGPL-2.1 -Jmol is a java molecular viever for 3-D chemical structures. -~x86 ~amd64 +Java molecular viever for 3-D chemical structures +~amd64 ~x86 eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator webapp client-only vhosts elibc_FreeBSD elibc_FreeBSD diff --git a/metadata/cache/sci-chemistry/jmol-12.0.45 b/metadata/cache/sci-chemistry/jmol-12.0.45 index 20e98b32bab7..2b7d5c723d6f 100644 --- a/metadata/cache/sci-chemistry/jmol-12.0.45 +++ b/metadata/cache/sci-chemistry/jmol-12.0.45 @@ -1,11 +1,11 @@ >=virtual/jdk-1.4 !client-only? ( >=app-admin/webapp-config-1.50.15 ) dev-java/commons-cli:1 dev-java/itext:0 sci-libs/jmol-acme:0 sci-libs/vecmath-objectclub:0 >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 >=dev-java/ant-core-1.7.0 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 >=virtual/jre-1.4 dev-java/commons-cli:1 dev-java/itext:0 sci-libs/jmol-acme:0 sci-libs/vecmath-objectclub:0 >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 0 -mirror://sourceforge/jmol/Jmol-12.0.45-full.tar.gz +mirror://sourceforge/jmol/Jmol-12.0.45-full.tar.gz http://dev.gentoo.org/~jlec/distfiles/jmol-selfSignedCertificate.store.tar http://jmol.sourceforge.net/ LGPL-2.1 -Jmol is a java molecular viever for 3-D chemical structures. +Java molecular viever for 3-D chemical structures ~amd64 ~x86 eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator webapp client-only vhosts elibc_FreeBSD elibc_FreeBSD diff --git a/metadata/cache/sci-libs/cholmod-1.7.4 b/metadata/cache/sci-libs/cholmod-1.7.4 index 97c71594ef88..20ab53bd5250 100644 --- a/metadata/cache/sci-libs/cholmod-1.7.4 +++ b/metadata/cache/sci-libs/cholmod-1.7.4 @@ -1,14 +1,14 @@ -supernodal? ( virtual/lapack ) sci-libs/amd sci-libs/colamd metis? ( sci-libs/camd sci-libs/ccolamd || ( sci-libs/metis sci-libs/parmetis ) ) supernodal? ( dev-util/pkgconfig ) metis? ( dev-util/pkgconfig ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool -supernodal? ( virtual/lapack ) sci-libs/amd sci-libs/colamd metis? ( sci-libs/camd sci-libs/ccolamd || ( sci-libs/metis sci-libs/parmetis ) ) +sci-libs/amd sci-libs/colamd metis? ( sci-libs/camd sci-libs/ccolamd || ( sci-libs/metis sci-libs/parmetis ) ) supernodal? ( virtual/lapack ) supernodal? ( dev-util/pkgconfig ) metis? ( dev-util/pkgconfig ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +sci-libs/amd sci-libs/colamd metis? ( sci-libs/camd sci-libs/ccolamd || ( sci-libs/metis sci-libs/parmetis ) ) supernodal? ( virtual/lapack ) 0 http://www.cise.ufl.edu/research/sparse/cholmod/CHOLMOD-1.7.4.tar.gz mirror://gentoo/cholmod-1.7.0-autotools.patch.bz2 -http://www.cise.ufl.edu/research/sparse/cholmod +http://www.cise.ufl.edu/research/sparse/cholmod/ LGPL-2.1 GPL-2 Sparse Cholesky factorization and update/downdate library ~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos autotools autotools-utils eutils libtool multilib portability toolchain-funcs user -doc metis minimal static-libs +supernodal +debug doc metis minimal static-libs +supernodal diff --git a/metadata/cache/sci-libs/proj-4.7.0-r1 b/metadata/cache/sci-libs/proj-4.7.0-r1 new file mode 100644 index 000000000000..c9c5b48b6b4a --- /dev/null +++ b/metadata/cache/sci-libs/proj-4.7.0-r1 @@ -0,0 +1,22 @@ +app-arch/unzip + +0 +ftp://ftp.remotesensing.org/pub/proj/proj-4.7.0.tar.gz http://download.osgeo.org/proj/proj-datumgrid-1.5.zip + +http://trac.osgeo.org/proj/ +MIT +Proj.4 cartographic projection software with updated NAD27 grids +~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos + +static-libs + + + +4 + +configure install prepare unpack + + + + + diff --git a/metadata/cache/sci-mathematics/geomview-1.9.2 b/metadata/cache/sci-mathematics/geomview-1.9.2 deleted file mode 100644 index 77f3f814b5d2..000000000000 --- a/metadata/cache/sci-mathematics/geomview-1.9.2 +++ /dev/null @@ -1,22 +0,0 @@ -zlib? ( sys-libs/zlib ) >=x11-libs/openmotif-2.3:0 virtual/opengl -zlib? ( sys-libs/zlib ) >=x11-libs/openmotif-2.3:0 virtual/opengl netpbm? ( >=media-libs/netpbm-10.37.0 ) bzip2? ( app-arch/bzip2 ) app-arch/gzip pdf? ( || ( app-text/xpdf app-text/gv app-text/gsview app-text/epdfview app-text/acroread ) ) virtual/w3m -0 -http://mesh.dl.sourceforge.net/sourceforge/geomview/geomview-1.9.2.tar.bz2 - -http://geomview.sourceforge.net -LGPL-2.1 -Interactive Geometry Viewer -~amd64 ~ppc ~sparc ~x86 -eutils fdo-mime flag-o-matic multilib portability toolchain-funcs user -avg bzip2 debug emacs netpbm pdf zlib - - - -1 - -compile install postinst postrm - - - - - diff --git a/metadata/cache/sci-mathematics/geomview-1.9.4 b/metadata/cache/sci-mathematics/geomview-1.9.4 index 276dc69c6d5a..0b161bba611d 100644 --- a/metadata/cache/sci-mathematics/geomview-1.9.4 +++ b/metadata/cache/sci-mathematics/geomview-1.9.4 @@ -1,7 +1,7 @@ -zlib? ( sys-libs/zlib ) emacs? ( virtual/emacs ) >=x11-libs/openmotif-2.3:0 virtual/opengl -zlib? ( sys-libs/zlib ) emacs? ( virtual/emacs ) >=x11-libs/openmotif-2.3:0 virtual/opengl netpbm? ( >=media-libs/netpbm-10.37.0 ) bzip2? ( app-arch/bzip2 ) app-arch/gzip pdf? ( || ( app-text/xpdf app-text/gv app-text/gsview app-text/epdfview app-text/acroread ) ) virtual/w3m +>=x11-libs/openmotif-2.3:0 virtual/opengl emacs? ( virtual/emacs ) zlib? ( sys-libs/zlib ) +>=x11-libs/openmotif-2.3:0 virtual/opengl emacs? ( virtual/emacs ) zlib? ( sys-libs/zlib ) app-arch/gzip virtual/w3m bzip2? ( app-arch/bzip2 ) netpbm? ( >=media-libs/netpbm-10.37.0 ) pdf? ( || ( app-text/xpdf app-text/gv app-text/gsview app-text/epdfview app-text/acroread ) ) 0 -mirror://sourceforge/geomview/geomview-1.9.4.tar.bz2 +mirror://sourceforge/geomview/geomview-1.9.4.tar.bz2 http://dev.gentoo.org/~jlec/distfiles/geomview.png.tar http://geomview.sourceforge.net LGPL-2.1 diff --git a/metadata/cache/sys-apps/haveged-1.1 b/metadata/cache/sys-apps/haveged-1.1 index 8ed801bdb384..51222eb29d1b 100644 --- a/metadata/cache/sys-apps/haveged-1.1 +++ b/metadata/cache/sys-apps/haveged-1.1 @@ -6,7 +6,7 @@ http://www.issihosts.com/haveged/haveged-1.1.tar.gz http://www.issihosts.com/haveged/ GPL-2 A simple entropy daemon using the HAVEGE algorithm -amd64 x86 +amd64 -arm x86 diff --git a/metadata/cache/sys-apps/haveged-1.01 b/metadata/cache/sys-apps/haveged-1.3a similarity index 59% rename from metadata/cache/sys-apps/haveged-1.01 rename to metadata/cache/sys-apps/haveged-1.3a index 7c63ebacab18..55e44933c043 100644 --- a/metadata/cache/sys-apps/haveged-1.01 +++ b/metadata/cache/sys-apps/haveged-1.3a @@ -1,7 +1,7 @@ sys-devel/gcc - +sys-apps/openrc 0 -http://www.issihosts.com/haveged/haveged-1.01.tar.gz +http://www.issihosts.com/haveged/haveged-1.3a.tar.gz http://www.issihosts.com/haveged/ GPL-2 @@ -12,9 +12,9 @@ A simple entropy daemon using the HAVEGE algorithm -3 +4 -compile configure install +configure install diff --git a/metadata/cache/sys-apps/hwloc-1.4 b/metadata/cache/sys-apps/hwloc-1.4 new file mode 100644 index 000000000000..73eecd24d7e1 --- /dev/null +++ b/metadata/cache/sys-apps/hwloc-1.4 @@ -0,0 +1,22 @@ +sys-libs/ncurses cairo? ( x11-libs/cairo[X?,svg?] ) pci? ( sys-apps/pciutils ) xml? ( dev-libs/libxml2 ) dev-util/pkgconfig numa? ( sys-process/numactl ) +sys-libs/ncurses cairo? ( x11-libs/cairo[X?,svg?] ) pci? ( sys-apps/pciutils ) xml? ( dev-libs/libxml2 ) +0 +http://www.open-mpi.org/software/hwloc/v1.4/downloads/hwloc-1.4.tar.bz2 + +http://www.open-mpi.org/projects/hwloc/ +BSD +displays the hardware topology in convenient formats +~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux +eutils multilib portability toolchain-funcs user versionator +cairo debug +numa +pci svg static-libs xml X + + + +4 + +configure install + + + + + diff --git a/metadata/cache/sys-apps/pkgcore-0.7.7.6 b/metadata/cache/sys-apps/pkgcore-0.7.7.6 deleted file mode 100644 index e0d5642d68bf..000000000000 --- a/metadata/cache/sys-apps/pkgcore-0.7.7.6 +++ /dev/null @@ -1,22 +0,0 @@ ->=dev-lang/python-2.4 >=dev-python/snakeoil-0.4.5 || ( >=dev-lang/python-2.5 dev-python/pycrypto ) doc? ( dev-python/sphinx dev-python/pyparsing ) >=app-admin/eselect-python-20091230 dev-lang/python ->=dev-lang/python-2.4 >=dev-python/snakeoil-0.4.5 || ( >=dev-lang/python-2.5 dev-python/pycrypto ) >=app-admin/eselect-python-20091230 dev-lang/python -0 -http://pkgcore.googlecode.com/files/pkgcore-0.7.7.6.tar.bz2 - -http://pkgcore.googlecode.com/ -GPL-2 -pkgcore package manager -~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -distutils eutils multilib portability python toolchain-funcs user --doc build - - - -3 - -compile install postinst postrm prepare setup test - - - - - diff --git a/metadata/cache/sys-apps/pkgcore-0.7.7.7 b/metadata/cache/sys-apps/pkgcore-0.7.7.8 similarity index 91% rename from metadata/cache/sys-apps/pkgcore-0.7.7.7 rename to metadata/cache/sys-apps/pkgcore-0.7.7.8 index e18882367a95..2682a2163090 100644 --- a/metadata/cache/sys-apps/pkgcore-0.7.7.7 +++ b/metadata/cache/sys-apps/pkgcore-0.7.7.8 @@ -1,7 +1,7 @@ >=dev-lang/python-2.4 >=dev-python/snakeoil-0.4.5 || ( >=dev-lang/python-2.5 dev-python/pycrypto ) doc? ( dev-python/sphinx dev-python/pyparsing ) >=app-admin/eselect-python-20091230 dev-lang/python >=dev-lang/python-2.4 >=dev-python/snakeoil-0.4.5 || ( >=dev-lang/python-2.5 dev-python/pycrypto ) >=app-admin/eselect-python-20091230 dev-lang/python 0 -http://pkgcore.googlecode.com/files/pkgcore-0.7.7.7.tar.bz2 +http://pkgcore.googlecode.com/files/pkgcore-0.7.7.8.tar.bz2 http://pkgcore.googlecode.com/ GPL-2 diff --git a/metadata/cache/sys-fs/s3fs-1.61 b/metadata/cache/sys-fs/s3fs-1.61 index db82a4ccc7d4..6eb90801d51a 100644 --- a/metadata/cache/sys-fs/s3fs-1.61 +++ b/metadata/cache/sys-fs/s3fs-1.61 @@ -6,7 +6,7 @@ test http://s3fs.googlecode.com/ GPL-2 Amazon mounting S3 via fuse -~amd64 ~x86 +amd64 ~x86 multilib toolchain-funcs diff --git a/metadata/cache/sys-kernel/tuxonice-sources-3.0.17-r1 b/metadata/cache/sys-kernel/tuxonice-sources-3.0.17-r1 index f46ad6481a0b..4b32d5fc4e98 100644 --- a/metadata/cache/sys-kernel/tuxonice-sources-3.0.17-r1 +++ b/metadata/cache/sys-kernel/tuxonice-sources-3.0.17-r1 @@ -6,7 +6,7 @@ binchecks strip http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net GPL-2 freedist TuxOnIce + Gentoo patchset sources -~amd64 ~x86 +amd64 ~x86 eutils kernel-2 multilib portability toolchain-funcs user versionator symlink build diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.2.2 b/metadata/cache/sys-kernel/vanilla-sources-3.2.2 index a6e7d58d2405..c45d66fb87b0 100644 --- a/metadata/cache/sys-kernel/vanilla-sources-3.2.2 +++ b/metadata/cache/sys-kernel/vanilla-sources-3.2.2 @@ -6,7 +6,7 @@ binchecks strip http://www.kernel.org GPL-2 !deblob? ( freedist ) Full sources for the Linux kernel -~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 +~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 eutils kernel-2 multilib portability toolchain-funcs user versionator deblob symlink build deblob diff --git a/metadata/cache/www-client/surfraw-2.2.7 b/metadata/cache/www-client/surfraw-2.2.7 deleted file mode 100644 index f65d66e8c19f..000000000000 --- a/metadata/cache/www-client/surfraw-2.2.7 +++ /dev/null @@ -1,22 +0,0 @@ - -bash-completion? ( app-admin/eselect ) -0 -http://surfraw.alioth.debian.org/dist/surfraw-2.2.7.tar.gz -test -http://surfraw.alioth.debian.org/ -public-domain -A fast unix command line interface to WWW -amd64 hppa ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris -bash-completion eutils multilib portability toolchain-funcs user -bash-completion - -bash-completion? ( app-shells/bash-completion ) - -3 - -configure install postinst preinst prepare - - - - - diff --git a/metadata/cache/x11-apps/whyteboard-0.41.1 b/metadata/cache/x11-apps/whyteboard-0.41.1 index b1bd09e14436..76a0427aefc8 100644 --- a/metadata/cache/x11-apps/whyteboard-0.41.1 +++ b/metadata/cache/x11-apps/whyteboard-0.41.1 @@ -1,7 +1,7 @@ >=app-admin/eselect-python-20091230 =dev-lang/python-2* dev-python/wxpython media-gfx/imagemagick >=app-admin/eselect-python-20091230 =dev-lang/python-2* 0 -http://whyteboard.googlecode.com/files/whyteboard-0.41.1.tar.gz +http://whyteboard.googlecode.com/files/whyteboard-0.41.1.tar.gz http://dev.gentoo.org/~lxnay/whyteboard/whyteboard.png http://code.google.com/p/whyteboard ISC diff --git a/metadata/cache/x11-misc/rednotebook-1.2.0 b/metadata/cache/x11-misc/rednotebook-1.2.0 index e404f4295d70..238410633c87 100644 --- a/metadata/cache/x11-misc/rednotebook-1.2.0 +++ b/metadata/cache/x11-misc/rednotebook-1.2.0 @@ -6,7 +6,7 @@ mirror://sourceforge/rednotebook/rednotebook-1.2.0.tar.gz http://rednotebook.sourceforge.net GPL-2 A graphical journal with calendar, templates, tags, keyword searching, and export functionality -~amd64 ~x86 +amd64 ~x86 distutils eutils multilib portability python toolchain-funcs user libyaml spell diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index e09bf4228ec6..4a4ee881a61e 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Thu, 26 Jan 2012 15:37:18 +0000 +Fri, 27 Jan 2012 01:06:46 +0000 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index 948b5301f37c..4a4ee881a61e 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Thu, 26 Jan 2012 15:37:19 +0000 +Fri, 27 Jan 2012 01:06:46 +0000 diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index a0c3d61c7f8b..c61c85f83354 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Thu, 26 Jan 2012 15:37:20 +0000 +Fri, 27 Jan 2012 01:06:48 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index e2d1f1fbcc9d..ad6c9ec61216 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Thu Jan 26 15:37:18 UTC 2012 +Fri Jan 27 01:06:46 UTC 2012 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index 0f49b2a69184..9dd4f44e64e3 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Thu, 26 Jan 2012 16:00:01 +0000 +Fri, 27 Jan 2012 01:30:01 +0000 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index f6c00fcbbdbb..3b2302fbae05 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1327592101 Thu Jan 26 15:35:01 2012 UTC +1327626301 Fri Jan 27 01:05:01 2012 UTC diff --git a/net-analyzer/bwping/bwping-1.4.ebuild b/net-analyzer/bwping/bwping-1.4.ebuild index 16f5b2bf9d8c..702a7a979d76 100644 --- a/net-analyzer/bwping/bwping-1.4.ebuild +++ b/net-analyzer/bwping/bwping-1.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwping/bwping-1.4.ebuild,v 1.1 2011/08/26 13:03:03 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwping/bwping-1.4.ebuild,v 1.2 2012/01/26 20:36:08 hwoarang Exp $ EAPI="2" @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="amd64 ~sparc ~x86 ~x86-fbsd" IUSE="" src_prepare() { diff --git a/net-dns/idnkit/idnkit-1.0-r2.ebuild b/net-dns/idnkit/idnkit-1.0-r2.ebuild index 4ad535bf39fd..9f15a8582d46 100644 --- a/net-dns/idnkit/idnkit-1.0-r2.ebuild +++ b/net-dns/idnkit/idnkit-1.0-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/idnkit/idnkit-1.0-r2.ebuild,v 1.3 2011/11/27 22:46:13 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/idnkit/idnkit-1.0-r2.ebuild,v 1.4 2012/01/26 20:34:41 hwoarang Exp $ EAPI="4" @@ -12,7 +12,7 @@ SRC_URI="http://www.nic.ad.jp/ja/idn/idnkit/download/sources/${P}-src.tar.gz" LICENSE="JNIC" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="static-libs" DEPEND="virtual/libiconv" diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest index 80a915afbfce..a51006237635 100644 --- a/net-dns/pdns/Manifest +++ b/net-dns/pdns/Manifest @@ -1,4 +1,5 @@ DIST pdns-2.9.22.5.tar.gz 1077617 RMD160 8be76a7a63c3366d55724815245e2f955ec0adda SHA1 7a514fe624c110afb8a262f4d76376d0f8e17bea SHA256 f85a18e8fec99b687854852738b04d32fca407bfd1198c681fc3c85dd6e83a07 +DIST pdns-2.9.22.6.tar.gz 1090648 RMD160 e0c6048e683eca8308336792db1628c17277d17a SHA1 608d5255b2989902fdc6048cd81bc07bc1305e3e SHA256 fdbbbc209363102d026f1a434bcf3459fa70026a78c3146c36fd1ed149242d0e DIST pdns-2.9.22.tar.gz 1072257 RMD160 be9bff3edac0a9700eaf8ac30c77bfc8336b7d92 SHA1 2c0888c8252299c5a17dc69eec289e90c7e8f3ff SHA256 7c03da01c2cbd8bbe897180bc3bd50ca8cfaa63ada94dc6b29f7745b82e17525 DIST pdns-3.0.1.tar.gz 1196471 RMD160 996fb9db4d94456d01df840c61c1500d40ea2b1e SHA1 88205f0fd80268113aadcc0a4cffd2dfd4b9df44 SHA256 922554431737b4a8126a8c4b5be3126eb8bf8ac2a086e3030d1cf4b3dfa7d1b9 DIST pdns-3.0.tar.gz 1202795 RMD160 d4042f6711743f7b35439de313fe675d06354236 SHA1 d5de28ec125fa14deebc834d01a48922f9bac910 SHA256 a468b24b35c2595cc81119c3c8f2db4bd3566266431853e7d6be5930f692b0a2 diff --git a/net-dns/pdns/pdns-2.9.22.6.ebuild b/net-dns/pdns/pdns-2.9.22.6.ebuild new file mode 100644 index 000000000000..a53761bf67d4 --- /dev/null +++ b/net-dns/pdns/pdns-2.9.22.6.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.22.6.ebuild,v 1.1 2012/01/26 20:17:49 swegener Exp $ + +EAPI=2 +inherit eutils multilib + +DESCRIPTION="The PowerDNS Daemon" +SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.gz" +HOMEPAGE="http://www.powerdns.com/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug doc ldap mysql postgres sqlite sqlite3 static opendbx" + +RDEPEND="mysql? ( virtual/mysql ) + postgres? ( dev-db/postgresql-base ) + ldap? ( >=net-nds/openldap-2.0.27-r4 ) + sqlite? ( =dev-db/sqlite-2.8* ) + sqlite3? ( =dev-db/sqlite-3* ) + opendbx? ( dev-db/opendbx ) + !static? ( >=dev-libs/boost-1.31 )" +DEPEND="${RDEPEND} + static? ( >=dev-libs/boost-1.31[static-libs] ) + doc? ( app-doc/doxygen )" + +src_prepare() { + epatch "${FILESDIR}"/2.9.18-default-mysql-options.patch +} + +src_configure() { + local modules="pipe geo" myconf="" + + use mysql && modules="${modules} gmysql" + use postgres && modules="${modules} gpgsql" + use sqlite && modules="${modules} gsqlite" + use sqlite3 && modules="${modules} gsqlite3" + use opendbx && modules="${modules} opendbx" + use ldap && modules="${modules} ldap" + use debug && myconf="${myconf} --enable-verbose-logging" + + econf \ + --sysconfdir=/etc/powerdns \ + --libdir=/usr/$(get_libdir)/powerdns \ + --disable-recursor \ + --with-modules= \ + --with-dynmodules="${modules}" \ + --with-pgsql-includes=/usr/include \ + --with-pgsql-lib=/usr/$(get_libdir) \ + --with-mysql-lib=/usr/$(get_libdir) \ + --with-sqlite-lib=/usr/$(get_libdir) \ + --with-sqlite3-lib=/usr/$(get_libdir) \ + $(use_enable static static-binaries) \ + ${myconf} \ + || die "econf failed" +} + +src_compile() { + default + + if use doc + then + emake -C codedocs codedocs || die "emake codedocs failed" + fi +} + +src_install () { + emake DESTDIR="${D}" install || die "make install failed" + + mv "${D}"/etc/powerdns/pdns.conf{-dist,} + + # set defaults: setuid=pdns, setgid=pdns + sed -i \ + -e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \ + "${D}"/etc/powerdns/pdns.conf + + doinitd "${FILESDIR}"/pdns + + keepdir /var/empty + + dodoc ChangeLog README TODO + use doc && dohtml -r codedocs/html/. + + # Install development headers + insinto /usr/include/pdns + doins pdns/*.hh + insinto /usr/include/pdns/backends/gsql + doins pdns/backends/gsql/*.hh + + rm -f "${D}"/usr/$(get_libdir)/powerdns/*.{a,la} +} + +pkg_preinst() { + enewgroup pdns + enewuser pdns -1 -1 /var/empty pdns +} + +pkg_postinst() { + elog + elog "PowerDNS provides multiple instances support. You can create more instances" + elog "by symlinking the pdns init script to another name." + elog + elog "The name must be in the format pdns. and PowerDNS will use the" + elog "/etc/powerdns/pdns-.conf configuration file instead of the default." + elog +} diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 4680016ac9c1..979b22d68319 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -3,3 +3,4 @@ DIST curl-7.21.6.tar.bz2 2311355 RMD160 25741abc0ec79d6f0da249aa50d310397bb92d17 DIST curl-7.21.7.tar.bz2 2319682 RMD160 c4c8afe66fb30be9eec8233c22db6d5beed00e39 SHA1 88aab0188ac86c3d13118bb5b6ee49a83e53b0ce SHA256 1a50dd17400c042090203eef347e946f29c342c32b6c4843c740c80975e8215a DIST curl-7.22.0.tar.bz2 2337931 RMD160 c65a5f2c4454ec5be3db66d4816bd8c0fcc7a91a SHA1 8e7b2b0ca933812614ec0eade2f83e77632247d6 SHA256 bda0da862322b122784f5a9d7a65efdd99a6061292cfb8e9357e0c67c03e5112 DIST curl-7.23.1.tar.bz2 2376653 RMD160 96c45f38361d04a939e135c9e5fcf27ca1180abe SHA1 9bac69696446ead85e59d8488098ee84cf897b7e SHA256 7d8c8cef8f244118245c37853cb175bd95c156ff453730ec2c88189b05a7c06e +DIST curl-7.24.0.tar.bz2 2406936 RMD160 b2b3116318813478b4683ae479cb889c4fc05cea SHA1 2f2775a67de9fc91b47f5bb70fb7d359f7db55e7 SHA256 ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01812c16 diff --git a/net-misc/curl/curl-7.21.4.ebuild b/net-misc/curl/curl-7.21.4.ebuild index 27c38a7e257b..73ef82e8b929 100644 --- a/net-misc/curl/curl-7.21.4.ebuild +++ b/net-misc/curl/curl-7.21.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.4.ebuild,v 1.12 2011/12/01 21:11:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.4.ebuild,v 1.13 2012/01/26 19:20:26 vapier Exp $ # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl! @@ -33,6 +33,7 @@ RDEPEND="ldap? ( net-nds/openldap ) # krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html DEPEND="${RDEPEND} + dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl diff --git a/net-misc/curl/curl-7.21.6.ebuild b/net-misc/curl/curl-7.21.6.ebuild index 7db58193f274..a7df76229a66 100644 --- a/net-misc/curl/curl-7.21.6.ebuild +++ b/net-misc/curl/curl-7.21.6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.6.ebuild,v 1.2 2011/12/01 21:11:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.6.ebuild,v 1.3 2012/01/26 19:20:26 vapier Exp $ # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl! @@ -33,6 +33,7 @@ RDEPEND="ldap? ( net-nds/openldap ) # krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html DEPEND="${RDEPEND} + dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl diff --git a/net-misc/curl/curl-7.21.7-r2.ebuild b/net-misc/curl/curl-7.21.7-r2.ebuild index 9e641dcd8316..8a3b758b5596 100644 --- a/net-misc/curl/curl-7.21.7-r2.ebuild +++ b/net-misc/curl/curl-7.21.7-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.7-r2.ebuild,v 1.4 2011/12/01 21:11:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.7-r2.ebuild,v 1.5 2012/01/26 19:20:26 vapier Exp $ EAPI=4 @@ -32,6 +32,7 @@ RDEPEND="ldap? ( net-nds/openldap ) DEPEND="${RDEPEND} sys-apps/ed + dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl diff --git a/net-misc/curl/curl-7.21.7.ebuild b/net-misc/curl/curl-7.21.7.ebuild index 13eb0ec64c92..dbf51e93aff8 100644 --- a/net-misc/curl/curl-7.21.7.ebuild +++ b/net-misc/curl/curl-7.21.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.7.ebuild,v 1.5 2011/12/01 21:11:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.7.ebuild,v 1.6 2012/01/26 19:20:26 vapier Exp $ # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl! @@ -33,6 +33,7 @@ RDEPEND="ldap? ( net-nds/openldap ) # krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html DEPEND="${RDEPEND} + dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl diff --git a/net-misc/curl/curl-7.22.0.ebuild b/net-misc/curl/curl-7.22.0.ebuild index 1d9da11e3690..c7ba191548cc 100644 --- a/net-misc/curl/curl-7.22.0.ebuild +++ b/net-misc/curl/curl-7.22.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild,v 1.3 2011/12/01 21:11:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild,v 1.4 2012/01/26 19:20:26 vapier Exp $ EAPI=4 @@ -30,6 +30,7 @@ RDEPEND="ldap? ( net-nds/openldap ) DEPEND="${RDEPEND} sys-apps/ed + dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl diff --git a/net-misc/curl/curl-7.23.1.ebuild b/net-misc/curl/curl-7.23.1.ebuild index 460c9fb05242..71d515276ee9 100644 --- a/net-misc/curl/curl-7.23.1.ebuild +++ b/net-misc/curl/curl-7.23.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.23.1.ebuild,v 1.3 2011/12/01 21:11:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.23.1.ebuild,v 1.4 2012/01/26 19:20:26 vapier Exp $ EAPI=4 @@ -30,6 +30,7 @@ RDEPEND="ldap? ( net-nds/openldap ) DEPEND="${RDEPEND} sys-apps/ed + dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl diff --git a/net-misc/curl/curl-7.24.0.ebuild b/net-misc/curl/curl-7.24.0.ebuild new file mode 100644 index 000000000000..1b92f6882ea6 --- /dev/null +++ b/net-misc/curl/curl-7.24.0.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.24.0.ebuild,v 1.1 2012/01/26 19:41:53 vapier Exp $ + +EAPI="4" + +inherit autotools eutils prefix + +DESCRIPTION="A Client that groks URLs" +HOMEPAGE="http://curl.haxx.se/" +SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads" + +RDEPEND="ldap? ( net-nds/openldap ) + gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) + ssl? ( !gnutls? ( dev-libs/openssl ) ) + nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) + idn? ( net-dns/libidn ) + ares? ( >=net-dns/c-ares-1.6 ) + kerberos? ( virtual/krb5 ) + ssh? ( >=net-libs/libssh2-0.16 )" + +# rtmpdump ( media-video/rtmpdump ) / --with-librtmp +# fbopenssl (not in gentoo) --with-spnego +# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html + +DEPEND="${RDEPEND} + sys-apps/ed + dev-util/pkgconfig + test? ( + sys-apps/diffutils + dev-lang/perl + )" +# used - but can do without in self test: net-misc/stunnel + +# ares must be disabled for threads and both can be disabled +# one can use wether gnutls or nss if ssl is enabled +REQUIRED_USE="threads? ( !ares ) + nss? ( !gnutls )" + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-7.20.0-strip-ldflags.patch \ + "${FILESDIR}"/${PN}-7.19.7-test241.patch \ + "${FILESDIR}"/${PN}-7.18.2-prefix.patch \ + "${FILESDIR}"/${PN}-respect-cflags-3.patch + sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 + + eprefixify curl-config.in + eautoreconf +} + +src_configure() { + local myconf=() + + if use gnutls; then + myconf+=( --without-ssl --with-gnutls --without-nss ) + myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) + elif use ssl; then + myconf+=( --with-ssl --without-gnutls --without-nss ) + myconf+=( --without-ca-bundle --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + elif use nss; then + myconf+=( --without-ssl --without-gnutls --with-nss ) + myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) + else + myconf+=( --without-ssl --without-gnutls --without-nss ) + fi + + econf \ + $(use_enable ldap) \ + $(use_enable ldap ldaps) \ + $(use_with idn libidn) \ + $(use_with kerberos gssapi "${EPREFIX}"/usr) \ + $(use_with ssh libssh2) \ + $(use_enable static-libs static) \ + $(use_enable ipv6) \ + $(use_enable threads threaded-resolver) \ + $(use_enable ares) \ + --enable-http \ + --enable-ftp \ + --enable-gopher \ + --enable-file \ + --enable-dict \ + --enable-manual \ + --enable-telnet \ + --enable-smtp \ + --enable-pop3 \ + --enable-imap \ + --enable-rtsp \ + --enable-nonblocking \ + --enable-largefile \ + --enable-maintainer-mode \ + --disable-sspi \ + --without-krb4 \ + --without-librtmp \ + --without-spnego \ + "${myconf[@]}" +} + +src_compile() { + default + ed - lib/curl_config.h < "${FILESDIR}"/config.h.ed || die + ed - src/curl_config.h < "${FILESDIR}"/config.h.ed || die + ed - include/curl/curlbuild.h < "${FILESDIR}"/curlbuild.h.ed || die +} + +src_install() { + default + find "${ED}" -name '*.la' -delete + rm -rf "${ED}"/etc/ + + # https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976 + insinto /usr/share/aclocal + doins docs/libcurl/libcurl.m4 + + dodoc CHANGES README + dodoc docs/FEATURES docs/INTERNALS + dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE +} diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest index 2443bd5a3402..cc138900c2a2 100644 --- a/net-p2p/transmission/Manifest +++ b/net-p2p/transmission/Manifest @@ -1,5 +1,4 @@ DIST transmission-2.22.tar.bz2 4802843 RMD160 e87b560f81fc8bc422dc7071a4b27bdcf2b2d6ac SHA1 ddd515bdcc201193b45f58b705f6e8fde9fcb5d1 SHA256 5a4079194f45260c143f21ea6f33ce2660d89fca02ad8f1e65169968d365e4d4 -DIST transmission-2.31.tar.xz 2558880 RMD160 e777e32e5d02e8a93a64e4821ea0f9ccd8724f2c SHA1 84cfbc4e6a8db437d3c5b7eb983ce763b2879b62 SHA256 82cd04c93c65df818d38dcec154f5864520ab3147fac372e11d8e9d12506deba -DIST transmission-2.33.tar.xz 2583032 RMD160 8b8228a2fad55a64d46314f1bf879a8b89fa150d SHA1 a5502723e9b8fdc982cc4d3c052e4839cb45b1a8 SHA256 c15a7f9d82743fb329ee12e41bf242070ddbaa8c6741da7ce0bb91d8d399a072 DIST transmission-2.41.tar.xz 2623344 RMD160 a2c9c80cff444978dff305d573007473af5b3084 SHA1 dd9531587778dc46757b1520accacf6afa20c370 SHA256 f31bf798f620b436b2f5ed7047fa27fab78ce4b229d6d02f8c71f9867277685a +DIST transmission-2.42-patchset-1.tar.xz 4624 RMD160 7755ac87fcb58ab2fddf9707c2f212ebd76ce751 SHA1 f53ce89356fb09545f86e75c9bdd4eebd8d784ab SHA256 07541b76d77459f099c389df4722ff7fd085142433601a871df1d08ac9fefc33 DIST transmission-2.42.tar.xz 2629072 RMD160 c74688a61c2a8489f878363046ac705f1ce3f005 SHA1 78903095842fe1331c0b6ae214a9e99b0f112951 SHA256 ca94d8de5338178c2210e86e31aa522f559cac87da33a85199fbd81b7e8b04eb diff --git a/net-p2p/transmission/files/transmission-2.31-0001-configure.ac.patch b/net-p2p/transmission/files/transmission-2.31-0001-configure.ac.patch deleted file mode 100644 index 1ccaf4392559..000000000000 --- a/net-p2p/transmission/files/transmission-2.31-0001-configure.ac.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 5ca762c520be7e0182ed3cb8371c227d6e38d93a Mon Sep 17 00:00:00 2001 -From: Peter Volkov -Date: Thu, 16 Jun 2011 12:46:48 +0400 -Subject: [PATCH 1/3] configure.ac: Drop redudant code/indentation. - ---- - configure.ac | 16 ++++------------ - 1 files changed, 4 insertions(+), 12 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7e239bf..7f17a55 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -217,26 +217,18 @@ AC_CHECK_LIB([rt], - - AC_MSG_CHECKING([µTP]) - build_utp="no" --if test "x$CXX" = "x" ; then -- have_utp="no" --else -- have_utp="yes" --fi - AC_ARG_ENABLE([utp], - AS_HELP_STRING([--enable-utp],[build µTP support]), - [want_utp=${enableval}], -- [want_utp=${have_utp}]) -+ [want_utp="yes"]) - if test "x$want_utp" = "xyes" ; then -- if test "x$have_utp" = "xyes"; then -+ if test "x$CXX" != "x" ; then - LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/" -- LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a" -- if test "x$libutp_extra_libs" != "x" ; then -- LIBUTP_LIBS="$LIBUTP_LIBS $libutp_extra_libs" -- fi -+ LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a $libutp_extra_libs" - AC_DEFINE([WITH_UTP],[1]) - build_utp="yes" - else -- AC_MSG_ERROR("Unable to build uTP support -- C++ compiler not found") -+ AC_MSG_ERROR("Unable to build uTP support -- C++ compiler not found; consider --disable-utp") - fi - fi - AC_SUBST(LIBUTP_CFLAGS) --- -1.7.3.4 - diff --git a/net-p2p/transmission/files/transmission-2.31-0002-config.in-4-qt.pro.patch b/net-p2p/transmission/files/transmission-2.31-0002-config.in-4-qt.pro.patch deleted file mode 100644 index eeef9d87e8a2..000000000000 --- a/net-p2p/transmission/files/transmission-2.31-0002-config.in-4-qt.pro.patch +++ /dev/null @@ -1,72 +0,0 @@ -From f742757aa1e4419d2d5cb77425bc6b694e511ad6 Mon Sep 17 00:00:00 2001 -From: Peter Volkov -Date: Thu, 16 Jun 2011 12:48:11 +0400 -Subject: [PATCH 2/3] Add qt/config to make qmake aware about ./configure results. This simplifies use of system third-party tools. Fixes build issue caused by ordering of make/qmake run: bugs.gentoo.org/368523. - ---- - configure.ac | 5 ++++- - qt/config.in | 1 + - qt/qtr.pro | 6 +++--- - 3 files changed, 8 insertions(+), 4 deletions(-) - create mode 100644 qt/config.in - -diff --git a/configure.ac b/configure.ac -index 7f17a55..f4ec7d1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -225,6 +225,7 @@ if test "x$want_utp" = "xyes" ; then - if test "x$CXX" != "x" ; then - LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/" - LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a $libutp_extra_libs" -+ LIBUTP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/libutp/libutp.a $libutp_extra_libs" - AC_DEFINE([WITH_UTP],[1]) - build_utp="yes" - else -@@ -233,6 +234,7 @@ if test "x$want_utp" = "xyes" ; then - fi - AC_SUBST(LIBUTP_CFLAGS) - AC_SUBST(LIBUTP_LIBS) -+AC_SUBST(LIBUTP_LIBS_QT) - AM_CONDITIONAL([BUILD_UTP],[test "x$build_utp" = "xyes"]) - AC_MSG_RESULT([$build_utp]) - -@@ -505,7 +507,8 @@ AC_CONFIG_FILES([Makefile - web/javascript/Makefile - web/javascript/jquery/Makefile - web/stylesheets/Makefile -- po/Makefile.in]) -+ po/Makefile.in -+ qt/config]) - - AC_OUTPUT - -diff --git a/qt/config.in b/qt/config.in -new file mode 100644 -index 0000000..3340d1a ---- /dev/null -+++ b/qt/config.in -@@ -0,0 +1 @@ -+LIBUTP_LIBS = @LIBUTP_LIBS_QT@ -diff --git a/qt/qtr.pro b/qt/qtr.pro -index ce138a2..4e28e98 100644 ---- a/qt/qtr.pro -+++ b/qt/qtr.pro -@@ -16,12 +16,12 @@ QT += network - PKGCONFIG = fontconfig libcurl openssl libevent - - TRANSMISSION_TOP = .. -+include(config) -+ - INCLUDEPATH = $${EVENT_TOP}/include $${INCLUDEPATH} - INCLUDEPATH += $${TRANSMISSION_TOP} - LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a --exists( $${TRANSMISSION_TOP}/third-party/libutp/libutp.a ) { -- LIBS += $${TRANSMISSION_TOP}/third-party/libutp/libutp.a --} -+LIBS += $${LIBUTP_LIBS} - LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a - LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a - LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a --- -1.7.3.4 - diff --git a/net-p2p/transmission/files/transmission-2.31-0003-system-miniupnpc.patch b/net-p2p/transmission/files/transmission-2.31-0003-system-miniupnpc.patch deleted file mode 100644 index 6a022f8c2782..000000000000 --- a/net-p2p/transmission/files/transmission-2.31-0003-system-miniupnpc.patch +++ /dev/null @@ -1,290 +0,0 @@ -From efd40a3adc1568c2494ce51845accd9d94f8e527 Mon Sep 17 00:00:00 2001 -From: Peter Volkov -Date: Thu, 16 Jun 2011 12:58:04 +0400 -Subject: [PATCH 3/3] Allow usage of system miniupnp. Rename miniupnp -> miniupnpc since upstream suggests miniupnpc name for headers. - ---- - Transmission.xcodeproj/project.pbxproj | 50 ++++++++++++++++---------------- - cli/Makefile.am | 2 +- - configure.ac | 27 ++++++++++++++++- - daemon/Makefile.am | 2 +- - gtk/Makefile.am | 2 +- - libtransmission/Makefile.am | 3 +- - libtransmission/upnp.c | 4 +- - qt/config.in | 2 + - qt/qtr.pro | 2 +- - third-party/Makefile.am | 5 ++- - utils/Makefile.am | 2 +- - 11 files changed, 66 insertions(+), 35 deletions(-) - -diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj -index 99febe7..e477df4 100644 ---- a/Transmission.xcodeproj/project.pbxproj -+++ b/Transmission.xcodeproj/project.pbxproj -@@ -620,8 +620,8 @@ - A223AA830D220CEB00840069 /* nl */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = nl; path = macosx/nl.lproj/PrefsWindow.xib; sourceTree = ""; }; - A2265F3F0B5EF5F40093DDA5 /* FileNameCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FileNameCell.h; path = macosx/FileNameCell.h; sourceTree = ""; }; - A2265F400B5EF5F40093DDA5 /* FileNameCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = FileNameCell.m; path = macosx/FileNameCell.m; sourceTree = ""; }; -- A22B00AE116A9E90003315FC /* connecthostport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = connecthostport.c; path = "third-party/miniupnp/connecthostport.c"; sourceTree = ""; }; -- A22B00AF116A9E90003315FC /* connecthostport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = connecthostport.h; path = "third-party/miniupnp/connecthostport.h"; sourceTree = ""; }; -+ A22B00AE116A9E90003315FC /* connecthostport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = connecthostport.c; path = "third-party/miniupnpc/connecthostport.c"; sourceTree = ""; }; -+ A22B00AF116A9E90003315FC /* connecthostport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = connecthostport.h; path = "third-party/miniupnpc/connecthostport.h"; sourceTree = ""; }; - A22CF7AC0FA3505F0009BD3E /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = macosx/it.lproj/GroupRules.xib; sourceTree = ""; }; - A22CF7B90FA352740009BD3E /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = macosx/fr.lproj/GroupRules.xib; sourceTree = ""; }; - A22CF7C90FA5D3F90009BD3E /* es */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = es; path = macosx/es.lproj/GroupRules.xib; sourceTree = ""; }; -@@ -665,7 +665,7 @@ - A251A65D0F9E8FD5004F5973 /* pt */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pt; path = macosx/pt.lproj/PrefsWindow.xib; sourceTree = ""; }; - A251A65E0F9E8FDA004F5973 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = macosx/pt.lproj/InfoPlist.strings; sourceTree = ""; }; - A251A6620F9E8FED004F5973 /* pt */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pt; path = macosx/pt.lproj/Localizable.strings; sourceTree = ""; }; -- A25485390EB66CBB004539DA /* codelength.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = codelength.h; path = "third-party/miniupnp/codelength.h"; sourceTree = ""; }; -+ A25485390EB66CBB004539DA /* codelength.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = codelength.h; path = "third-party/miniupnpc/codelength.h"; sourceTree = ""; }; - A256588A0A9A695400E8A03B /* MessageWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MessageWindowController.h; path = macosx/MessageWindowController.h; sourceTree = ""; }; - A256588B0A9A695400E8A03B /* MessageWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = MessageWindowController.m; path = macosx/MessageWindowController.m; sourceTree = ""; }; - A257C17F0CAD3003004E121C /* PeerTableView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PeerTableView.h; path = macosx/PeerTableView.h; sourceTree = ""; }; -@@ -895,31 +895,31 @@ - A2F7CF5D13035FFD0016FF10 /* URLSheetWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = URLSheetWindowController.h; path = macosx/URLSheetWindowController.h; sourceTree = ""; }; - A2F7CF5E13035FFD0016FF10 /* URLSheetWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = URLSheetWindowController.m; path = macosx/URLSheetWindowController.m; sourceTree = ""; }; - A2F8951E0A2D4BA500ED2127 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Credits.rtf; path = macosx/Credits.rtf; sourceTree = ""; }; -- A2F8CD420F3D0F4A00DB356A /* miniupnpcstrings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = miniupnpcstrings.h; path = "third-party/miniupnp/miniupnpcstrings.h"; sourceTree = ""; }; -+ A2F8CD420F3D0F4A00DB356A /* miniupnpcstrings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = miniupnpcstrings.h; path = "third-party/miniupnpc/miniupnpcstrings.h"; sourceTree = ""; }; - A2FB057C0BFEB6800095564D /* DragOverlayView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DragOverlayView.h; path = macosx/DragOverlayView.h; sourceTree = ""; }; - A2FB057D0BFEB6800095564D /* DragOverlayView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = DragOverlayView.m; path = macosx/DragOverlayView.m; sourceTree = ""; }; - A2FB06950BFF484A0095564D /* Globe.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Globe.png; path = macosx/Images/Globe.png; sourceTree = ""; }; - A2FB701A0D95CAEA0001F331 /* GroupsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GroupsController.h; path = macosx/GroupsController.h; sourceTree = ""; }; - A2FB701B0D95CAEA0001F331 /* GroupsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GroupsController.m; path = macosx/GroupsController.m; sourceTree = ""; }; - BE1183480CE160960002D0F3 /* libminiupnp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libminiupnp.a; sourceTree = BUILT_PRODUCTS_DIR; }; -- BE11834D0CE160C50002D0F3 /* bsdqueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bsdqueue.h; path = "third-party/miniupnp/bsdqueue.h"; sourceTree = ""; }; -- BE11834E0CE160C50002D0F3 /* declspec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = declspec.h; path = "third-party/miniupnp/declspec.h"; sourceTree = ""; }; -- BE11834F0CE160C50002D0F3 /* igd_desc_parse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = igd_desc_parse.h; path = "third-party/miniupnp/igd_desc_parse.h"; sourceTree = ""; }; -- BE1183500CE160C50002D0F3 /* minixml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = minixml.h; path = "third-party/miniupnp/minixml.h"; sourceTree = ""; }; -- BE1183510CE160C50002D0F3 /* miniwget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = miniwget.h; path = "third-party/miniupnp/miniwget.h"; sourceTree = ""; }; -- BE1183520CE160C50002D0F3 /* minisoap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = minisoap.h; path = "third-party/miniupnp/minisoap.h"; sourceTree = ""; }; -- BE1183530CE160C50002D0F3 /* upnpreplyparse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = upnpreplyparse.h; path = "third-party/miniupnp/upnpreplyparse.h"; sourceTree = ""; }; -- BE1183540CE160C50002D0F3 /* upnpcommands.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = upnpcommands.h; path = "third-party/miniupnp/upnpcommands.h"; sourceTree = ""; }; -- BE1183550CE160C50002D0F3 /* miniupnpc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = miniupnpc.h; path = "third-party/miniupnp/miniupnpc.h"; sourceTree = ""; }; -- BE1183560CE160C50002D0F3 /* minissdpc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = minissdpc.h; path = "third-party/miniupnp/minissdpc.h"; sourceTree = ""; }; -- BE1183610CE160D50002D0F3 /* igd_desc_parse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = igd_desc_parse.c; path = "third-party/miniupnp/igd_desc_parse.c"; sourceTree = ""; }; -- BE1183620CE160D50002D0F3 /* minixml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = minixml.c; path = "third-party/miniupnp/minixml.c"; sourceTree = ""; }; -- BE1183630CE160D50002D0F3 /* miniwget.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = miniwget.c; path = "third-party/miniupnp/miniwget.c"; sourceTree = ""; }; -- BE1183640CE160D50002D0F3 /* minissdpc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = minissdpc.c; path = "third-party/miniupnp/minissdpc.c"; sourceTree = ""; }; -- BE1183650CE160D50002D0F3 /* minisoap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = minisoap.c; path = "third-party/miniupnp/minisoap.c"; sourceTree = ""; }; -- BE1183660CE160D50002D0F3 /* upnpreplyparse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = upnpreplyparse.c; path = "third-party/miniupnp/upnpreplyparse.c"; sourceTree = ""; }; -- BE1183670CE160D50002D0F3 /* upnpcommands.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = upnpcommands.c; path = "third-party/miniupnp/upnpcommands.c"; sourceTree = ""; }; -- BE1183680CE160D50002D0F3 /* miniupnpc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = miniupnpc.c; path = "third-party/miniupnp/miniupnpc.c"; sourceTree = ""; }; -+ BE11834D0CE160C50002D0F3 /* bsdqueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bsdqueue.h; path = "third-party/miniupnpc/bsdqueue.h"; sourceTree = ""; }; -+ BE11834E0CE160C50002D0F3 /* declspec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = declspec.h; path = "third-party/miniupnpc/declspec.h"; sourceTree = ""; }; -+ BE11834F0CE160C50002D0F3 /* igd_desc_parse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = igd_desc_parse.h; path = "third-party/miniupnpc/igd_desc_parse.h"; sourceTree = ""; }; -+ BE1183500CE160C50002D0F3 /* minixml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = minixml.h; path = "third-party/miniupnpc/minixml.h"; sourceTree = ""; }; -+ BE1183510CE160C50002D0F3 /* miniwget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = miniwget.h; path = "third-party/miniupnpc/miniwget.h"; sourceTree = ""; }; -+ BE1183520CE160C50002D0F3 /* minisoap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = minisoap.h; path = "third-party/miniupnpc/minisoap.h"; sourceTree = ""; }; -+ BE1183530CE160C50002D0F3 /* upnpreplyparse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = upnpreplyparse.h; path = "third-party/miniupnpc/upnpreplyparse.h"; sourceTree = ""; }; -+ BE1183540CE160C50002D0F3 /* upnpcommands.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = upnpcommands.h; path = "third-party/miniupnpc/upnpcommands.h"; sourceTree = ""; }; -+ BE1183550CE160C50002D0F3 /* miniupnpc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = miniupnpc.h; path = "third-party/miniupnpc/miniupnpc.h"; sourceTree = ""; }; -+ BE1183560CE160C50002D0F3 /* minissdpc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = minissdpc.h; path = "third-party/miniupnpc/minissdpc.h"; sourceTree = ""; }; -+ BE1183610CE160D50002D0F3 /* igd_desc_parse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = igd_desc_parse.c; path = "third-party/miniupnpc/igd_desc_parse.c"; sourceTree = ""; }; -+ BE1183620CE160D50002D0F3 /* minixml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = minixml.c; path = "third-party/miniupnpc/minixml.c"; sourceTree = ""; }; -+ BE1183630CE160D50002D0F3 /* miniwget.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = miniwget.c; path = "third-party/miniupnpc/miniwget.c"; sourceTree = ""; }; -+ BE1183640CE160D50002D0F3 /* minissdpc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = minissdpc.c; path = "third-party/miniupnpc/minissdpc.c"; sourceTree = ""; }; -+ BE1183650CE160D50002D0F3 /* minisoap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = minisoap.c; path = "third-party/miniupnpc/minisoap.c"; sourceTree = ""; }; -+ BE1183660CE160D50002D0F3 /* upnpreplyparse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = upnpreplyparse.c; path = "third-party/miniupnpc/upnpreplyparse.c"; sourceTree = ""; }; -+ BE1183670CE160D50002D0F3 /* upnpcommands.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = upnpcommands.c; path = "third-party/miniupnpc/upnpcommands.c"; sourceTree = ""; }; -+ BE1183680CE160D50002D0F3 /* miniupnpc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = miniupnpc.c; path = "third-party/miniupnpc/miniupnpc.c"; sourceTree = ""; }; - BE75C3490C729E9500DBEFE0 /* libevent.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libevent.a; sourceTree = BUILT_PRODUCTS_DIR; }; - BEFC1C000C07750000B0BB3C /* transmission-daemon */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "transmission-daemon"; sourceTree = BUILT_PRODUCTS_DIR; }; - BEFC1C0E0C07756200B0BB3C /* daemon.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = daemon.c; path = daemon/daemon.c; sourceTree = ""; }; -@@ -2129,14 +2129,14 @@ - files = ( - ); - inputPaths = ( -- "$(SRCROOT)/third-party/miniupnp/miniupnpcstrings.h.in", -+ "$(SRCROOT)/third-party/miniupnpc/miniupnpcstrings.h.in", - ); - outputPaths = ( -- "$(SRCROOT)/third-party/miniupnp/miniupnpcstrings.h", -+ "$(SRCROOT)/third-party/miniupnpc/miniupnpcstrings.h", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; -- shellScript = "sh third-party/miniupnp/updateminiupnpcstrings.sh \"$SCRIPT_INPUT_FILE_0\" \"$SCRIPT_OUTPUT_FILE_0\""; -+ shellScript = "sh third-party/miniupnpc/updateminiupnpcstrings.sh \"$SCRIPT_INPUT_FILE_0\" \"$SCRIPT_OUTPUT_FILE_0\""; - }; - BE75C3510C729EE100DBEFE0 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; -diff --git a/cli/Makefile.am b/cli/Makefile.am -index 9d618f2..8af71e6 100644 ---- a/cli/Makefile.am -+++ b/cli/Makefile.am -@@ -18,8 +18,8 @@ transmission_cli_SOURCES = cli.c - - transmission_cli_LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ -+ @LIBUPNP_LIBS@ \ - $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ - @DHT_LIBS@ \ - @LIBUTP_LIBS@ \ - @LIBEVENT_LIBS@ \ -diff --git a/configure.ac b/configure.ac -index f4ec7d1..a0187a7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -241,6 +241,31 @@ AC_MSG_RESULT([$build_utp]) - - dnl ---------------------------------------------------------------------------- - dnl -+dnl Allow usage of system miniupnp library -+LIBUPNP_CFLAGS="-I\$(top_srcdir)/third-party/" -+LIBUPNP_LIBS="\$(top_builddir)/third-party/miniupnp/libminiupnp.a" -+LIBUPNP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a" -+build_bundled_miniupnp="yes" -+AC_ARG_ENABLE([external-miniupnp], -+ AS_HELP_STRING([--enable-external-miniupnp],[Use system external-miniupnp]), -+ [want_external_miniupnp=${enableval}], -+ [want_external_miniupnp=no]) -+if test "x$want_external_utp" != "xno" ; then -+ AC_CHECK_LIB([miniupnpc], -+ [upnpDiscover], -+ [LIBUPNP_CFLAGS="" -+ LIBUPNP_LIBS="-lminiupnpc" -+ LIBUPNP_LIBS_QT="-lminiupnpc" -+ build_bundled_miniupnp="no"], -+ AC_MSG_ERROR("Requested system libminiupnp but it is not found") -+ ) -+fi -+AM_CONDITIONAL([BUILD_MINIUPNP],[test "x$build_bundled_miniupnp" = "xyes"]) -+AC_SUBST(LIBUPNP_CFLAGS) -+AC_SUBST(LIBUPNP_LIBS) -+AC_SUBST(LIBUPNP_LIBS_QT) -+dnl ---------------------------------------------------------------------------- -+dnl - dnl detection for the GTK+ client - - PKG_CHECK_MODULES(GTK, -@@ -492,7 +517,7 @@ AC_CONFIG_FILES([Makefile - libtransmission/Makefile - utils/Makefile - third-party/Makefile -- third-party/miniupnp/Makefile -+ third-party/miniupnpc/Makefile - third-party/libnatpmp/Makefile - third-party/libutp/Makefile - third-party/dht/Makefile -diff --git a/daemon/Makefile.am b/daemon/Makefile.am -index 9e2a10a..7a5e085 100644 ---- a/daemon/Makefile.am -+++ b/daemon/Makefile.am -@@ -20,7 +20,7 @@ bin_PROGRAMS = \ - - LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ -+ @LIBUPNP_LIBS@ \ - $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - @DHT_LIBS@ \ - @LIBUTP_LIBS@ \ -diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index a86a440..abf3cd1 100644 ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -93,7 +93,7 @@ dist_man_MANS = transmission-gtk.1 - - transmission_gtk_LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ -+ @LIBUPNP_LIBS@ \ - $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - @LIBCANBERRA_LIBS@ \ - @GCONF2_LIBS@ \ -diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am -index 0dd244a..a68349b 100644 ---- a/libtransmission/Makefile.am -+++ b/libtransmission/Makefile.am -@@ -8,6 +8,7 @@ AM_CPPFLAGS = \ - AM_CFLAGS = \ - @DHT_CFLAGS@ \ - @LIBUTP_CFLAGS@ \ -+ @LIBUPNP_CFLAGS@ \ - @LIBEVENT_CFLAGS@ \ - @LIBCURL_CFLAGS@ \ - @OPENSSL_CFLAGS@ \ -@@ -139,7 +140,7 @@ apps_ldflags = \ - - apps_ldadd = \ - ./libtransmission.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ -+ @LIBUPNP_LIBS@ \ - $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - @INTLLIBS@ \ - @DHT_LIBS@ \ -diff --git a/libtransmission/upnp.c b/libtransmission/upnp.c -index 2059864..8f43d2a 100644 ---- a/libtransmission/upnp.c -+++ b/libtransmission/upnp.c -@@ -13,8 +13,8 @@ - #include - #include - --#include --#include -+#include -+#include - - #include "transmission.h" - #include "port-forwarding.h" -diff --git a/qt/config.in b/qt/config.in -index 3340d1a..25851ea 100644 ---- a/qt/config.in -+++ b/qt/config.in -@@ -1 +1,3 @@ - LIBUTP_LIBS = @LIBUTP_LIBS_QT@ -+MINIUPNP_LIBS = @LIBUPNP_LIBS_QT@ -+ -diff --git a/qt/qtr.pro b/qt/qtr.pro -index 4e28e98..8f6e659 100644 ---- a/qt/qtr.pro -+++ b/qt/qtr.pro -@@ -23,7 +23,7 @@ INCLUDEPATH += $${TRANSMISSION_TOP} - LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a - LIBS += $${LIBUTP_LIBS} - LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a --LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a -+LIBS += $${MINIUPNP_LIBS} - LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a - unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt - win32:DEFINES += QT_DBUS -diff --git a/third-party/Makefile.am b/third-party/Makefile.am -index 39eb5ee..ea2acaa 100644 ---- a/third-party/Makefile.am -+++ b/third-party/Makefile.am -@@ -1,11 +1,14 @@ - if BUILD_UTP - UTP_DIR = libutp - endif -+if BUILD_MINIUPNP -+ MINIUPNP = miniupnpc -+endif - - SUBDIRS = \ - dht \ - libnatpmp \ -- miniupnp \ -+ $(MINIUPNP_DIR) \ - $(UTP_DIR) - - EXTRA_DIST = \ -diff --git a/utils/Makefile.am b/utils/Makefile.am -index 896cb2b..1f687ed 100644 ---- a/utils/Makefile.am -+++ b/utils/Makefile.am -@@ -26,7 +26,7 @@ dist_man_MANS = \ - - transmission_create_LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ -+ @LIBUPNP_LIBS@ \ - $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - @INTLLIBS@ \ - @DHT_LIBS@ \ --- -1.7.3.4 - diff --git a/net-p2p/transmission/files/transmission-2.31-no-tests.patch b/net-p2p/transmission/files/transmission-2.31-no-tests.patch deleted file mode 100644 index d4a7e2fafc6a..000000000000 --- a/net-p2p/transmission/files/transmission-2.31-no-tests.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit b46cac3a9fb95fa6edd6f18c82b7738ab81c062d -Author: Peter Volkov -Date: Thu Jun 16 13:21:12 2011 +0400 - - Don't build programs required for tests. - -diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am -index a68349b..656f8aa 100644 ---- a/libtransmission/Makefile.am -+++ b/libtransmission/Makefile.am -@@ -133,7 +133,7 @@ TESTS = \ - test-peer-id \ - utils-test - --noinst_PROGRAMS = $(TESTS) -+check_PROGRAMS = $(TESTS) - - apps_ldflags = \ - @ZLIB_LDFLAGS@ diff --git a/net-p2p/transmission/files/transmission-2.31-qt-libutp.patch b/net-p2p/transmission/files/transmission-2.31-qt-libutp.patch deleted file mode 100644 index b83fac7d3aae..000000000000 --- a/net-p2p/transmission/files/transmission-2.31-qt-libutp.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://trac.transmissionbt.com/changeset/12452#file0 -https://bugs.gentoo.org/show_bug.cgi?id=368187 - ---- qt/qtr.pro (revision 12449) -+++ qt/qtr.pro (working copy) -@@ -19,7 +19,9 @@ - INCLUDEPATH = $${EVENT_TOP}/include $${INCLUDEPATH} - INCLUDEPATH += $${TRANSMISSION_TOP} - LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a --LIBS += $${TRANSMISSION_TOP}/third-party/libutp/libutp.a -+exists( $${TRANSMISSION_TOP}/third-party/libutp/libutp.a ) { -+ LIBS += $${TRANSMISSION_TOP}/third-party/libutp/libutp.a -+} - LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a - LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a - LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a diff --git a/net-p2p/transmission/files/transmission-2.33-0003-system-miniupnpc.patch b/net-p2p/transmission/files/transmission-2.33-0003-system-miniupnpc.patch deleted file mode 100644 index 7aa1f22ab8a9..000000000000 --- a/net-p2p/transmission/files/transmission-2.33-0003-system-miniupnpc.patch +++ /dev/null @@ -1,299 +0,0 @@ -From f69247bd3ca045b87e5ecf5d1c454181b59ecf5b Mon Sep 17 00:00:00 2001 -From: Peter Volkov -Date: Tue, 28 Jun 2011 18:26:11 +0400 -Subject: [PATCH 3/3] Allow usage of system miniupnp. - ---- - cli/Makefile.am | 2 +- - configure.ac | 73 ++++++++++++++++++++++++++++++++++++++++++- - daemon/Makefile.am | 2 +- - gtk/Makefile.am | 2 +- - libtransmission/Makefile.am | 3 +- - libtransmission/upnp.c | 25 +++++++++++++++ - qt/config.in | 2 + - qt/qtr.pro | 2 +- - third-party/Makefile.am | 5 ++- - utils/Makefile.am | 2 +- - 10 files changed, 110 insertions(+), 8 deletions(-) - -diff --git a/cli/Makefile.am b/cli/Makefile.am -index 9d618f2..8af71e6 100644 ---- a/cli/Makefile.am -+++ b/cli/Makefile.am -@@ -18,8 +18,8 @@ transmission_cli_SOURCES = cli.c - - transmission_cli_LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ -+ @LIBUPNP_LIBS@ \ - $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ - @DHT_LIBS@ \ - @LIBUTP_LIBS@ \ - @LIBEVENT_LIBS@ \ -diff --git a/configure.ac b/configure.ac -index 57acb9d..417b6ef 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -241,6 +241,77 @@ AC_MSG_RESULT([$build_utp]) - - dnl ---------------------------------------------------------------------------- - dnl -+dnl Allow usage of system miniupnp library -+LIBUPNP_CFLAGS="-I\$(top_srcdir)/third-party/" -+LIBUPNP_LIBS="\$(top_builddir)/third-party/miniupnp/libminiupnp.a" -+LIBUPNP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a" -+build_bundled_miniupnp="yes" -+AC_ARG_ENABLE([external-miniupnp], -+ AS_HELP_STRING([--enable-external-miniupnp],[Use system external-miniupnp]), -+ [want_external_miniupnp=${enableval}], -+ [want_external_miniupnp=no]) -+if test "x$want_external_miniupnp" != "xno" ; then -+ AC_DEFINE([SYSTEM_MINIUPNP]) -+ ac_save_LIBS="$LIBS" -+ LIBS="-lminiupnpc" -+ # Check miniupnp 1.5 -+ AC_TRY_LINK([ -+ #include -+ #include -+ #include -+ ],[ -+ struct UPNPDev * devlist; -+ struct UPNPUrls urls; -+ struct IGDdatas data; -+ char lanaddr[16]; -+ char portStr[8]; -+ char intPort[8]; -+ char intClient[16]; -+ upnpDiscover( 2000, NULL, NULL, 0 ); -+ UPNP_GetValidIGD( devlist, &urls, &data, lanaddr, sizeof( lanaddr ) ); -+ UPNP_GetSpecificPortMappingEntry( urls.controlURL, data.first.servicetype, -+ portStr, "TCP", intClient, intPort ); -+ ],[ -+ AC_DEFINE(HAVE_MINIUPNP_15, 1, [Define to 1 if you have miniupnpc version 1.5]) -+ build_bundled_miniupnp="no"]) -+ -+ # Check miniupnp 1.6 -+ AC_TRY_LINK([ -+ #include -+ #include -+ #include -+ #include -+ ],[ -+ struct UPNPDev * devlist; -+ struct UPNPUrls urls; -+ struct IGDdatas data; -+ char lanaddr[16]; -+ char portStr[8]; -+ char intPort[8]; -+ char intClient[16]; -+ upnpDiscover( 2000, NULL, NULL, 0, 0, &errno ); -+ UPNP_GetValidIGD( devlist, &urls, &data, lanaddr, sizeof( lanaddr ) ); -+ UPNP_GetSpecificPortMappingEntry( urls.controlURL, data.first.servicetype, -+ portStr, "TCP", intClient, intPort, NULL, NULL, NULL ); -+ ],[ -+ AC_DEFINE(HAVE_MINIUPNP_16, 1, [Define to 1 if you have miniupnpc version 1.6]) -+ build_bundled_miniupnp="no"]) -+ -+ if test "x$build_bundled_miniupnp" = "xno" ; then -+ LIBUPNP_CFLAGS="" -+ LIBUPNP_LIBS="-lminiupnpc" -+ LIBUPNP_LIBS_QT="-lminiupnpc" -+ else -+ AC_MSG_ERROR("Requested system libminiupnp but it is not found") -+ fi -+ LIBS="$ac_save_LIBS" -+fi -+AM_CONDITIONAL([BUILD_MINIUPNP],[test "x$build_bundled_miniupnp" = "xyes"]) -+AC_SUBST(LIBUPNP_CFLAGS) -+AC_SUBST(LIBUPNP_LIBS) -+AC_SUBST(LIBUPNP_LIBS_QT) -+dnl ---------------------------------------------------------------------------- -+dnl - dnl detection for the GTK+ client - - PKG_CHECK_MODULES(GTK, -@@ -492,7 +563,7 @@ AC_CONFIG_FILES([Makefile - libtransmission/Makefile - utils/Makefile - third-party/Makefile -- third-party/miniupnp/Makefile -+ third-party/miniupnp/Makefile - third-party/libnatpmp/Makefile - third-party/libutp/Makefile - third-party/dht/Makefile -diff --git a/daemon/Makefile.am b/daemon/Makefile.am -index 9e2a10a..7a5e085 100644 ---- a/daemon/Makefile.am -+++ b/daemon/Makefile.am -@@ -20,7 +20,7 @@ bin_PROGRAMS = \ - - LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ -+ @LIBUPNP_LIBS@ \ - $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - @DHT_LIBS@ \ - @LIBUTP_LIBS@ \ -diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index a86a440..abf3cd1 100644 ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -93,7 +93,7 @@ dist_man_MANS = transmission-gtk.1 - - transmission_gtk_LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ -+ @LIBUPNP_LIBS@ \ - $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - @LIBCANBERRA_LIBS@ \ - @GCONF2_LIBS@ \ -diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am -index 0dd244a..a68349b 100644 ---- a/libtransmission/Makefile.am -+++ b/libtransmission/Makefile.am -@@ -8,6 +8,7 @@ AM_CPPFLAGS = \ - AM_CFLAGS = \ - @DHT_CFLAGS@ \ - @LIBUTP_CFLAGS@ \ -+ @LIBUPNP_CFLAGS@ \ - @LIBEVENT_CFLAGS@ \ - @LIBCURL_CFLAGS@ \ - @OPENSSL_CFLAGS@ \ -@@ -139,7 +140,7 @@ apps_ldflags = \ - - apps_ldadd = \ - ./libtransmission.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ -+ @LIBUPNP_LIBS@ \ - $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - @INTLLIBS@ \ - @DHT_LIBS@ \ -diff --git a/libtransmission/upnp.c b/libtransmission/upnp.c -index 2059864..a675b7c 100644 ---- a/libtransmission/upnp.c -+++ b/libtransmission/upnp.c -@@ -13,8 +13,13 @@ - #include - #include - -+#ifdef SYSTEM_MINIUPNP -+#include -+#include -+#else - #include - #include -+#endif - - #include "transmission.h" - #include "port-forwarding.h" -@@ -97,7 +102,11 @@ tr_upnpPulse( tr_upnp * handle, - { - struct UPNPDev * devlist; - errno = 0; -+#ifdef HAVE_MINIUPNP_16 -+ devlist = upnpDiscover( 2000, NULL, NULL, 0, 0, &errno ); -+#else - devlist = upnpDiscover( 2000, NULL, NULL, 0 ); -+#endif - if( devlist == NULL ) - { - tr_ndbg( -@@ -144,9 +153,17 @@ tr_upnpPulse( tr_upnp * handle, - - tr_snprintf( portStr, sizeof( portStr ), "%d", handle->port ); - if( UPNP_GetSpecificPortMappingEntry( handle->urls.controlURL, handle->data.first.servicetype, -+#ifdef HAVE_MINIUPNP_16 -+ portStr, "TCP", intClient, intPort, NULL, NULL, NULL ) != UPNPCOMMAND_SUCCESS || -+#else - portStr, "TCP", intClient, intPort ) != UPNPCOMMAND_SUCCESS || -+#endif - UPNP_GetSpecificPortMappingEntry( handle->urls.controlURL, handle->data.first.servicetype, -+#ifdef HAVE_MINIUPNP_16 -+ portStr, "UDP", intClient, intPort, NULL, NULL, NULL ) != UPNPCOMMAND_SUCCESS ) -+#else - portStr, "UDP", intClient, intPort ) != UPNPCOMMAND_SUCCESS ) -+#endif - { - tr_ninf( getKey( ), _( "Port %d isn't forwarded" ), handle->port ); - handle->isMapped = false; -@@ -198,7 +215,11 @@ tr_upnpPulse( tr_upnp * handle, - err_tcp = UPNP_AddPortMapping( handle->urls.controlURL, - handle->data.first.servicetype, - portStr, portStr, handle->lanaddr, -+#ifdef HAVE_MINIUPNP_16 -+ desc, "TCP", NULL, NULL ); -+#else - desc, "TCP", NULL ); -+#endif - if( err_tcp ) - tr_ndbg( getKey( ), "TCP Port forwarding failed with error %d (errno %d - %s)", - err_tcp, errno, tr_strerror( errno ) ); -@@ -207,7 +228,11 @@ tr_upnpPulse( tr_upnp * handle, - err_udp = UPNP_AddPortMapping( handle->urls.controlURL, - handle->data.first.servicetype, - portStr, portStr, handle->lanaddr, -+#ifdef HAVE_MINIUPNP_16 -+ desc, "UDP", NULL, NULL ); -+#else - desc, "UDP", NULL ); -+#endif - if( err_udp ) - tr_ndbg( getKey( ), "UDP Port forwarding failed with error %d (errno %d - %s)", - err_udp, errno, tr_strerror( errno ) ); -diff --git a/qt/config.in b/qt/config.in -index 3340d1a..25851ea 100644 ---- a/qt/config.in -+++ b/qt/config.in -@@ -1 +1,3 @@ - LIBUTP_LIBS = @LIBUTP_LIBS_QT@ -+MINIUPNP_LIBS = @LIBUPNP_LIBS_QT@ -+ -diff --git a/qt/qtr.pro b/qt/qtr.pro -index 4e28e98..8f6e659 100644 ---- a/qt/qtr.pro -+++ b/qt/qtr.pro -@@ -23,7 +23,7 @@ INCLUDEPATH += $${TRANSMISSION_TOP} - LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a - LIBS += $${LIBUTP_LIBS} - LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a --LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a -+LIBS += $${MINIUPNP_LIBS} - LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a - unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt - win32:DEFINES += QT_DBUS -diff --git a/third-party/Makefile.am b/third-party/Makefile.am -index 39eb5ee..fcf1369 100644 ---- a/third-party/Makefile.am -+++ b/third-party/Makefile.am -@@ -1,11 +1,14 @@ - if BUILD_UTP - UTP_DIR = libutp - endif -+if BUILD_MINIUPNP -+ MINIUPNP_DIR = miniupnp -+endif - - SUBDIRS = \ - dht \ - libnatpmp \ -- miniupnp \ -+ $(MINIUPNP_DIR) \ - $(UTP_DIR) - - EXTRA_DIST = \ -diff --git a/utils/Makefile.am b/utils/Makefile.am -index 896cb2b..1f687ed 100644 ---- a/utils/Makefile.am -+++ b/utils/Makefile.am -@@ -26,7 +26,7 @@ dist_man_MANS = \ - - transmission_create_LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ -+ @LIBUPNP_LIBS@ \ - $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - @INTLLIBS@ \ - @DHT_LIBS@ \ --- -1.7.3.4 - diff --git a/net-p2p/transmission/files/transmission-2.42-0001-configure.ac.patch b/net-p2p/transmission/files/transmission-2.42-0001-configure.ac.patch deleted file mode 100644 index 57d0649fdeac..000000000000 --- a/net-p2p/transmission/files/transmission-2.42-0001-configure.ac.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- configure.ac.old 2011-11-01 12:26:58.384182367 +0100 -+++ configure.ac 2011-11-01 12:31:59.779150140 +0100 -@@ -209,26 +209,18 @@ - - AC_MSG_CHECKING([µTP]) - build_utp="no" --if test "x$HAVE_CXX" = "xyes" ; then -- have_utp="yes" --else -- have_utp="no" --fi - AC_ARG_ENABLE([utp], - AS_HELP_STRING([--enable-utp],[build µTP support]), - [want_utp=${enableval}], -- [want_utp=${have_utp}]) -+ [want_utp="yes"]) - if test "x$want_utp" = "xyes" ; then -- if test "x$have_utp" = "xyes"; then -+ if test "x$HAVE_CXX" = "xyes"; then - LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/" -- LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a" -- if test "x$libutp_extra_libs" != "x" ; then -- LIBUTP_LIBS="$LIBUTP_LIBS $libutp_extra_libs" -- fi -+ LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a $libutp_extra_libs" - AC_DEFINE([WITH_UTP],[1]) - build_utp="yes" - else -- AC_MSG_ERROR("Unable to build uTP support -- C++ compiler not found") -+ AC_MSG_ERROR("Unable to build uTP support -- C++ compiler not found; consider --disable-utp") - fi - fi - AC_SUBST(LIBUTP_CFLAGS) diff --git a/net-p2p/transmission/files/transmission-2.42-0003-system-miniupnpc.patch b/net-p2p/transmission/files/transmission-2.42-0003-system-miniupnpc.patch deleted file mode 100644 index 501ca8ec8949..000000000000 --- a/net-p2p/transmission/files/transmission-2.42-0003-system-miniupnpc.patch +++ /dev/null @@ -1,208 +0,0 @@ -From: Leo 'costela' Antunes -Date: Sat, 12 Jun 2011 23:24:11 +0200 -Subject: use system libminiupnpc and libnatpmp - -TODO: make this optional before forwarding upstream - -Forwarded: no - -Index: repo/configure.ac -=================================================================== ---- repo.orig/configure.ac 2011-11-05 00:55:07.000000000 +0100 -+++ repo/configure.ac 2011-11-05 00:55:24.000000000 +0100 -@@ -18,7 +18,7 @@ - - dnl AM_CONFIG_HEADER(config.h) - AC_CONFIG_SRCDIR(libtransmission/transmission.h) --AM_INIT_AUTOMAKE([1.9 tar-pax]) -+AM_INIT_AUTOMAKE([1.9 tar-pax nostdinc]) - AC_PROG_LIBTOOL - - if test m4_substr(peer_id_prefix,6,1) = "0"; then -@@ -197,6 +197,20 @@ - AC_SUBST(DHT_CFLAGS) - AC_SUBST(DHT_LIBS) - -+dnl ---------------------------------------------------------------------------- -+dnl -+dnl miniupnp -+ -+MINIUPNPC_LIBS="-lminiupnpc" -+AC_SUBST(MINIUPNPC_LIBS) -+ -+dnl ---------------------------------------------------------------------------- -+dnl -+dnl natpmp -+ -+NATPMP_LIBS="-lnatpmp" -+AC_SUBST(NATPMP_LIBS) -+ - - dnl ---------------------------------------------------------------------------- - dnl -@@ -416,8 +430,6 @@ - libtransmission/Makefile - utils/Makefile - third-party/Makefile -- third-party/miniupnp/Makefile -- third-party/libnatpmp/Makefile - third-party/libutp/Makefile - third-party/dht/Makefile - macosx/Makefile -Index: repo/libtransmission/Makefile.am -=================================================================== ---- repo.orig/libtransmission/Makefile.am 2011-11-05 00:55:07.000000000 +0100 -+++ repo/libtransmission/Makefile.am 2011-11-05 00:55:24.000000000 +0100 -@@ -1,7 +1,5 @@ - AM_CPPFLAGS = \ -- -I. \ - -I$(top_srcdir) \ -- -I$(top_srcdir)/third-party/ \ - -D__TRANSMISSION__ \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" - -@@ -68,6 +66,8 @@ - webseed.c \ - wildmat.c - -+libtransmission_a_LDFLAGS = @MINIUPNPC_LIBS@ @NATPMP_LIBS@ -+ - noinst_HEADERS = \ - announcer.h \ - announcer-common.h \ -@@ -139,8 +139,8 @@ - - apps_ldadd = \ - ./libtransmission.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ -- $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ -+ @MINIUPNPC_LIBS@ \ -+ @NATPMP_LIBS@ \ - @INTLLIBS@ \ - @DHT_LIBS@ \ - @LIBUTP_LIBS@ \ -Index: repo/third-party/Makefile.am -=================================================================== ---- repo.orig/third-party/Makefile.am 2011-11-05 00:55:07.000000000 +0100 -+++ repo/third-party/Makefile.am 2011-11-05 00:55:24.000000000 +0100 -@@ -4,8 +4,6 @@ - - SUBDIRS = \ - dht \ -- libnatpmp \ -- miniupnp \ - $(UTP_DIR) - - EXTRA_DIST = \ -Index: repo/utils/Makefile.am -=================================================================== ---- repo.orig/utils/Makefile.am 2011-11-05 00:55:07.000000000 +0100 -+++ repo/utils/Makefile.am 2011-11-05 00:55:24.000000000 +0100 -@@ -26,8 +26,8 @@ - - transmission_create_LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ -- $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ -+ @MINIUPNPC_LIBS@ \ -+ @NATPMP_LIBS@ \ - @INTLLIBS@ \ - @DHT_LIBS@ \ - @LIBUTP_LIBS@ \ -Index: repo/daemon/Makefile.am -=================================================================== ---- repo.orig/daemon/Makefile.am 2011-11-05 00:55:07.000000000 +0100 -+++ repo/daemon/Makefile.am 2011-11-05 00:55:24.000000000 +0100 -@@ -20,8 +20,8 @@ - - LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ -- $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ -+ @MINIUPNPC_LIBS@ \ -+ @NATPMP_LIBS@ \ - @DHT_LIBS@ \ - @LIBUTP_LIBS@ \ - @LIBEVENT_LIBS@ \ -Index: repo/gtk/Makefile.am -=================================================================== ---- repo.orig/gtk/Makefile.am 2011-11-05 00:55:07.000000000 +0100 -+++ repo/gtk/Makefile.am 2011-11-05 00:55:24.000000000 +0100 -@@ -84,8 +84,8 @@ - - transmission_gtk_LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ -- $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ -+ @MINIUPNPC_LIBS@ \ -+ @NATPMP_LIBS@ \ - @DHT_LIBS@ \ - @LIBUTP_LIBS@ \ - @GTK_LIBS@ \ -Index: repo/qt/qtr.pro -=================================================================== ---- repo.orig/qt/qtr.pro 2011-11-05 00:55:07.000000000 +0100 -+++ repo/qt/qtr.pro 2011-11-05 00:55:24.000000000 +0100 -@@ -23,8 +23,7 @@ - LIBS += $${TRANSMISSION_TOP}/third-party/libutp/libutp.a - } - LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a --LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a --LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a -+LIBS += -lminiupnpc -lnatpmp - unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt - win32:DEFINES += QT_DBUS - win32:LIBS += -levent-2.0 -lws2_32 -lintl -Index: repo/cli/Makefile.am -=================================================================== ---- repo.orig/cli/Makefile.am 2011-11-05 00:55:07.000000000 +0100 -+++ repo/cli/Makefile.am 2011-11-05 00:55:24.000000000 +0100 -@@ -18,8 +18,8 @@ - - transmission_cli_LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ -- $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ -+ @NATPMP_LIBS@ \ -+ @MINIUPNPC_LIBS@ \ - @DHT_LIBS@ \ - @LIBUTP_LIBS@ \ - @LIBEVENT_LIBS@ \ -Index: repo/libtransmission/upnp.c -=================================================================== ---- repo.orig/libtransmission/upnp.c 2011-11-05 00:55:07.000000000 +0100 -+++ repo/libtransmission/upnp.c 2011-11-05 00:55:24.000000000 +0100 -@@ -13,8 +13,8 @@ - #include - #include - --#include --#include -+#include -+#include - - #include "transmission.h" - #include "port-forwarding.h" -Index: repo/libtransmission/natpmp.c -=================================================================== ---- repo.orig/libtransmission/natpmp.c 2011-11-05 00:55:07.000000000 +0100 -+++ repo/libtransmission/natpmp.c 2011-11-05 00:55:24.000000000 +0100 -@@ -17,7 +17,7 @@ - #include /* evutil_inet_ntop() */ - - #define ENABLE_STRNATPMPERR --#include -+#include - - #include "transmission.h" - #include "natpmp.h" -Index: repo/third-party/libutp/utp.cpp -=================================================================== ---- repo.orig/third-party/libutp/utp.cpp 2011-11-05 00:55:07.000000000 +0100 -+++ repo/third-party/libutp/utp.cpp 2011-11-05 00:55:24.000000000 +0100 -@@ -1,4 +1,4 @@ --#include -+#include "StdAfx.h" - - #include "utp.h" - #include "templates.h" diff --git a/net-p2p/transmission/files/transmission-2.42-0005-build-with-natpmp1.patch b/net-p2p/transmission/files/transmission-2.42-0005-build-with-natpmp1.patch deleted file mode 100644 index 87071762f54c..000000000000 --- a/net-p2p/transmission/files/transmission-2.42-0005-build-with-natpmp1.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: repo/libtransmission/natpmp.c -=================================================================== ---- repo.orig/libtransmission/natpmp.c 2011-08-22 14:08:37.000000000 +0200 -+++ repo/libtransmission/natpmp.c 2011-08-22 14:14:39.000000000 +0200 -@@ -120,7 +120,7 @@ - - if( is_enabled && ( nat->state == TR_NATPMP_DISCOVER ) ) - { -- int val = initnatpmp( &nat->natpmp ); -+ int val = initnatpmp( &nat->natpmp, 0, NULL ); - logVal( "initnatpmp", val ); - val = sendpublicaddressrequest( &nat->natpmp ); - logVal( "sendpublicaddressrequest", val ); diff --git a/net-p2p/transmission/files/transmission-2.42-natpmp-system.patch b/net-p2p/transmission/files/transmission-2.42-natpmp-system.patch deleted file mode 100644 index cdf1872d7131..000000000000 --- a/net-p2p/transmission/files/transmission-2.42-natpmp-system.patch +++ /dev/null @@ -1,260 +0,0 @@ -diff -urN transmission-2.42.old/cli/Makefile.am transmission-2.42/cli/Makefile.am ---- transmission-2.42.old/cli/Makefile.am 2012-01-25 12:30:32.737406480 +0100 -+++ transmission-2.42/cli/Makefile.am 2012-01-25 15:25:14.903209957 +0100 -@@ -19,7 +19,7 @@ - transmission_cli_LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ - @LIBUPNP_LIBS@ \ -- $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ -+ @LIBNATPMP_LIBS@ \ - @DHT_LIBS@ \ - @LIBUTP_LIBS@ \ - @LIBEVENT_LIBS@ \ -diff -urN transmission-2.42.old/configure.ac transmission-2.42/configure.ac ---- transmission-2.42.old/configure.ac 2012-01-25 12:30:32.742406446 +0100 -+++ transmission-2.42/configure.ac 2012-01-25 14:45:14.264515474 +0100 -@@ -302,6 +302,29 @@ - AC_SUBST(LIBUPNP_CFLAGS) - AC_SUBST(LIBUPNP_LIBS) - AC_SUBST(LIBUPNP_LIBS_QT) -+ -+dnl ---------------------------------------------------------------------------- -+dnl -+dnl Allow usage of system natpmp library -+LIBNATPMP_CFLAGS="-I\$(top_srcdir)/third-party/libnatpmp/" -+LIBNATPMP_LIBS="\$(top_builddir)/third-party/natpmp/libnatpmp.a" -+LIBNATPMP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/natpmp/libnatpmp.a" -+build_bundled_natpmp="yes" -+AC_ARG_ENABLE([external-natpmp], -+ AS_HELP_STRING([--enable-external-natpmp],[Use system external-natpmp]), -+ [want_external_natpmp=${enableval}], -+ [want_external_natpmp=no]) -+if test "x$want_external_natpmp" != "xno" ; then -+ dnl Would be lovely if it had pkgconfig -+ LIBNATPMP_CFLAGS="" -+ LIBNATPMP_LIBS="-lnatpmp" -+ LIBNATPMP_LIBS_QT="-lnatpmp" -+ build_bundled_natpmp="no" -+fi -+AM_CONDITIONAL([BUILD_NATPMP],[test "x$build_bundled_natpmp" = "xyes"]) -+AC_SUBST(LIBNATPMP_CFLAGS) -+AC_SUBST(LIBNATPMP_LIBS) -+AC_SUBST(LIBNATPMP_LIBS_QT) - dnl ---------------------------------------------------------------------------- - dnl - dnl detection for the GTK+ client -diff -urN transmission-2.42.old/daemon/Makefile.am transmission-2.42/daemon/Makefile.am ---- transmission-2.42.old/daemon/Makefile.am 2012-01-25 12:30:32.742406446 +0100 -+++ transmission-2.42/daemon/Makefile.am 2012-01-25 12:48:10.476222152 +0100 -@@ -21,7 +21,7 @@ - LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ - @LIBUPNP_LIBS@ \ -- $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ -+ @LIBNATPMP_LIBS@ \ - @DHT_LIBS@ \ - @LIBUTP_LIBS@ \ - @LIBEVENT_LIBS@ \ -diff -urN transmission-2.42.old/gtk/Makefile.am transmission-2.42/gtk/Makefile.am ---- transmission-2.42.old/gtk/Makefile.am 2012-01-25 12:30:32.742406446 +0100 -+++ transmission-2.42/gtk/Makefile.am 2012-01-25 14:46:46.797886956 +0100 -@@ -85,7 +85,7 @@ - transmission_gtk_LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ - @LIBUPNP_LIBS@ \ -- $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ -+ @LIBNATPMP_LIBS@ \ - @DHT_LIBS@ \ - @LIBUTP_LIBS@ \ - @GTK_LIBS@ \ -diff -urN transmission-2.42.old/libtransmission/Makefile.am transmission-2.42/libtransmission/Makefile.am ---- transmission-2.42.old/libtransmission/Makefile.am 2012-01-25 12:30:32.739406466 +0100 -+++ transmission-2.42/libtransmission/Makefile.am 2012-01-25 15:10:54.507053909 +0100 -@@ -1,7 +1,5 @@ - AM_CPPFLAGS = \ -- -I. \ - -I$(top_srcdir) \ -- -I$(top_srcdir)/third-party/ \ - -D__TRANSMISSION__ \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" - -@@ -9,6 +7,7 @@ - @DHT_CFLAGS@ \ - @LIBUTP_CFLAGS@ \ - @LIBUPNP_CFLAGS@ \ -+ @LIBNATPMP_CFLAGS@ \ - @LIBEVENT_CFLAGS@ \ - @LIBCURL_CFLAGS@ \ - @OPENSSL_CFLAGS@ \ -@@ -91,7 +90,7 @@ - magnet.h \ - makemeta.h \ - metainfo.h \ -- natpmp.h \ -+ natpmp_local.h \ - net.h \ - peer-common.h \ - peer-io.h \ -@@ -141,7 +140,7 @@ - apps_ldadd = \ - ./libtransmission.a \ - @LIBUPNP_LIBS@ \ -- $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ -+ @LIBNATPMP_LIBS@ \ - @INTLLIBS@ \ - @DHT_LIBS@ \ - @LIBUTP_LIBS@ \ -diff -urN transmission-2.42.old/libtransmission/natpmp.c transmission-2.42/libtransmission/natpmp.c ---- transmission-2.42.old/libtransmission/natpmp.c 2012-01-25 12:30:32.739406466 +0100 -+++ transmission-2.42/libtransmission/natpmp.c 2012-01-25 15:11:10.186947403 +0100 -@@ -17,10 +17,10 @@ - #include /* evutil_inet_ntop() */ - - #define ENABLE_STRNATPMPERR --#include -+#include "natpmp.h" - - #include "transmission.h" --#include "natpmp.h" -+#include "natpmp_local.h" - #include "net.h" /* tr_netCloseSocket */ - #include "port-forwarding.h" - #include "utils.h" -diff -urN transmission-2.42.old/libtransmission/natpmp.h transmission-2.42/libtransmission/natpmp.h ---- transmission-2.42.old/libtransmission/natpmp.h 2012-01-25 12:30:32.739406466 +0100 -+++ transmission-2.42/libtransmission/natpmp.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,34 +0,0 @@ --/* -- * This file Copyright (C) Mnemosyne LLC -- * -- * This file is licensed by the GPL version 2. Works owned by the -- * Transmission project are granted a special exemption to clause 2(b) -- * so that the bulk of its code can remain under the MIT license. -- * This exemption does not extend to derived works not owned by -- * the Transmission project. -- * -- * $Id: natpmp.h 12204 2011-03-22 15:19:54Z jordan $ -- */ -- --#ifndef __TRANSMISSION__ --#error only libtransmission should #include this header. --#endif -- --#ifndef TR_NATPMP_H --#define TR_NATPMP_H 1 -- --/** -- * @addtogroup port_forwarding Port Forwarding -- * @{ -- */ -- --typedef struct tr_natpmp tr_natpmp; -- --tr_natpmp * tr_natpmpInit( void ); -- --void tr_natpmpClose( tr_natpmp * ); -- --int tr_natpmpPulse( tr_natpmp *, tr_port port, bool isEnabled, tr_port * public_port ); -- --/* @} */ --#endif -diff -urN transmission-2.42.old/libtransmission/natpmp_local.h transmission-2.42/libtransmission/natpmp_local.h ---- transmission-2.42.old/libtransmission/natpmp_local.h 1970-01-01 01:00:00.000000000 +0100 -+++ transmission-2.42/libtransmission/natpmp_local.h 2012-01-25 12:27:55.513474369 +0100 -@@ -0,0 +1,34 @@ -+/* -+ * This file Copyright (C) Mnemosyne LLC -+ * -+ * This file is licensed by the GPL version 2. Works owned by the -+ * Transmission project are granted a special exemption to clause 2(b) -+ * so that the bulk of its code can remain under the MIT license. -+ * This exemption does not extend to derived works not owned by -+ * the Transmission project. -+ * -+ * $Id: natpmp.h 12204 2011-03-22 15:19:54Z jordan $ -+ */ -+ -+#ifndef __TRANSMISSION__ -+#error only libtransmission should #include this header. -+#endif -+ -+#ifndef TR_NATPMP_H -+#define TR_NATPMP_H 1 -+ -+/** -+ * @addtogroup port_forwarding Port Forwarding -+ * @{ -+ */ -+ -+typedef struct tr_natpmp tr_natpmp; -+ -+tr_natpmp * tr_natpmpInit( void ); -+ -+void tr_natpmpClose( tr_natpmp * ); -+ -+int tr_natpmpPulse( tr_natpmp *, tr_port port, bool isEnabled, tr_port * public_port ); -+ -+/* @} */ -+#endif -diff -urN transmission-2.42.old/libtransmission/port-forwarding.c transmission-2.42/libtransmission/port-forwarding.c ---- transmission-2.42.old/libtransmission/port-forwarding.c 2012-01-25 12:30:32.739406466 +0100 -+++ transmission-2.42/libtransmission/port-forwarding.c 2012-01-25 15:19:34.684520801 +0100 -@@ -18,7 +18,7 @@ - #include - - #include "transmission.h" --#include "natpmp.h" -+#include "natpmp_local.h" - #include "net.h" - #include "peer-mgr.h" - #include "port-forwarding.h" -diff -urN transmission-2.42.old/qt/config.in transmission-2.42/qt/config.in ---- transmission-2.42.old/qt/config.in 2012-01-25 12:30:32.741406452 +0100 -+++ transmission-2.42/qt/config.in 2012-01-25 14:47:43.390502589 +0100 -@@ -1,3 +1,4 @@ - LIBUTP_LIBS = @LIBUTP_LIBS_QT@ - MINIUPNP_LIBS = @LIBUPNP_LIBS_QT@ -+NATPNP_LIBS = @LIBNATPNP_LIBS_QT@ - -diff -urN transmission-2.42.old/qt/qtr.pro transmission-2.42/qt/qtr.pro ---- transmission-2.42.old/qt/qtr.pro 2012-01-25 12:30:32.742406446 +0100 -+++ transmission-2.42/qt/qtr.pro 2012-01-25 14:47:32.270578114 +0100 -@@ -24,7 +24,7 @@ - LIBS += $${LIBUTP_LIBS} - LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a - LIBS += $${MINIUPNP_LIBS} --LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a -+LIBS += $${NATPNP_LIBS} - unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt - win32:DEFINES += QT_DBUS - win32:LIBS += -levent-2.0 -lws2_32 -lintl -diff -urN transmission-2.42.old/third-party/Makefile.am transmission-2.42/third-party/Makefile.am ---- transmission-2.42.old/third-party/Makefile.am 2012-01-25 12:30:32.702406719 +0100 -+++ transmission-2.42/third-party/Makefile.am 2012-01-25 14:45:04.312583068 +0100 -@@ -4,10 +4,13 @@ - if BUILD_MINIUPNP - MINIUPNP_DIR = miniupnp - endif -+if BUILD_NATPMP -+ NATPMP_DIR = libnatpmp -+endif - - SUBDIRS = \ - dht \ -- libnatpmp \ -+ $(NATPMP_DIR) \ - $(MINIUPNP_DIR) \ - $(UTP_DIR) - -diff -urN transmission-2.42.old/utils/Makefile.am transmission-2.42/utils/Makefile.am ---- transmission-2.42.old/utils/Makefile.am 2012-01-25 12:30:32.744406434 +0100 -+++ transmission-2.42/utils/Makefile.am 2012-01-25 12:48:14.787192871 +0100 -@@ -27,7 +27,7 @@ - transmission_create_LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ - @LIBUPNP_LIBS@ \ -- $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ -+ @LIBNATPMP_LIBS@ \ - @INTLLIBS@ \ - @DHT_LIBS@ \ - @LIBUTP_LIBS@ \ diff --git a/net-p2p/transmission/files/transmission-2.42-respect-cflags.patch b/net-p2p/transmission/files/transmission-2.42-respect-cflags.patch deleted file mode 100644 index bbd0678cf30b..000000000000 --- a/net-p2p/transmission/files/transmission-2.42-respect-cflags.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN transmission-2.42.old/configure.ac transmission-2.42/configure.ac ---- transmission-2.42.old/configure.ac 2011-10-20 03:57:56.703752495 +0200 -+++ transmission-2.42/configure.ac 2012-01-25 12:03:05.754593046 +0100 -@@ -77,7 +77,7 @@ - AC_C_INLINE - if test "x$GCC" = "xyes" ; then - -- CFLAGS="$CFLAGS -std=gnu99 -ggdb3 -Wall -W -Wpointer-arith -Wformat-security -Wcast-align -Wundef -Wcast-align -Wstrict-prototypes -Wmissing-declarations -Wmissing-format-attribute -Wredundant-decls -Wnested-externs -Wunused-parameter -Wwrite-strings -Winline -Wfloat-equal" -+ CFLAGS="$CFLAGS -std=gnu99 -W -Wpointer-arith -Wformat-security -Wcast-align -Wundef -Wcast-align -Wstrict-prototypes -Wmissing-declarations -Wmissing-format-attribute -Wredundant-decls -Wnested-externs -Wunused-parameter -Wwrite-strings -Winline -Wfloat-equal" - - dnl figure out gcc version - AC_MSG_CHECKING([gcc version]) diff --git a/net-p2p/transmission/files/transmission-daemon.initd.7 b/net-p2p/transmission/files/transmission-daemon.initd.7 deleted file mode 100644 index d4ddb66127b1..000000000000 --- a/net-p2p/transmission/files/transmission-daemon.initd.7 +++ /dev/null @@ -1,72 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/files/transmission-daemon.initd.7,v 1.2 2011/12/04 10:35:07 swegener Exp $ - -extra_started_commands="reload" -description="Transmission is a fast, easy and free bittorrent client" -description_start="Start transmission-daemon server and web interface" -description_stop="Stop transmission-daemon server and web interface" -description_reload="Reload transmission-daemon settings" - -pidfile=/var/run/transmission/transmission.pid -config_dir=/var/transmission/config -download_dir=/var/transmission/downloads -logfile=${logfile:-/var/log/transmission/transmission.log} -runas_user=${runas_user:-transmission:transmission} - -SSD_OPTIONS="" - -depend() { - need net -} - -check_config() { - if [ ! -d /var/run/transmission/ ]; then - mkdir /var/run/transmission/ - if [ -n "${runas_user}" ]; then - chown -R ${runas_user} /var/run/transmission/ - fi - fi - - # In case no config directory option passed use default - if ! $(echo ${TRANSMISSION_OPTIONS} | grep -q -e '\B-g' -e '\B--config-dir'); then - TRANSMISSION_OPTIONS="${TRANSMISSION_OPTIONS} --config-dir ${config_dir}" - # put download dir location on first run (and take it from config later) - if [ ! -f ${config_dir}/settings.json ]; then - TRANSMISSION_OPTIONS="${TRANSMISSION_OPTIONS} --download-dir ${download_dir}" - fi - fi - - if [ -n "${runas_user}" ]; then - if [ -f /etc/init.d/sysfs ]; then - SSD_OPTIONS="${SSD_OPTIONS} --user ${runas_user}" - else - SSD_OPTIONS="${SSD_OPTIONS} --chuid ${runas_user}" - fi - fi -} - -start() { - check_config - - ebegin "Starting transmission daemon" - start-stop-daemon --start --quiet --pidfile ${pidfile} ${SSD_OPTIONS} \ - --exec /usr/bin/transmission-daemon -- --pid-file ${pidfile} \ - $(test ${logfile} != "syslog" && echo --logfile ${logfile}) \ - ${TRANSMISSION_OPTIONS} - eend $? -} - -stop() { - ebegin "Stopping transmission daemon" - start-stop-daemon --stop --quiet --retry TERM/45/QUIT/15 --pidfile ${pidfile} - eend $? -} - -reload() { - ebegin "Reloading transmission configuration" - start-stop-daemon --signal HUP --pidfile ${pidfile} - eend $? -} - diff --git a/net-p2p/transmission/metadata.xml b/net-p2p/transmission/metadata.xml index 7407c9c58a70..bd5dcb93e8f5 100644 --- a/net-p2p/transmission/metadata.xml +++ b/net-p2p/transmission/metadata.xml @@ -3,12 +3,16 @@ net-p2p - pva@gentoo.org - Peter Volkov - + pva@gentoo.org + Peter Volkov + + + ssuominen@gentoo.org + Samuli Suominen + - Enable sound event support with media-libs/libcanberra - Adds support for µTP (Micro Transport Protocol) - Enable gtk3 frontend instead of gtk2 one + Enable Ayatana support with dev-libs/libappindicator + Enable sound event support with media-libs/libcanberra + Adds support for µTP (Micro Transport Protocol) diff --git a/net-p2p/transmission/transmission-2.31-r1.ebuild b/net-p2p/transmission/transmission-2.31-r1.ebuild deleted file mode 100644 index c8dcd13b85c0..000000000000 --- a/net-p2p/transmission/transmission-2.31-r1.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.31-r1.ebuild,v 1.2 2011/06/16 09:30:23 pva Exp $ - -EAPI=4 -inherit eutils fdo-mime gnome2-utils qt4-r2 autotools - -MY_P="${P/_beta/b}" - -DESCRIPTION="A Fast, Easy and Free BitTorrent client" -HOMEPAGE="http://www.transmissionbt.com/" -SRC_URI="http://download.transmissionbt.com/${PN}/files/${MY_P}.tar.xz" - -LICENSE="MIT GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gtk kde libnotify libcanberra qt4 utp" - -# >=dev-libs/glib-2.28 is required for updated mime support. This makes gconf -# unnecessary for handling magnet links -RDEPEND=" - sys-libs/zlib - >=dev-libs/libevent-2.0.10 - >=dev-libs/openssl-0.9.4 - || ( >=net-misc/curl-7.16.3[ssl] - >=net-misc/curl-7.16.3[gnutls] ) - net-libs/miniupnpc - gtk? ( >=dev-libs/glib-2.28:2 - >=x11-libs/gtk+-2.12:2 - >=dev-libs/dbus-glib-0.70 - libnotify? ( >=x11-libs/libnotify-0.4.3 ) - libcanberra? ( >=media-libs/libcanberra-0.10 ) ) - qt4? ( x11-libs/qt-gui:4[dbus] )" -DEPEND="${RDEPEND} - >=sys-devel/libtool-2.2.6b - sys-devel/gettext - >=dev-util/intltool-0.40 - dev-util/pkgconfig - sys-apps/sed" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup transmission - enewuser transmission -1 -1 -1 transmission -} - -src_prepare() { - epatch "${FILESDIR}/${P}-qt-libutp.patch" #368187 - epatch "${FILESDIR}/${P}-0001-configure.ac.patch" - epatch "${FILESDIR}/${P}-0002-config.in-4-qt.pro.patch" - epatch "${FILESDIR}/${P}-0003-system-miniupnpc.patch" - epatch "${FILESDIR}/${P}-no-tests.patch" - mv third-party/miniupnp{,c} || die - eautoreconf - - sed -i -e 's:-ggdb3::g' configure || die - # Magnet link support - if use kde; then - cat > qt/transmission-magnet.protocol <<-EOF - [Protocol] - exec=transmission-qt '%u' - protocol=magnet - Icon=transmission - input=none - output=none - helper=true - listing= - reading=false - writing=false - makedir=false - deleting=false - EOF - fi -} - -src_configure() { - # cli and daemon doesn't have external deps and are enabled by default - econf \ - $(use_enable gtk) \ - $(use_enable utp) \ - $(use gtk && use_enable libnotify) \ - $(use gtk && use_enable libcanberra) \ - --enable-external-miniupnp \ - --disable-gconf2 - - use qt4 && cd qt && eqmake4 qtr.pro -} - -src_compile() { - emake - use qt4 && cd qt && emake -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc AUTHORS NEWS qt/README.txt - rm -f "${ED}"/usr/share/${PN}/web/LICENSE - - newinitd "${FILESDIR}"/${PN}-daemon.initd.8 ${PN}-daemon - newconfd "${FILESDIR}"/${PN}-daemon.confd.3 ${PN}-daemon - - keepdir /var/{transmission/{config,downloads},log/transmission} - fowners -R transmission:transmission /var/{transmission/{,config,downloads},log/transmission} - - if use qt4; then - cd qt - emake INSTALL_ROOT="${D}/usr" install - insinto /usr/share/applications/ - doins transmission-qt.desktop - mv icons/transmission{,-qt}.png - doicon icons/transmission-qt.png - if use kde; then - insinto /usr/share/kde4/services/ - doins transmission-magnet.protocol - fi - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - - # Keep default permissions on default dirs - einfo "Seting owners of /var/{transmission/{,config,downloads},log/transmission}" - chown -R transmission:transmission /var/{transmission/{,config,downloads},log/transmission} - - ewarn "If you use transmission-daemon, please, set 'rpc-username' and" - ewarn "'rpc-password' (in plain text, transmission-daemon will hash it on" - ewarn "start) in settings.json file located at /var/transmission/config or" - ewarn "any other appropriate config directory." - ewarn - ewarn "You must change download location after you change a user daemon" - ewarn "starts as, or it'll refuse to start, see bug #349867 for details." - if use utp; then - ewarn - ewarn "Since uTP is enabled ${PN} needs large kernel buffers for the UDP socket." - ewarn "Please, add into /etc/sysctl.conf following lines:" - ewarn " net.core.rmem_max = 4194304" - ewarn " net.core.wmem_max = 1048576" - ewarn "and run sysctl -p" - fi -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/net-p2p/transmission/transmission-2.31.ebuild b/net-p2p/transmission/transmission-2.31.ebuild deleted file mode 100644 index e742758681c0..000000000000 --- a/net-p2p/transmission/transmission-2.31.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.31.ebuild,v 1.2 2011/05/23 07:32:00 pva Exp $ - -EAPI=4 -inherit eutils fdo-mime gnome2-utils qt4-r2 - -MY_P="${P/_beta/b}" - -DESCRIPTION="A Fast, Easy and Free BitTorrent client" -HOMEPAGE="http://www.transmissionbt.com/" -SRC_URI="http://download.transmissionbt.com/${PN}/files/${MY_P}.tar.xz" - -LICENSE="MIT GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="gtk kde libnotify libcanberra qt4 utp" - -# >=dev-libs/glib-2.28 is required for updated mime support. This makes gconf -# unnecessary for handling magnet links -RDEPEND=" - sys-libs/zlib - >=dev-libs/libevent-2.0.10 - >=dev-libs/openssl-0.9.4 - || ( >=net-misc/curl-7.16.3[ssl] - >=net-misc/curl-7.16.3[gnutls] ) - gtk? ( >=dev-libs/glib-2.28:2 - >=x11-libs/gtk+-2.12:2 - >=dev-libs/dbus-glib-0.70 - libnotify? ( >=x11-libs/libnotify-0.4.3 ) - libcanberra? ( >=media-libs/libcanberra-0.10 ) ) - qt4? ( x11-libs/qt-gui:4[dbus] )" -DEPEND="${RDEPEND} - >=sys-devel/libtool-2.2.6b - sys-devel/gettext - >=dev-util/intltool-0.40 - dev-util/pkgconfig - sys-apps/sed" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup transmission - enewuser transmission -1 -1 -1 transmission -} - -src_prepare() { - epatch "${FILESDIR}/${P}-qt-libutp.patch" #368187 - - sed -i -e 's:-ggdb3::g' configure || die - # Magnet link support - if use kde; then - cat > qt/transmission-magnet.protocol <<-EOF - [Protocol] - exec=transmission-qt '%u' - protocol=magnet - Icon=transmission - input=none - output=none - helper=true - listing= - reading=false - writing=false - makedir=false - deleting=false - EOF - fi -} - -src_configure() { - # cli and daemon doesn't have external deps and are enabled by default - econf \ - $(use_enable gtk) \ - $(use_enable utp) \ - $(use gtk && use_enable libnotify) \ - $(use gtk && use_enable libcanberra) \ - --disable-gconf2 - - use qt4 && cd qt && eqmake4 qtr.pro -} - -src_compile() { - emake - use qt4 && cd qt && emake -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc AUTHORS NEWS qt/README.txt - rm -f "${ED}"/usr/share/${PN}/web/LICENSE - - newinitd "${FILESDIR}"/${PN}-daemon.initd.7 ${PN}-daemon - newconfd "${FILESDIR}"/${PN}-daemon.confd.3 ${PN}-daemon - - keepdir /var/{transmission/{config,downloads},log/transmission} - fowners -R transmission:transmission /var/{transmission/{,config,downloads},log/transmission} - - if use qt4; then - cd qt - emake INSTALL_ROOT="${D}/usr" install - insinto /usr/share/applications/ - doins transmission-qt.desktop - mv icons/transmission{,-qt}.png - doicon icons/transmission-qt.png - if use kde; then - insinto /usr/share/kde4/services/ - doins transmission-magnet.protocol - fi - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - - # Keep default permissions on default dirs - einfo "Seting owners of /var/{transmission/{,config,downloads},log/transmission}" - chown -R transmission:transmission /var/{transmission/{,config,downloads},log/transmission} - - ewarn "If you use transmission-daemon, please, set 'rpc-username' and" - ewarn "'rpc-password' (in plain text, transmission-daemon will hash it on" - ewarn "start) in settings.json file located at /var/transmission/config or" - ewarn "any other appropriate config directory." - ewarn - ewarn "You must change download location after you change a user daemon" - ewarn "starts as, or it'll refuse to start, see bug #349867 for details." -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/net-p2p/transmission/transmission-2.33-r1.ebuild b/net-p2p/transmission/transmission-2.33-r1.ebuild deleted file mode 100644 index d305f2a2db24..000000000000 --- a/net-p2p/transmission/transmission-2.33-r1.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.33-r1.ebuild,v 1.1 2011/08/05 21:00:38 pva Exp $ - -EAPI=4 -inherit eutils fdo-mime gnome2-utils qt4-r2 autotools - -MY_P="${P/_beta/b}" - -DESCRIPTION="A Fast, Easy and Free BitTorrent client" -HOMEPAGE="http://www.transmissionbt.com/" -SRC_URI="http://download.transmissionbt.com/${PN}/files/${MY_P}.tar.xz" - -LICENSE="MIT GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gtk kde libnotify libcanberra nls qt4 utp" - -# >=dev-libs/glib-2.28 is required for updated mime support. This makes gconf -# unnecessary for handling magnet links -RDEPEND=" - sys-libs/zlib - >=dev-libs/libevent-2.0.10 - >=dev-libs/openssl-0.9.4 - || ( >=net-misc/curl-7.16.3[ssl] - >=net-misc/curl-7.16.3[gnutls] ) - net-libs/miniupnpc - gtk? ( >=dev-libs/glib-2.28:2 - >=x11-libs/gtk+-2.12:2 - >=dev-libs/dbus-glib-0.70 - libnotify? ( >=x11-libs/libnotify-0.4.3 ) - libcanberra? ( >=media-libs/libcanberra-0.10 ) ) - qt4? ( x11-libs/qt-gui:4[dbus] )" -DEPEND="${RDEPEND} - >=sys-devel/libtool-2.2.6b - nls? ( sys-devel/gettext - >=dev-util/intltool-0.40 ) - dev-util/pkgconfig - sys-apps/sed" - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE="gtk? ( nls )" - -pkg_setup() { - enewgroup transmission - enewuser transmission -1 -1 -1 transmission -} - -src_prepare() { - # https://trac.transmissionbt.com/ticket/4323 - epatch "${FILESDIR}/${P}-0001-configure.ac.patch" - epatch "${FILESDIR}/${P}-0002-config.in-4-qt.pro.patch" - epatch "${FILESDIR}/${P}-0003-system-miniupnpc.patch" - - # Upstream is not interested in this: https://trac.transmissionbt.com/ticket/4324 - sed -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' -i libtransmission/Makefile.am || die - - #mv third-party/miniupnp{,c} || die - eautoreconf - - sed -i -e 's:-ggdb3::g' configure || die - # Magnet link support - if use kde; then - cat > qt/transmission-magnet.protocol <<-EOF - [Protocol] - exec=transmission-qt '%u' - protocol=magnet - Icon=transmission - input=none - output=none - helper=true - listing= - reading=false - writing=false - makedir=false - deleting=false - EOF - fi -} - -src_configure() { - # cli and daemon doesn't have external deps and are enabled by default - econf \ - $(use_enable nls) \ - $(use_enable gtk) \ - $(use_enable utp) \ - $(use gtk && use_enable libnotify) \ - $(use gtk && use_enable libcanberra) \ - --enable-external-miniupnp - - use qt4 && cd qt && eqmake4 qtr.pro -} - -src_compile() { - emake - use qt4 && cd qt && emake -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc AUTHORS NEWS qt/README.txt - rm -f "${ED}"/usr/share/${PN}/web/LICENSE - - newinitd "${FILESDIR}"/${PN}-daemon.initd.8 ${PN}-daemon - newconfd "${FILESDIR}"/${PN}-daemon.confd.3 ${PN}-daemon - - keepdir /var/{transmission/{config,downloads},log/transmission} - fowners -R transmission:transmission /var/{transmission/{,config,downloads},log/transmission} - - if use qt4; then - cd qt - emake INSTALL_ROOT="${D}/usr" install - insinto /usr/share/applications/ - doins transmission-qt.desktop - mv icons/transmission{,-qt}.png - doicon icons/transmission-qt.png - if use kde; then - insinto /usr/share/kde4/services/ - doins transmission-magnet.protocol - fi - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - - # Keep default permissions on default dirs - einfo "Seting owners of /var/{transmission/{,config,downloads},log/transmission}" - chown -R transmission:transmission /var/{transmission/{,config,downloads},log/transmission} - - ewarn "If you use transmission-daemon, please, set 'rpc-username' and" - ewarn "'rpc-password' (in plain text, transmission-daemon will hash it on" - ewarn "start) in settings.json file located at /var/transmission/config or" - ewarn "any other appropriate config directory." - ewarn - ewarn "You must change download location after you change a user daemon" - ewarn "starts as, or it'll refuse to start, see bug #349867 for details." - if use utp; then - ewarn - ewarn "Since uTP is enabled ${PN} needs large kernel buffers for the UDP socket." - ewarn "Please, add into /etc/sysctl.conf following lines:" - ewarn " net.core.rmem_max = 4194304" - ewarn " net.core.wmem_max = 1048576" - ewarn "and run sysctl -p" - fi -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/net-p2p/transmission/transmission-2.33.ebuild b/net-p2p/transmission/transmission-2.33.ebuild deleted file mode 100644 index 4e730eb13683..000000000000 --- a/net-p2p/transmission/transmission-2.33.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.33.ebuild,v 1.1 2011/07/24 08:54:10 pva Exp $ - -EAPI=4 -inherit eutils fdo-mime gnome2-utils qt4-r2 autotools - -MY_P="${P/_beta/b}" - -DESCRIPTION="A Fast, Easy and Free BitTorrent client" -HOMEPAGE="http://www.transmissionbt.com/" -SRC_URI="http://download.transmissionbt.com/${PN}/files/${MY_P}.tar.xz" - -LICENSE="MIT GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gtk kde libnotify libcanberra nls qt4 utp" - -# >=dev-libs/glib-2.28 is required for updated mime support. This makes gconf -# unnecessary for handling magnet links -RDEPEND=" - sys-libs/zlib - >=dev-libs/libevent-2.0.10 - >=dev-libs/openssl-0.9.4 - || ( >=net-misc/curl-7.16.3[ssl] - >=net-misc/curl-7.16.3[gnutls] ) - net-libs/miniupnpc - gtk? ( >=dev-libs/glib-2.28:2 - >=x11-libs/gtk+-2.12:2 - >=dev-libs/dbus-glib-0.70 - libnotify? ( >=x11-libs/libnotify-0.4.3 ) - libcanberra? ( >=media-libs/libcanberra-0.10 ) ) - qt4? ( x11-libs/qt-gui:4[dbus] )" -DEPEND="${RDEPEND} - >=sys-devel/libtool-2.2.6b - nls? ( sys-devel/gettext - >=dev-util/intltool-0.40 ) - dev-util/pkgconfig - sys-apps/sed" - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE="gtk? ( nls )" - -pkg_setup() { - enewgroup transmission - enewuser transmission -1 -1 -1 transmission -} - -src_prepare() { - # https://trac.transmissionbt.com/ticket/4323 - epatch "${FILESDIR}/${P}-0001-configure.ac.patch" - epatch "${FILESDIR}/${P}-0002-config.in-4-qt.pro.patch" - epatch "${FILESDIR}/${P}-0003-system-miniupnpc.patch" - - # Upstream is not interested in this: https://trac.transmissionbt.com/ticket/4324 - sed -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' -i libtransmission/Makefile.am || die - - mv third-party/miniupnp{,c} || die - eautoreconf - - sed -i -e 's:-ggdb3::g' configure || die - # Magnet link support - if use kde; then - cat > qt/transmission-magnet.protocol <<-EOF - [Protocol] - exec=transmission-qt '%u' - protocol=magnet - Icon=transmission - input=none - output=none - helper=true - listing= - reading=false - writing=false - makedir=false - deleting=false - EOF - fi -} - -src_configure() { - # cli and daemon doesn't have external deps and are enabled by default - econf \ - $(use_enable nls) \ - $(use_enable gtk) \ - $(use_enable utp) \ - $(use gtk && use_enable libnotify) \ - $(use gtk && use_enable libcanberra) \ - --enable-external-miniupnp - - use qt4 && cd qt && eqmake4 qtr.pro -} - -src_compile() { - emake - use qt4 && cd qt && emake -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc AUTHORS NEWS qt/README.txt - rm -f "${ED}"/usr/share/${PN}/web/LICENSE - - newinitd "${FILESDIR}"/${PN}-daemon.initd.8 ${PN}-daemon - newconfd "${FILESDIR}"/${PN}-daemon.confd.3 ${PN}-daemon - - keepdir /var/{transmission/{config,downloads},log/transmission} - fowners -R transmission:transmission /var/{transmission/{,config,downloads},log/transmission} - - if use qt4; then - cd qt - emake INSTALL_ROOT="${D}/usr" install - insinto /usr/share/applications/ - doins transmission-qt.desktop - mv icons/transmission{,-qt}.png - doicon icons/transmission-qt.png - if use kde; then - insinto /usr/share/kde4/services/ - doins transmission-magnet.protocol - fi - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - - # Keep default permissions on default dirs - einfo "Seting owners of /var/{transmission/{,config,downloads},log/transmission}" - chown -R transmission:transmission /var/{transmission/{,config,downloads},log/transmission} - - ewarn "If you use transmission-daemon, please, set 'rpc-username' and" - ewarn "'rpc-password' (in plain text, transmission-daemon will hash it on" - ewarn "start) in settings.json file located at /var/transmission/config or" - ewarn "any other appropriate config directory." - ewarn - ewarn "You must change download location after you change a user daemon" - ewarn "starts as, or it'll refuse to start, see bug #349867 for details." - if use utp; then - ewarn - ewarn "Since uTP is enabled ${PN} needs large kernel buffers for the UDP socket." - ewarn "Please, add into /etc/sysctl.conf following lines:" - ewarn " net.core.rmem_max = 4194304" - ewarn " net.core.wmem_max = 1048576" - ewarn "and run sysctl -p" - fi -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/net-p2p/transmission/transmission-2.42.ebuild b/net-p2p/transmission/transmission-2.42-r1.ebuild similarity index 55% rename from net-p2p/transmission/transmission-2.42.ebuild rename to net-p2p/transmission/transmission-2.42-r1.ebuild index 090297581b0e..d8c003abfa4b 100644 --- a/net-p2p/transmission/transmission-2.42.ebuild +++ b/net-p2p/transmission/transmission-2.42-r1.ebuild @@ -1,41 +1,35 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.42.ebuild,v 1.1 2012/01/25 14:33:01 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.42-r1.ebuild,v 1.2 2012/01/26 22:01:24 mr_bones_ Exp $ EAPI=4 -inherit eutils fdo-mime gnome2-utils qt4-r2 autotools - -MY_P="${P/_beta/b}" +inherit autotools eutils fdo-mime gnome2-utils qt4-r2 DESCRIPTION="A Fast, Easy and Free BitTorrent client" HOMEPAGE="http://www.transmissionbt.com/" -SRC_URI="http://download.transmissionbt.com/${PN}/files/${MY_P}.tar.xz" +SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.xz + http://dev.gentoo.org/~ssuominen/${P}-patchset-1.tar.xz" -LICENSE="MIT GPL-2" +LICENSE="GPL-2 MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="gtk gtk3 kde nls qt4 utp" +IUSE="ayatana gtk kde nls qt4" RDEPEND=" >=dev-libs/libevent-2.0.10 - >=dev-libs/openssl-0.9.4 + dev-libs/openssl:0 >=net-misc/curl-7.16.3[ssl] >=net-libs/miniupnpc-1.6 net-libs/libnatpmp sys-libs/zlib gtk? ( - >=dev-libs/dbus-glib-0.70 - >=dev-libs/glib-2.28:2 - dev-libs/libappindicator:0 - >=x11-libs/gtk+-2.22:2 - ) - gtk3? ( - >=dev-libs/dbus-glib-0.70 - >=dev-libs/glib-2.28:2 - dev-libs/libappindicator:3 + >=dev-libs/dbus-glib-0.98 + >=dev-libs/glib-2.28 >=x11-libs/gtk+-3.2:3 - ) + ayatana? ( dev-libs/libappindicator:3 ) + ) qt4? ( x11-libs/qt-gui:4[dbus] )" + DEPEND="${RDEPEND} dev-util/intltool dev-util/pkgconfig @@ -45,17 +39,12 @@ DEPEND="${RDEPEND} nls? ( >=dev-util/intltool-0.40 sys-devel/gettext - )" -# Intltool/gettext are required as far as we eautoreconf for -# its autotools macros. -# If the source is not eautoreconfed we can keep it in nls. - -S="${WORKDIR}/${MY_P}" + )" +# note: gettext is always a depend with eautoreconf REQUIRED_USE=" - gtk? ( nls !gtk3 ) - gtk3? ( nls !gtk ) -" + ayatana? ( gtk ) + gtk? ( nls )" DOCS="AUTHORS NEWS qt/README.txt" @@ -65,27 +54,22 @@ pkg_setup() { } src_prepare() { - # https://trac.transmissionbt.com/ticket/4323 - epatch "${FILESDIR}/${PN}-2.42-0001-configure.ac.patch" - epatch "${FILESDIR}/${PN}-2.33-0002-config.in-4-qt.pro.patch" - epatch "${FILESDIR}/${PN}-2.41-0003-system-miniupnpc.patch" - epatch "${FILESDIR}/${PN}-2.42-0005-build-with-natpmp1.patch" - - # Fix build failure with USE=-utp, bug #290737 - epatch "${FILESDIR}/${PN}-2.41-noutp.patch" + # note: this patchset has useless bits for optionalizing UTP which can be + # dropped from next one + EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patches - # Use system cflags - epatch "${FILESDIR}/${PN}-2.42-respect-cflags.patch" + # note: http://trac.transmissionbt.com/ticket/4324 + sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' libtransmission/Makefile.am || die - # Use system natpmp - epatch "${FILESDIR}/${PN}-2.42-natpmp-system.patch" + if ! use ayatana; then + sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die + fi - # Upstream is not interested in this: https://trac.transmissionbt.com/ticket/4324 - sed -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' -i libtransmission/Makefile.am || die + sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die eautoreconf - # Magnet link support + # note: magnet link support if use kde; then cat > qt/transmission-magnet.protocol <<-EOF [Protocol] @@ -105,19 +89,13 @@ src_prepare() { } src_configure() { - local gtkver - - use gtk && gtkver="--with-gtk=2" - use gtk3 && gtkver="--with-gtk=3" - use gtk || use gtk3 || gtkver="--without-gtk" - - # cli and daemon doesn't have external deps and are enabled by default + # note: cli and daemon doesn't have external deps and are enabled by default econf \ - ${gtkver} \ $(use_enable nls) \ - $(use_enable utp) \ + --enable-utp \ --enable-external-miniupnp \ - --enable-external-natpmp + --enable-external-natpmp \ + $(use_with gtk) use qt4 && cd qt && eqmake4 qtr.pro } @@ -140,10 +118,10 @@ src_install() { if use qt4; then cd qt - emake INSTALL_ROOT="${D}/usr" install - insinto /usr/share/applications/ + emake INSTALL_ROOT="${D}"/usr install + insinto /usr/share/applications doins transmission-qt.desktop - mv icons/transmission{,-qt}.png + mv -vf icons/transmission{,-qt}.png doicon icons/transmission-qt.png if use kde; then insinto /usr/share/kde4/services/ @@ -169,14 +147,11 @@ pkg_postinst() { elog "some sound them is selected. For this go:" elog "Gnome/system/preferences/sound themes tab and 'sound theme: default'" elog - if use utp; then - ewarn - ewarn "Since uTP is enabled ${PN} needs large kernel buffers for the UDP socket." - ewarn "Please, add into /etc/sysctl.conf following lines:" - ewarn " net.core.rmem_max = 4194304" - ewarn " net.core.wmem_max = 1048576" - ewarn "and run sysctl -p" - fi + ewarn "Since uTP is enabled ${PN} needs large kernel buffers for the UDP socket." + ewarn "Please, add into /etc/sysctl.conf following lines:" + ewarn " net.core.rmem_max = 4194304" + ewarn " net.core.wmem_max = 1048576" + ewarn "and run sysctl -p" } pkg_postrm() { diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 53c1c571b8c1..fdba7fb5d16f 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -215,6 +215,7 @@ app-backup/duplicity:s3 - Support for backing up to the Amazon S3 system app-backup/spideroak-bin:headless - Build without graphic frontend app-backup/spideroak-bin:pycurl-bundled - Use bundled pycurl app-backup/spideroak-bin:qt-bundled - Use bundled Qt4 libraries +app-backup/spideroak-bin:system-libs - Use the system libraries rather than bundled app-backup/tsm:hsm - Installs Tivoli Storage Manager for Space Management app-benchmarks/bootchart:acct - Enable process accounting app-benchmarks/jmeter:beanshell - Enable BeanShell scripting support @@ -4196,7 +4197,7 @@ net-p2p/mldonkey:guionly - enable client build only net-p2p/mldonkey:magic - enable use of libmagic net-p2p/rtorrent:color - Add custom color support for torrent list net-p2p/rtorrent:daemon - Uses app-misc/screen to daemonize this application -net-p2p/transmission:gtk3 - Enable gtk3 frontend instead of gtk2 one +net-p2p/transmission:ayatana - Enable Ayatana support with dev-libs/libappindicator net-p2p/transmission:libcanberra - Enable sound event support with media-libs/libcanberra net-p2p/transmission:utp - Adds support for µTP (Micro Transport Protocol) net-print/cups:filters - Pull in net-print/foomatic-filters for filtering by default. diff --git a/sci-chemistry/chemtool/Manifest b/sci-chemistry/chemtool/Manifest index f1a6dfd77af7..f91d09079dcc 100644 --- a/sci-chemistry/chemtool/Manifest +++ b/sci-chemistry/chemtool/Manifest @@ -1 +1,2 @@ DIST chemtool-1.6.12.tar.gz 733454 RMD160 b3501d4af20164e6ec3227970d6daf2950e5506c SHA1 23ab6555fcad2b85c3ecdde7ee4b62f1de1c7acc SHA256 24db06e47a3b2ab1c8882eb99961d788e0d7fa89d5fbd9b87a70352c88303408 +DIST chemtool-1.6.13.tar.gz 838868 RMD160 c54494fdda19deb0115839263c7db5b9825bf56b SHA1 03d139cfefe9e4e8957239d8d16c56dc6a369090 SHA256 31a07683f55305c3e0c4d7af3bc3d1d3a9a2eff4d836455fe1e382962f0aa0c8 diff --git a/sci-chemistry/chemtool/chemtool-1.6.12-r1.ebuild b/sci-chemistry/chemtool/chemtool-1.6.12-r1.ebuild index d4e4e835c64c..6d25c0ddf643 100644 --- a/sci-chemistry/chemtool/chemtool-1.6.12-r1.ebuild +++ b/sci-chemistry/chemtool/chemtool-1.6.12-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/chemtool-1.6.12-r1.ebuild,v 1.1 2011/05/23 15:18:31 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/chemtool-1.6.12-r1.ebuild,v 1.2 2012/01/26 18:38:30 jlec Exp $ EAPI=4 @@ -16,8 +16,11 @@ KEYWORDS="~amd64 ~ppc ~x86" IUSE="emf gnome nls" RDEPEND=" + dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 + x11-libs/libX11 + x11-libs/pango emf? ( media-libs/libemf )" DEPEND="${RDEPEND} dev-util/pkgconfig" diff --git a/sci-chemistry/chemtool/chemtool-1.6.12.ebuild b/sci-chemistry/chemtool/chemtool-1.6.12.ebuild index 6093bf8c8d6e..4a726ae34acd 100644 --- a/sci-chemistry/chemtool/chemtool-1.6.12.ebuild +++ b/sci-chemistry/chemtool/chemtool-1.6.12.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/chemtool-1.6.12.ebuild,v 1.6 2011/05/23 15:18:32 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/chemtool-1.6.12.ebuild,v 1.7 2012/01/26 18:38:30 jlec Exp $ EAPI=1 @@ -16,8 +16,11 @@ KEYWORDS="amd64 ppc x86" IUSE="gnome nls" RDEPEND=" + dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 + x11-libs/libX11 + x11-libs/pango x86? ( media-libs/libemf )" DEPEND="${RDEPEND} dev-util/pkgconfig" diff --git a/sci-chemistry/chemtool/chemtool-1.6.13.ebuild b/sci-chemistry/chemtool/chemtool-1.6.13.ebuild new file mode 100644 index 000000000000..d9a518ce33de --- /dev/null +++ b/sci-chemistry/chemtool/chemtool-1.6.13.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/chemtool-1.6.13.ebuild,v 1.1 2012/01/26 18:38:30 jlec Exp $ + +EAPI=4 + + AUTOTOOLS_AUTORECONF=true + +inherit autotools-utils eutils + +DESCRIPTION="A GTK program for drawing organic molecules" +HOMEPAGE="http://ruby.chemie.uni-freiburg.de/~martin/chemtool/" +SRC_URI="http://ruby.chemie.uni-freiburg.de/~martin/chemtool/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="emf gnome nls" + +RDEPEND=" + dev-libs/glib:2 + media-gfx/transfig + x11-libs/gtk+:2 + x11-libs/libX11 + x11-libs/pango + emf? ( media-libs/libemf )" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +AUTOTOOLS_IN_SOURCE_BUILD=1 + +PATCHES=( + "${FILESDIR}"/${PV}-no-underlinking.patch + ) + +src_configure() { + local myeconfargs=( + --without-kdedir + $(use_with gnome gnomedir /usr) + $(use_enable emf) + --enable-undo + --enable-menu + ) + autotools-utils_src_configure +} + +src_install() { + autotools-utils_src_install + + insinto /usr/share/${PN}/examples + doins "${S}"/examples/* + if ! use nls; then rm -rf "${ED}"/usr/share/locale || die; fi + + insinto /usr/share/pixmaps + doins chemtool.xpm + make_desktop_entry ${PN} Chemtool ${PN} "Education;Science;Chemistry" +} diff --git a/sci-chemistry/chemtool/files/1.6.13-no-underlinking.patch b/sci-chemistry/chemtool/files/1.6.13-no-underlinking.patch new file mode 100644 index 000000000000..5d2fe36d6bf1 --- /dev/null +++ b/sci-chemistry/chemtool/files/1.6.13-no-underlinking.patch @@ -0,0 +1,78 @@ + Makefile.am | 6 ++++-- + configure.ac | 24 ++++-------------------- + 2 files changed, 8 insertions(+), 22 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 99dbf8c..931ba16 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -22,10 +22,12 @@ localedir = $(datadir)/locale + DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ + + # Make sure the gettext.h include file is found. +-AM_CPPFLAGS = -I. -I$(srcdir) @GTK_CFLAGS@ ++AM_CPPFLAGS = -I. -I$(srcdir) @GTK_CFLAGS@ @EMFINCL@ + + # Link time dependencies. +-LDADD = @LIBINTL@ @GTK_LIBS@ @EMFLIBS@ ++LDADD = @LIBINTL@ @GTK_LIBS@ @EMFLIBS@ -lX11 ++ ++AM_CFLAGS = -DGTK2 + + # Additional files to be distributed. + EXTRA_DIST = autogen.sh autoclean.sh +diff --git a/configure.ac b/configure.ac +index 6d8c45a..c5fab42 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -32,32 +32,14 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + + AC_MSG_CHECKING([for GTK version and compile options ]) + +-if test x$PKG_CONFIG = xno -o x$enable_gtk1 = xyes ; then +-AM_PATH_GTK(1.0.2, , exit 1) +-else +-if $PKG_CONFIG gtk+-2.0 --cflags ; then +- GTK_CFLAGS="-DGTK2 `$PKG_CONFIG gtk+-2.0 --cflags` " +- GTK_LIBS=`$PKG_CONFIG gtk+-2.0 --libs` +-dnl use_gtk2=yes +- AC_DEFINE([GTK2], [1], [the GTK2 library]) +- enable_stockgtk=yes +-else +-if $PKG_CONFIG --cflags gtk+ ; then +- GTK_CFLAGS=`$PKG_CONFIG gtk+ --cflags` +- GTK_LIBS=`$PKG_CONFIG gtk+ --libs` +-dnl use_gtk2=no +-fi +-fi +-fi +- +-dnl AC_MSG_RESULT using GTK2 : $use_gtk2 ++PKG_CHECK_MODULES([GTK],[gtk+-2.0]) + + dnl Checks for header files. + AC_PATH_XTRA + AC_HEADER_DIRENT + AC_HEADER_STDC + +-LDFLAGS="$X_LIBS" ++LDFLAGS+="$X_LIBS" + AC_CHECK_LIB([X11],[XOpenDisplay]) + dnl just an ugly hack to work around the more aggressive header checks + dnl in recent autoconf. Not sure if we should really rely on include +@@ -184,6 +166,7 @@ if test x$enable_emf = xyes; then + AC_MSG_RESULT(yes) + AC_DEFINE([EMF], [1], [use optional libEMF instead of fig2dev for EMF output]) + EMFLIBS="-lEMF -lstdc++" ++ EMFINCL="-I${includedir}libEMF" + else + AC_MSG_RESULT(no) + EMFLIBS="" +@@ -221,6 +204,7 @@ AC_SUBST(localedir) + AC_SUBST(kdemimedir) + AC_SUBST(gnomemimedir) + AC_SUBST(EMFLIBS) ++AC_SUBST(EMFINCL) + AC_SUBST(MYGTKSRCS) + AC_SUBST(MYGTKOBJS) + AC_SUBST(GTK_CFLAGS) diff --git a/sci-chemistry/chemtool/metadata.xml b/sci-chemistry/chemtool/metadata.xml index 446f133a9389..f029f0c0a504 100644 --- a/sci-chemistry/chemtool/metadata.xml +++ b/sci-chemistry/chemtool/metadata.xml @@ -1,6 +1,8 @@ -sci-chemistry - EMF export support + sci-chemistry + + EMF export support + diff --git a/sci-chemistry/gperiodic/files/gperiodic-2.0.10-nls.patch b/sci-chemistry/gperiodic/files/gperiodic-2.0.10-nls.patch new file mode 100644 index 000000000000..de0bea04dc14 --- /dev/null +++ b/sci-chemistry/gperiodic/files/gperiodic-2.0.10-nls.patch @@ -0,0 +1,20 @@ + po/Makefile | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/po/Makefile b/po/Makefile +index d7d7d78..179dad6 100644 +--- a/po/Makefile ++++ b/po/Makefile +@@ -26,10 +26,12 @@ endif + + install: + $(MAKE) all ++ifeq ($(enable_nls),1) + for f in $(FILES_MO) ; do \ + mkdir -p $(DESTDIR)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES ; \ + install -m 644 $$f $(DESTDIR)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES/$(PACKAGE).mo ; \ + done ++endif + + uninstall: + for f in $(FILES_MO) ; do \ diff --git a/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild b/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild index 3cf2b8a00162..b525e26ad231 100644 --- a/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild +++ b/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild,v 1.3 2011/12/13 23:34:34 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild,v 1.4 2012/01/26 19:17:33 jlec Exp $ EAPI="2" @@ -24,15 +24,21 @@ DEPEND="${RDEPEND} dev-util/pkgconfig" src_prepare() { - use nls && myopts="enable_nls=1" || myopts="enable_nls=0" - epatch "${FILESDIR}"/${P}-makefile.patch + epatch \ + "${FILESDIR}"/${P}-makefile.patch \ + "${FILESDIR}"/${P}-nls.patch } src_compile() { + local myopts + use nls && myopts="enable_nls=1" || myopts="enable_nls=0" emake CC=$(tc-getCC) ${myopts} || die } src_install() { + local myopts + use nls && myopts="enable_nls=1" || myopts="enable_nls=0" emake DESTDIR="${D}" ${myopts} install || die dodoc AUTHORS ChangeLog README NEWS || die + newdoc po/README README.translation || die } diff --git a/sci-chemistry/gperiodic/metadata.xml b/sci-chemistry/gperiodic/metadata.xml index 4b6a11a4996d..e87a8759836d 100644 --- a/sci-chemistry/gperiodic/metadata.xml +++ b/sci-chemistry/gperiodic/metadata.xml @@ -1,8 +1,8 @@ - sci-chemistry - + sci-chemistry + GPeriodic is a program for looking up various data about elements from the periodic table, based on the GTK2 toolkit. It also features a command line interface. diff --git a/sci-chemistry/jmol/Manifest b/sci-chemistry/jmol/Manifest index 40af2b7bd23c..a42486bdc06e 100644 --- a/sci-chemistry/jmol/Manifest +++ b/sci-chemistry/jmol/Manifest @@ -1,2 +1,3 @@ DIST Jmol-12.0.45-full.tar.gz 26501382 RMD160 0d9a4212abf45852706f92cb16aedae7632763c5 SHA1 c43b0542be8bd845dadbcacdd41e47482e23fe03 SHA256 f9a3fe242841f9b56a718f8da2efe4130e497afe2c12d77f2e68344c62d7f70e DIST jmol-11.0.3-full.tar.gz 13578526 RMD160 53e34c52d6085635daea74cd9c5787da67ef483e SHA1 35dc9d3d3cfe08cbe3076a6939f62361b2c59c86 SHA256 210eb7d119e53ed0b7f41939321bcfcdb4d7312761d8002e340c83ff49664616 +DIST jmol-selfSignedCertificate.store.tar 10240 RMD160 a6d4df5f108a2c13074190569b95d3310439ea57 SHA1 218fff84df0c542b634ba08ed2e82d3d3280a481 SHA256 416744934991ef4f1fa298c0afc8e855d43771de2f2278ed3fbc60f707ea46b2 diff --git a/sci-chemistry/jmol/files/selfSignedCertificate.store b/sci-chemistry/jmol/files/selfSignedCertificate.store deleted file mode 100644 index a7b0ccb86e12..000000000000 Binary files a/sci-chemistry/jmol/files/selfSignedCertificate.store and /dev/null differ diff --git a/sci-chemistry/jmol/jmol-11.0.3-r1.ebuild b/sci-chemistry/jmol/jmol-11.0.3-r1.ebuild index b90b18b61f5f..97301969291d 100644 --- a/sci-chemistry/jmol/jmol-11.0.3-r1.ebuild +++ b/sci-chemistry/jmol/jmol-11.0.3-r1.ebuild @@ -1,22 +1,23 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/jmol-11.0.3-r1.ebuild,v 1.6 2008/10/05 19:12:36 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/jmol-11.0.3-r1.ebuild,v 1.7 2012/01/26 17:34:04 jlec Exp $ EAPI=1 WEBAPP_OPTIONAL="yes" inherit eutils webapp java-pkg-2 java-ant-2 -DESCRIPTION="Jmol is a java molecular viever for 3-D chemical structures." -SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.gz" +DESCRIPTION="Java molecular viever for 3-D chemical structures" HOMEPAGE="http://jmol.sourceforge.net/" -KEYWORDS="~x86 ~amd64" -LICENSE="LGPL-2.1" - -IUSE="client-only vhosts" +SRC_URI=" + mirror://sourceforge/${PN}/${P}-full.tar.gz + http://dev.gentoo.org/~jlec/${PN}-selfSignedCertificate.store.tar" WEBAPP_MANUAL_SLOT="yes" SLOT="0" +KEYWORDS="~amd64 ~x86" +LICENSE="LGPL-2.1" +IUSE="client-only vhosts" COMMON_DEP="dev-java/commons-cli:1 dev-java/itext:0 @@ -30,23 +31,18 @@ DEPEND=">=virtual/jdk-1.4 ${COMMON_DEP}" pkg_setup() { - - if ! use client-only ; then - webapp_pkg_setup || die "Failed to setup webapp" - fi - + use client-only || webapp_pkg_setup java-pkg-2_pkg_setup - } src_unpack() { - unpack ${A} - epatch "${FILESDIR}"/${P}-nointl.patch - epatch "${FILESDIR}"/${P}-manifest.patch + epatch \ + "${FILESDIR}"/${P}-nointl.patch \ + "${FILESDIR}"/${P}-manifest.patch mkdir "${S}"/selfSignedCertificate || die "Failed to create Cert directory." - cp "${FILESDIR}"/selfSignedCertificate.store "${S}"/selfSignedCertificate/ \ + cp "${WORKDIR}"/selfSignedCertificate.store "${S}"/selfSignedCertificate/ \ || die "Failed to install Cert file." rm -v "${S}"/*.jar "${S}"/plugin-jars/*.jar || die @@ -73,7 +69,6 @@ src_compile() { } src_install() { - java-pkg_dojar build/Jmol.jar dohtml -r build/doc/* || die "Failed to install html docs." dodoc *.txt doc/*license* || die "Failed to install licenses." @@ -103,17 +98,9 @@ src_install() { } pkg_postinst() { - - if ! use client-only ; then - webapp_pkg_postinst || die "webapp_pkg_postinst failed" - fi - + use client-only || webapp_pkg_postinst } pkg_prerm() { - - if ! use client-only ; then - webapp_pkg_prerm || die "webapp_pkg_prerm failed" - fi - + use client-only || webapp_pkg_prerm } diff --git a/sci-chemistry/jmol/jmol-12.0.45.ebuild b/sci-chemistry/jmol/jmol-12.0.45.ebuild index d0cb26f82bf5..0b468f1e773f 100644 --- a/sci-chemistry/jmol/jmol-12.0.45.ebuild +++ b/sci-chemistry/jmol/jmol-12.0.45.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/jmol-12.0.45.ebuild,v 1.1 2011/06/28 10:17:13 je_fro Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/jmol-12.0.45.ebuild,v 1.2 2012/01/26 17:34:04 jlec Exp $ EAPI=1 WEBAPP_OPTIONAL="yes" @@ -9,16 +9,17 @@ inherit eutils webapp java-pkg-2 java-ant-2 MY_P=Jmol -DESCRIPTION="Jmol is a java molecular viever for 3-D chemical structures." -SRC_URI="mirror://sourceforge/${PN}/${MY_P}-${PV}-full.tar.gz" +DESCRIPTION="Java molecular viever for 3-D chemical structures" HOMEPAGE="http://jmol.sourceforge.net/" -KEYWORDS="~amd64 ~x86" -LICENSE="LGPL-2.1" - -IUSE="client-only vhosts" +SRC_URI=" + mirror://sourceforge/${PN}/${MY_P}-${PV}-full.tar.gz + http://dev.gentoo.org/~jlec/distfiles/${PN}-selfSignedCertificate.store.tar" WEBAPP_MANUAL_SLOT="yes" SLOT="0" +KEYWORDS="~amd64 ~x86" +LICENSE="LGPL-2.1" +IUSE="client-only vhosts" COMMON_DEP="dev-java/commons-cli:1 dev-java/itext:0 @@ -32,24 +33,19 @@ DEPEND=">=virtual/jdk-1.4 ${COMMON_DEP}" pkg_setup() { - - if ! use client-only ; then - webapp_pkg_setup || die "Failed to setup webapp" - fi - + use client-only || webapp_pkg_setup java-pkg-2_pkg_setup - } src_unpack() { - unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${PV}/${PN}-nointl.patch - epatch "${FILESDIR}"/${PV}/${PN}-manifest.patch + epatch \ + "${FILESDIR}"/${PV}/${PN}-nointl.patch \ + "${FILESDIR}"/${PV}/${PN}-manifest.patch mkdir "${S}"/selfSignedCertificate || die "Failed to create Cert directory." - cp "${FILESDIR}"/selfSignedCertificate.store "${S}"/selfSignedCertificate/ \ + cp "${WORKDIR}"/selfSignedCertificate.store "${S}"/selfSignedCertificate/ \ || die "Failed to install Cert file." rm -v "${S}"/*.jar "${S}"/plugin-jars/*.jar || die @@ -76,7 +72,6 @@ src_compile() { } src_install() { - java-pkg_dojar build/Jmol.jar dohtml -r build/doc/* || die "Failed to install html docs." dodoc *.txt doc/*license* || die "Failed to install licenses." @@ -106,17 +101,9 @@ src_install() { } pkg_postinst() { - - if ! use client-only ; then - webapp_pkg_postinst || die "webapp_pkg_postinst failed" - fi - + use client-only || webapp_pkg_postinst } pkg_prerm() { - - if ! use client-only ; then - webapp_pkg_prerm || die "webapp_pkg_prerm failed" - fi - + use client-only || webapp_pkg_prerm } diff --git a/sci-libs/cholmod/cholmod-1.7.4.ebuild b/sci-libs/cholmod/cholmod-1.7.4.ebuild index aa08ddbf8fe8..37167c6aac71 100644 --- a/sci-libs/cholmod/cholmod-1.7.4.ebuild +++ b/sci-libs/cholmod/cholmod-1.7.4.ebuild @@ -1,31 +1,35 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/cholmod-1.7.4.ebuild,v 1.1 2012/01/20 05:52:25 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/cholmod-1.7.4.ebuild,v 1.2 2012/01/26 19:40:13 jlec Exp $ EAPI=4 AUTOTOOLS_AUTORECONF=yes -inherit eutils autotools autotools-utils + +inherit autotools-utils eutils MY_PN=CHOLMOD PPV=1.7.0 DESCRIPTION="Sparse Cholesky factorization and update/downdate library" -HOMEPAGE="http://www.cise.ufl.edu/research/sparse/cholmod" -SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz +HOMEPAGE="http://www.cise.ufl.edu/research/sparse/cholmod/" +SRC_URI=" + http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz mirror://gentoo/${PN}-${PPV}-autotools.patch.bz2" LICENSE="LGPL-2.1 GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="doc metis minimal static-libs +supernodal" +IUSE="debug doc metis minimal static-libs +supernodal" -RDEPEND="supernodal? ( virtual/lapack ) +RDEPEND=" sci-libs/amd sci-libs/colamd - metis? ( sci-libs/camd - sci-libs/ccolamd - || ( sci-libs/metis sci-libs/parmetis ) )" + metis? ( + sci-libs/camd + sci-libs/ccolamd + || ( sci-libs/metis sci-libs/parmetis ) ) + supernodal? ( virtual/lapack )" DEPEND="${RDEPEND} supernodal? ( dev-util/pkgconfig ) @@ -39,6 +43,7 @@ src_prepare() { cd "${WORKDIR}" epatch "${WORKDIR}"/${PN}-${PPV}-autotools.patch cd "${S}" + use debug && epatch "${FILESDIR}"/${P}-debug.patch # We need to take care of cholmod.h here as well depending on # the USE flags, otherwise the installed file will reference # headers that we may not have included. diff --git a/sci-libs/cholmod/files/cholmod-1.7.4-debug.patch b/sci-libs/cholmod/files/cholmod-1.7.4-debug.patch new file mode 100644 index 000000000000..bf434e24f267 --- /dev/null +++ b/sci-libs/cholmod/files/cholmod-1.7.4-debug.patch @@ -0,0 +1,17 @@ + Include/cholmod_internal.h | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/Include/cholmod_internal.h b/Include/cholmod_internal.h +index 36f20a2..2cd6dd2 100644 +--- a/Include/cholmod_internal.h ++++ b/Include/cholmod_internal.h +@@ -53,9 +53,7 @@ + #define NDEBUG + #endif + +-/* Uncomment this line to enable debugging. CHOLMOD will be very slow. + #undef NDEBUG +- */ + + #ifdef MATLAB_MEX_FILE + #include "mex.h" diff --git a/sci-libs/cholmod/metadata.xml b/sci-libs/cholmod/metadata.xml index eafad5c8fb54..54dd26275c31 100644 --- a/sci-libs/cholmod/metadata.xml +++ b/sci-libs/cholmod/metadata.xml @@ -1,15 +1,15 @@ -sci - + sci + CHOLMOD is a set of ANSI C routines for sparse Cholesky factorization and update/downdate. - - Enable the Partition module to cholmod using metis + + Enable the Partition module to cholmod using metis (sci-libs/metis, sci-libs/parmetis) - Enable the Supernodal module + Enable the Supernodal module (needs virtual/lapack) - + diff --git a/sci-libs/proj/files/proj-4.7.0-robinson.patch b/sci-libs/proj/files/proj-4.7.0-robinson.patch new file mode 100644 index 000000000000..85759c6e4807 --- /dev/null +++ b/sci-libs/proj/files/proj-4.7.0-robinson.patch @@ -0,0 +1,12 @@ +--- src/PJ_robin.c.orig 2009-01-26 18:17:46.000000000 +0100 ++++ src/PJ_robin.c 2011-12-12 11:45:28.515779709 +0100 +@@ -35,7 +35,7 @@ + 0.31, 0.0124108, 3.73349e-06, -1.1779e-06, + 0.372, 0.0123598, -1.3935e-05, 4.39588e-06, + 0.434, 0.0125501, 5.20034e-05, -1.00051e-05, +-0.4968, 0.0123198, -9.80735e-05, 9.22397e-06, ++0.4958, 0.0123198, -9.80735e-05, 9.22397e-06, + 0.5571, 0.0120308, 4.02857e-05, -5.2901e-06, + 0.6176, 0.0120369, -3.90662e-05, 7.36117e-07, + 0.6769, 0.0117015, -2.80246e-05, -8.54283e-07, + diff --git a/sci-libs/proj/proj-4.7.0-r1.ebuild b/sci-libs/proj/proj-4.7.0-r1.ebuild new file mode 100644 index 000000000000..67aabd966b0c --- /dev/null +++ b/sci-libs/proj/proj-4.7.0-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/proj/proj-4.7.0-r1.ebuild,v 1.1 2012/01/26 18:12:58 bicatali Exp $ + +EAPI=4 + +DESCRIPTION="Proj.4 cartographic projection software with updated NAD27 grids" +HOMEPAGE="http://trac.osgeo.org/proj/" +SRC_URI="ftp://ftp.remotesensing.org/pub/proj/${P}.tar.gz + http://download.osgeo.org/proj/${PN}-datumgrid-1.5.zip" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="static-libs" + +RDEPEND="" +DEPEND="app-arch/unzip" + +src_unpack() { + unpack ${P}.tar.gz || die + cd "${S}"/nad || die + mv README README.NAD || die + unpack ${PN}-datumgrid-1.5.zip || die +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-robinson.patch +} + +src_configure() { + econf $(use_enable static-libs static) +} + +src_install() { + default + cd nad + dodoc README.{NAD,NADUS} + insinto /usr/share/proj + insopts -m 755 + doins test27 test83 + insopts -m 644 + doins pj_out27.dist pj_out83.dist +} diff --git a/sci-mathematics/geomview/Manifest b/sci-mathematics/geomview/Manifest index 3b94e4a96a55..4afd69017cfb 100644 --- a/sci-mathematics/geomview/Manifest +++ b/sci-mathematics/geomview/Manifest @@ -1,2 +1,2 @@ -DIST geomview-1.9.2.tar.bz2 3060421 RMD160 af91598a2ce379df33aefbc018d40f4079891ed5 SHA1 81a11b5e7cd7b003550b90698bd32ac2b220ef5c SHA256 de91ba018fa08626180102d281d8564e5a55329a2a13fef23165504c56200c40 DIST geomview-1.9.4.tar.bz2 4037982 RMD160 6d53d7e6bce17e3298dc6f55e1e1770918b868a5 SHA1 4d1c2654968c3f2395b438302e163e0465b7e2d3 SHA256 a384790429541b8c86c41c4b27d157d5a92ee7c46e6a78741e55d81bd9a46c5b +DIST geomview.png.tar 10240 RMD160 8f4c23eb8c43cc8d168bba3c5a2f5bd039db7da9 SHA1 c60a21c6cc1b67793a37f631477639e156d567de SHA256 cf1f5b94d868d363fa6f251343b1426cc7e9ed36ed8ee1fea4339ccabcba33cb diff --git a/sci-mathematics/geomview/files/geomview.png b/sci-mathematics/geomview/files/geomview.png deleted file mode 100644 index 5170f1ed7b5c..000000000000 Binary files a/sci-mathematics/geomview/files/geomview.png and /dev/null differ diff --git a/sci-mathematics/geomview/geomview-1.9.2.ebuild b/sci-mathematics/geomview/geomview-1.9.2.ebuild deleted file mode 100644 index 6821ecb4279c..000000000000 --- a/sci-mathematics/geomview/geomview-1.9.2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/geomview-1.9.2.ebuild,v 1.9 2010/10/10 21:49:01 ulm Exp $ - -EAPI=1 - -inherit eutils flag-o-matic fdo-mime - -DESCRIPTION="Interactive Geometry Viewer" -SRC_URI="http://mesh.dl.sourceforge.net/sourceforge/geomview/${P/_/-}.tar.bz2" -HOMEPAGE="http://geomview.sourceforge.net" - -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="avg bzip2 debug emacs netpbm pdf zlib" - -DEPEND="zlib? ( sys-libs/zlib ) - >=x11-libs/openmotif-2.3:0 - virtual/opengl" - -RDEPEND="${DEPEND} - netpbm? ( >=media-libs/netpbm-10.37.0 ) - bzip2? ( app-arch/bzip2 ) - app-arch/gzip - pdf? ( || ( app-text/xpdf - app-text/gv - app-text/gsview - app-text/epdfview - app-text/acroread ) - ) - virtual/w3m" - -S="${WORKDIR}/${P/_/-}" - -src_compile() { - # GNU standard is /usr/share/doc/${PN}, so override this; also note - # that motion averaging is still experimental. - if use pdf; then - local myconf="--docdir=/usr/share/doc/${PF}" - else - local myconf="--docdir=/usr/share/doc/${PF} --without-pdfviewer" - fi - - econf ${myconf} $(use_enable debug d1debug) $(use_with zlib) \ - $(use_enable avg motion-averaging) \ - || die "could not configure" - - make || die "make failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - doicon "${FILESDIR}"/geomview.png - make_desktop_entry geomview "GeomView ${PV}" \ - "/usr/share/pixmaps/geomview.png" \ - "Science;Math;Education" - - dodoc AUTHORS ChangeLog NEWS INSTALL.Geomview - - if ! use pdf; then - rm "${D}"usr/share/doc/${PF}/${PN}.pdf - fi - - if use emacs; then - insinto /usr/share/geomview - doins "${FILESDIR}"/gvcl-mode.el || die - fi -} - -pkg_postinst() { - fdo-mime_desktop_database_update - - elog "GeomView expects you to have both Firefox and Xpdf installed for" - elog "viewing the documentation (this can be changed at runtime)." - elog "" - elog "The w3m virtual should handle the HTML borwser part, and if" - elog "you wish to use an alternate PDF viewer, feel free to remove" - elog "xpdf and use the viewer of your choice (see the docs for how" - elog "to setup the \'(ui-pdf-viewer VIEWER)\' GCL-command)." - elog "" - elog "If you use emacs, enable the corresponding use flag and check" - elog "out the provided mode file for editing the GeomView command" - elog "language (courtesy of Claus-Justus Heine). Incorporating it" - elog "into your emacs configuration is left as an exercise..." - elog "" -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/sci-mathematics/geomview/geomview-1.9.4.ebuild b/sci-mathematics/geomview/geomview-1.9.4.ebuild index f55efbc40c67..9a18a8a015c8 100644 --- a/sci-mathematics/geomview/geomview-1.9.4.ebuild +++ b/sci-mathematics/geomview/geomview-1.9.4.ebuild @@ -1,38 +1,42 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/geomview-1.9.4.ebuild,v 1.6 2010/10/10 21:49:01 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/geomview-1.9.4.ebuild,v 1.7 2012/01/26 17:10:25 jlec Exp $ EAPI=1 inherit elisp-common eutils flag-o-matic fdo-mime DESCRIPTION="Interactive Geometry Viewer" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" HOMEPAGE="http://geomview.sourceforge.net" +SRC_URI=" + mirror://sourceforge/${PN}/${P}.tar.bz2 + http://dev.gentoo.org/~jlec/distfiles/geomview.png.tar" KEYWORDS="~amd64 ~ppc ~sparc ~x86" LICENSE="LGPL-2.1" SLOT="0" IUSE="avg bzip2 debug emacs netpbm pdf zlib" -DEPEND="zlib? ( sys-libs/zlib ) - emacs? ( virtual/emacs ) +DEPEND=" >=x11-libs/openmotif-2.3:0 - virtual/opengl" - + virtual/opengl + emacs? ( virtual/emacs ) + zlib? ( sys-libs/zlib )" RDEPEND="${DEPEND} - netpbm? ( >=media-libs/netpbm-10.37.0 ) - bzip2? ( app-arch/bzip2 ) app-arch/gzip - pdf? ( || ( app-text/xpdf - app-text/gv - app-text/gsview - app-text/epdfview - app-text/acroread ) - ) - virtual/w3m" + virtual/w3m + bzip2? ( app-arch/bzip2 ) + netpbm? ( >=media-libs/netpbm-10.37.0 ) + pdf? ( + || ( app-text/xpdf + app-text/gv + app-text/gsview + app-text/epdfview + app-text/acroread ) + )" S="${WORKDIR}/${P/_/-}" + SITEFILE=50${PN}-gentoo.el src_compile() { @@ -45,8 +49,7 @@ src_compile() { fi econf ${myconf} $(use_enable debug d1debug) $(use_with zlib) \ - $(use_enable avg motion-averaging) \ - || die "could not configure" + $(use_enable avg motion-averaging) emake || die "make failed" @@ -60,15 +63,15 @@ src_compile() { src_install() { emake DESTDIR="${D}" install || die "emake install failed" - doicon "${FILESDIR}"/geomview.png + doicon "${WORKDIR}"/geomview.png || die make_desktop_entry geomview "GeomView ${PV}" \ "/usr/share/pixmaps/geomview.png" \ "Science;Math;Education" - dodoc AUTHORS ChangeLog NEWS INSTALL.Geomview + dodoc AUTHORS ChangeLog NEWS INSTALL.Geomview || die if ! use pdf; then - rm "${D}"/usr/share/doc/${PF}/${PN}.pdf + rm "${D}"/usr/share/doc/${PF}/${PN}.pdf || die fi if use emacs; then @@ -83,7 +86,7 @@ pkg_postinst() { elog "GeomView expects you to have both Firefox and Xpdf installed for" elog "viewing the documentation (this can be changed at runtime)." - elog "" + echo "" elog "The w3m virtual should handle the HTML browser part, and if" elog "you wish to use an alternate PDF viewer, feel free to remove" elog "xpdf and use the viewer of your choice (see the docs for how" diff --git a/sci-visualization/gfsview/gfsview-20111003.ebuild b/sci-visualization/gfsview/gfsview-20111003.ebuild index 1dbc64e1ce88..6692fe26af23 100644 --- a/sci-visualization/gfsview/gfsview-20111003.ebuild +++ b/sci-visualization/gfsview/gfsview-20111003.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gfsview/gfsview-20111003.ebuild,v 1.1 2012/01/23 04:33:02 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gfsview/gfsview-20111003.ebuild,v 1.2 2012/01/26 22:01:54 mr_bones_ Exp $ EAPI=4 @@ -25,7 +25,6 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/${P/-20/-snapshot-} - src_configure() { econf $(use_enable static-libs static) } diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest index 273cc6289bb0..b125a887d1f6 100644 --- a/sys-apps/haveged/Manifest +++ b/sys-apps/haveged/Manifest @@ -1,3 +1,3 @@ -DIST haveged-1.01.tar.gz 199499 RMD160 c76c1846efd5c7930f55303d6469928ad072d220 SHA1 ac3240e0418fd09ab38e5491b467e6cfdb8b1ca9 SHA256 68768604b269a42f8ff983b52c2f4c4fc9977e7c4c3cc3eff5ba23616452f316 DIST haveged-1.1.tar.gz 200273 RMD160 8a2a4d6b7b223161c558356d2c637531c70049e3 SHA1 311a8d63afe9d10866afe9eb7387c3c28e5df3f8 SHA256 2c1b7b9778e058745a1e8c1245627d2d01249101dd377ab4ee04c6b77092a220 DIST haveged-1.2.tar.gz 206864 RMD160 ea787f7d5b52e3af4301550949e6df4372e00d54 SHA1 5008f96663a04fb34337f80a8081d583e0a671e4 SHA256 2cca4a02644b2d264cd85eaaf141a0e75709dd978c86f83241f68832c0079feb +DIST haveged-1.3a.tar.gz 212072 RMD160 8acbc7a7b01dd77b6184182225e1ac0caf95d6d7 SHA1 4108604ac14587b077066b30021ea7cbb38a5e4b SHA256 0430cbeffd0dea31dbe300f7b88c532a2d046e336c7d0ce5e1ef84858179595b diff --git a/sys-apps/haveged/haveged-1.1.ebuild b/sys-apps/haveged/haveged-1.1.ebuild index 701825d12087..b5044a1aed66 100644 --- a/sys-apps/haveged/haveged-1.1.ebuild +++ b/sys-apps/haveged/haveged-1.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/haveged-1.1.ebuild,v 1.4 2011/08/06 12:23:32 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/haveged-1.1.ebuild,v 1.5 2012/01/26 23:26:58 darkside Exp $ EAPI=4 DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm" @@ -9,7 +9,7 @@ SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 -arm x86" IUSE="" DEPEND="sys-devel/gcc" diff --git a/sys-apps/haveged/haveged-1.2.ebuild b/sys-apps/haveged/haveged-1.2.ebuild index 8ca76739986b..253ccd8127dc 100644 --- a/sys-apps/haveged/haveged-1.2.ebuild +++ b/sys-apps/haveged/haveged-1.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/haveged-1.2.ebuild,v 1.1 2011/10/17 17:20:53 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/haveged-1.2.ebuild,v 1.3 2012/01/26 23:26:58 darkside Exp $ EAPI=4 DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm" diff --git a/sys-apps/haveged/haveged-1.01.ebuild b/sys-apps/haveged/haveged-1.3a.ebuild similarity index 56% rename from sys-apps/haveged/haveged-1.01.ebuild rename to sys-apps/haveged/haveged-1.3a.ebuild index 020bab69d99a..339c3b0acb18 100644 --- a/sys-apps/haveged/haveged-1.01.ebuild +++ b/sys-apps/haveged/haveged-1.3a.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/haveged-1.01.ebuild,v 1.1 2011/01/05 03:30:30 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/haveged-1.3a.ebuild,v 1.2 2012/01/26 23:26:58 darkside Exp $ -EAPI=3 +EAPI=4 DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm" HOMEPAGE="http://www.issihosts.com/haveged/" SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz" @@ -13,22 +13,19 @@ KEYWORDS="~amd64 ~x86" IUSE="" DEPEND="sys-devel/gcc" -RDEPEND="" +RDEPEND="sys-apps/openrc" -src_configure() { - econf --bindir=/usr/sbin || die -} +S="${WORKDIR}/${P/3a/3}" -src_compile() { - emake || die +src_configure() { + econf --bindir=/usr/sbin --enable-nistest } src_install() { - emake DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog NEWS README + default # This is a RedHat init script rm -rf "${D}"/etc/init.d/haveged # Install gentoo ones instead - newinitd "${FILESDIR}"/haveged-init.d haveged + newinitd "${FILESDIR}"/haveged-init.d.2 haveged newconfd "${FILESDIR}"/haveged-conf.d haveged } diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest index e3055328ccbe..12714a012817 100644 --- a/sys-apps/hwloc/Manifest +++ b/sys-apps/hwloc/Manifest @@ -1 +1,2 @@ DIST hwloc-1.3.1.tar.bz2 2616262 RMD160 0b72991f0ffac0c6f409d8a6e7d7f6cc49fe83ed SHA1 1051c937c3d2a4c98922903f313a1fa021bb35ba SHA256 a38ab3f60995d8f511129499b558a22c3e8907b0a08ef02bb664ee9fc269cc70 +DIST hwloc-1.4.tar.bz2 2707553 RMD160 f8859b924ffcee315c66fbf4b3dc0a491bf645fc SHA1 04326ebbf5a084164d72269f05e37ae23996c023 SHA256 1e21018fc0e6ec33192a7708f1e624e34c3d3599a2217cf1e3b218bb538a91e1 diff --git a/sys-apps/hwloc/hwloc-1.4.ebuild b/sys-apps/hwloc/hwloc-1.4.ebuild new file mode 100644 index 000000000000..5cff878c809f --- /dev/null +++ b/sys-apps/hwloc/hwloc-1.4.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.4.ebuild,v 1.1 2012/01/26 17:33:31 xarthisius Exp $ + +EAPI=4 + +inherit multilib versionator + +MY_PV=v$(get_version_component_range 1-2) + +DESCRIPTION="displays the hardware topology in convenient formats" +HOMEPAGE="http://www.open-mpi.org/projects/hwloc/" +SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux" +IUSE="cairo debug +numa +pci svg static-libs xml X" + +RDEPEND="sys-libs/ncurses + cairo? ( x11-libs/cairo[X?,svg?] ) + pci? ( sys-apps/pciutils ) + xml? ( dev-libs/libxml2 )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + numa? ( sys-process/numactl )" + +DOCS=( AUTHORS NEWS README VERSION ) + +src_configure() { + export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467 + econf \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + $(use_enable cairo) \ + $(use_enable debug) \ + $(use_enable pci) \ + $(use_enable static-libs static) \ + $(use_enable xml libxml2) \ + $(use_with X x) \ + --disable-silent-rules +} + +src_install() { + default + use static-libs || rm "${D}"/usr/$(get_libdir)/lib${PN}.la +} diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest index c1a997073752..5877a4791c9a 100644 --- a/sys-apps/pkgcore/Manifest +++ b/sys-apps/pkgcore/Manifest @@ -1,2 +1,2 @@ -DIST pkgcore-0.7.7.6.tar.bz2 437497 RMD160 d56bdec9550ec7c6524cdac64edf065abeb11dce SHA1 74c688d0bd9ed93f7a8f850c0d2c1c91c7e95835 SHA256 5077cfa75227770600ed47f695a6ee58bbb69dd3932ca13972a1ad24710d7e3c DIST pkgcore-0.7.7.7.tar.bz2 437984 RMD160 d1204551c074d403fb049efac2ae6731934ed8fc SHA1 d746ca4edd84c84ba3b785336a684e0efa0c9d3b SHA256 47273b634f38141b2a6095dc9d62b9153796d1c445d31d4569a06e05dccc56d7 +DIST pkgcore-0.7.7.8.tar.bz2 439499 RMD160 ec9c10e3095f8a529223d98786e4111b7a6e538e SHA1 bcaaea0f920c4ae1caa6cb4cc18a5248a71a31a6 SHA256 ad90b71a1cd2e7aefcab77893396a483cf7c2b9fc08cbcd55711d1985e048116 diff --git a/sys-apps/pkgcore/pkgcore-0.7.7.7.ebuild b/sys-apps/pkgcore/pkgcore-0.7.7.7.ebuild deleted file mode 100644 index 1c0befdc8092..000000000000 --- a/sys-apps/pkgcore/pkgcore-0.7.7.7.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.7.7.ebuild,v 1.1 2012/01/24 11:53:49 ferringb Exp $ - -EAPI="3" -DISTUTILS_SRC_TEST="setup.py" - -inherit distutils eutils - -DESCRIPTION="pkgcore package manager" -HOMEPAGE="http://pkgcore.googlecode.com/" -SRC_URI="http://pkgcore.googlecode.com/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="-doc build" - -RDEPEND=">=dev-lang/python-2.4 - >=dev-python/snakeoil-0.4.5 - || ( >=dev-lang/python-2.5 dev-python/pycrypto )" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx dev-python/pyparsing )" - -DOCS="AUTHORS NEWS" - -pkg_setup() { - # disable snakeoil 2to3 caching... - unset PY2TO3_CACHEDIR - python_pkg_setup -} - -src_compile() { - distutils_src_compile - - if use doc; then - python setup.py build_docs || die "doc building failed" - fi -} - -src_install() { - distutils_src_install - - if use doc; then - dohtml -r build/sphinx/html/* - fi -} - -pkg_postinst() { - distutils_pkg_postinst - pplugincache -} diff --git a/sys-apps/pkgcore/pkgcore-0.7.7.6.ebuild b/sys-apps/pkgcore/pkgcore-0.7.7.8.ebuild similarity index 95% rename from sys-apps/pkgcore/pkgcore-0.7.7.6.ebuild rename to sys-apps/pkgcore/pkgcore-0.7.7.8.ebuild index f653d5c46cf6..298236e3eb14 100644 --- a/sys-apps/pkgcore/pkgcore-0.7.7.6.ebuild +++ b/sys-apps/pkgcore/pkgcore-0.7.7.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.7.6.ebuild,v 1.1 2012/01/16 10:52:51 ferringb Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.7.8.ebuild,v 1.1 2012/01/26 15:47:25 ferringb Exp $ EAPI="3" DISTUTILS_SRC_TEST="setup.py" diff --git a/sys-fs/s3fs/s3fs-1.61.ebuild b/sys-fs/s3fs/s3fs-1.61.ebuild index e54845837cdb..1c796d7e15a4 100644 --- a/sys-fs/s3fs/s3fs-1.61.ebuild +++ b/sys-fs/s3fs/s3fs-1.61.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/s3fs/s3fs-1.61.ebuild,v 1.1 2011/08/31 05:00:09 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/s3fs/s3fs-1.61.ebuild,v 1.2 2012/01/26 20:37:10 hwoarang Exp $ EAPI=4 @@ -12,7 +12,7 @@ SRC_URI="http://s3fs.googlecode.com/files/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" CDEPEND=">=dev-libs/libxml2-2.6:2 diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.17-r1.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.17-r1.ebuild index 38f273509a53..6ea8a40ce1e6 100644 --- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.17-r1.ebuild +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.17-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.17-r1.ebuild,v 1.1 2012/01/26 11:42:36 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.17-r1.ebuild,v 1.2 2012/01/26 20:38:28 hwoarang Exp $ EAPI="4" @@ -34,7 +34,7 @@ TUXONICE_URI="${TUXONICE_SRC}.bz2" UNIPATCH_STRICTORDER="yes" SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" RDEPEND="${RDEPEND} >=sys-apps/tuxonice-userui-1.0 diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.2.2.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.2.2.ebuild index 5430b079467e..b99d8bd4b72b 100644 --- a/sys-kernel/vanilla-sources/vanilla-sources-3.2.2.ebuild +++ b/sys-kernel/vanilla-sources/vanilla-sources-3.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.2.2.ebuild,v 1.1 2012/01/26 13:06:55 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.2.2.ebuild,v 1.2 2012/01/26 15:46:30 ago Exp $ EAPI="2" K_NOUSENAME="yes" @@ -15,5 +15,5 @@ DESCRIPTION="Full sources for the Linux kernel" HOMEPAGE="http://www.kernel.org" SRC_URI="${KERNEL_URI}" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="deblob" diff --git a/www-client/surfraw/Manifest b/www-client/surfraw/Manifest index cd610c27238e..f9da781b49b8 100644 --- a/www-client/surfraw/Manifest +++ b/www-client/surfraw/Manifest @@ -1,2 +1 @@ -DIST surfraw-2.2.7.tar.gz 169771 RMD160 aaab07dd942ad7fa0885d362132bc7db6d87b59c SHA1 18f7db3b85f6c8af784338b9af66bf84d9d33443 SHA256 1f23e08210ba04d874e825e6bbbdb23e669cf9c0804388ba0fdd0fd535995fcb DIST surfraw-2.2.8.tar.gz 183019 RMD160 77f8f625946fb76665c9e4834506ce4e45f1cd4f SHA1 3114cd6e8d64f87b84ed0eff4369bfb0b10f2eb6 SHA256 925075e05637e39458b00e859193aacde306aafd9a962f44f5114f81713539ec diff --git a/www-client/surfraw/surfraw-2.2.7.ebuild b/www-client/surfraw/surfraw-2.2.7.ebuild deleted file mode 100644 index 62dfdd3afa8a..000000000000 --- a/www-client/surfraw/surfraw-2.2.7.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/surfraw-2.2.7.ebuild,v 1.7 2011/01/25 17:57:13 darkside Exp $ - -EAPI="3" - -inherit bash-completion eutils - -DESCRIPTION="A fast unix command line interface to WWW" -HOMEPAGE="http://surfraw.alioth.debian.org/" -SRC_URI="http://${PN}.alioth.debian.org/dist/${P}.tar.gz" - -SLOT="0" -LICENSE="public-domain" -KEYWORDS="amd64 hppa ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" -IUSE="" -RESTRICT="test" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.2.6-gentoo_pkg_tools.patch - # Man page symlinks shouldn't link to compressed files - sed -i 's,\.gz,,g' links.IN -} - -src_configure() { - econf \ - --with-elvidir='$(datadir)'/surfraw \ - --disable-opensearch -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog HACKING NEWS README TODO - - dobashcompletion surfraw-bash-completion - - docinto examples - dodoc examples/README - insinto /usr/share/doc/${PF}/examples - doins examples/uzbl_load_url_from_surfraw -} - -pkg_preinst() { - has_version "=${CATEGORY}/${PN}-1.0.7" - upgrade_from_1_0_7=$? -} - -pkg_postinst() { - local moves f - - bash-completion_pkg_postinst - einfo - einfo "You can get a list of installed elvi by just typing 'surfraw' or" - einfo "the abbreviated 'sr'." - einfo - einfo "You can try some searches, for example:" - einfo "$ sr ask why is jeeves gay? " - einfo "$ sr google -results=100 RMS, GNU, which is sinner, which is sin?" - einfo "$ sr rhyme -method=perfect Julian" - einfo - einfo "The system configuration file is /etc/surfraw.conf" - einfo - einfo "Users can specify preferences in '~/.surfraw.conf' e.g." - einfo "SURFRAW_graphical_browser=mozilla" - einfo "SURFRAW_text_browser=w3m" - einfo "SURFRAW_graphical=no" - einfo - einfo "surfraw works with any graphical and/or text WWW browser" - einfo - if [[ $upgrade_from_1_0_7 = 0 ]] ; then - ewarn "surfraw usage has changed slightly since version 1.0.7, elvi are now called" - ewarn "using the 'sr' wrapper script as described above. If you wish to return to" - ewarn "the old behaviour you can add /usr/share/surfraw to your \$PATH" - fi - # This file was always autogenerated, and is no longer needed. - if [ -f "${EROOT}"/etc/surfraw_elvi.list ]; then - rm -f "${EROOT}"/etc/surfraw_elvi.list - fi - - # Config file location changes in v2.2.6 - for f in /etc/surfraw.{bookmarks,conf}; do - if [ -f "${EROOT}"${f} ]; then - ewarn "${f} has moved to /etc/xdg/config/surfraw/${f##*.} in v2.2.6." - moves=1 - fi - done - if [ "${moves}" == 1 ]; then - ewarn "You must manually move, and update, the config files listed" - ewarn "above for surfraw v2.2.6 and above to use them." - fi -} diff --git a/x11-apps/whyteboard/Manifest b/x11-apps/whyteboard/Manifest index 2c41bf21c967..df7843a52dd1 100644 --- a/x11-apps/whyteboard/Manifest +++ b/x11-apps/whyteboard/Manifest @@ -1 +1,2 @@ DIST whyteboard-0.41.1.tar.gz 372110 RMD160 e2643e1b8c3604c0770d644645044165c2e59ec1 SHA1 ed0d9030c94c58eff6b8b540a2a2f3954e96a176 SHA256 2d054981736f905a5c690b73bf2eedbb32337e61e099e87aeae52681f9d83125 +DIST whyteboard.png 7601 RMD160 fea74bed5ad33667f4048b18ee0dcbd6553fef0f SHA1 53932a33bc9905aa40c46a27914dbf255631ac64 SHA256 cd1188ebc24c7fc139052269a528e12c4cb4943195c626a73604ea9b2cf042af diff --git a/x11-apps/whyteboard/files/whyteboard.png b/x11-apps/whyteboard/files/whyteboard.png deleted file mode 100644 index 8d430b7c1e94..000000000000 Binary files a/x11-apps/whyteboard/files/whyteboard.png and /dev/null differ diff --git a/x11-apps/whyteboard/whyteboard-0.41.1.ebuild b/x11-apps/whyteboard/whyteboard-0.41.1.ebuild index d62c108ea523..f791003ca2ed 100644 --- a/x11-apps/whyteboard/whyteboard-0.41.1.ebuild +++ b/x11-apps/whyteboard/whyteboard-0.41.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/whyteboard/whyteboard-0.41.1.ebuild,v 1.1 2011/01/20 18:07:22 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/whyteboard/whyteboard-0.41.1.ebuild,v 1.2 2012/01/26 18:53:38 lxnay Exp $ EAPI="3" @@ -14,7 +14,7 @@ SLOT="0" IUSE="" HOMEPAGE="http://code.google.com/p/whyteboard" -SRC_URI="http://whyteboard.googlecode.com/files/${P}.tar.gz" +SRC_URI="http://whyteboard.googlecode.com/files/${P}.tar.gz http://dev.gentoo.org/~lxnay/${PN}/${PN}.png" KEYWORDS="~amd64 ~x86" RDEPEND="${DEPEND} @@ -27,7 +27,7 @@ src_install() { dodir /usr/share/pixmaps insinto /usr/share/pixmaps - doins "${FILESDIR}/${PN}.png" || die + doins "${DISTDIR}/${PN}.png" || die insinto /usr/share/applications doins "${FILESDIR}/${PN}.desktop" || die diff --git a/x11-misc/rednotebook/rednotebook-1.2.0.ebuild b/x11-misc/rednotebook/rednotebook-1.2.0.ebuild index 23ddbaaefee4..49814c4a300b 100644 --- a/x11-misc/rednotebook/rednotebook-1.2.0.ebuild +++ b/x11-misc/rednotebook/rednotebook-1.2.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/rednotebook/rednotebook-1.2.0.ebuild,v 1.1 2011/10/09 14:43:26 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/rednotebook/rednotebook-1.2.0.ebuild,v 1.2 2012/01/26 21:12:23 hwoarang Exp $ EAPI="3" @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="libyaml spell" RDEPEND="dev-python/pyyaml[libyaml?]