diff --git a/app-arch/libarchive/libarchive-2.8.5.ebuild b/app-arch/libarchive/libarchive-2.8.5.ebuild index 05ee19be0792..1b49e97d7544 100644 --- a/app-arch/libarchive/libarchive-2.8.5.ebuild +++ b/app-arch/libarchive/libarchive-2.8.5.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-arch/libarchive/libarchive-2.8.5.ebuild,v 1.7 2012/01/18 21:13:55 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.5.ebuild,v 1.8 2012/01/20 10:40:08 tomka Exp $ EAPI="2" @@ -13,7 +13,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd" IUSE="static static-libs acl xattr kernel_linux +bzip2 +lzma +zlib expat" COMPRESS_LIBS_DEPEND="lzma? ( app-arch/xz-utils ) diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild index e7325a7dd545..3c75b9e605f8 100644 --- a/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild +++ b/app-emulation/qemu-kvm/qemu-kvm-0.15.1-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/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild,v 1.3 2012/01/17 22:23:53 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild,v 1.4 2012/01/20 10:54:04 ago Exp $ #BACKPORTS=1 @@ -21,7 +21,7 @@ else ${BACKPORTS:+ http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/${P}-backports-${BACKPORTS}.tar.bz2}" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 ~ppc ~ppc64 ~x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" diff --git a/app-emulation/virt-manager/virt-manager-0.9.0-r3.ebuild b/app-emulation/virt-manager/virt-manager-0.9.0-r3.ebuild index 6f7589843abd..bffc1a4094bb 100644 --- a/app-emulation/virt-manager/virt-manager-0.9.0-r3.ebuild +++ b/app-emulation/virt-manager/virt-manager-0.9.0-r3.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/app-emulation/virt-manager/virt-manager-0.9.0-r3.ebuild,v 1.2 2012/01/18 22:37:29 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.9.0-r3.ebuild,v 1.3 2012/01/20 09:33:31 jlec Exp $ BACKPORTS=4 -EAPI=2 +EAPI=4 if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="http://git.fedorahosted.org/git/virt-manager.git" @@ -55,6 +55,8 @@ DEPEND="${RDEPEND} pkg_setup() { G2CONF="--without-tui" + python_set_active_version 2 + python_pkg_setup } src_prepare() { @@ -70,17 +72,23 @@ src_prepare() { # unless we do this touch config.rpath - rm -rf config.status - intltoolize --automake --copy --force - perl -i -p -e 's,^DATADIRNAME.*$,DATADIRNAME = share,' po/Makefile.in.in + rm -rf config.status || die + intltoolize --automake --copy --force || die + perl -i -p -e 's,^DATADIRNAME.*$,DATADIRNAME = share,' po/Makefile.in.in || die perl -i -p -e 's,^GETTEXT_PACKAGE.*$,GETTEXT_PACKAGE = virt-manager,' \ - po/Makefile.in.in + po/Makefile.in.in || die eautoreconf fi gnome2_src_prepare } -src_install() { - gnome2_src_install +pkg_postinst() { + python_mod_optimize /usr/share/${PN} + gnome2_pkg_postinst +} + +pkg_postrm() { + python_mod_cleanup /usr/share/${PN} + gnome2_pkg_postrm } diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild index 486b2c492858..8ac09780daa3 100644 --- a/app-emulation/virt-manager/virt-manager-9999.ebuild +++ b/app-emulation/virt-manager/virt-manager-9999.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-emulation/virt-manager/virt-manager-9999.ebuild,v 1.7 2011/07/27 15:37:30 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-9999.ebuild,v 1.8 2012/01/20 09:33:31 jlec Exp $ #BACKPORTS= -EAPI=2 +EAPI=4 if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="http://git.fedorahosted.org/git/virt-manager.git" @@ -26,7 +26,7 @@ else SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz ${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}" KEYWORDS="~amd64 ~x86" - VIRTINSTDEP=">=app-emulation/virtinst-0.500.6" + VIRTINSTDEP=">=app-emulation/virtinst-0.600.0-r2" fi DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)" @@ -47,13 +47,16 @@ RDEPEND=">=dev-python/pygtk-1.99.12 gnome-keyring? ( dev-python/gnome-keyring-python ) policykit? ( sys-auth/polkit ) spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] )" +# tui? ( >=dev-python/new_syrup-0.1.2 )" DEPEND="${RDEPEND} app-text/rarian dev-util/intltool" -# The TUI (terminal UI) requires newt_syrup which is not packaged on -# Gentoo. bug #356711 +pkg_setup() { G2CONF="--without-tui" + python_set_active_version 2 + python_pkg_setup +} src_prepare() { sed -e "s/python/python2/" -i src/virt-manager.in || \ @@ -68,33 +71,23 @@ src_prepare() { # unless we do this touch config.rpath - rm -rf config.status - intltoolize --automake --copy --force - perl -i -p -e 's,^DATADIRNAME.*$,DATADIRNAME = share,' po/Makefile.in.in + rm -rf config.status || die + intltoolize --automake --copy --force || die + perl -i -p -e 's,^DATADIRNAME.*$,DATADIRNAME = share,' po/Makefile.in.in || die perl -i -p -e 's,^GETTEXT_PACKAGE.*$,GETTEXT_PACKAGE = virt-manager,' \ - po/Makefile.in.in + po/Makefile.in.in || die eautoreconf fi gnome2_src_prepare } -src_install() { - gnome2_src_install - - insinto /usr/share/virt-manager/pixmaps/ - doins "${S}"/pixmaps/*.png - doins "${S}"/pixmaps/*.svg - - insinto /usr/share/virt-manager/pixmaps/hicolor/16x16/actions/ - doins "${S}"/pixmaps/hicolor/16x16/actions/*.png - - insinto /usr/share/virt-manager/pixmaps/hicolor/22x22/actions/ - doins "${S}"/pixmaps/hicolor/22x22/actions/*.png - - insinto /usr/share/virt-manager/pixmaps/hicolor/24x24/actions/ - doins "${S}"/pixmaps/hicolor/24x24/actions/*.png +pkg_postinst() { + python_mod_optimize /usr/share/${PN} + gnome2_pkg_postinst +} - insinto /usr/share/virt-manager/pixmaps/hicolor/32x32/actions/ - doins "${S}"/pixmaps/hicolor/32x32/actions/*.png +pkg_postrm() { + python_mod_cleanup /usr/share/${PN} + gnome2_pkg_postrm } diff --git a/dev-java/javahelp/Manifest b/dev-java/javahelp/Manifest index 892bf01ecb3e..7e56c73fafb0 100644 --- a/dev-java/javahelp/Manifest +++ b/dev-java/javahelp/Manifest @@ -1,2 +1 @@ -DIST javahelp2-src-2.0.02_svn46.zip 6518989 RMD160 c9737aa99cc8c7143972cc3c2f53acd6d56db75b SHA1 93e03e15cefaae066abfb8b55507c30df3fe4d9e SHA256 97979f8cb8d8c43f040a1fb4ca998e9e209f5b7c898648e57c7337ec4458ea2f DIST javahelp2-src-2.0.05_svn63.zip 3747088 RMD160 20d510dea595d6c2edc2ecd46265eeb6cf509787 SHA1 478d71f4957c037c0da2f8a3b0eeb10bdd5f3acb SHA256 a864ac71701ed8d12ba192460cd7b4d51e78813f39a140ede5d9b04afd9eae92 diff --git a/dev-java/javahelp/javahelp-2.0.02_p46.ebuild b/dev-java/javahelp/javahelp-2.0.02_p46.ebuild deleted file mode 100644 index cc03eac646e6..000000000000 --- a/dev-java/javahelp/javahelp-2.0.02_p46.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/javahelp/javahelp-2.0.02_p46.ebuild,v 1.12 2011/12/27 18:46:17 halcy0n Exp $ - -WANT_ANT_TASKS="ant-nodeps" -JAVA_PKG_IUSE="doc examples source" - -inherit versionator java-pkg-2 java-ant-2 - -DESCRIPTION="The JavaHelp system online help system" -HOMEPAGE="https://javahelp.dev.java.net/" - -MY_PV="${PV/_p/_svn}" -MY_PN="${PN}2" -SRC_URI="https://${PN}.dev.java.net/files/documents/5985/47404/${MY_PN}-src-${MY_PV}.zip" - -LICENSE="GPL-2-with-linking-exception" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris" - -COMMON_DEP=" - =dev-java/servletapi-2.4*" -RDEPEND=" - >=virtual/jre-1.4 - ${COMMON_DEP}" -DEPEND=" - >=virtual/jdk-1.4 - app-arch/unzip - ${COMMON_DEP} - " - -S="${WORKDIR}/${MY_PN}-${MY_PV}/" -BDIR="${S}/javahelp_nbproject" - -src_unpack() { - unpack "${A}" - # jdic does not currently build out of the box against the browsers we have - cd "${S}/jhMaster/JavaHelp/src/new/" || die - rm -v javax/help/plaf/basic/BasicNativeContentViewerUI.java || die - cd "${BDIR}/lib" || die - java-pkg_jar-from servletapi-2.4 - java-pkg_filter-compiler jikes -} - -_eant() { - cd ${BDIR} || die - eant \ - -Dservlet-jar="$(java-pkg_getjar servletapi-2.4 servlet-api.jar)" \ - -Djsp-jar="$(java-pkg_getjar servletapi-2.4 jsp-api.jar)" \ - -Djdic-jar-present=true \ - -Djdic-zip-present=true \ - -Dtomcat-zip-present=true \ - -Dservlet-jar-present=true \ - ${@} -} - -src_compile() { - _eant release $(use_doc) -} - -#Does not actually run anything -#src_test() { -# _eant test -#} - -src_install() { - cd jhMaster/JavaHelp || die - dodoc README || die - dohtml *.{html,css} || die - java-pkg_dojar "${BDIR}"/dist/lib/*.jar - java-pkg_dolauncher jhsearch \ - --main com.sun.java.help.search.QueryEngine - java-pkg_dolauncher jhindexer \ - --main com.sun.java.help.search.Indexer - use doc && java-pkg_dojavadoc "${BDIR}/dist/lib/javadoc" - cd "${S}" - use source && java-pkg_dosrc \ - ./jhMaster/JSearch/*/com \ - ./jhMaster/JavaHelp/src/*/{javax,com} - use examples && java-pkg_doexamples jhMaster/JavaHelp/demos -} - -pkg_postinst() { - elog "Native browser integration is disabled because it needs jdic" - elog "which does not build out of the box. See" - elog "https://bugs.gentoo.org/show_bug.cgi?id=53897 for progress" -} diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest index d2b97990c3b7..b683d57137d8 100644 --- a/dev-java/sun-jdk/Manifest +++ b/dev-java/sun-jdk/Manifest @@ -4,3 +4,9 @@ DIST jdk-6u29-solaris-i586.sh 85022791 RMD160 88595026cad4f10156c90e3df03771218e DIST jdk-6u29-solaris-sparc.sh 90224612 RMD160 998ec8a2bd8f2606e45f21cb7d08ab0fa4feff12 SHA1 887dc14e330832c80083c16b6550abd3304486bb SHA256 975976e41c7f92cc2945398c780282ede345a44eb079a244892dd440e601df06 DIST jdk-6u29-solaris-sparcv9.sh 12832683 RMD160 6df1203c8b92ac0d652afe4e7bf6556bbfbf0562 SHA1 d73f3858dbf3076f8151a46c1b065e613e9f0e11 SHA256 de42908a88e0dfcda66bb2c66e1e82feeb278a5d5a74e8a71b634883c6ad7379 DIST jdk-6u29-solaris-x64.sh 8909539 RMD160 a7ecfac24fee9139a9c5113d928625933f63ec82 SHA1 a6332aead99377f2492c8330fdc9daf923a93054 SHA256 37595a803e571056350f7c0b326cf8005e5c6e1eb9d8726d6afac46f9d140973 +DIST jdk-6u30-linux-i586.bin 85282052 RMD160 c150f624dcefcb666594eea4b62ce8fa7f4ae4e6 SHA1 f05e12dcc5128af264f26695e861ea86427464d4 SHA256 b551be83a690bc9fec0107d9aa4f828cd47e150fa54cbedbfa8f80c99e2f18b5 +DIST jdk-6u30-linux-x64.bin 85570714 RMD160 2e7aa2796c7c798c4602bb95c0d776a59c618ae9 SHA1 6ff68d74a108718ce4012e9d41b0e9bafdad7067 SHA256 928220f4e46c5dabef0440791c48023945629d8a23998e072157e04960d8a759 +DIST jdk-6u30-solaris-i586.sh 85158600 RMD160 b5366802d39e9d0b23facc60e03e82e909140ee7 SHA1 fd49db8ba608e256e9ed457d4fe0935589706544 SHA256 b63c192dc580d08911ba466f5e19673f512178a7158f44946fc982062064eb69 +DIST jdk-6u30-solaris-sparc.sh 90368229 RMD160 d33ea028c5a12ed1cc16cec3f911548dd403efa3 SHA1 f0d9bc2db3c11966391ae6eb0143a3dee84a1ae2 SHA256 f2fdb58029a7b592c571431e2b5649173488f3e0eaf9df6b796f3596556b9586 +DIST jdk-6u30-solaris-sparcv9.sh 12835286 RMD160 51a7fd247d96b4d9d4af6aa4440a97e58d0ef3a0 SHA1 ea0e9acb90d9e5f3eff5745e4c14eab99d84b791 SHA256 ec4a9e25c83853cbc579e6127b657301c4a937a8872317339c116a7605813cc0 +DIST jdk-6u30-solaris-x64.sh 8911544 RMD160 e9b9a97d3a8a95000c2a7b6e1c26c5237d9b246e SHA1 7ed8e660b705cd8aa06f12677cfa52c0d197441f SHA256 bf51af22389868bd250990f682b92b20e36fec2cfa1d08978fa8b165fa04cd7c diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.30.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.30.ebuild new file mode 100644 index 000000000000..1fc16b6a826f --- /dev/null +++ b/dev-java/sun-jdk/sun-jdk-1.6.0.30.ebuild @@ -0,0 +1,177 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.30.ebuild,v 1.1 2012/01/20 10:20:12 sera Exp $ + +EAPI="4" + +inherit java-vm-2 eutils prefix versionator + +# This URIs need to be updated when bumping! +JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk-6u30-download-1377139.html" + +MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)" +S_PV="$(replace_version_separator 3 '_')" + +X86_AT="jdk-${MY_PV}-linux-i586.bin" +AMD64_AT="jdk-${MY_PV}-linux-x64.bin" +SOL_X86_AT="jdk-${MY_PV}-solaris-i586.sh" +SOL_AMD64_AT="jdk-${MY_PV}-solaris-x64.sh" +SOL_SPARC_AT="jdk-${MY_PV}-solaris-sparc.sh" +SOL_SPARCv9_AT="jdk-${MY_PV}-solaris-sparcv9.sh" + +DESCRIPTION="Oracle's Java SE Development Kit" +HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" +SRC_URI="x86? ( ${X86_AT} ) + amd64? ( ${AMD64_AT} ) + x86-solaris? ( ${SOL_X86_AT} ) + x64-solaris? ( ${SOL_X86_AT} ${SOL_AMD64_AT} ) + sparc-solaris? ( ${SOL_SPARC_AT} ) + sparc64-solaris? ( ${SOL_SPARC_AT} ${SOL_SPARCv9_AT} )" + +LICENSE="Oracle-BCLA-JavaSE" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +SLOT="1.6" +IUSE="X alsa derby doc examples jce kernel_SunOS nsplugin" + +RESTRICT="fetch strip" +QA_TEXTRELS_x86=" + opt/${P}/jre/lib/i386/client/libjvm.so + opt/${P}/jre/lib/i386/motif21/libmawt.so + opt/${P}/jre/lib/i386/server/libjvm.so" + +RDEPEND="${DEPEND} + doc? ( dev-java/java-sdk-docs:1.6.0 ) + !prefix? ( sys-libs/glibc ) + kernel_SunOS? ( app-arch/unzip ) + alsa? ( media-libs/alsa-lib ) + X? ( + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libX11 + )" +DEPEND="jce? ( dev-java/sun-jce-bin:1.6 )" + +S="${WORKDIR}/jdk${S_PV}" + +pkg_nofetch() { + if use x86; then + AT=${X86_AT} + elif use amd64; then + AT=${AMD64_AT} + elif use x86-solaris; then + AT=${SOL_X86_AT} + elif use x64-solaris; then + AT="${SOL_X86_AT} and ${SOL_AMD64_AT}" + elif use sparc-solaris; then + AT=${SOL_SPARC_AT} + elif use sparc64-solaris; then + AT="${SOL_SPARC_AT} and ${SOL_SPARCv9_AT}" + fi + + einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again." + einfo "Alternatives are switching to dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6" + + einfo "Please download ${AT} from:" + einfo "${JDK_URI}" + einfo "and move it to ${DISTDIR}" +} + +src_unpack() { + if [[ ${CHOST} == *-solaris* ]] ; then + for i in ${A}; do + rm -f "${S}"/jre/{LICENSE,README} "${S}"/LICENSE + # don't die on unzip, it always "fails" + unzip "${DISTDIR}"/${i} + done + for f in $(find "${S}" -name "*.pack") ; do + "${S}"/bin/unpack200 ${f} ${f%.pack}.jar + rm ${f} + done + else + sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack" + fi +} + +src_compile() { + # This needs to be done before CDS - #215225 + java-vm_set-pax-markings "${S}" + + # see bug #207282 + einfo "Creating the Class Data Sharing archives" + if use x86; then + "${S}"/bin/java -client -Xshare:dump || die + fi + "${S}"/bin/java -server -Xshare:dump || die +} + +src_install() { + # We should not need the ancient plugin for Firefox 2 anymore, plus it has + # writable executable segments + if use x86; then + rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \ + {,jre/}lib/i386/libjavaplugin_nscp*.so + rm -vrf jre/plugin/i386 + fi + # Without nsplugin flag, also remove the new plugin + local arch=${ARCH}; + use x86 && arch=i386; + if ! use nsplugin; then + rm -vf {,jre/}lib/${arch}/libnpjp2.so \ + {,jre/}lib/${arch}/libjavaplugin_jni.so + fi + + dodir /opt/${P} + cp -pPR bin include jre lib man src.zip "${ED}"/opt/${P} || die + + if use derby; then + cp -pPR db "${ED}"/opt/${P} || die + fi + + if use examples; then + cp -pPR demo sample "${ED}"/opt/${P} || die + fi + + # Remove empty dirs we might have copied + rmdir -v $(find "${D}" -type d -empty) || die + + dodoc COPYRIGHT + dohtml README.html + + if use jce; then + dodir /opt/${P}/jre/lib/security/strong-jce + mv "${ED}"/opt/${P}/jre/lib/security/US_export_policy.jar \ + "${ED}"/opt/${P}/jre/lib/security/strong-jce || die + mv "${ED}"/opt/${P}/jre/lib/security/local_policy.jar \ + "${ED}"/opt/${P}/jre/lib/security/strong-jce || die + dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \ + /opt/${P}/jre/lib/security/US_export_policy.jar + dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \ + /opt/${P}/jre/lib/security/local_policy.jar + fi + + if use nsplugin; then + install_mozilla_plugin /opt/${P}/jre/lib/${arch}/libnpjp2.so + fi + + # Install desktop file for the Java Control Panel. Using VMHANDLE as file + # name to prevent file collision with jre and or other slots. + [[ -f "${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop ]] || die + sed -e "s/\(Name=\)Java/\1 Java Control Panel for Oracle JDK ${SLOT} (sun-jdk)/" \ + -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \ + -e "s#Icon=.*#Icon=/opt/${P}/jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png#" \ + "${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop > \ + "${T}"/${VMHANDLE}.desktop + + domenu "${T}"/${VMHANDLE}.desktop + + # bug #56444 + cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die + eprefixify "${T}"/fontconfig.properties + insinto /opt/${P}/jre/lib/ + doins "${T}"/fontconfig.properties + + set_java_env "${FILESDIR}/${VMHANDLE}.env-r1" + java-vm_revdep-mask +} diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest index 0a2540dd9978..b80a2cfa3be3 100644 --- a/dev-java/sun-jre-bin/Manifest +++ b/dev-java/sun-jre-bin/Manifest @@ -1,2 +1,4 @@ DIST jre-6u29-linux-i586.bin 21632980 RMD160 ce7ba2ec99643b6d47f6b634d7e9fa5877513b4a SHA1 6de26b992a9920117d2f156ff5bbddf2d5b28f77 SHA256 13bd1ce27709be7d05c07221185d4f572242b14a80cea67b557e761f5ba7e440 DIST jre-6u29-linux-x64.bin 21230518 RMD160 53bb593ae6ff9f09bc1f00a94ebd6a3506260f87 SHA1 820399aed6db6c1960ba0942bc64c49a3b809b89 SHA256 624e566642ebe1dc41d07737d15e3a0ada754f36e7d27a789b4a44a2f2148e58 +DIST jre-6u30-linux-i586.bin 21686310 RMD160 f721ccaef056f4281ad6b020ec9a3c79cbfc1252 SHA1 6e2f60a3d62b73e878dc77e3a6266b03eadec31e SHA256 5bf23eddbcb0f61e9415ec2cc6432f3ca86f6a3efbc37b55ab3f48d054c1bb47 +DIST jre-6u30-linux-x64.bin 21300428 RMD160 7bf08b9330c7e299eec85a08eb25fa6d58a3f8d9 SHA1 8da1cfb1143374afed424e55e48d1f4e1c4e2183 SHA256 f35225a514efc3a56bedb92b73b188710c54715dc20a97cb9524f650e37628d5 diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.30.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.30.ebuild new file mode 100644 index 000000000000..6da380b5a182 --- /dev/null +++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.30.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.30.ebuild,v 1.1 2012/01/20 10:32:10 sera Exp $ + +EAPI="4" + +inherit java-vm-2 eutils prefix versionator + +# This URIs need to be updated when bumping! +JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre-6u30-download-1377142.html" + +MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)" +S_PV="$(replace_version_separator 3 '_')" + +X86_AT="jre-${MY_PV}-linux-i586.bin" +AMD64_AT="jre-${MY_PV}-linux-x64.bin" + +DESCRIPTION="Oracle's Java SE Runtime Environment" +HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" +SRC_URI=" + amd64? ( ${AMD64_AT} ) + x86? ( ${X86_AT} )" + +LICENSE="Oracle-BCLA-JavaSE" +KEYWORDS="~amd64 ~x86" +SLOT="1.6" +IUSE="X alsa jce nsplugin" + +RESTRICT="fetch strip" +QA_TEXTRELS_x86=" + opt/${P}/lib/i386/client/libjvm.so + opt/${P}/lib/i386/motif21/libmawt.so + opt/${P}/lib/i386/server/libjvm.so" + +RDEPEND="${DEPEND} + !prefix? ( sys-libs/glibc ) + alsa? ( media-libs/alsa-lib ) + X? ( + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libX11 + )" +DEPEND="jce? ( dev-java/sun-jce-bin:1.6 )" + +S="${WORKDIR}/jre${S_PV}" + +pkg_nofetch() { + if use x86; then + AT=${X86_AT} + elif use amd64; then + AT=${AMD64_AT} + fi + + einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again." + einfo "Alternatives are switching to dev-java/icedtea-bin or the source-based dev-java/icedtea:6" + + einfo "Please download ${AT} from:" + einfo "${JRE_URI}" + einfo "and move it to ${DISTDIR}" +} + +src_unpack() { + sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack" +} + +src_compile() { + # This needs to be done before CDS - #215225 + java-vm_set-pax-markings "${S}" + + # see bug #207282 + einfo "Creating the Class Data Sharing archives" + if use x86; then + "${S}"/bin/java -client -Xshare:dump || die + fi + "${S}"/bin/java -server -Xshare:dump || die +} + +src_install() { + # We should not need the ancient plugin for Firefox 2 anymore, plus it has + # writable executable segments + if use x86; then + rm -vf lib/i386/libjavaplugin_oji.so \ + lib/i386/libjavaplugin_nscp*.so + rm -vrf plugin/i386 + fi + # Without nsplugin flag, also remove the new plugin + local arch=${ARCH}; + use x86 && arch=i386; + if ! use nsplugin; then + rm -vf lib/${arch}/libnpjp2.so \ + lib/${arch}/libjavaplugin_jni.so + fi + + dodir /opt/${P} + cp -pPR bin lib man "${ED}"/opt/${P} || die + + # Remove empty dirs we might have copied + rmdir -v $(find "${D}" -type d -empty) || die + + dodoc COPYRIGHT README + + if use jce; then + dodir /opt/${P}/lib/security/strong-jce + mv "${ED}"/opt/${P}/lib/security/US_export_policy.jar \ + "${ED}"/opt/${P}/lib/security/strong-jce || die + mv "${ED}"/opt/${P}/lib/security/local_policy.jar \ + "${ED}"/opt/${P}/lib/security/strong-jce || die + dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \ + /opt/${P}/lib/security/US_export_policy.jar + dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \ + /opt/${P}/lib/security/local_policy.jar + fi + + if use nsplugin; then + install_mozilla_plugin /opt/${P}/lib/${arch}/libnpjp2.so + fi + + # Install desktop file for the Java Control Panel. Using VMHANDLE as file + # name to prevent file collision with jdk and or other slots. + [[ -f "${ED}"/opt/${P}/lib/desktop/applications/sun_java.desktop ]] || die + sed -e "s/\(Name=\)Java/\1 Java Control Panel for Oracle JRE ${SLOT} (sun-jre-bin)/" \ + -e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \ + -e "s#Icon=.*#Icon=/opt/${P}/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png#" \ + "${ED}"/opt/${P}/lib/desktop/applications/sun_java.desktop > \ + "${T}"/${VMHANDLE}.desktop + + domenu "${T}"/${VMHANDLE}.desktop + + # bug #56444 + cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die + eprefixify "${T}"/fontconfig.properties + insinto /opt/${P}/lib/ + doins "${T}"/fontconfig.properties + + set_java_env "${FILESDIR}/${VMHANDLE}.env-r1" + java-vm_revdep-mask +} diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index bd75fb4eaa38..1970bc32a080 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -8,6 +8,7 @@ DIST php-5.3.9RC4.tar.bz2 11711811 RMD160 30041f935004fd423db399f657dae4c85063e7 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.2.17-r0.tar.bz2 8369 RMD160 544af4eb2de8e4478e675810f18a5b494b59709b SHA1 7b3c56437b435f60f72f7af08112e77c01e2f827 SHA256 fb159a02faf5120dd9bc620bd3f3094735f181aa6893273bb7dd29771b8b23b2 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 @@ -18,6 +19,7 @@ DIST php-patchset-5.3.9_rc4-r0.tar.bz2 7517 RMD160 8e36f129dbb02ba47b1e7b55bbabc 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.2.16-0.9.7.patch.gz 23069 RMD160 b28b70faf136b3e04c5b483da0f4c2279378f43a SHA1 fec10b2b81582d06bb0d0a96ea55c525afc8ab29 SHA256 aae115a318d80b3f32cedf876e7a8e4b932febb1b0c743c0b398003ebe122f91 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.4.0_rc6.ebuild b/dev-lang/php/php-5.4.0_rc6.ebuild new file mode 100644 index 000000000000..106649e71477 --- /dev/null +++ b/dev-lang/php/php-5.4.0_rc6.ebuild @@ -0,0 +1,390 @@ +# 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_rc6.ebuild,v 1.1 2012/01/20 14:40:05 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/gmime/Manifest b/dev-libs/gmime/Manifest index 618e7585c66f..1c8b259c1dfd 100644 --- a/dev-libs/gmime/Manifest +++ b/dev-libs/gmime/Manifest @@ -2,7 +2,9 @@ DIST gmime-2.2.27.tar.bz2 790878 RMD160 43a7c2cac36e97ad1391a33fce9ca4bc53ff1704 DIST gmime-2.4.26.tar.xz 729020 RMD160 5bc32a1afd87e41134ed2381e1044aab3703fddc SHA1 e91ecae390e11b062fea8354e097195368ce11a5 SHA256 bad2c9ceb36a685a8f31eccf047be9d761da781c777c7657b093f9ff0bba401f DIST gmime-2.4.28.tar.xz 730112 RMD160 15d2dc3ee365fe60c13ffde8466f38c5cebb1677 SHA1 0006053f3eedae80fed0d62dae8abcd331f55754 SHA256 8487faf949ca60c7fb814338e6457d4b4260fcba361158667e1f3fe3e7cce13e DIST gmime-2.4.30.tar.xz 731224 RMD160 9adc5282fa8b3bdf3da111a1d8ff17d1b195ab74 SHA1 c8f0814dcf4ea3cde53f9a698a680ba5402dc42d SHA256 8a25f511734d3ec01938a1915c7d64571f4b92e1ff6f76c363ed94b83616d44e +DIST gmime-2.4.31.tar.xz 684740 RMD160 e7927334759cd3e4152db1bed1419445c71245e8 SHA1 60ac46236bf621676dab607568a182633a4f91d9 SHA256 d9601328ee3d2d5be57ac8397571af4835dba8eb2c68ad224de3ec722a81fd04 DIST gmime-2.6.0.tar.xz 775012 RMD160 ac0b9a6e59c3abdf1b4ece55b3cc9a2ba7a1c0e3 SHA1 a78b4afab2664586145e49c4673d1351a7fbf813 SHA256 bc71b1860ea85efd3e17d9d8edef6ef7ba9880bc34d73dc683d36d8a48dcad17 DIST gmime-2.6.1.tar.xz 775204 RMD160 6d8cfc8cd0ea1a1b03efe3282cffcd976d1f8bc6 SHA1 fe977dfbeb05a44028f60204022f9cb895da9eac SHA256 89864f8dd7e9c8d1e8abb762401ef54123d2a1f456d41dcd63364a42ac0cc80e DIST gmime-2.6.3.tar.xz 776216 RMD160 64b17b477147892a54b66fd256f7826ce67e8cd3 SHA1 31193111d3b54809b3af8bb60775a535d2c4946c SHA256 6284fde1c73a1944d1a3529ab792bb7984633f619c8f74eb7fe2dfb0fd7c030b +DIST gmime-2.6.4.tar.xz 719668 RMD160 62b5b39ee6fbb3febfd7cb5f08da1ebd5c6da16e SHA1 5ccf322d69870b29d82f3df2c4d82e954399171d SHA256 2e85076c223fe8bf1392a7c1affa4454cb3bb6dec83016ad6e3230c65533f163 DIST gmime-sharp.snk 596 RMD160 62a475a0a29bc8823ddcd25211e417bd0ee26221 SHA1 106d8812445a6fcd52526b2bc1184249dda6f4b8 SHA256 f71eb61399bb038acc847298b74eee6c03a8773309dc5c10929ee4aa0aeb3948 diff --git a/dev-libs/gmime/files/gmime-2.4.31-fix-tutorial.patch b/dev-libs/gmime/files/gmime-2.4.31-fix-tutorial.patch new file mode 100644 index 000000000000..acf0819f6b4c --- /dev/null +++ b/dev-libs/gmime/files/gmime-2.4.31-fix-tutorial.patch @@ -0,0 +1,49 @@ +From a876678c4bee4a969ad66d0701869df06b1d10ea Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Fri, 20 Jan 2012 02:27:34 -0500 +Subject: [PATCH] Fix tutorial generation for DB2HTML changes + +DB2HTML is now a path, so in HAVE_DOCBOOK AM_CONDITIONAL we need to test +it for non-emptiness instead of trying to execute it. + +docbook2html uses . as the default output directory, while db2html uses +gmime-tut by default. We therefore need to explicitly set the output +directory by calling $DB2HTML with "-o html". + +https://bugzilla.gnome.org/show_bug.cgi?id=667070 +--- + configure.in | 2 +- + docs/tutorial/Makefile.am | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure.in b/configure.in +index 89304d3..93997c8 100644 +--- a/configure.in ++++ b/configure.in +@@ -133,7 +133,7 @@ dnl ************************************ + GTK_DOC_CHECK([1.8]) + + AC_PATH_PROGS([DB2HTML], [db2html docbook2html]) +-AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML) ++AM_CONDITIONAL(HAVE_DOCBOOK, [test -n "$DB2HTML"]) + + dnl NOTE: We need to use a separate automake conditional for this + dnl to make this work with the tarballs. +diff --git a/docs/tutorial/Makefile.am b/docs/tutorial/Makefile.am +index 71d70be..13e713d 100644 +--- a/docs/tutorial/Makefile.am ++++ b/docs/tutorial/Makefile.am +@@ -6,9 +6,7 @@ html: + if HAVE_DOCBOOK + if test -w $(srcdir); then \ + (cd $(srcdir); \ +- $(DB2HTML) gmime-tut.sgml; \ +- test -d html && rm -r html; \ +- mv gmime-tut html); \ ++ $(DB2HTML) -o html gmime-tut.sgml); \ + fi + else + echo "***" +-- +1.7.8.3 + diff --git a/dev-libs/gmime/files/gmime-2.6.4-fix-tutorial.patch b/dev-libs/gmime/files/gmime-2.6.4-fix-tutorial.patch new file mode 100644 index 000000000000..814d432876bc --- /dev/null +++ b/dev-libs/gmime/files/gmime-2.6.4-fix-tutorial.patch @@ -0,0 +1,49 @@ +From 2c2a72338c1f5af69d8173d4fb5d2e0076d30238 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Fri, 20 Jan 2012 02:27:34 -0500 +Subject: [PATCH] Fix tutorial generation for DB2HTML changes + +DB2HTML is now a path, so in HAVE_DOCBOOK AM_CONDITIONAL we need to test +it for non-emptiness instead of trying to execute it. + +docbook2html uses . as the default output directory, while db2html uses +gmime-tut by default. We therefore need to explicitly set the output +directory by calling $DB2HTML with "-o html". + +https://bugzilla.gnome.org/show_bug.cgi?id=667070 +--- + configure.ac | 2 +- + docs/tutorial/Makefile.am | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c799346..da7325e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -199,7 +199,7 @@ dnl ************************************ + GTK_DOC_CHECK([1.8]) + + AC_PATH_PROGS([DB2HTML], [db2html docbook2html]) +-AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML) ++AM_CONDITIONAL(HAVE_DOCBOOK, [test -n "$DB2HTML"]) + + dnl NOTE: We need to use a separate automake conditional for this + dnl to make this work with the tarballs. +diff --git a/docs/tutorial/Makefile.am b/docs/tutorial/Makefile.am +index 71d70be..13e713d 100644 +--- a/docs/tutorial/Makefile.am ++++ b/docs/tutorial/Makefile.am +@@ -6,9 +6,7 @@ html: + if HAVE_DOCBOOK + if test -w $(srcdir); then \ + (cd $(srcdir); \ +- $(DB2HTML) gmime-tut.sgml; \ +- test -d html && rm -r html; \ +- mv gmime-tut html); \ ++ $(DB2HTML) -o html gmime-tut.sgml); \ + fi + else + echo "***" +-- +1.7.8.3 + diff --git a/dev-libs/gmime/gmime-2.4.31.ebuild b/dev-libs/gmime/gmime-2.4.31.ebuild new file mode 100644 index 000000000000..93efe3ef8ea7 --- /dev/null +++ b/dev-libs/gmime/gmime-2.4.31.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.4.31.ebuild,v 1.1 2012/01/20 10:21:27 tetromino Exp $ + +EAPI="4" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit autotools gnome2 eutils mono + +DESCRIPTION="Utilities for creating and parsing messages using MIME" +HOMEPAGE="http://spruce.sourceforge.net/gmime/" + +SLOT="2.4" +LICENSE="LGPL-2.1" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +IUSE="doc mono static-libs" + +RDEPEND=">=dev-libs/glib-2.12:2 + sys-libs/zlib + mono? ( + dev-lang/mono + >=dev-dotnet/glib-sharp-2.4.0:2 )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + doc? ( + >=dev-util/gtk-doc-1.8 + app-text/docbook-sgml-utils ) + mono? ( dev-dotnet/gtk-sharp-gapi:2 ) + + dev-util/gtk-doc-am" +# eautoreconf requires dev-util/gtk-doc-am + +pkg_setup() { + DOCS="AUTHORS ChangeLog NEWS PORTING README TODO" + G2CONF="${G2CONF} + --enable-cryptography + $(use_enable mono) + $(use_enable static-libs static)" +} + +src_prepare() { + # https://bugzilla.gnome.org/show_bug.cgi?id=667070 + epatch "${FILESDIR}/${P}-fix-tutorial.patch" # needs eautoreconf + eautoreconf + gnome2_src_prepare +} + +src_compile() { + MONO_PATH="${S}" gnome2_src_compile + if use doc; then + emake -C docs/tutorial html + fi +} + +src_install() { + GACUTIL_FLAGS="/root '${ED}/usr/$(get_libdir)' /gacdir '${EPREFIX}/usr/$(get_libdir)' /package ${PN}" \ + gnome2_src_install + + if use doc ; then + # we don't use docinto/dodoc, because we don't want html doc gzipped + insinto /usr/share/doc/${PF}/tutorial + doins docs/tutorial/html/* + fi + + # rename these two, so they don't conflict with slot 0 + mv "${ED}/usr/bin/gmime-uuencode"{,-${SLOT}} || die + mv "${ED}/usr/bin/gmime-uudecode"{,-${SLOT}} || die +} diff --git a/dev-libs/gmime/gmime-2.6.4.ebuild b/dev-libs/gmime/gmime-2.6.4.ebuild new file mode 100644 index 000000000000..1f1f186ac5e8 --- /dev/null +++ b/dev-libs/gmime/gmime-2.6.4.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.6.4.ebuild,v 1.1 2012/01/20 10:21:27 tetromino Exp $ + +EAPI="4" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit autotools gnome2 eutils mono + +DESCRIPTION="Utilities for creating and parsing messages using MIME" +HOMEPAGE="http://spruce.sourceforge.net/gmime/" + +SLOT="2.6" +LICENSE="LGPL-2.1" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +IUSE="doc mono static-libs" + +RDEPEND=">=dev-libs/glib-2.18.0:2 + sys-libs/zlib + >=app-crypt/gpgme-1.1.6 + mono? ( + dev-lang/mono + >=dev-dotnet/glib-sharp-2.4.0:2 )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + doc? ( + >=dev-util/gtk-doc-1.8 + app-text/docbook-sgml-utils ) + mono? ( dev-dotnet/gtk-sharp-gapi:2 ) + + dev-util/gtk-doc-am" +# eautoreconf requires dev-util/gtk-doc-am + +pkg_setup() { + DOCS="AUTHORS ChangeLog NEWS PORTING README TODO" + G2CONF="${G2CONF} + --enable-cryptography + --disable-strict-parser + $(use_enable mono) + $(use_enable static-libs static)" +} + +src_prepare() { + # https://bugzilla.gnome.org/show_bug.cgi?id=667070 + epatch "${FILESDIR}/${P}-fix-tutorial.patch" # needs eautoreconf + eautoreconf + gnome2_src_prepare +} + +src_compile() { + MONO_PATH="${S}" gnome2_src_compile + if use doc; then + emake -C docs/tutorial html + fi +} + +src_install() { + GACUTIL_FLAGS="/root '${ED}/usr/$(get_libdir)' /gacdir '${EPREFIX}/usr/$(get_libdir)' /package ${PN}" \ + gnome2_src_install + + if use doc ; then + # we don't use docinto/dodoc, because we don't want html doc gzipped + insinto /usr/share/doc/${PF}/tutorial + doins docs/tutorial/html/* + fi + + # rename these two, so they don't conflict with slot 0 + mv "${ED}/usr/bin/gmime-uuencode"{,-${SLOT}} || die + mv "${ED}/usr/bin/gmime-uudecode"{,-${SLOT}} || die +} diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest index e835347d7da4..9a76fbc9a328 100644 --- a/dev-libs/uriparser/Manifest +++ b/dev-libs/uriparser/Manifest @@ -1 +1,2 @@ DIST uriparser-0.7.5.tar.bz2 408363 RMD160 657fb03fbeb4210d94721b86cf475b6e28717d0b SHA1 146b138b0c0022bc2234c1269e6bf44a57ec026c SHA256 2a963348fb797475e9d7188da46af0a9b6e676d5ab98458f2799d352d56d5be4 +DIST uriparser-0.7.6.tar.bz2 428437 RMD160 485b9b990e7f913b511b7a70f0b36dffc9eb98db SHA1 621b218fe7ff87a33f835c71e6e9356aefe98019 SHA256 77f1fa8f159ce64ab7150378cb83f4ec7116ac2da3942d4db610f4d2b0d8817f diff --git a/dev-libs/uriparser/uriparser-0.7.6.ebuild b/dev-libs/uriparser/uriparser-0.7.6.ebuild new file mode 100644 index 000000000000..1243b1c91398 --- /dev/null +++ b/dev-libs/uriparser/uriparser-0.7.6.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/uriparser/uriparser-0.7.6.ebuild,v 1.1 2012/01/20 01:31:30 sping Exp $ + +EAPI=4 + +inherit eutils + +DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C" +HOMEPAGE="http://uriparser.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +IUSE="doc qt4 test unicode" + +RDEPEND="" +DEPEND="dev-util/pkgconfig + doc? ( >=app-doc/doxygen-1.5.8 + qt4? ( x11-libs/qt-assistant ) ) + test? ( >=dev-util/cpptest-1.1.1 )" + +REQUIRED_USE="test? ( unicode )" + +src_configure() { + econf \ + --disable-sizedown \ + $(use_enable test) \ + --enable-char \ + $(use_enable unicode wchar_t) \ + $(use_enable doc) \ + --disable-dependency-tracking \ + --docdir=/usr/share/doc/${PF}/ +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + dodoc AUTHORS ChangeLog THANKS doc/*.txt || die + + if use doc && use qt4; then + insinto /usr/share/doc/${PF}/ + doins doc/*.qch || die # Using doins to avoid dodoc's compression + fi +} diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest index 97b94dfb990e..31f34a630a81 100644 --- a/dev-python/requests/Manifest +++ b/dev-python/requests/Manifest @@ -1 +1 @@ -DIST requests-0.9.0.tar.gz 55217 RMD160 b9adb70a3cb5a825f76a6e63b825fdf769dd714b SHA1 de7aeadf4050a1f7eade1a172ecad0541c3406f2 SHA256 43b26edb5c47e0ccf9612d3cf13639a1e7e6c774af5375a684cfa00e747f21b1 +DIST requests-0.9.3.tar.gz 61006 RMD160 d2294ac48e9ea7656fa3d7271f28090df5fd5f38 SHA1 85cd1103fbd0f0afa936305a56b23a8e9b82c477 SHA256 3c0dd7c014474e0cdd00cad661abd74c88c14183d260d0555dfa51fc5b29abc5 diff --git a/dev-python/requests/requests-0.9.0.ebuild b/dev-python/requests/requests-0.9.3.ebuild similarity index 89% rename from dev-python/requests/requests-0.9.0.ebuild rename to dev-python/requests/requests-0.9.3.ebuild index 4b5f4d7a1534..97023efd4a36 100644 --- a/dev-python/requests/requests-0.9.0.ebuild +++ b/dev-python/requests/requests-0.9.3.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/dev-python/requests/requests-0.9.0.ebuild,v 1.1 2012/01/02 06:58:29 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-0.9.3.ebuild,v 1.1 2012/01/20 05:53:03 floppym Exp $ EAPI="4" PYTHON_DEPEND="2" @@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="ISC" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="test" +IUSE="" DEPEND="dev-python/setuptools" RDEPEND="dev-python/certifi" diff --git a/dev-python/whisper/Manifest b/dev-python/whisper/Manifest new file mode 100644 index 000000000000..f5008105ec4f --- /dev/null +++ b/dev-python/whisper/Manifest @@ -0,0 +1 @@ +DIST whisper-0.9.9.tar.gz 9238 RMD160 8ac2045ba17d1d3f281ab415355bca0ba59e37b5 SHA1 3e3ee0a46da5e8e4c1cd62122474d0120abef06a SHA256 66c05eafe8d86167909262dddc96c0bbfde199fa75524efa50c9ffbe9472078d diff --git a/dev-python/whisper/metadata.xml b/dev-python/whisper/metadata.xml new file mode 100644 index 000000000000..340136403603 --- /dev/null +++ b/dev-python/whisper/metadata.xml @@ -0,0 +1,8 @@ + + + + + chutzpah@gentoo.org + Patrick McLean + + diff --git a/dev-python/whisper/whisper-0.9.9.ebuild b/dev-python/whisper/whisper-0.9.9.ebuild new file mode 100644 index 000000000000..c546f4cd5763 --- /dev/null +++ b/dev-python/whisper/whisper-0.9.9.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/whisper/whisper-0.9.9.ebuild,v 1.1 2012/01/20 01:53:25 chutzpah Exp $ + +EAPI=3 + +PYTHON_DEPEND="2" +SUPPORT_PYTHON_ABIS="1" + +inherit distutils + +DESCRIPTION="Fixed size round-robin style database" +HOMEPAGE="http://graphite.wikidot.com/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="" diff --git a/dev-ruby/actionmailer/actionmailer-3.0.11-r1.ebuild b/dev-ruby/actionmailer/actionmailer-3.0.11-r1.ebuild new file mode 100644 index 000000000000..dea1adadc20b --- /dev/null +++ b/dev-ruby/actionmailer/actionmailer-3.0.11-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/actionmailer-3.0.11-r1.ebuild,v 1.1 2012/01/20 10:06:40 graaff Exp $ + +EAPI=4 +USE_RUBY="ruby18 ree18" + +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc" + +RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="Framework for designing email-service layers" +HOMEPAGE="http://rubyforge.org/projects/actionmailer/" +SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz" + +LICENSE="MIT" +SLOT="3.0" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RUBY_S="rails-rails-*/actionmailer" + +ruby_add_rdepend "~dev-ruby/actionpack-${PV} + >=dev-ruby/mail-2.2.19" +ruby_add_bdepend "test? ( + >=dev-ruby/mocha-0.9.5 + virtual/ruby-test-unit +)" + +all_ruby_prepare() { + # Set test environment to our hand. + rm "${S}/../Gemfile" || die "Unable to remove Gemfile" + sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths" + + # Rename private method to avoid conflict with the simple_format + # TextHelper. Already fixed in Rails 3.1. + sed -i -e 's/simple_format/format_paragraph/' lib/action_mailer/mail_helper.rb || die +} diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index 4f912a306ffd..2b679848c64d 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -2,68 +2,41 @@ DIST git-1.6.4.5.tar.bz2 2176867 RMD160 def8d5219e579741551ba8678f726bb9e24c2bc2 DIST git-1.7.2.5.tar.bz2 2561345 RMD160 d69abab041064265e41780447d804717f229fc85 SHA1 912c812e98f2985c7152ffb3311572d5f12f2855 SHA256 d84e6d76fe9d30af5515ea8177b0d8bfe774ee0836d21ed450cb4d52f5aa6311 DIST git-1.7.3.4.tar.bz2 2635522 RMD160 37cdb8b50c802655643a243ef26fe3d50145d29c SHA1 8bda6668531fc41a72a680978798deb9ee048846 SHA256 3e5e2b6547ee4aae82b4c5f589ff084996e9e6e0e2b52c92365e6baa1e4a0171 DIST git-1.7.3.5.tar.bz2 2635455 RMD160 3ad6eb187b7a901addb3ee5a2ade70ba550007f6 SHA1 cf9587ecf7cae04463d05b9f9ce8990913bd925a SHA256 41682e4c13b43591b61a96b6f7a549b24863f62dfc4a917b6147c8e708e288a6 -DIST git-1.7.4.1.tar.bz2 2703860 RMD160 13ef7b6d1e8b596f97a1920e012a00f6cc8cdf6c SHA1 fff10cb498b17decc146c8f18b0b02136d5e9b88 SHA256 85c5afc1c8f96abcd8d1adfde6f813023bef5cec1dc0990fc3b159945b60cd1b -DIST git-1.7.4.4.tar.bz2 2709587 RMD160 047ad2cb600e31e89133fbd44fbfa16ee42e5fc1 SHA1 0c5d6b06cfbe73eb60ce7a59b9eec5fb9c6dc034 SHA256 5c3e738b01a4021ade56abebfdcce8825d2a50868e5c7befb65102f497387aa0 DIST git-1.7.4.5.tar.bz2 2711452 RMD160 5e9a0ccbaa913bf42507c2ebdbcf35fb9f7476f9 SHA1 96dcb8a7b6122f8ea5017b598e570e062d2511e1 SHA256 a6c084752cf5645864b466ea10c0afb2dd74854dc9e4189aa87bf1446668a901 -DIST git-1.7.4.tar.bz2 2703735 RMD160 a064d7a5b2d3fae6171ca91a03082eb46d7bb9b7 SHA1 57b783627d9a9515ce3ef8f79128074de6197b2e SHA256 8e260b9e5dfb46a35f26e3db450c2dabb4d1df254bfb2820779945a1ecbcef51 DIST git-1.7.5.3.tar.bz2 2766856 RMD160 99a8f69690dc75c37b5141c6984dc5b499fcd8d4 SHA1 762d0985af37c9dda4e22c84e09c6e4efb46a22a SHA256 8017b0c624fea88bf5488d35f3839778fac3c0e089a02fe0017aea6913af3292 -DIST git-1.7.5.rc1.tar.bz2 2753147 RMD160 cd2f3b6e4bcfc45ea384cab5c62bd28cd11cd2c3 SHA1 0d68a770d363272bc7dbcedfdd2602310379242e SHA256 4424f22f96ee091476d8c260deda55eb333a0af1500d1f63f19f7a0ac2633014 -DIST git-1.7.5.rc3.tar.bz2 2754303 RMD160 d287ab8542fe8dcf14105daf7ccad46912fd625f SHA1 02c9c9b539bba5abac66a8201caedc03d56bfcf2 SHA256 0400002ead965ebed6a2dd252a3abbb33d940f0136a2685a641b81c9cf622754 -DIST git-1.7.6.1.tar.bz2 2811203 RMD160 ec85ee434e51fbb3144b5336921922afc97ba709 SHA1 a0e9f63ec432d4b20411d3759084b4118edf5887 SHA256 856d4197ef7172938b0b44e55174c7d7ddfaf5e844e04960322c49eda9f3a246 DIST git-1.7.6.4.tar.gz 3399093 RMD160 80d226e77b8b9ad6d0bba86773e26257e5b3d734 SHA1 df91e2c32d6097ab1c9d0edc56dd8cecb4e9b686 SHA256 c95bb6fdfa8276a6cbc1c3150e56ce3dc2fc29a4bcecd9c246ab9df5d9638ec6 -DIST git-1.7.6.tar.bz2 2806337 RMD160 9ba5daa7bf56b6a242b3302e12c8ced7d3abc77a SHA1 c519b0765c419c84b561bb4a2a86526b16d95cde SHA256 778795cece63cd758192378f3a999870cea290181b3a4c9de573c77192561082 -DIST git-1.7.7.1.tar.gz 3480051 RMD160 92bf7db1fb7a7659e0e6763f221283969687fe55 SHA1 9200e0b8ee543d297952b78aac8f61f8b3693f8e SHA256 6a7909226b2b249c7970b0d36054dbcfe58e6558cc4d671ea1f5ac6a69d8cf4f -DIST git-1.7.7.2.tar.gz 3483993 RMD160 e1b2bdcf6ff7e206a346f09e7af02250f6e0fc7e SHA1 be5be63fbab63517fcccf5c876749c61b0019d14 SHA256 b309c172b63636bb746ded2771536cb5b2efdfa011511d81783e87950c665260 -DIST git-1.7.7.3.tar.gz 3484344 RMD160 638f21de4b834d64788413261ee572264f942f33 SHA1 382ee40da74a1b4a1875820c0f0a35c9ccd750f8 SHA256 dc9d773004cdae17453e330a02de630a1beeeb404d0601b9e8c1aef0a0efd100 -DIST git-1.7.7.4.tar.gz 3484470 RMD160 2820925a7b2e5839bc91f7df511980b41d194e1a SHA1 5b6920989480a37ec65977e756b24961578795dd SHA256 7fa85e04f66cbd358db0ff4939b07cab594f7e3b2f09a26b56c6ffdec649681d -DIST git-1.7.7.tar.gz 3475448 RMD160 54a185d66fb1f0e1607dc4514640c4b353d2cd1c SHA1 bbf85bd767ca6b7e9caa1489bb4ba7ec64e0ab35 SHA256 5a977bc01e4989b9928345e99aab15ce896cf5897c6e32eb449538574df377f6 +DIST git-1.7.7.6.tar.gz 3485668 RMD160 6453d81893f2a32d7d9e93ff1b683b8464d6e6a8 SHA1 483dc95de0e26f0154fb23444589266b59848cfe SHA256 086eaca9d629bd9997f73763131dd194b62ae269a56ad71011263870b9263a56 DIST git-1.7.8.1.tar.gz 3539908 RMD160 b9b6c52fa38712679867e140c6b5d1bfcbc05831 SHA1 198e23e6e50245331590a6159ccdbdbe1792422c SHA256 e393aad2286f85f23e859ad64ddcc20b74bfa7788c85c56645757cb201c9006a DIST git-1.7.8.2.tar.gz 3543890 RMD160 9d2cd1f2c1009122a2c8d41f7d4696fa83d3f198 SHA1 7187c1af96db0c181b801957d6e152ec7cd60ab6 SHA256 2247f214fce3be72da3020947ce3fbfb7f6f9950a145897554e043cd63f9a3e3 DIST git-1.7.8.3.tar.gz 3543164 RMD160 2c88b4cf4f915363dfdc1bddda925f4a62b4e454 SHA1 e5eb8c289b69d69fd08c81b587a06eb5dd2b5c1c SHA256 77f52b7104a107e0fbe1ce85b3f35c97f029fab92cd35a3909015ca169af505d +DIST git-1.7.8.4.tar.gz 3544195 RMD160 ee203b3d6252c2df150ef7904c6b95672dea4aff SHA1 add7b05f26216181d1b148dde298432132552b0f SHA256 71a5a98d386061fe606b5be1ac390dc725d418d12edfa20796ff7671247c67e3 DIST git-1.7.8.tar.gz 3538330 RMD160 efde5f593ea804a998c4aeebc27ccbc0674596e4 SHA1 7453e737e008f7319a5eca24a9ef3c5fb1f13398 SHA256 ede41a79c83e0d8673ed16c64d5c105e404d953591f9611e44c3964130da0713 +DIST git-1.7.9.rc2.tar.gz 3606493 RMD160 9e5104dba8babc594a9da8fcdad8d47e7722a93b SHA1 4eeaaf8a73006f797e6c23455097684664bf256e SHA256 1d417ceaead73b4a2baaef3e26e204abcf476896046674291527e2a372636c62 DIST git-htmldocs-1.6.4.5.tar.bz2 772113 RMD160 64b3f689385334d9b101b4bb8647f0fed14bd1fc SHA1 4ac2ede0a3ed82dea9107ff5e4a4948b60282f49 SHA256 12c13ead869918d8470d68c7331675c56a192eae819c283a398aaf9f0f7555d2 DIST git-htmldocs-1.7.2.5.tar.bz2 919247 RMD160 8ff6503efdb3cfaa639d2acbfaf76dad274aeb8f SHA1 b99f4e9eb620918b68fd98a4a0f0686832799477 SHA256 6b6291ffad4eae80d2739acdffffdd6293b9e50366cfa53ffb0c3a1427700337 DIST git-htmldocs-1.7.3.4.tar.bz2 929858 RMD160 4183ff0e61885323371b11dfb119bcc718e46a34 SHA1 17cbfcb9b85352777ace4b787e8ff48b6aeee6ab SHA256 24f03bcd6b5c3745c2395cf49260cdbf7fe80292883b0b4da3e1ac636aee6fba DIST git-htmldocs-1.7.3.5.tar.bz2 930432 RMD160 8ee1e22158d1d9585346e0bba965a60e2d04ac99 SHA1 232a5d9c7ff53d1149f790bea8dd2c6dc5f50dc9 SHA256 630ee4546aa0ee3e92ad0eed2ef60b90fe9e16754db38a479a5a59870846030d -DIST git-htmldocs-1.7.4.1.tar.bz2 940833 RMD160 ccaf6812b959b0456c8a0d2f0977150acb37881f SHA1 84f439108670c15a8fa508a9e26682fe2f5586d1 SHA256 bcb9b4b06d4f5bd6e23689bb4ea82aca555f187804b9005e753ba0969874b4e8 -DIST git-htmldocs-1.7.4.4.tar.bz2 945094 RMD160 1c4b5c41a0921c1136c3df4a4b3c321cc84dee3f SHA1 c63b910f549a50806238c3db703eaa4e29ee6124 SHA256 37321a3bf64ed2035af0d3ca5d4634e9d45a3f553c1dd88cc47ee03e673a491a DIST git-htmldocs-1.7.4.5.tar.bz2 945737 RMD160 d0e45908b397fd46e2eca46beeac292896ef7d4c SHA1 86ffa2c180112232c6acdedee5827d9973e0708f SHA256 52a2007146acdc4ab9ca4a4b70d4f55b72ef8c4b1a29395d06ed93561c84dcfb -DIST git-htmldocs-1.7.4.tar.bz2 940665 RMD160 19a20260259fca5d7898e7661ae2ce9af726e7a1 SHA1 e6d2b4f0cb2d43d9290793365f95def7038730b3 SHA256 8f2d9dea509b41149a888b2e524089008cc59d21dbef2d53e8016aa432db2b99 DIST git-htmldocs-1.7.5.3.tar.bz2 956542 RMD160 777b354e18522bebd4ebfed070179e632998b5da SHA1 f0a66b8b21fab39acf466cea5c14416c718334c4 SHA256 a08cc349b53271cf1b1c23d68033105bee25b1cb1884c8ecaa12271737baff52 -DIST git-htmldocs-1.7.5.rc1.tar.bz2 947839 RMD160 38028acebeb4d8d06f48e41b44c44f1ff8c99bf2 SHA1 03ae74753d1954a71cf2994fa34fd948f918b583 SHA256 960911628dede957f50eefac76328e97514b1d4d8cc52effcac74d4c6a22ddaf -DIST git-htmldocs-1.7.5.rc3.tar.bz2 948759 RMD160 ced2881bc257f014d35e9315ac805ad341ff8bbb SHA1 d65f6c409d6a87accccf89e9e73465ac92ef74ae SHA256 4096452b503d76b19cc2fc0cc87ba1813e7de2a7e8cb874767dbfeb085a1b013 -DIST git-htmldocs-1.7.6.1.tar.bz2 978820 RMD160 357cda7d4df61db43cafae0c4b3d42bc84f02f13 SHA1 525888fff8242ba03d59de2fdb8afd80310d978a SHA256 6f03a7ed0c2db4d47c22bb27c27249be9bc3c50b72e108d7dca5227917b2de7a DIST git-htmldocs-1.7.6.4.tar.gz 1606389 RMD160 931da8cc615cd1f52024a07f53ebc14e3fcc03ff SHA1 6abd985e24b6585284cef7fae2e3046ba9201356 SHA256 b73ded7089bb253efe45ef3a444022500df012a4bd596249ac999135ca76e240 -DIST git-htmldocs-1.7.6.tar.bz2 974583 RMD160 0c396a95126670a67c3e61ea69196508b88ef195 SHA1 926168673669d7568b94af6dec35b9ef10ecaedc SHA256 7e6685c89149d1e1e84a916d913452cfbac3ae801d02a0631243e41c25949277 -DIST git-htmldocs-1.7.7.1.tar.gz 1626041 RMD160 b001a9afcc0cf373622039cbd96967924f17b21e SHA1 b25dacb07ebbfc37e7a90c3d47f76b4c0f0487d9 SHA256 bd312ee9b767eda02b82cc1844696e60664be1ddb16790a357ceac689cfe4189 -DIST git-htmldocs-1.7.7.2.tar.gz 1634159 RMD160 66e5a7816ce0660b93edd3d2c3f441eb3207813c SHA1 8f0eb6f1150ea8c6922343aa4c3ee6cf37e8a091 SHA256 504313b32c0144cba8758c1ec1b2977b3c70a6656921dea885bef4944116add3 -DIST git-htmldocs-1.7.7.3.tar.gz 1660184 RMD160 b3c7e10545bcf896e7294ee4f8c7dcd2c2fb35f4 SHA1 bc0f89cb04e562e4a6d3b936382dbc8f593d861f SHA256 b84992ea9d2dad0ddc643a87f5c463342acd0f9475ecfd082ac5f61b00294dc0 -DIST git-htmldocs-1.7.7.4.tar.gz 1634131 RMD160 3103ecd72a913246ce5f9378c694a0af1cb66862 SHA1 6012cb017a04ded85c48ca5510f741e98c02f671 SHA256 098525f205eb0d35ce7e31f6c48672bf0a54f4fb0f52e9ca4c0e276bf413e367 -DIST git-htmldocs-1.7.7.tar.gz 1391354 RMD160 7e0fb2f27053d97d4945eb2e41080e7f9b31f8e8 SHA1 33183db94fd25e001bd8a9fd6696b992f61e28d8 SHA256 bcb11eda56ac74687cc6852f6ee104ab5dcf13039546616c608783cebc7f4a40 +DIST git-htmldocs-1.7.7.6.tar.gz 1635617 RMD160 f151c86c48add564d75caa348bc8ccd48714f38c SHA1 8bcbd0a53fd3b937a9991aa096220a1a0eb2f771 SHA256 7046fab9bc9dc237bc25c700840bbfec2c79171fc61957889583444ea5d8783c DIST git-htmldocs-1.7.8.1.tar.gz 1695296 RMD160 9f0a4d43e327da14592ecca6816301f143b9ed4b SHA1 8f674dba39d9ae78928abfe9d924b0855e283e98 SHA256 6f68f05b76cb07fb9a671a2e59c79aac26deffd2ae3a46027520ef6f2fab404d DIST git-htmldocs-1.7.8.2.tar.gz 1697858 RMD160 d9f5c0b4c01e682f241ebc59d1abf7cd79fe6dd0 SHA1 9047175e5c46aa3260c42e6b4459cf4ee5a7bb8a SHA256 c402b231b8d8b8ecae267a6e3b0224c473c0f0c3fd0e22915d07854276d8c800 DIST git-htmldocs-1.7.8.3.tar.gz 1698145 RMD160 3c77c0ae24b3bd035c1057648736d6ba008c57ab SHA1 8a65d2425c1b6f646d130cf5846e92e9e0e93736 SHA256 d6dad326af1aaae36d349f6a722a6c53e6a936f4e6a470d96320857319db6af9 +DIST git-htmldocs-1.7.8.4.tar.gz 1699142 RMD160 beccc1e17f6d930c79f2f35aeac4e8dc0c318e1e SHA1 ac2b89d8d4418c7633ee2344e89eb7dfcb81522a SHA256 a86d8d939cb031d8ebbbaa17399c32474a13e0e4a6705406ad5771620b351acd DIST git-htmldocs-1.7.8.tar.gz 1694941 RMD160 07344d8dd95f2d72667cf16a4f340aa5cc4c8950 SHA1 2734079e22a0a6e3e78779582be9138ffc7de6f7 SHA256 45b3e3016bd5dbd933bafd5e8091acb0431ff3a63b7fd829e9d9832dde096862 +DIST git-htmldocs-1.7.9.rc2.tar.gz 1742598 RMD160 e0413e2d89de34c631e5ea0a2f312f2f47b832d2 SHA1 22aad76c146abe04e8f9bd89b2fbf4b575f434ce SHA256 1aa639e9447afbcfb90eeade0d1791cc76e939fc9d88f1a33301348ca3185781 DIST git-manpages-1.6.4.5.tar.bz2 254368 RMD160 7731d81631ec2c8c33ddc028667eaad79926754b SHA1 905d5e66db1b22b48c1b001d1f5dec830a75dde1 SHA256 f73ae98b0cea0ef6d8f7c8b599d6cad0bdae702b1fe58ad8ebab32a0bb7ba447 DIST git-manpages-1.7.2.5.tar.bz2 289543 RMD160 b921fa2b5ec47e091987d1122b1c189b4bd87f3b SHA1 735ee1f23428404bdb99d9b0bd1cbb79c9e7afce SHA256 a42a977a1ecfd3cea62e1f02fc89f57029a94f163ff7205f6a56ab4b67d6bd6e DIST git-manpages-1.7.3.4.tar.bz2 294381 RMD160 dfd4a4757077290a666ad974585677888f909890 SHA1 c4f93ed1d9892af1174d63743dc578835a6183f1 SHA256 2ff98641bc655b29a7fb72bced46da09c99b6fad3b651722b7b8057df4a9ce75 DIST git-manpages-1.7.3.5.tar.bz2 294754 RMD160 2d360b820a7390d50954778f56e9eaf4c9bbfa31 SHA1 fe00694f9db7b8a29b5c44dd8610ef24bd73ec3f SHA256 7b14eff2e06f3de2b6f6b5fbab730fd204324b394b7bf7cc7b776f7edb220769 -DIST git-manpages-1.7.4.1.tar.bz2 300082 RMD160 40260f59c319af521d9a215d053f7e65ce80afec SHA1 c8bf13d5bcdc3908e2e3edfa8edffd42a314e3a0 SHA256 84252b3d26fd4e3d1a5b5159fdc1bfe9d41a48856596d3b375e428a7508e228b -DIST git-manpages-1.7.4.4.tar.bz2 300989 RMD160 2bc9e07e7542cb02df5576b213e8e684640f0be0 SHA1 46335ecefe46ae211c10dcaa7422945af14d51d6 SHA256 fa2ce1fd34a81dac1d8fca466dcd823ce1ed800ec5cb98d8bb2b0967deed19d0 DIST git-manpages-1.7.4.5.tar.bz2 301080 RMD160 f363285195421dea67d70d978d235d8b687ad461 SHA1 88ff272c517043b662010747d6b60f6a32a20b2d SHA256 04e06a14db8c4258cdec1b9bf8cc33b2407bea368ecf22a5e06012af3c01cd2c -DIST git-manpages-1.7.4.tar.bz2 300025 RMD160 ea82117f6150cead06373667054acabbfa9f4c0d SHA1 1bad24d225d39266b2b697bc68a4f02ff6677d41 SHA256 883781c0513dde0af30e32d319b34035fbf8e766eb39fbe9f715794c1049865a DIST git-manpages-1.7.5.3.tar.bz2 304065 RMD160 02919cf1db61717f6f3ad298c31d6eae3c01b48a SHA1 2b6f770b0314d12d7abd4fe2274a46c29ac64f50 SHA256 018f5c16b9a3c4e4942ae318d1faea0b6092287228069a718efd267b9f98b8c8 -DIST git-manpages-1.7.5.rc1.tar.bz2 300314 RMD160 d9ec84a4e2c9177ac292f1fe905fcd88d2401a78 SHA1 096e7edc944154ff854abe2fcb48a62a9c1c874a SHA256 72000ccbffa0ddadf90b5e2831ef0b2122c6771e69c4bcfee24003a2d4dd8a5b -DIST git-manpages-1.7.5.rc3.tar.bz2 300578 RMD160 cc2d1a0f3de158a41ce2174d87b76df5e366b30d SHA1 d386db01edcbc826e82c88f7dcf61956b00b500e SHA256 8a14d4bbca3d0484a30d30e6efb0a697d574eeedb0ca790cebd00523cebedec5 -DIST git-manpages-1.7.6.1.tar.bz2 318418 RMD160 16fdba0c70f0998dd08bf0d1b1b47ba5f1834849 SHA1 e1817c996fc0bf06abd6b15232040de766798101 SHA256 faece1418e72d90ed9ee65e59fe89489e504db9b76e8325a2505e8fb61598a44 DIST git-manpages-1.7.6.4.tar.gz 468334 RMD160 91d0df4b4182bead27149dbf03481d3e139cc730 SHA1 c6f6d92f4005a7eccaf89e851c45768c18f7e65a SHA256 c1ae86f0bfd80ec819535a64825a141aeef950dfebf9a3f82bef6752b586f63f -DIST git-manpages-1.7.6.tar.bz2 309563 RMD160 9534cf6540c3be85c6f3b5dfca8ca0cf3f2f366f SHA1 45e0759597d649b13f684f55a186d46dafb7d414 SHA256 a0ffd7e16997262ef741db5e2dd8eabf44b6767cf1a213753c7d8a268b4553ad -DIST git-manpages-1.7.7.1.tar.gz 474532 RMD160 3b3cb0cc3c53e24a022fb2cba5dd9baba928bd9f SHA1 419c750617ae0c952e2e43f0357c16de6ebc0a44 SHA256 28904942a0e91d601d731a9fe0bf26c2fe595d8a69a9c2a4da3ec66286c50db5 -DIST git-manpages-1.7.7.2.tar.gz 474637 RMD160 dd5b397967c20702922c01d145d36ea040c1939a SHA1 07e0887315224ac83c61ed60602c345c32a5d658 SHA256 8a80657b6095b10d0f9db9707de6d02c38e364a5ccf25ee94edb4daa4c27c755 -DIST git-manpages-1.7.7.3.tar.gz 475209 RMD160 99ea33e5d21d8daae28c23a9850016bc5e3975a8 SHA1 cf1b0d35e2d242bc4cffce3b2bf5b3e32857b395 SHA256 62bec01d704d3495fcf66a3b97a8fb7c337a06202784fa7a7fa510360e79671f -DIST git-manpages-1.7.7.4.tar.gz 474588 RMD160 32b7d50be70fc6960bef6ea4e6fc9d62625e44b6 SHA1 cb21e55ae793865453c165a0e666348f2db8c740 SHA256 ac500a0e6da6dcf449e20c3a819f0bcb1b4be1d4169ad38d8631411d5b4a99c2 -DIST git-manpages-1.7.7.tar.gz 476036 RMD160 4bc0504533df3c956e9ad5133e6bd8bfca980007 SHA1 75d3cceb46f7a46eeb825033dff76af5eb5ea3d9 SHA256 dde1ffaee0d90cce80f98126c5d9013c6687dc6f0b26bd12d61e229346701ecb +DIST git-manpages-1.7.7.6.tar.gz 474628 RMD160 2cb26c04de36d84dd6fd9fc51d83b2660211d4dc SHA1 0fd7452c88d0b3ccb08d9b2b91b552680b0209e0 SHA256 3e94c718530ce7343ca5cc13a5583c01d8806d465e657f970c28b43420906dd3 DIST git-manpages-1.7.8.1.tar.gz 496876 RMD160 d3e601038e8fc85b32798148ecc8c82390eb3b56 SHA1 b49ce0b4da4f85671693c9b2c6f6a8b8ee65c809 SHA256 1575acc41beb05ee4939508325a65ea01746982f2eeb77ed55bf1ffc673f54ef DIST git-manpages-1.7.8.2.tar.gz 497249 RMD160 94477d2e301c684ca271334ee66699071421c896 SHA1 cc394a0a9689297fddad40c1ccbded0ba9d708da SHA256 87b95eb0e6d93c71dcf850100a1ebdb2e06b86a03603a695f7ffb947f4da94a9 DIST git-manpages-1.7.8.3.tar.gz 497446 RMD160 87aad1c9975a006683ab6b1128df39ae19b30d2c SHA1 a6e2b7cff8181ee52a1cc00ebba7b349850d6680 SHA256 5c0c402d41c577b9cd9a31e30abd029d3e79d6c3164d4a527d3103ee2a0dfb5a +DIST git-manpages-1.7.8.4.tar.gz 497621 RMD160 0ab22cbe1820b29d991a63cfb087aacb42b8223e SHA1 4372c423a0d2f7df33b5b39727a81f0a7b40669d SHA256 b4930a17de7b18d40d81c3830913e5c4c2a91134e3a331ad49757d496ee53b76 DIST git-manpages-1.7.8.tar.gz 496974 RMD160 ee09c9a1c80fe46ca3a6787ea30eadeddee2a9a0 SHA1 93315f7f51d7f27d3e421c9b0d64afa27f3d16df SHA256 f67d593f5aecd01ec42683cff515172c67f79109161629621e9df58e39ef5354 +DIST git-manpages-1.7.9.rc2.tar.gz 508558 RMD160 ff92b1eb6cf41a760ff814fbe25b6ead77919edc SHA1 8565f64f6227fcfba3f768dabdcd9d6037f08842 SHA256 4f84e77e90abada3ac89082c7cef49af791bf63b76427edf4c9d25c732ba4a5c diff --git a/dev-vcs/git/files/git-1.7.8-git-svn-1.7-canonical-path.patch b/dev-vcs/git/files/git-1.7.8-git-svn-1.7-canonical-path.patch new file mode 100644 index 000000000000..5b169a1f54fb --- /dev/null +++ b/dev-vcs/git/files/git-1.7.8-git-svn-1.7-canonical-path.patch @@ -0,0 +1,63 @@ +diff --git a/git-svn.perl b/git-svn.perl +index eeb83d3..ae77c6a 100755 +--- a/git-svn.perl ++++ b/git-svn.perl +@@ -1248,6 +1248,7 @@ sub canonicalize_path { + $path =~ s#^\./## if $dot_slash_added; + $path =~ s#^/##; + $path =~ s#^\.$##; ++ #$path =~ s# #%20#; + return $path; + } + +@@ -2134,6 +2135,7 @@ sub fetch_all { + die "[svn-remote \"$repo_id\"] unknown\n"; + my $fetch = $remote->{fetch}; + my $url = $remote->{url} or die "svn-remote.$repo_id.url not defined\n"; ++ #$url = main::canonicalize_url($url); + my (@gs, @globs); + my $ra = Git::SVN::Ra->new($url); + my $uuid = $ra->get_uuid; +@@ -2285,6 +2287,7 @@ sub find_existing_remote { + + sub init_remote_config { + my ($self, $url, $no_write) = @_; ++ #$url = main::canonicalize_url($url); + $url =~ s!/+$!!; # strip trailing slash + my $r = read_all_remotes(); + my $existing = find_existing_remote($url, $r); +@@ -2325,6 +2328,7 @@ sub init_remote_config { + command_oneline('config', '--get', + "svn-remote.$self->{repo_id}.url") + }; ++ #$orig_url = main::canonicalize_url($orig_url); + if ($orig_url && ($orig_url ne $url)) { + die "svn-remote.$self->{repo_id}.url already set: ", + "$orig_url\nwanted to set to: $url\n"; +@@ -2446,6 +2450,8 @@ sub new { + die "Failed to read \"svn-remote.$repo_id.url\" in config\n"; + $self->{pushurl} = eval { command_oneline('config', '--get', + "svn-remote.$repo_id.pushurl") }; ++ #$self->{url} = main::canonicalize_url($self->{url}); ++ #$self->{pushurl} = main::canonicalize_url($self->{pushurl}) if defined $self->{pushurl}; + $self->rebuild; + $self; + } +@@ -6475,6 +6481,7 @@ sub migrate_from_v1 { + next unless -f "$git_dir/$x/info/url"; + my $u = eval { ::file_to_s("$git_dir/$x/info/url") }; + next unless $u; ++ #$u = main::canonicalize_url($u); + my $dn = dirname("$git_dir/svn/$x"); + mkpath([$dn]) unless -d $dn; + if ($x eq 'svn') { # they used 'svn' as GIT_SVN_ID: +@@ -6509,7 +6516,8 @@ sub read_old_urls { + $pfx .= '/' if $pfx && $pfx !~ m!/$!; + my $ref_id = $pfx . basename $_; + my $url = ::file_to_s("$_/info/url"); +- $l_map->{$ref_id} = $url; ++ $l_map->{$ref_id} = $url; ++ #$l_map->{$ref_id} = main::canonicalize_url($url); + } elsif (-d $_) { + push @dir, $_; + } diff --git a/dev-vcs/git/git-1.7.3.5-r1.ebuild b/dev-vcs/git/git-1.7.3.5-r1.ebuild deleted file mode 100644 index c70132b1c8e4..000000000000 --- a/dev-vcs/git/git-1.7.3.5-r1.ebuild +++ /dev/null @@ -1,497 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.5-r1.ebuild,v 1.5 2011/08/19 18:43:47 darkside Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no -inherit toolchain-funcs eutils elisp-common perl-module bash-completion -[ "$PV" == "9999" ] && inherit git - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [ "$PV" != "9999" ]; then - SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - EGIT_BRANCH="master" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - !blksha1? ( dev-libs/openssl ) - sys-libs/zlib - perl? ( dev-lang/perl[-build] ) - python? ( dev-lang/python ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${CDEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8 - dev-python/pygtksourceview:2 - ) )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [ "$PV" == "9999" ]; then - DEPEND="${DEPEND} - app-text/asciidoc - app-text/xmlto" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." - # || myopts="${myopts} NO_ICONV=YesPlease" - # because, above, we need to do this unconditionally (no "&& use iconv") - use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" - - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [ "${PV}" != "9999" ]; then - unpack ${MY_P}.tar.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # Noperl is being merged to upstream as of 2009/04/05 - #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch - - # GetOpt-Long v2.38 is strict - # Merged in 1.6.3 final 2009/05/07 - #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch - - # JS install fixup - epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch - - # USE=-iconv causes segfaults, fixed post 1.7.1 - # Gentoo bug #321895 - #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch - - # Fix false positives with t3404 due to SHELL=/bin/false for the portage - # user. - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch - - # bug #350075: t9001: fix missing prereq on some tests - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch - - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # bug #318289 - epatch "${FILESDIR}"/git-1.7.3.2-interix.patch -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="${EPREFIX}/usr/bin/python" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_PATH="${EPREFIX}/usr/bin/env perl" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el \ - || die "emacs modules failed" - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - cd "${S}"/Documentation - if [[ "$PV" == "9999" ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - dobashcompletion contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use python && use gtk ; then - dobin "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - dobin contrib/fast-import/git-p4 - dodoc contrib/fast-import/git-p4.txt - newbin contrib/fast-import/import-tars.perl import-tars - newbin contrib/git-resurrect.sh git-resurrect - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - blameview buildsystems ciabot continuous convert-objects fast-import \ - hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ - stats svn-fe vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - built_with_use dev-vcs/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first - cd "${S}/t" - git_emake clean - - # Now run the tests - cd "${S}" - einfo "Start test run" - git_emake test - rc=$? - - # Display nice results - cd "${S}/t" - git_emake aggregate-results - - # And exit - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-1.7.3.5.ebuild b/dev-vcs/git/git-1.7.3.5.ebuild deleted file mode 100644 index 25ec75829662..000000000000 --- a/dev-vcs/git/git-1.7.3.5.ebuild +++ /dev/null @@ -1,487 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.5.ebuild,v 1.3 2011/08/19 18:43:47 darkside Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no -inherit toolchain-funcs eutils elisp-common perl-module bash-completion -[ "$PV" == "9999" ] && inherit git - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [ "$PV" != "9999" ]; then - SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - EGIT_BRANCH="master" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - !blksha1? ( dev-libs/openssl ) - sys-libs/zlib - perl? ( dev-lang/perl[-build] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${CDEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? - ( - >=dev-python/pygtk-2.8 - dev-python/pygtksourceview:2 - )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [ "$PV" == "9999" ]; then - DEPEND="${DEPEND} - app-text/asciidoc - app-text/xmlto" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." - # || myopts="${myopts} NO_ICONV=YesPlease" - # because, above, we need to do this unconditionally (no "&& use iconv") - use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" - - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [ "${PV}" != "9999" ]; then - unpack ${MY_P}.tar.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # Noperl is being merged to upstream as of 2009/04/05 - #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch - - # GetOpt-Long v2.38 is strict - # Merged in 1.6.3 final 2009/05/07 - #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch - - # JS install fixup - epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch - - # USE=-iconv causes segfaults, fixed post 1.7.1 - # Gentoo bug #321895 - #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch - - # Fix false positives with t3404 due to SHELL=/bin/false for the portage - # user. - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch - - # bug #350075: t9001: fix missing prereq on some tests - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # bug #318289 - epatch "${FILESDIR}"/git-1.7.3.2-interix.patch -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${EPREFIX}/usr/bin/python" \ - PERL_PATH="${EPREFIX}/usr/bin/env perl" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el \ - || die "emacs modules failed" - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - cd "${S}"/Documentation - if [[ "$PV" == "9999" ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - dobashcompletion contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use gtk ; then - dobin "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - dobin contrib/fast-import/git-p4 - dodoc contrib/fast-import/git-p4.txt - newbin contrib/fast-import/import-tars.perl import-tars - newbin contrib/git-resurrect.sh git-resurrect - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - blameview buildsystems ciabot continuous convert-objects fast-import \ - hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ - stats svn-fe vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${D}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - built_with_use dev-vcs/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first - cd "${S}/t" - git_emake clean - - # Now run the tests - cd "${S}" - einfo "Start test run" - git_emake test - rc=$? - - # Display nice results - cd "${S}/t" - git_emake aggregate-results - - # And exit - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-1.7.4.1.ebuild b/dev-vcs/git/git-1.7.4.1.ebuild deleted file mode 100644 index ef44e38f8fd6..000000000000 --- a/dev-vcs/git/git-1.7.4.1.ebuild +++ /dev/null @@ -1,511 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4.1.ebuild,v 1.3 2011/08/19 18:43:47 darkside Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_DEPEND="python? 2" - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion python -[ "$PV" == "9999" ] && inherit git - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [ "$PV" != "9999" ]; then - SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - EGIT_BRANCH="master" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - !blksha1? ( dev-libs/openssl ) - sys-libs/zlib - perl? ( dev-lang/perl[-build] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${CDEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8 - dev-python/pygtksourceview:2 - ) )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [ "$PV" == "9999" ]; then - DEPEND="${DEPEND} - app-text/asciidoc - app-text/xmlto" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python_set_active_version 2 - python_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." - # || myopts="${myopts} NO_ICONV=YesPlease" - # because, above, we need to do this unconditionally (no "&& use iconv") - use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" - - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [ "${PV}" != "9999" ]; then - unpack ${MY_P}.tar.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # Noperl is being merged to upstream as of 2009/04/05 - #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch - - # GetOpt-Long v2.38 is strict - # Merged in 1.6.3 final 2009/05/07 - #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch - - # JS install fixup - epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch - - # USE=-iconv causes segfaults, fixed post 1.7.1 - # Gentoo bug #321895 - #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch - - # Fix false positives with t3404 due to SHELL=/bin/false for the portage - # user. - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch - - # bug #350075: t9001: fix missing prereq on some tests - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch - - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # bug #318289 - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="$(PYTHON -a)" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_PATH="${EPREFIX}/usr/bin/env perl" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el \ - || die "emacs modules failed" - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - cd "${S}"/Documentation - if [[ "$PV" == "9999" ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - dobashcompletion contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use python && use gtk ; then - dobin "${S}"/contrib/gitview/gitview - python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - dobin contrib/fast-import/git-p4 - dodoc contrib/fast-import/git-p4.txt - newbin contrib/fast-import/import-tars.perl import-tars - newbin contrib/git-resurrect.sh git-resurrect - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - blameview buildsystems ciabot continuous convert-objects fast-import \ - hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ - stats svn-fe vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - built_with_use dev-vcs/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first - cd "${S}/t" - git_emake clean - - # Now run the tests - cd "${S}" - einfo "Start test run" - git_emake test - rc=$? - - # Display nice results - cd "${S}/t" - git_emake aggregate-results - - # And exit - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - use python && python_mod_optimize git_remote_helpers - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen - use python && python_mod_cleanup git_remote_helpers -} diff --git a/dev-vcs/git/git-1.7.4.4.ebuild b/dev-vcs/git/git-1.7.4.4.ebuild deleted file mode 100644 index e87d69df7c19..000000000000 --- a/dev-vcs/git/git-1.7.4.4.ebuild +++ /dev/null @@ -1,511 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4.4.ebuild,v 1.2 2011/08/19 18:43:47 darkside Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_DEPEND="python? 2" - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion python -[ "$PV" == "9999" ] && inherit git - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [ "$PV" != "9999" ]; then - SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - EGIT_BRANCH="master" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - !blksha1? ( dev-libs/openssl ) - sys-libs/zlib - perl? ( dev-lang/perl[-build] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${CDEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8 - dev-python/pygtksourceview:2 - ) )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [ "$PV" == "9999" ]; then - DEPEND="${DEPEND} - app-text/asciidoc - app-text/xmlto" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python_set_active_version 2 - python_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." - # || myopts="${myopts} NO_ICONV=YesPlease" - # because, above, we need to do this unconditionally (no "&& use iconv") - use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" - - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [ "${PV}" != "9999" ]; then - unpack ${MY_P}.tar.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # Noperl is being merged to upstream as of 2009/04/05 - #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch - - # GetOpt-Long v2.38 is strict - # Merged in 1.6.3 final 2009/05/07 - #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch - - # JS install fixup - epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch - - # USE=-iconv causes segfaults, fixed post 1.7.1 - # Gentoo bug #321895 - #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch - - # Fix false positives with t3404 due to SHELL=/bin/false for the portage - # user. - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch - - # bug #350075: t9001: fix missing prereq on some tests - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch - - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # bug #318289 - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="$(PYTHON -a)" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_PATH="${EPREFIX}/usr/bin/env perl" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el \ - || die "emacs modules failed" - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - cd "${S}"/Documentation - if [[ "$PV" == "9999" ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - dobashcompletion contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use python && use gtk ; then - dobin "${S}"/contrib/gitview/gitview - python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - dobin contrib/fast-import/git-p4 - dodoc contrib/fast-import/git-p4.txt - newbin contrib/fast-import/import-tars.perl import-tars - newbin contrib/git-resurrect.sh git-resurrect - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - blameview buildsystems ciabot continuous convert-objects fast-import \ - hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ - stats svn-fe vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - built_with_use dev-vcs/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first - cd "${S}/t" - git_emake clean - - # Now run the tests - cd "${S}" - einfo "Start test run" - git_emake test - rc=$? - - # Display nice results - cd "${S}/t" - git_emake aggregate-results - - # And exit - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - use python && python_mod_optimize git_remote_helpers - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen - use python && python_mod_cleanup git_remote_helpers -} diff --git a/dev-vcs/git/git-1.7.4.ebuild b/dev-vcs/git/git-1.7.4.ebuild deleted file mode 100644 index d3afb190cbe7..000000000000 --- a/dev-vcs/git/git-1.7.4.ebuild +++ /dev/null @@ -1,511 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4.ebuild,v 1.3 2011/08/19 18:43:47 darkside Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_DEPEND="python? 2" - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion python -[ "$PV" == "9999" ] && inherit git - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [ "$PV" != "9999" ]; then - SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - EGIT_BRANCH="master" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - !blksha1? ( dev-libs/openssl ) - sys-libs/zlib - perl? ( dev-lang/perl[-build] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${CDEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8 - dev-python/pygtksourceview:2 - ) )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [ "$PV" == "9999" ]; then - DEPEND="${DEPEND} - app-text/asciidoc - app-text/xmlto" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python_set_active_version 2 - python_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." - # || myopts="${myopts} NO_ICONV=YesPlease" - # because, above, we need to do this unconditionally (no "&& use iconv") - use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" - - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [ "${PV}" != "9999" ]; then - unpack ${MY_P}.tar.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # Noperl is being merged to upstream as of 2009/04/05 - #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch - - # GetOpt-Long v2.38 is strict - # Merged in 1.6.3 final 2009/05/07 - #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch - - # JS install fixup - epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch - - # USE=-iconv causes segfaults, fixed post 1.7.1 - # Gentoo bug #321895 - #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch - - # Fix false positives with t3404 due to SHELL=/bin/false for the portage - # user. - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch - - # bug #350075: t9001: fix missing prereq on some tests - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch - - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # bug #318289 - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="$(PYTHON -a)" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_PATH="${EPREFIX}/usr/bin/env perl" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el \ - || die "emacs modules failed" - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - cd "${S}"/Documentation - if [[ "$PV" == "9999" ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - dobashcompletion contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use python && use gtk ; then - dobin "${S}"/contrib/gitview/gitview - python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - dobin contrib/fast-import/git-p4 - dodoc contrib/fast-import/git-p4.txt - newbin contrib/fast-import/import-tars.perl import-tars - newbin contrib/git-resurrect.sh git-resurrect - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - blameview buildsystems ciabot continuous convert-objects fast-import \ - hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ - stats svn-fe vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - built_with_use dev-vcs/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first - cd "${S}/t" - git_emake clean - - # Now run the tests - cd "${S}" - einfo "Start test run" - git_emake test - rc=$? - - # Display nice results - cd "${S}/t" - git_emake aggregate-results - - # And exit - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - use python && python_mod_optimize git_remote_helpers - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen - use python && python_mod_cleanup git_remote_helpers -} diff --git a/dev-vcs/git/git-1.7.5_rc1.ebuild b/dev-vcs/git/git-1.7.5_rc1.ebuild deleted file mode 100644 index 95e8e5c6e366..000000000000 --- a/dev-vcs/git/git-1.7.5_rc1.ebuild +++ /dev/null @@ -1,511 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.5_rc1.ebuild,v 1.2 2011/08/19 18:43:47 darkside Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_DEPEND="python? 2" - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion python -[ "$PV" == "9999" ] && inherit git - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [ "$PV" != "9999" ]; then - SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - EGIT_BRANCH="master" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - !blksha1? ( dev-libs/openssl ) - sys-libs/zlib - perl? ( dev-lang/perl[-build] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${CDEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8 - dev-python/pygtksourceview:2 - ) )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [ "$PV" == "9999" ]; then - DEPEND="${DEPEND} - app-text/asciidoc - app-text/xmlto" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python_set_active_version 2 - python_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." - # || myopts="${myopts} NO_ICONV=YesPlease" - # because, above, we need to do this unconditionally (no "&& use iconv") - use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" - - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [ "${PV}" != "9999" ]; then - unpack ${MY_P}.tar.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # Noperl is being merged to upstream as of 2009/04/05 - #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch - - # GetOpt-Long v2.38 is strict - # Merged in 1.6.3 final 2009/05/07 - #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch - - # JS install fixup - epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch - - # USE=-iconv causes segfaults, fixed post 1.7.1 - # Gentoo bug #321895 - #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch - - # Fix false positives with t3404 due to SHELL=/bin/false for the portage - # user. - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch - - # bug #350075: t9001: fix missing prereq on some tests - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch - - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # bug #318289 - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="$(PYTHON -a)" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_PATH="${EPREFIX}/usr/bin/env perl" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el \ - || die "emacs modules failed" - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - cd "${S}"/Documentation - if [[ "$PV" == "9999" ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - dobashcompletion contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use python && use gtk ; then - dobin "${S}"/contrib/gitview/gitview - python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - dobin contrib/fast-import/git-p4 - dodoc contrib/fast-import/git-p4.txt - newbin contrib/fast-import/import-tars.perl import-tars - newbin contrib/git-resurrect.sh git-resurrect - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - blameview buildsystems ciabot continuous convert-objects fast-import \ - hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ - stats svn-fe vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - built_with_use dev-vcs/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first - cd "${S}/t" - git_emake clean - - # Now run the tests - cd "${S}" - einfo "Start test run" - git_emake test - rc=$? - - # Display nice results - cd "${S}/t" - git_emake aggregate-results - - # And exit - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - use python && python_mod_optimize git_remote_helpers - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen - use python && python_mod_cleanup git_remote_helpers -} diff --git a/dev-vcs/git/git-1.7.5_rc3.ebuild b/dev-vcs/git/git-1.7.5_rc3.ebuild deleted file mode 100644 index 1a493014c91c..000000000000 --- a/dev-vcs/git/git-1.7.5_rc3.ebuild +++ /dev/null @@ -1,509 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.5_rc3.ebuild,v 1.3 2011/08/19 18:43:47 darkside Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_DEPEND="python? 2" -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion python ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - !blksha1? ( dev-libs/openssl ) - sys-libs/zlib - perl? ( dev-lang/perl[-build] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${CDEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8 - dev-python/pygtksourceview:2 - ) )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc - app-text/xmlto" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python_set_active_version 2 - python_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." - # || myopts="${myopts} NO_ICONV=YesPlease" - # because, above, we need to do this unconditionally (no "&& use iconv") - use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" - - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # Noperl is being merged to upstream as of 2009/04/05 - #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch - - # GetOpt-Long v2.38 is strict - # Merged in 1.6.3 final 2009/05/07 - #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch - - # JS install fixup - epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch - - # USE=-iconv causes segfaults, fixed post 1.7.1 - # Gentoo bug #321895 - #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch - - # Fix false positives with t3404 due to SHELL=/bin/false for the portage - # user. - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch - - # bug #350075: t9001: fix missing prereq on some tests - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch - - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # bug #318289 - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="$(PYTHON -a)" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_PATH="${EPREFIX}/usr/bin/env perl" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el \ - || die "emacs modules failed" - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - dobashcompletion contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use python && use gtk ; then - dobin "${S}"/contrib/gitview/gitview - python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - dobin contrib/fast-import/git-p4 - dodoc contrib/fast-import/git-p4.txt - newbin contrib/fast-import/import-tars.perl import-tars - newbin contrib/git-resurrect.sh git-resurrect - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - blameview buildsystems ciabot continuous convert-objects fast-import \ - hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ - stats svn-fe vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - built_with_use dev-vcs/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first - cd "${S}/t" - git_emake clean - - # Now run the tests - cd "${S}" - einfo "Start test run" - git_emake test - rc=$? - - # Display nice results - cd "${S}/t" - git_emake aggregate-results - - # And exit - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - use python && python_mod_optimize git_remote_helpers - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen - use python && python_mod_cleanup git_remote_helpers -} diff --git a/dev-vcs/git/git-1.7.6.1.ebuild b/dev-vcs/git/git-1.7.6.1.ebuild deleted file mode 100644 index bdb03da44cf7..000000000000 --- a/dev-vcs/git/git-1.7.6.1.ebuild +++ /dev/null @@ -1,520 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.6.1.ebuild,v 1.1 2011/08/25 01:45:36 robbat2 Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_DEPEND="python? 2" -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion python ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - !blksha1? ( dev-libs/openssl ) - sys-libs/zlib - perl? ( dev-lang/perl[-build] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${CDEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8 - dev-python/pygtksourceview:2 - ) )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc - app-text/xmlto" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python_set_active_version 2 - python_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." - # || myopts="${myopts} NO_ICONV=YesPlease" - # because, above, we need to do this unconditionally (no "&& use iconv") - use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" - - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # Noperl is being merged to upstream as of 2009/04/05 - #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch - - # GetOpt-Long v2.38 is strict - # Merged in 1.6.3 final 2009/05/07 - #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch - - # JS install fixup - # Merged in 1.7.5.x - #epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch - - # USE=-iconv causes segfaults, fixed post 1.7.1 - # Gentoo bug #321895 - #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch - - # Fix false positives with t3404 due to SHELL=/bin/false for the portage - # user. - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch - - # bug #350075: t9001: fix missing prereq on some tests - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch - - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # bug #318289 - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch - - # merged upstream - #epatch "${FILESDIR}"/git-1.7.5-interix.patch - # but only one of two hunks made it into the release ... :( - epatch "${FILESDIR}"/git-1.7.6-interix.patch -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="$(PYTHON -a)" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el \ - || die "emacs modules failed" - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - dobashcompletion contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use python && use gtk ; then - dobin "${S}"/contrib/gitview/gitview - python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - dobin contrib/fast-import/git-p4 - dodoc contrib/fast-import/git-p4.txt - newbin contrib/fast-import/import-tars.perl import-tars - newbin contrib/git-resurrect.sh git-resurrect - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - blameview buildsystems ciabot continuous convert-objects fast-import \ - hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ - stats svn-fe vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - built_with_use dev-vcs/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first - cd "${S}/t" - git_emake clean - - # Now run the tests - cd "${S}" - einfo "Start test run" - git_emake test - rc=$? - - # Display nice results - cd "${S}/t" - git_emake aggregate-results - - # And exit - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - use python && python_mod_optimize git_remote_helpers - use bash-completion && \ - einfo "Please read /usr/share/bash-completion/git for Git bash completion" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen - use python && python_mod_cleanup git_remote_helpers -} diff --git a/dev-vcs/git/git-1.7.6.ebuild b/dev-vcs/git/git-1.7.6.ebuild deleted file mode 100644 index 78bdf8410e6f..000000000000 --- a/dev-vcs/git/git-1.7.6.ebuild +++ /dev/null @@ -1,520 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.6.ebuild,v 1.3 2011/08/19 18:43:47 darkside Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_DEPEND="python? 2" -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion python ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - !blksha1? ( dev-libs/openssl ) - sys-libs/zlib - perl? ( dev-lang/perl[-build] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${CDEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8 - dev-python/pygtksourceview:2 - ) )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc - app-text/xmlto" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python_set_active_version 2 - python_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." - # || myopts="${myopts} NO_ICONV=YesPlease" - # because, above, we need to do this unconditionally (no "&& use iconv") - use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" - - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # Noperl is being merged to upstream as of 2009/04/05 - #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch - - # GetOpt-Long v2.38 is strict - # Merged in 1.6.3 final 2009/05/07 - #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch - - # JS install fixup - # Merged in 1.7.5.x - #epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch - - # USE=-iconv causes segfaults, fixed post 1.7.1 - # Gentoo bug #321895 - #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch - - # Fix false positives with t3404 due to SHELL=/bin/false for the portage - # user. - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch - - # bug #350075: t9001: fix missing prereq on some tests - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch - - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # bug #318289 - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch - - # merged upstream - #epatch "${FILESDIR}"/git-1.7.5-interix.patch - # but only one of two hunks made it into the release ... :( - epatch "${FILESDIR}"/git-1.7.6-interix.patch -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="$(PYTHON -a)" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el \ - || die "emacs modules failed" - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - dobashcompletion contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use python && use gtk ; then - dobin "${S}"/contrib/gitview/gitview - python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - dobin contrib/fast-import/git-p4 - dodoc contrib/fast-import/git-p4.txt - newbin contrib/fast-import/import-tars.perl import-tars - newbin contrib/git-resurrect.sh git-resurrect - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - blameview buildsystems ciabot continuous convert-objects fast-import \ - hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ - stats svn-fe vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - built_with_use dev-vcs/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first - cd "${S}/t" - git_emake clean - - # Now run the tests - cd "${S}" - einfo "Start test run" - git_emake test - rc=$? - - # Display nice results - cd "${S}/t" - git_emake aggregate-results - - # And exit - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - use python && python_mod_optimize git_remote_helpers - use bash-completion && \ - einfo "Please read /usr/share/bash-completion/git for Git bash completion" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen - use python && python_mod_cleanup git_remote_helpers -} diff --git a/dev-vcs/git/git-1.7.7.1-r1.ebuild b/dev-vcs/git/git-1.7.7.1-r1.ebuild deleted file mode 100644 index e46ba01379da..000000000000 --- a/dev-vcs/git/git-1.7.7.1-r1.ebuild +++ /dev/null @@ -1,527 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.7.1-r1.ebuild,v 1.1 2011/10/24 17:36:35 robbat2 Exp $ - -EAPI=4 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_DEPEND="python? 2" -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="gz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - !blksha1? ( dev-libs/openssl ) - sys-libs/zlib - perl? ( dev-lang/perl[-build] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${CDEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8 - dev-python/pygtksourceview:2 - ) )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc - app-text/xmlto" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - subversion? ( perl ) - webdav? ( curl ) -" - -pkg_setup() { - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python_set_active_version 2 - python_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." - # || myopts="${myopts} NO_ICONV=YesPlease" - # because, above, we need to do this unconditionally (no "&& use iconv") - use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" - - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # Noperl is being merged to upstream as of 2009/04/05 - #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch - - # GetOpt-Long v2.38 is strict - # Merged in 1.6.3 final 2009/05/07 - #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch - - # JS install fixup - # Merged in 1.7.5.x - #epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch - - # USE=-iconv causes segfaults, fixed post 1.7.1 - # Gentoo bug #321895 - #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch - - # Fix false positives with t3404 due to SHELL=/bin/false for the portage - # user. - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch - - # bug #350075: t9001: fix missing prereq on some tests - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch - - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # bug #318289 - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch - - # merged upstream - #epatch "${FILESDIR}"/git-1.7.5-interix.patch - - # merged upstream - #epatch "${FILESDIR}"/git-1.7.6-interix.patch -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="$(PYTHON -a)" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el \ - || die "emacs modules failed" - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use python && use gtk ; then - dobin "${S}"/contrib/gitview/gitview - python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - dobin contrib/fast-import/git-p4 - dodoc contrib/fast-import/git-p4.txt - newbin contrib/fast-import/import-tars.perl import-tars - newbin contrib/git-resurrect.sh git-resurrect - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - blameview buildsystems ciabot continuous convert-objects fast-import \ - hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ - stats svn-fe vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - built_with_use dev-vcs/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first - cd "${S}/t" - git_emake clean - - # Now run the tests - cd "${S}" - einfo "Start test run" - git_emake test - rc=$? - - # Display nice results - cd "${S}/t" - git_emake aggregate-results - - # And exit - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - use python && python_mod_optimize git_remote_helpers - einfo "Please read /usr/share/bash-completion/git for Git bash completion" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen - use python && python_mod_cleanup git_remote_helpers -} diff --git a/dev-vcs/git/git-1.7.7.1.ebuild b/dev-vcs/git/git-1.7.7.1.ebuild deleted file mode 100644 index e7fcdd0bd771..000000000000 --- a/dev-vcs/git/git-1.7.7.1.ebuild +++ /dev/null @@ -1,529 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.7.1.ebuild,v 1.1 2011/10/24 08:34:13 robbat2 Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_DEPEND="python? 2" -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion python ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="gz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - !blksha1? ( dev-libs/openssl ) - sys-libs/zlib - perl? ( dev-lang/perl[-build] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${CDEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8 - dev-python/pygtksourceview:2 - ) )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc - app-text/xmlto" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python_set_active_version 2 - python_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." - # || myopts="${myopts} NO_ICONV=YesPlease" - # because, above, we need to do this unconditionally (no "&& use iconv") - use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" - - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # Noperl is being merged to upstream as of 2009/04/05 - #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch - - # GetOpt-Long v2.38 is strict - # Merged in 1.6.3 final 2009/05/07 - #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch - - # JS install fixup - # Merged in 1.7.5.x - #epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch - - # USE=-iconv causes segfaults, fixed post 1.7.1 - # Gentoo bug #321895 - #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch - - # Fix false positives with t3404 due to SHELL=/bin/false for the portage - # user. - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch - - # bug #350075: t9001: fix missing prereq on some tests - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch - - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # bug #318289 - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch - - # merged upstream - #epatch "${FILESDIR}"/git-1.7.5-interix.patch - - # merged upstream - #epatch "${FILESDIR}"/git-1.7.6-interix.patch -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="$(PYTHON -a)" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el \ - || die "emacs modules failed" - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - dobashcompletion contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use python && use gtk ; then - dobin "${S}"/contrib/gitview/gitview - python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - dobin contrib/fast-import/git-p4 - dodoc contrib/fast-import/git-p4.txt - newbin contrib/fast-import/import-tars.perl import-tars - newbin contrib/git-resurrect.sh git-resurrect - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - blameview buildsystems ciabot continuous convert-objects fast-import \ - hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ - stats svn-fe vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - built_with_use dev-vcs/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first - cd "${S}/t" - git_emake clean - - # Now run the tests - cd "${S}" - einfo "Start test run" - git_emake test - rc=$? - - # Display nice results - cd "${S}/t" - git_emake aggregate-results - - # And exit - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - use python && python_mod_optimize git_remote_helpers - use bash-completion && \ - einfo "Please read /usr/share/bash-completion/git for Git bash completion" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen - use python && python_mod_cleanup git_remote_helpers -} diff --git a/dev-vcs/git/git-1.7.7.4.ebuild b/dev-vcs/git/git-1.7.7.6.ebuild similarity index 99% rename from dev-vcs/git/git-1.7.7.4.ebuild rename to dev-vcs/git/git-1.7.7.6.ebuild index d19f5d6c93db..c32ae3e78b07 100644 --- a/dev-vcs/git/git-1.7.7.4.ebuild +++ b/dev-vcs/git/git-1.7.7.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/dev-vcs/git/git-1.7.7.4.ebuild,v 1.1 2011/11/18 22:55:11 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.7.6.ebuild,v 1.1 2012/01/20 08:32:39 robbat2 Exp $ EAPI=4 diff --git a/dev-vcs/git/git-1.7.7.ebuild b/dev-vcs/git/git-1.7.7.ebuild deleted file mode 100644 index 0d86d2e79dd8..000000000000 --- a/dev-vcs/git/git-1.7.7.ebuild +++ /dev/null @@ -1,529 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.7.ebuild,v 1.2 2011/10/01 05:58:42 mr_bones_ Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_DEPEND="python? 2" -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion python ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="gz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - !blksha1? ( dev-libs/openssl ) - sys-libs/zlib - perl? ( dev-lang/perl[-build] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${CDEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8 - dev-python/pygtksourceview:2 - ) )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc - app-text/xmlto" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python_set_active_version 2 - python_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." - # || myopts="${myopts} NO_ICONV=YesPlease" - # because, above, we need to do this unconditionally (no "&& use iconv") - use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" - - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # Noperl is being merged to upstream as of 2009/04/05 - #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch - - # GetOpt-Long v2.38 is strict - # Merged in 1.6.3 final 2009/05/07 - #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch - - # JS install fixup - # Merged in 1.7.5.x - #epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch - - # USE=-iconv causes segfaults, fixed post 1.7.1 - # Gentoo bug #321895 - #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch - - # Fix false positives with t3404 due to SHELL=/bin/false for the portage - # user. - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch - - # bug #350075: t9001: fix missing prereq on some tests - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch - - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # bug #318289 - # Merged upstream - #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch - - # merged upstream - #epatch "${FILESDIR}"/git-1.7.5-interix.patch - - # merged upstream - #epatch "${FILESDIR}"/git-1.7.6-interix.patch -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="$(PYTHON -a)" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el \ - || die "emacs modules failed" - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - dobashcompletion contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use python && use gtk ; then - dobin "${S}"/contrib/gitview/gitview - python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - dobin contrib/fast-import/git-p4 - dodoc contrib/fast-import/git-p4.txt - newbin contrib/fast-import/import-tars.perl import-tars - newbin contrib/git-resurrect.sh git-resurrect - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - blameview buildsystems ciabot continuous convert-objects fast-import \ - hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ - stats svn-fe vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - built_with_use dev-vcs/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first - cd "${S}/t" - git_emake clean - - # Now run the tests - cd "${S}" - einfo "Start test run" - git_emake test - rc=$? - - # Display nice results - cd "${S}/t" - git_emake aggregate-results - - # And exit - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - use python && python_mod_optimize git_remote_helpers - use bash-completion && \ - einfo "Please read /usr/share/bash-completion/git for Git bash completion" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen - use python && python_mod_cleanup git_remote_helpers -} diff --git a/dev-vcs/git/git-1.7.7.2.ebuild b/dev-vcs/git/git-1.7.8.4.ebuild similarity index 98% rename from dev-vcs/git/git-1.7.7.2.ebuild rename to dev-vcs/git/git-1.7.8.4.ebuild index ebc4056ea5b2..58b26891a8fd 100644 --- a/dev-vcs/git/git-1.7.7.2.ebuild +++ b/dev-vcs/git/git-1.7.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/dev-vcs/git/git-1.7.7.2.ebuild,v 1.1 2011/11/02 18:45:21 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.4.ebuild,v 1.1 2012/01/20 08:32:39 robbat2 Exp $ EAPI=4 @@ -46,7 +46,7 @@ IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads + CDEPEND=" !blksha1? ( dev-libs/openssl ) sys-libs/zlib - perl? ( dev-lang/perl[-build] ) + perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl @@ -146,7 +146,7 @@ exportmakeopts() { use tk \ || myopts="${myopts} NO_TCLTK=YesPlease" use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ + && myopts="${myopts} INSTALLDIRS=vendor USE_LIBPCRE=yes" \ || myopts="${myopts} NO_PERL=YesPlease" use python \ || myopts="${myopts} NO_PYTHON=YesPlease" diff --git a/dev-vcs/git/git-1.7.7.3.ebuild b/dev-vcs/git/git-1.7.9_rc2.ebuild similarity index 89% rename from dev-vcs/git/git-1.7.7.3.ebuild rename to dev-vcs/git/git-1.7.9_rc2.ebuild index 438521135b6b..78ec9d1f088a 100644 --- a/dev-vcs/git/git-1.7.7.3.ebuild +++ b/dev-vcs/git/git-1.7.9_rc2.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-vcs/git/git-1.7.7.3.ebuild,v 1.1 2011/11/09 10:29:18 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9_rc2.ebuild,v 1.1 2012/01/20 08:27:19 robbat2 Exp $ EAPI=4 @@ -33,6 +33,7 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="" # Pending git-svn fixes else SRC_URI="" KEYWORDS="" @@ -46,7 +47,7 @@ IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads + CDEPEND=" !blksha1? ( dev-libs/openssl ) sys-libs/zlib - perl? ( dev-lang/perl[-build] ) + perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl @@ -55,6 +56,7 @@ CDEPEND=" emacs? ( virtual/emacs )" RDEPEND="${CDEPEND} + app-crypt/gnupg perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL @@ -74,10 +76,13 @@ RDEPEND="${CDEPEND} # .texi --(makeinfo)---------> .info DEPEND="${CDEPEND} app-arch/cpio - doc? ( + doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo + ) + test? ( + app-crypt/gnupg )" # Live ebuild builds man pages and HTML docs, additionally @@ -146,7 +151,7 @@ exportmakeopts() { use tk \ || myopts="${myopts} NO_TCLTK=YesPlease" use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ + && myopts="${myopts} INSTALLDIRS=vendor USE_LIBPCRE=yes" \ || myopts="${myopts} NO_PERL=YesPlease" use python \ || myopts="${myopts} NO_PYTHON=YesPlease" @@ -256,6 +261,26 @@ src_prepare() { # merged upstream #epatch "${FILESDIR}"/git-1.7.6-interix.patch + + # Newer versions of SVN hate a whitespace in the file URL. + # So we avoid that by replaced the space with an underscore. + #Initialized empty Git repository in /dev/shm/portage/dev-vcs/git-9999/work/git-9999/t/t d.t9155/git_project/.git/ + #svn: E235000: In file 'subversion/libsvn_subr/dirent_uri.c' line 2291: assertion failed (svn_uri_is_canonical(url, pool)) + # + # With this change the following tests still fail: t9100 t9118 t9120 + # Without it, MOST of t91* fails, due to the space tripping up the + # svn_uri_is_canonical. + # + # git-svn actually needs to be fixed here, but this chagne is useful for + # testing it. + # + # This patch is my work to date on fixing git-svn, but it causes more + # breakage than it fixes (it's manually-edited now to do nothing). + #epatch "${FILESDIR}"/git-1.7.8-git-svn-1.7-canonical-path.patch + cd "${S}"/t + sed -i \ + -e 's/trash directory/trash_directory/g' \ + test-lib.sh t0000-basic.sh Makefile || die "sed failed" } git_emake() { @@ -355,7 +380,7 @@ src_install() { fi dobin contrib/fast-import/git-p4 - dodoc contrib/fast-import/git-p4.txt + #dodoc contrib/fast-import/git-p4.txt # Moved upstream newbin contrib/fast-import/import-tars.perl import-tars newbin contrib/git-resurrect.sh git-resurrect @@ -485,21 +510,23 @@ src_test() { sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ -i "${S}"/t/Makefile - # Clean old results first + # Clean old results first, must always run cd "${S}/t" - git_emake clean + nonfatal git_emake clean - # Now run the tests + # Now run the tests, keep going if we hit an error, and don't terminate on + # failure cd "${S}" einfo "Start test run" - git_emake test + #MAKEOPTS=-j1 + nonfatal git_emake --keep-going test rc=$? - # Display nice results + # Display nice results, now print the results cd "${S}/t" - git_emake aggregate-results + nonfatal git_emake aggregate-results - # And exit + # And bail if there was a problem [ $rc -eq 0 ] || die "tests failed. Please file a bug." } diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 675f4cb6cbcc..73a6099a78ac 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-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/dev-vcs/git/git-9999.ebuild,v 1.26 2012/01/13 21:48:42 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.27 2012/01/20 08:27:19 robbat2 Exp $ EAPI=4 @@ -55,6 +55,7 @@ CDEPEND=" emacs? ( virtual/emacs )" RDEPEND="${CDEPEND} + app-crypt/gnupg perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL @@ -74,10 +75,13 @@ RDEPEND="${CDEPEND} # .texi --(makeinfo)---------> .info DEPEND="${CDEPEND} app-arch/cpio - doc? ( + doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo + ) + test? ( + app-crypt/gnupg )" # Live ebuild builds man pages and HTML docs, additionally @@ -256,6 +260,26 @@ src_prepare() { # merged upstream #epatch "${FILESDIR}"/git-1.7.6-interix.patch + + # Newer versions of SVN hate a whitespace in the file URL. + # So we avoid that by replaced the space with an underscore. + #Initialized empty Git repository in /dev/shm/portage/dev-vcs/git-9999/work/git-9999/t/t d.t9155/git_project/.git/ + #svn: E235000: In file 'subversion/libsvn_subr/dirent_uri.c' line 2291: assertion failed (svn_uri_is_canonical(url, pool)) + # + # With this change the following tests still fail: t9100 t9118 t9120 + # Without it, MOST of t91* fails, due to the space tripping up the + # svn_uri_is_canonical. + # + # git-svn actually needs to be fixed here, but this chagne is useful for + # testing it. + # + # This patch is my work to date on fixing git-svn, but it causes more + # breakage than it fixes (it's manually-edited now to do nothing). + epatch "${FILESDIR}"/git-1.7.8-git-svn-1.7-canonical-path.patch + cd "${S}"/t + sed -i \ + -e 's/trash directory/trash_directory/g' \ + test-lib.sh t0000-basic.sh Makefile || die "sed failed" } git_emake() { @@ -355,7 +379,7 @@ src_install() { fi dobin contrib/fast-import/git-p4 - dodoc contrib/fast-import/git-p4.txt + #dodoc contrib/fast-import/git-p4.txt # Moved upstream newbin contrib/fast-import/import-tars.perl import-tars newbin contrib/git-resurrect.sh git-resurrect @@ -485,21 +509,23 @@ src_test() { sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ -i "${S}"/t/Makefile - # Clean old results first + # Clean old results first, must always run cd "${S}/t" - git_emake clean + nonfatal git_emake clean - # Now run the tests + # Now run the tests, keep going if we hit an error, and don't terminate on + # failure cd "${S}" einfo "Start test run" - git_emake test + #MAKEOPTS=-j1 + nonfatal git_emake --keep-going test rc=$? - # Display nice results + # Display nice results, now print the results cd "${S}/t" - git_emake aggregate-results + nonfatal git_emake aggregate-results - # And exit + # And bail if there was a problem [ $rc -eq 0 ] || die "tests failed. Please file a bug." } diff --git a/games-arcade/stardork/stardork-0.6.ebuild b/games-arcade/stardork/stardork-0.6.ebuild index cb4581cf321b..61e33943850e 100644 --- a/games-arcade/stardork/stardork-0.6.ebuild +++ b/games-arcade/stardork/stardork-0.6.ebuild @@ -1,6 +1,6 @@ -# 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/games-arcade/stardork/stardork-0.6.ebuild,v 1.6 2008/05/05 20:20:05 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/stardork/stardork-0.6.ebuild,v 1.7 2012/01/20 11:38:53 ssuominen Exp $ inherit toolchain-funcs games @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ppc64 x86" +KEYWORDS="~amd64 ~ppc ~ppc64 x86" IUSE="" DEPEND="sys-libs/ncurses" diff --git a/games-misc/robotfindskitten/robotfindskitten-1.7320508.406.ebuild b/games-misc/robotfindskitten/robotfindskitten-1.7320508.406.ebuild index 399ac05b83c3..f533eae5a3a6 100644 --- a/games-misc/robotfindskitten/robotfindskitten-1.7320508.406.ebuild +++ b/games-misc/robotfindskitten/robotfindskitten-1.7320508.406.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-misc/robotfindskitten/robotfindskitten-1.7320508.406.ebuild,v 1.1 2011/12/20 16:51:16 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-misc/robotfindskitten/robotfindskitten-1.7320508.406.ebuild,v 1.2 2012/01/20 09:21:37 ago Exp $ inherit games @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/rfk/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~ppc ~sparc ~x86" IUSE="" DEPEND="sys-libs/ncurses" diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest index fd2dde2355d7..fe1cd66160c3 100644 --- a/mail-filter/imapfilter/Manifest +++ b/mail-filter/imapfilter/Manifest @@ -2,3 +2,4 @@ DIST imapfilter-2.2.2.tar.bz2 45670 RMD160 c80dfa41af55fd7968f0c018825af4c6ba385 DIST imapfilter-2.2.3.tar.gz 55503 RMD160 8bb83015225257131199f8bc0a92d09967cb87b6 SHA1 8d71dbb5f67494c27706400ba8d89c29cb4914de SHA256 7ed19d91f0e01f53d443b03de0b1c465407aad1b7c4886ef7a078896ccf63cd9 DIST imapfilter-2.3.tar.gz 53086 RMD160 0ff0d32bb8bd12b0f73dabeec06c8966949fe361 SHA1 c913a05948e55b5eb3c647ee3327074b86eae2e5 SHA256 b5012c43169d56a2809a6c1a524aee479eb50ca9fb363798794c45b28a679710 DIST imapfilter-2.4.1.tar.gz 54789 RMD160 ad17d719daa6187ca48bc4aa62445deb2dc84b08 SHA1 2f06f8ce4057efd631836ac6ea066764f7481875 SHA256 9822093e6b9c1318e4e376266465bf629c38f204ac088012fdc1d10664a7a64a +DIST imapfilter-2.4.2.tar.gz 55284 RMD160 fbe36f3b9fa5065b250ba838967cba350882144c SHA1 9e7031ad8d7d83c268140f73caf92add0e2363c4 SHA256 470a712b52f9937e71c0269d48bc7773b3d7a532c5693881a9eec56da8742e44 diff --git a/mail-filter/imapfilter/imapfilter-2.4.2.ebuild b/mail-filter/imapfilter/imapfilter-2.4.2.ebuild new file mode 100644 index 000000000000..21879bbc4242 --- /dev/null +++ b/mail-filter/imapfilter/imapfilter-2.4.2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/imapfilter/imapfilter-2.4.2.ebuild,v 1.1 2012/01/20 04:36:50 radhermit Exp $ + +EAPI=4 + +inherit toolchain-funcs + +DESCRIPTION="An IMAP mail filtering utility" +HOMEPAGE="http://imapfilter.hellug.gr" +SRC_URI="https://github.com/downloads/lefcha/imapfilter/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +RDEPEND="dev-libs/openssl + dev-libs/libpcre + >=dev-lang/lua-5.1" +DEPEND="${RDEPEND}" + +src_prepare() { + sed -i -e "/^PREFIX/s:/local::" \ + -e "/^MANDIR/s:man:share/man:" \ + -e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \ + -e "/^CFLAGS/s/-O//" \ + src/Makefile || die +} + +src_compile() { + emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" +} + +src_install() { + emake DESTDIR="${D}" install + dodoc AUTHORS NEWS README samples/* + doman doc/imapfilter.1 doc/imapfilter_config.5 +} diff --git a/media-libs/libmikmod/libmikmod-3.1.12.ebuild b/media-libs/libmikmod/libmikmod-3.1.12.ebuild index f62fba89b2ea..8fd333285ead 100644 --- a/media-libs/libmikmod/libmikmod-3.1.12.ebuild +++ b/media-libs/libmikmod/libmikmod-3.1.12.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/media-libs/libmikmod/libmikmod-3.1.12.ebuild,v 1.2 2010/03/12 12:23:24 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.1.12.ebuild,v 1.3 2012/01/20 13:00:41 ago Exp $ # this ebuild is only for the libmikmod.so.2 SONAME for ABI compat @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz" LICENSE="|| ( LGPL-2.1 LGPL-2 )" SLOT="2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="+oss raw" src_prepare() { diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild index c968f8b5d0f1..d5302297d8a7 100644 --- a/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild +++ b/media-sound/alsaplayer/alsaplayer-0.99.81.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/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild,v 1.5 2012/01/09 18:36:12 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild,v 1.6 2012/01/20 12:32:06 ago Exp $ EAPI=4 inherit autotools eutils @@ -23,7 +23,7 @@ RDEPEND="media-libs/libsndfile id3tag? ( media-libs/libid3tag ) jack? ( >=media-sound/jack-audio-connection-kit-0.80 ) mad? ( media-libs/libmad ) - mikmod? ( media-libs/libmikmod ) + mikmod? ( media-libs/libmikmod:0 ) nas? ( media-libs/nas ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl ) diff --git a/media-sound/cmus/cmus-2.4.2.ebuild b/media-sound/cmus/cmus-2.4.2.ebuild index 5e5d1a26e0f7..6a65e6d3f0d8 100644 --- a/media-sound/cmus/cmus-2.4.2.ebuild +++ b/media-sound/cmus/cmus-2.4.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/cmus/cmus-2.4.2.ebuild,v 1.3 2011/11/02 14:53:45 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.4.2.ebuild,v 1.4 2012/01/20 12:30:44 ago Exp $ EAPI=4 inherit eutils multilib @@ -23,7 +23,7 @@ CDEPEND="sys-libs/ncurses[unicode?] ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) - mikmod? ( media-libs/libmikmod ) + mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) diff --git a/media-sound/cmus/cmus-2.4.3.ebuild b/media-sound/cmus/cmus-2.4.3.ebuild index b778aa707952..2a8678822b3e 100644 --- a/media-sound/cmus/cmus-2.4.3.ebuild +++ b/media-sound/cmus/cmus-2.4.3.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/cmus/cmus-2.4.3.ebuild,v 1.1 2011/12/01 02:38:57 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.4.3.ebuild,v 1.2 2012/01/20 12:30:44 ago Exp $ EAPI=4 inherit eutils multilib @@ -23,7 +23,7 @@ CDEPEND="sys-libs/ncurses[unicode?] ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) - mikmod? ( media-libs/libmikmod ) + mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) diff --git a/media-sound/ecasound/ecasound-2.6.0.ebuild b/media-sound/ecasound/ecasound-2.6.0.ebuild index d43f5fc6d888..f0a1f6ebedc7 100644 --- a/media-sound/ecasound/ecasound-2.6.0.ebuild +++ b/media-sound/ecasound/ecasound-2.6.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-sound/ecasound/ecasound-2.6.0.ebuild,v 1.8 2011/07/24 18:15:44 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ecasound-2.6.0.ebuild,v 1.9 2012/01/20 12:29:31 ago Exp $ EAPI=3 @@ -22,7 +22,7 @@ RDEPEND="python? ( dev-lang/python ) alsa? ( media-libs/alsa-lib ) vorbis? ( media-libs/libvorbis ) libsamplerate? ( media-libs/libsamplerate ) - mikmod? ( media-libs/libmikmod ) + mikmod? ( media-libs/libmikmod:0 ) ruby? ( dev-lang/ruby ) python? ( dev-lang/python ) ncurses? ( sys-libs/ncurses ) diff --git a/media-sound/ecasound/ecasound-2.8.1.ebuild b/media-sound/ecasound/ecasound-2.8.1.ebuild index 804d3392c924..1e91266377a7 100644 --- a/media-sound/ecasound/ecasound-2.8.1.ebuild +++ b/media-sound/ecasound/ecasound-2.8.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/media-sound/ecasound/ecasound-2.8.1.ebuild,v 1.1 2011/06/28 04:21:12 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ecasound-2.8.1.ebuild,v 1.2 2012/01/20 12:29:31 ago Exp $ EAPI=3 PYTHON_DEPEND="python? 2" @@ -23,7 +23,7 @@ RDEPEND="sys-libs/readline jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) media-libs/ladspa-sdk - mikmod? ( media-libs/libmikmod ) + mikmod? ( media-libs/libmikmod:0 ) ncurses? ( sys-libs/ncurses ) oil? ( dev-libs/liboil ) osc? ( media-libs/liblo ) diff --git a/media-sound/mikmod/mikmod-3.2.1.ebuild b/media-sound/mikmod/mikmod-3.2.1.ebuild index 0631fad3b1ee..9b83956ca6fa 100644 --- a/media-sound/mikmod/mikmod-3.2.1.ebuild +++ b/media-sound/mikmod/mikmod-3.2.1.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2009 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/mikmod/mikmod-3.2.1.ebuild,v 1.10 2009/08/03 12:54:00 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mikmod/mikmod-3.2.1.ebuild,v 1.11 2012/01/20 12:56:25 ago Exp $ + +EAPI=4 DESCRIPTION="MikMod is a console MOD-Player based on libmikmod" HOMEPAGE="http://mikmod.raphnet.net/" @@ -11,10 +13,7 @@ SLOT="0" KEYWORDS="amd64 ~ppc sparc x86" IUSE="" -RDEPEND=">=media-libs/libmikmod-3.1.5" +RDEPEND="media-libs/libmikmod:0" DEPEND="${RDEPEND}" -src_install () { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc README NEWS -} +DOCS=( README NEWS ) \ No newline at end of file diff --git a/media-sound/mikmod/mikmod-3.2.2_beta1.ebuild b/media-sound/mikmod/mikmod-3.2.2_beta1.ebuild index 53e3f68bec61..bdf5c48f0957 100644 --- a/media-sound/mikmod/mikmod-3.2.2_beta1.ebuild +++ b/media-sound/mikmod/mikmod-3.2.2_beta1.ebuild @@ -1,6 +1,8 @@ -# 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/media-sound/mikmod/mikmod-3.2.2_beta1.ebuild,v 1.2 2010/01/09 19:55:01 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mikmod/mikmod-3.2.2_beta1.ebuild,v 1.3 2012/01/20 12:56:25 ago Exp $ + +EAPI=4 DESCRIPTION="MikMod is a console MOD-Player based on libmikmod" HOMEPAGE="http://mikmod.raphnet.net" @@ -11,12 +13,9 @@ SLOT="0" KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" IUSE="" -RDEPEND=">=media-libs/libmikmod-3.1.5" +RDEPEND="media-libs/libmikmod:0" DEPEND="${RDEPEND}" -S="${WORKDIR}"/${P/_/-} +DOCS=( AUTHORS NEWS README ) -src_install() { - emake DESTDIR="${D}" install || die "emake install failed." - dodoc AUTHORS NEWS README -} +S="${WORKDIR}"/${P/_/-} \ No newline at end of file diff --git a/media-sound/mpd/mpd-0.16.2.ebuild b/media-sound/mpd/mpd-0.16.2.ebuild index 7d0662e2ce46..1ef33309d980 100644 --- a/media-sound/mpd/mpd-0.16.2.ebuild +++ b/media-sound/mpd/mpd-0.16.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/mpd/mpd-0.16.2.ebuild,v 1.14 2011/08/07 14:24:41 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.2.ebuild,v 1.15 2012/01/20 12:27:58 ago Exp $ EAPI=4 inherit eutils flag-o-matic linux-info multilib @@ -44,7 +44,7 @@ RDEPEND="!=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) diff --git a/media-sound/mpd/mpd-0.16.5.ebuild b/media-sound/mpd/mpd-0.16.5.ebuild index a6137af1ebfa..87a507405738 100644 --- a/media-sound/mpd/mpd-0.16.5.ebuild +++ b/media-sound/mpd/mpd-0.16.5.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/media-sound/mpd/mpd-0.16.5.ebuild,v 1.7 2012/01/05 10:26:03 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.5.ebuild,v 1.8 2012/01/20 12:27:58 ago Exp $ EAPI=4 inherit eutils flag-o-matic linux-info multilib @@ -44,7 +44,7 @@ RDEPEND="!=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) diff --git a/media-sound/mpd/mpd-0.16.6.ebuild b/media-sound/mpd/mpd-0.16.6.ebuild index 7856a88a94d8..586c2e1b9e67 100644 --- a/media-sound/mpd/mpd-0.16.6.ebuild +++ b/media-sound/mpd/mpd-0.16.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/media-sound/mpd/mpd-0.16.6.ebuild,v 1.1 2011/12/04 13:01:02 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.6.ebuild,v 1.2 2012/01/20 12:27:58 ago Exp $ EAPI=4 inherit eutils flag-o-matic linux-info multilib @@ -44,7 +44,7 @@ RDEPEND="!=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) diff --git a/media-sound/mpd/mpd-9999.ebuild b/media-sound/mpd/mpd-9999.ebuild index 76c4e25badaf..c2972cf921a8 100644 --- a/media-sound/mpd/mpd-9999.ebuild +++ b/media-sound/mpd/mpd-9999.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/mpd/mpd-9999.ebuild,v 1.2 2011/07/17 16:08:37 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-9999.ebuild,v 1.3 2012/01/20 12:27:58 ago Exp $ EAPI=4 inherit autotools eutils flag-o-matic linux-info multilib git-2 @@ -43,7 +43,7 @@ RDEPEND="!=media-sound/mpg123-1.12.2 ) diff --git a/media-sound/mup/mup-5.7.ebuild b/media-sound/mup/mup-5.7.ebuild index 391dc331bbed..70486a1e0b94 100644 --- a/media-sound/mup/mup-5.7.ebuild +++ b/media-sound/mup/mup-5.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/media-sound/mup/mup-5.7.ebuild,v 1.2 2011/03/20 20:07:55 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-5.7.ebuild,v 1.3 2012/01/20 13:07:37 ago Exp $ EAPI=4 inherit eutils multilib toolchain-funcs @@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.arkkra.com/pub/unix/mup${PV//.}src.tar.gz" LICENSE="Arkkra" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~ppc ~sparc ~x86" IUSE="" RDEPEND="x11-libs/libX11 diff --git a/media-video/vlc/vlc-1.2.9999.ebuild b/media-video/vlc/vlc-1.2.9999.ebuild index 99c1b138d23c..05d4237a8d40 100644 --- a/media-video/vlc/vlc-1.2.9999.ebuild +++ b/media-video/vlc/vlc-1.2.9999.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-video/vlc/vlc-1.2.9999.ebuild,v 1.4 2011/12/16 12:48:44 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.2.9999.ebuild,v 1.5 2012/01/20 13:26:32 aballier Exp $ EAPI="4" @@ -98,7 +98,7 @@ RDEPEND=" libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) - live? ( >=media-plugins/live-2011.12.02 ) + live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) diff --git a/metadata/cache/app-arch/libarchive-2.8.5 b/metadata/cache/app-arch/libarchive-2.8.5 index 17fa84b31c80..0e50f1e86438 100644 --- a/metadata/cache/app-arch/libarchive-2.8.5 +++ b/metadata/cache/app-arch/libarchive-2.8.5 @@ -6,7 +6,7 @@ http://libarchive.googlecode.com/files/libarchive-2.8.5.tar.gz http://people.fre http://code.google.com/p/libarchive/ BSD BSD tar command -alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd +alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd eutils flag-o-matic multilib portability toolchain-funcs user static static-libs acl xattr kernel_linux +bzip2 +lzma +zlib expat diff --git a/metadata/cache/app-emulation/qemu-kvm-0.15.1-r1 b/metadata/cache/app-emulation/qemu-kvm-0.15.1-r1 index 03801320fe31..6f74b134d54c 100644 --- a/metadata/cache/app-emulation/qemu-kvm-0.15.1-r1 +++ b/metadata/cache/app-emulation/qemu-kvm-0.15.1-r1 @@ -6,7 +6,7 @@ test http://www.linux-kvm.org GPL-2 QEMU + Kernel-based Virtual Machine userland tools -~amd64 ~ppc ~ppc64 ~x86 +amd64 ~ppc ~ppc64 ~x86 eutils flag-o-matic linux-info multilib portability python toolchain-funcs user versionator +aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde +vhost-net xattr xen +qemu_softmmu_targets_x86_64 qemu_softmmu_targets_i386 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 diff --git a/metadata/cache/app-emulation/virt-manager-0.9.0-r3 b/metadata/cache/app-emulation/virt-manager-0.9.0-r3 index 34a525c38e90..12d8f6da12ed 100644 --- a/metadata/cache/app-emulation/virt-manager-0.9.0-r3 +++ b/metadata/cache/app-emulation/virt-manager-0.9.0-r3 @@ -1,4 +1,4 @@ ->=dev-python/pygtk-1.99.12 >=app-emulation/libvirt-0.7.0[python,sasl?] >=dev-libs/libxml2-2.6.23[python] >=app-emulation/virtinst-0.600.0-r2 >=gnome-base/librsvg-2 >=x11-libs/vte-0.12.2:0[python] >=net-libs/gtk-vnc-0.3.8[python,sasl?] >=dev-python/dbus-python-0.61 >=dev-python/gconf-python-1.99.11 dev-python/urlgrabber gnome-keyring? ( dev-python/gnome-keyring-python ) policykit? ( sys-auth/polkit ) spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] ) app-text/rarian dev-util/intltool >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* =dev-lang/python-2.4* ) +>=dev-python/pygtk-1.99.12 >=app-emulation/libvirt-0.7.0[python,sasl?] >=dev-libs/libxml2-2.6.23[python] >=app-emulation/virtinst-0.600.0-r2 >=gnome-base/librsvg-2 >=x11-libs/vte-0.12.2:0[python] >=net-libs/gtk-vnc-0.3.8[python,sasl?] >=dev-python/dbus-python-0.61 >=dev-python/gconf-python-1.99.11 dev-python/urlgrabber gnome-keyring? ( dev-python/gnome-keyring-python ) policykit? ( sys-auth/polkit ) spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] ) app-text/rarian dev-util/intltool app-arch/xz-utils >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* =dev-lang/python-2.4* ) >=dev-python/pygtk-1.99.12 >=app-emulation/libvirt-0.7.0[python,sasl?] >=dev-libs/libxml2-2.6.23[python] >=app-emulation/virtinst-0.600.0-r2 >=gnome-base/librsvg-2 >=x11-libs/vte-0.12.2:0[python] >=net-libs/gtk-vnc-0.3.8[python,sasl?] >=dev-python/dbus-python-0.61 >=dev-python/gconf-python-1.99.11 dev-python/urlgrabber gnome-keyring? ( dev-python/gnome-keyring-python ) policykit? ( sys-auth/polkit ) spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* =dev-lang/python-2.4* ) 0 http://virt-manager.org/download/sources/virt-manager/virt-manager-0.9.0.tar.gz mirror://gentoo/virt-manager-0.9.0-bp-4.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/virt-manager-0.9.0-bp-4.tar.bz2 @@ -12,7 +12,7 @@ gnome-keyring policykit sasl spice -2 +4 compile configure install postinst postrm preinst prepare setup unpack diff --git a/metadata/cache/app-emulation/virt-manager-9999 b/metadata/cache/app-emulation/virt-manager-9999 index b8e553e1aacf..f20a53a181a6 100644 --- a/metadata/cache/app-emulation/virt-manager-9999 +++ b/metadata/cache/app-emulation/virt-manager-9999 @@ -1,4 +1,4 @@ ->=dev-python/pygtk-1.99.12 >=app-emulation/libvirt-0.7.0[python,sasl?] >=dev-libs/libxml2-2.6.23[python] >=app-emulation/virtinst-9999 >=gnome-base/librsvg-2 >=x11-libs/vte-0.12.2:0[python] >=net-libs/gtk-vnc-0.3.8[python,sasl?] >=dev-python/dbus-python-0.61 >=dev-python/gconf-python-1.99.11 dev-python/urlgrabber gnome-keyring? ( dev-python/gnome-keyring-python ) policykit? ( sys-auth/polkit ) spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] ) app-text/rarian dev-util/intltool >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* =dev-lang/python-2.4* ) dev-vcs/git || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +>=dev-python/pygtk-1.99.12 >=app-emulation/libvirt-0.7.0[python,sasl?] >=dev-libs/libxml2-2.6.23[python] >=app-emulation/virtinst-9999 >=gnome-base/librsvg-2 >=x11-libs/vte-0.12.2:0[python] >=net-libs/gtk-vnc-0.3.8[python,sasl?] >=dev-python/dbus-python-0.61 >=dev-python/gconf-python-1.99.11 dev-python/urlgrabber gnome-keyring? ( dev-python/gnome-keyring-python ) policykit? ( sys-auth/polkit ) spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] ) app-text/rarian dev-util/intltool app-arch/xz-utils >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* =dev-lang/python-2.4* ) dev-vcs/git || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=dev-python/pygtk-1.99.12 >=app-emulation/libvirt-0.7.0[python,sasl?] >=dev-libs/libxml2-2.6.23[python] >=app-emulation/virtinst-9999 >=gnome-base/librsvg-2 >=x11-libs/vte-0.12.2:0[python] >=net-libs/gtk-vnc-0.3.8[python,sasl?] >=dev-python/dbus-python-0.61 >=dev-python/gconf-python-1.99.11 dev-python/urlgrabber gnome-keyring? ( dev-python/gnome-keyring-python ) policykit? ( sys-auth/polkit ) spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* =dev-lang/python-2.4* ) 0 @@ -12,9 +12,9 @@ gnome-keyring policykit sasl spice -2 +4 -compile configure install postinst postrm preinst prepare unpack +compile configure install postinst postrm preinst prepare setup unpack diff --git a/metadata/cache/dev-java/javahelp-2.0.02_p46 b/metadata/cache/dev-java/javahelp-2.0.02_p46 deleted file mode 100644 index 76eeeb4e6f55..000000000000 --- a/metadata/cache/dev-java/javahelp-2.0.02_p46 +++ /dev/null @@ -1,22 +0,0 @@ ->=virtual/jdk-1.4 app-arch/unzip =dev-java/servletapi-2.4* >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 ->=virtual/jre-1.4 =dev-java/servletapi-2.4* >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) -0 -https://javahelp.dev.java.net/files/documents/5985/47404/javahelp2-src-2.0.02_svn46.zip - -https://javahelp.dev.java.net/ -GPL-2-with-linking-exception -The JavaHelp system online help system -amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris -eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator -elibc_FreeBSD doc examples source elibc_FreeBSD - - - - - -compile install postinst preinst setup unpack - - - - - diff --git a/metadata/cache/dev-java/sun-jdk-1.6.0.30 b/metadata/cache/dev-java/sun-jdk-1.6.0.30 new file mode 100644 index 000000000000..43753bbf36a3 --- /dev/null +++ b/metadata/cache/dev-java/sun-jdk-1.6.0.30 @@ -0,0 +1,22 @@ +jce? ( dev-java/sun-jce-bin:1.6 ) =dev-java/java-config-2* +doc? ( dev-java/java-sdk-docs:1.6.0 ) !prefix? ( sys-libs/glibc ) kernel_SunOS? ( app-arch/unzip ) alsa? ( media-libs/alsa-lib ) X? ( x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libX11 ) =dev-java/java-config-2* +1.6 +x86? ( jdk-6u30-linux-i586.bin ) amd64? ( jdk-6u30-linux-x64.bin ) x86-solaris? ( jdk-6u30-solaris-i586.sh ) x64-solaris? ( jdk-6u30-solaris-i586.sh jdk-6u30-solaris-x64.sh ) sparc-solaris? ( jdk-6u30-solaris-sparc.sh ) sparc64-solaris? ( jdk-6u30-solaris-sparc.sh jdk-6u30-solaris-sparcv9.sh ) +fetch strip +http://www.oracle.com/technetwork/java/javase/ +Oracle-BCLA-JavaSE +Oracle's Java SE Development Kit +~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +eutils fdo-mime java-vm-2 multilib pax-utils portability prefix toolchain-funcs user versionator +X alsa derby doc examples jce kernel_SunOS nsplugin + + + +4 + +compile install nofetch postinst postrm prerm setup unpack + + + + + diff --git a/metadata/cache/dev-java/sun-jre-bin-1.6.0.30 b/metadata/cache/dev-java/sun-jre-bin-1.6.0.30 new file mode 100644 index 000000000000..a5be95ead205 --- /dev/null +++ b/metadata/cache/dev-java/sun-jre-bin-1.6.0.30 @@ -0,0 +1,22 @@ +jce? ( dev-java/sun-jce-bin:1.6 ) =dev-java/java-config-2* +!prefix? ( sys-libs/glibc ) alsa? ( media-libs/alsa-lib ) X? ( x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libX11 ) =dev-java/java-config-2* +1.6 +amd64? ( jre-6u30-linux-x64.bin ) x86? ( jre-6u30-linux-i586.bin ) +fetch strip +http://www.oracle.com/technetwork/java/javase/ +Oracle-BCLA-JavaSE +Oracle's Java SE Runtime Environment +~amd64 ~x86 +eutils fdo-mime java-vm-2 multilib pax-utils portability prefix toolchain-funcs user versionator +X alsa jce nsplugin + + + +4 + +compile install nofetch postinst postrm prerm setup unpack + + + + + diff --git a/metadata/cache/dev-lang/php-5.4.0_rc6 b/metadata/cache/dev-lang/php-5.4.0_rc6 new file mode 100644 index 000000000000..6509651046cb --- /dev/null +++ b/metadata/cache/dev-lang/php-5.4.0_rc6 @@ -0,0 +1,22 @@ +!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 enchant? ( !dev-php/pecl-enchant ) fileinfo? ( !=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +apache2? ( =www-servers/apache-2* ) +5.4 +http://downloads.php.net/stas/php-5.4.0RC6.tar.bz2 http://olemarkus.org/~olemarkus/gentoo/php-patchset-5.4.0_rc6-r0.tar.bz2 + +http://php.net/ +PHP-3 +The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs. +~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 +apache-module autotools db-use depend.apache eutils flag-o-matic libtool multilib portability toolchain-funcs user versionator +kolab embed +cli cgi fpm apache2 threads 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 apache2 +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 ) ) ) ) ) +doc? ( app-doc/php-docs ) + +4 + +compile configure install postinst prepare setup test + + + + + diff --git a/metadata/cache/dev-libs/gmime-2.4.31 b/metadata/cache/dev-libs/gmime-2.4.31 new file mode 100644 index 000000000000..fef531958f92 --- /dev/null +++ b/metadata/cache/dev-libs/gmime-2.4.31 @@ -0,0 +1,22 @@ +>=dev-libs/glib-2.12:2 sys-libs/zlib mono? ( dev-lang/mono >=dev-dotnet/glib-sharp-2.4.0:2 ) dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1.8 app-text/docbook-sgml-utils ) mono? ( dev-dotnet/gtk-sharp-gapi:2 ) dev-util/gtk-doc-am || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 +>=dev-libs/glib-2.12:2 sys-libs/zlib mono? ( dev-lang/mono >=dev-dotnet/glib-sharp-2.4.0:2 ) +2.4 +mirror://gnome/sources/gmime/2.4/gmime-2.4.31.tar.xz + +http://spruce.sourceforge.net/gmime/ +LGPL-2.1 +Utilities for creating and parsing messages using MIME +~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris +autotools eutils fdo-mime gnome.org gnome2 gnome2-utils libtool mono multilib portability toolchain-funcs user versionator +doc mono static-libs + + + +4 + +compile configure install postinst postrm preinst prepare setup unpack + + + + + diff --git a/metadata/cache/dev-libs/gmime-2.6.4 b/metadata/cache/dev-libs/gmime-2.6.4 new file mode 100644 index 000000000000..2402ca441f6b --- /dev/null +++ b/metadata/cache/dev-libs/gmime-2.6.4 @@ -0,0 +1,22 @@ +>=dev-libs/glib-2.18.0:2 sys-libs/zlib >=app-crypt/gpgme-1.1.6 mono? ( dev-lang/mono >=dev-dotnet/glib-sharp-2.4.0:2 ) dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1.8 app-text/docbook-sgml-utils ) mono? ( dev-dotnet/gtk-sharp-gapi:2 ) dev-util/gtk-doc-am || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 +>=dev-libs/glib-2.18.0:2 sys-libs/zlib >=app-crypt/gpgme-1.1.6 mono? ( dev-lang/mono >=dev-dotnet/glib-sharp-2.4.0:2 ) +2.6 +mirror://gnome/sources/gmime/2.6/gmime-2.6.4.tar.xz + +http://spruce.sourceforge.net/gmime/ +LGPL-2.1 +Utilities for creating and parsing messages using MIME +~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris +autotools eutils fdo-mime gnome.org gnome2 gnome2-utils libtool mono multilib portability toolchain-funcs user versionator +doc mono static-libs + + + +4 + +compile configure install postinst postrm preinst prepare setup unpack + + + + + diff --git a/metadata/cache/dev-libs/uriparser-0.7.6 b/metadata/cache/dev-libs/uriparser-0.7.6 new file mode 100644 index 000000000000..8c7536b7e0e0 --- /dev/null +++ b/metadata/cache/dev-libs/uriparser-0.7.6 @@ -0,0 +1,22 @@ +dev-util/pkgconfig doc? ( >=app-doc/doxygen-1.5.8 qt4? ( x11-libs/qt-assistant ) ) test? ( >=dev-util/cpptest-1.1.1 ) + +0 +mirror://sourceforge/uriparser/uriparser-0.7.6.tar.bz2 + +http://uriparser.sourceforge.net/ +BSD +Uriparser is a strictly RFC 3986 compliant URI parsing library in C +~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris +eutils multilib portability toolchain-funcs user +doc qt4 test unicode +test? ( unicode ) + + +4 + +configure install + + + + + diff --git a/metadata/cache/dev-python/requests-0.9.0 b/metadata/cache/dev-python/requests-0.9.3 similarity index 87% rename from metadata/cache/dev-python/requests-0.9.0 rename to metadata/cache/dev-python/requests-0.9.3 index 97ac77b5c589..ffbc1e08e5ed 100644 --- a/metadata/cache/dev-python/requests-0.9.0 +++ b/metadata/cache/dev-python/requests-0.9.3 @@ -1,14 +1,14 @@ dev-python/setuptools >=app-admin/eselect-python-20091230 =dev-lang/python-2* dev-python/certifi >=app-admin/eselect-python-20091230 =dev-lang/python-2* 0 -mirror://pypi/r/requests/requests-0.9.0.tar.gz +mirror://pypi/r/requests/requests-0.9.3.tar.gz http://python-requests.org/ http://pypi.python.org/pypi/requests ISC HTTP library for human beings ~amd64 ~x86 distutils multilib python toolchain-funcs -test + diff --git a/metadata/cache/dev-python/whisper-0.9.9 b/metadata/cache/dev-python/whisper-0.9.9 new file mode 100644 index 000000000000..4b9d9e6d326b --- /dev/null +++ b/metadata/cache/dev-python/whisper-0.9.9 @@ -0,0 +1,22 @@ +>=app-admin/eselect-python-20091230 =dev-lang/python-2* +>=app-admin/eselect-python-20091230 =dev-lang/python-2* +0 +mirror://pypi/w/whisper/whisper-0.9.9.tar.gz + +http://graphite.wikidot.com/ +Apache-2.0 +Fixed size round-robin style database +~amd64 ~x86 +distutils multilib python toolchain-funcs + + + + +3 + +compile install postinst postrm prepare + + + + + diff --git a/metadata/cache/dev-ruby/actionmailer-3.0.11-r1 b/metadata/cache/dev-ruby/actionmailer-3.0.11-r1 new file mode 100644 index 000000000000..f26a3dbc9180 --- /dev/null +++ b/metadata/cache/dev-ruby/actionmailer-3.0.11-r1 @@ -0,0 +1,22 @@ +test? ( ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ruby18] >=dev-ruby/mail-2.2.19[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ree18] >=dev-ruby/mail-2.2.19[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ) +ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ruby18] >=dev-ruby/mail-2.2.19[ruby_targets_ruby18] ) ruby_targets_ree18? ( ~dev-ruby/actionpack-3.0.11[ruby_targets_ree18] >=dev-ruby/mail-2.2.19[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) +3.0 +http://github.com/rails/rails/tarball/v3.0.11 -> rails-3.0.11.tgz + +http://rubyforge.org/projects/actionmailer/ +MIT +Framework for designing email-service layers +~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator +test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test +|| ( ruby_targets_ruby18 ruby_targets_ree18 ) + + +4 + +compile configure install prepare setup test unpack + + + + + diff --git a/metadata/cache/dev-vcs/git-1.7.3.5 b/metadata/cache/dev-vcs/git-1.7.3.5 deleted file mode 100644 index 97406211c263..000000000000 --- a/metadata/cache/dev-vcs/git-1.7.3.5 +++ /dev/null @@ -1,22 +0,0 @@ -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) bash-completion? ( app-admin/eselect ) -0 -mirror://kernel/software/scm/git/git-1.7.3.5.tar.bz2 mirror://kernel/software/scm/git/git-manpages-1.7.3.5.tar.bz2 doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.3.5.tar.bz2 ) - -http://www.git-scm.com/ -GPL-2 -GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team -~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -base bash-completion elisp-common eutils multilib perl-module portability toolchain-funcs user -+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion bash-completion - -bash-completion? ( app-shells/bash-completion ) - -3 - -compile configure install postinst postrm prepare setup test unpack - - - - - diff --git a/metadata/cache/dev-vcs/git-1.7.3.5-r1 b/metadata/cache/dev-vcs/git-1.7.3.5-r1 deleted file mode 100644 index 04b8c8497871..000000000000 --- a/metadata/cache/dev-vcs/git-1.7.3.5-r1 +++ /dev/null @@ -1,22 +0,0 @@ -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) python? ( dev-lang/python ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) python? ( dev-lang/python ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) bash-completion? ( app-admin/eselect ) -0 -mirror://kernel/software/scm/git/git-1.7.3.5.tar.bz2 mirror://kernel/software/scm/git/git-manpages-1.7.3.5.tar.bz2 doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.3.5.tar.bz2 ) - -http://www.git-scm.com/ -GPL-2 -GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team -~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -base bash-completion elisp-common eutils multilib perl-module portability toolchain-funcs user -+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion bash-completion - -bash-completion? ( app-shells/bash-completion ) - -3 - -compile configure install postinst postrm prepare setup test unpack - - - - - diff --git a/metadata/cache/dev-vcs/git-1.7.4 b/metadata/cache/dev-vcs/git-1.7.4 deleted file mode 100644 index 7bf0389ff8b5..000000000000 --- a/metadata/cache/dev-vcs/git-1.7.4 +++ /dev/null @@ -1,22 +0,0 @@ -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) bash-completion? ( app-admin/eselect ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -0 -mirror://kernel/software/scm/git/git-1.7.4.tar.bz2 mirror://kernel/software/scm/git/git-manpages-1.7.4.tar.bz2 doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.4.tar.bz2 ) - -http://www.git-scm.com/ -GPL-2 -GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team -~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -base bash-completion elisp-common eutils multilib perl-module portability python toolchain-funcs user -+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion bash-completion - -bash-completion? ( app-shells/bash-completion ) - -3 - -compile configure install postinst postrm prepare setup test unpack - - - - - diff --git a/metadata/cache/dev-vcs/git-1.7.4.1 b/metadata/cache/dev-vcs/git-1.7.4.1 deleted file mode 100644 index 267aba61b0ba..000000000000 --- a/metadata/cache/dev-vcs/git-1.7.4.1 +++ /dev/null @@ -1,22 +0,0 @@ -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) bash-completion? ( app-admin/eselect ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -0 -mirror://kernel/software/scm/git/git-1.7.4.1.tar.bz2 mirror://kernel/software/scm/git/git-manpages-1.7.4.1.tar.bz2 doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.4.1.tar.bz2 ) - -http://www.git-scm.com/ -GPL-2 -GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team -~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -base bash-completion elisp-common eutils multilib perl-module portability python toolchain-funcs user -+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion bash-completion - -bash-completion? ( app-shells/bash-completion ) - -3 - -compile configure install postinst postrm prepare setup test unpack - - - - - diff --git a/metadata/cache/dev-vcs/git-1.7.4.4 b/metadata/cache/dev-vcs/git-1.7.4.4 deleted file mode 100644 index ac376bcbc673..000000000000 --- a/metadata/cache/dev-vcs/git-1.7.4.4 +++ /dev/null @@ -1,22 +0,0 @@ -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) bash-completion? ( app-admin/eselect ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -0 -mirror://kernel/software/scm/git/git-1.7.4.4.tar.bz2 mirror://kernel/software/scm/git/git-manpages-1.7.4.4.tar.bz2 doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.4.4.tar.bz2 ) - -http://www.git-scm.com/ -GPL-2 -GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team -~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -base bash-completion elisp-common eutils multilib perl-module portability python toolchain-funcs user -+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion bash-completion - -bash-completion? ( app-shells/bash-completion ) - -3 - -compile configure install postinst postrm prepare setup test unpack - - - - - diff --git a/metadata/cache/dev-vcs/git-1.7.5_rc1 b/metadata/cache/dev-vcs/git-1.7.5_rc1 deleted file mode 100644 index 14484add1f96..000000000000 --- a/metadata/cache/dev-vcs/git-1.7.5_rc1 +++ /dev/null @@ -1,22 +0,0 @@ -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) bash-completion? ( app-admin/eselect ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -0 -mirror://kernel/software/scm/git/git-1.7.5.rc1.tar.bz2 mirror://kernel/software/scm/git/git-manpages-1.7.5.rc1.tar.bz2 doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.5.rc1.tar.bz2 ) - -http://www.git-scm.com/ -GPL-2 -GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team -~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -base bash-completion elisp-common eutils multilib perl-module portability python toolchain-funcs user -+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion bash-completion - -bash-completion? ( app-shells/bash-completion ) - -3 - -compile configure install postinst postrm prepare setup test unpack - - - - - diff --git a/metadata/cache/dev-vcs/git-1.7.5_rc3 b/metadata/cache/dev-vcs/git-1.7.5_rc3 deleted file mode 100644 index 9e37648f093b..000000000000 --- a/metadata/cache/dev-vcs/git-1.7.5_rc3 +++ /dev/null @@ -1,22 +0,0 @@ -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) bash-completion? ( app-admin/eselect ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -0 -mirror://kernel/software/scm/git/git-1.7.5.rc3.tar.bz2 mirror://kernel/software/scm/git/git-manpages-1.7.5.rc3.tar.bz2 doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.5.rc3.tar.bz2 ) - -http://www.git-scm.com/ -GPL-2 -GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team -~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -base bash-completion elisp-common eutils multilib perl-module portability python toolchain-funcs user -+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion bash-completion - -bash-completion? ( app-shells/bash-completion ) - -3 - -compile configure install postinst postrm prepare setup test unpack - - - - - diff --git a/metadata/cache/dev-vcs/git-1.7.6 b/metadata/cache/dev-vcs/git-1.7.6 deleted file mode 100644 index 3be5bdc9a7e4..000000000000 --- a/metadata/cache/dev-vcs/git-1.7.6 +++ /dev/null @@ -1,22 +0,0 @@ -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) bash-completion? ( app-admin/eselect ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -0 -mirror://kernel/software/scm/git/git-1.7.6.tar.bz2 mirror://kernel/software/scm/git/git-manpages-1.7.6.tar.bz2 doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.6.tar.bz2 ) - -http://www.git-scm.com/ -GPL-2 -GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team -~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -base bash-completion elisp-common eutils multilib perl-module portability python toolchain-funcs user -+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion bash-completion - -bash-completion? ( app-shells/bash-completion ) - -3 - -compile configure install postinst postrm prepare setup test unpack - - - - - diff --git a/metadata/cache/dev-vcs/git-1.7.6.1 b/metadata/cache/dev-vcs/git-1.7.6.1 deleted file mode 100644 index 1d37666ca273..000000000000 --- a/metadata/cache/dev-vcs/git-1.7.6.1 +++ /dev/null @@ -1,22 +0,0 @@ -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) bash-completion? ( app-admin/eselect ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -0 -mirror://kernel/software/scm/git/git-1.7.6.1.tar.bz2 mirror://kernel/software/scm/git/git-manpages-1.7.6.1.tar.bz2 doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.6.1.tar.bz2 ) - -http://www.git-scm.com/ -GPL-2 -GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team -~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -base bash-completion elisp-common eutils multilib perl-module portability python toolchain-funcs user -+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion bash-completion - -bash-completion? ( app-shells/bash-completion ) - -3 - -compile configure install postinst postrm prepare setup test unpack - - - - - diff --git a/metadata/cache/dev-vcs/git-1.7.7 b/metadata/cache/dev-vcs/git-1.7.7 deleted file mode 100644 index 985c5d3d2073..000000000000 --- a/metadata/cache/dev-vcs/git-1.7.7 +++ /dev/null @@ -1,22 +0,0 @@ -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) bash-completion? ( app-admin/eselect ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -0 -http://git-core.googlecode.com/files/git-1.7.7.tar.gz mirror://kernel/software/scm/git/git-1.7.7.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.7.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.7.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.7.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.7.tar.gz ) - -http://www.git-scm.com/ -GPL-2 -GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team -~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -base bash-completion elisp-common eutils multilib perl-module portability python toolchain-funcs user -+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion bash-completion - -bash-completion? ( app-shells/bash-completion ) - -3 - -compile configure install postinst postrm prepare setup test unpack - - - - - diff --git a/metadata/cache/dev-vcs/git-1.7.7.1 b/metadata/cache/dev-vcs/git-1.7.7.1 deleted file mode 100644 index 3a314a10f93e..000000000000 --- a/metadata/cache/dev-vcs/git-1.7.7.1 +++ /dev/null @@ -1,22 +0,0 @@ -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) bash-completion? ( app-admin/eselect ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -0 -http://git-core.googlecode.com/files/git-1.7.7.1.tar.gz mirror://kernel/software/scm/git/git-1.7.7.1.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.7.1.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.7.1.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.7.1.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.7.1.tar.gz ) - -http://www.git-scm.com/ -GPL-2 -GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team -~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -base bash-completion elisp-common eutils multilib perl-module portability python toolchain-funcs user -+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion bash-completion - -bash-completion? ( app-shells/bash-completion ) - -3 - -compile configure install postinst postrm prepare setup test unpack - - - - - diff --git a/metadata/cache/dev-vcs/git-1.7.7.1-r1 b/metadata/cache/dev-vcs/git-1.7.7.1-r1 deleted file mode 100644 index c11067e39cec..000000000000 --- a/metadata/cache/dev-vcs/git-1.7.7.1-r1 +++ /dev/null @@ -1,22 +0,0 @@ -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -0 -http://git-core.googlecode.com/files/git-1.7.7.1.tar.gz mirror://kernel/software/scm/git/git-1.7.7.1.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.7.1.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.7.1.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.7.1.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.7.1.tar.gz ) - -http://www.git-scm.com/ -GPL-2 -GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team -~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -base bash-completion-r1 elisp-common eutils multilib perl-module portability python toolchain-funcs user -+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion -cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl ) - - -4 - -compile configure install postinst postrm prepare setup test unpack - - - - - diff --git a/metadata/cache/dev-vcs/git-1.7.7.2 b/metadata/cache/dev-vcs/git-1.7.7.2 deleted file mode 100644 index c6e0b91f00b7..000000000000 --- a/metadata/cache/dev-vcs/git-1.7.7.2 +++ /dev/null @@ -1,22 +0,0 @@ -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -0 -http://git-core.googlecode.com/files/git-1.7.7.2.tar.gz mirror://kernel/software/scm/git/git-1.7.7.2.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.7.2.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.7.2.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.7.2.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.7.2.tar.gz ) - -http://www.git-scm.com/ -GPL-2 -GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team -~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -base bash-completion-r1 elisp-common eutils multilib perl-module portability python toolchain-funcs user -+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion -cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl ) - - -4 - -compile configure install postinst postrm prepare setup test unpack - - - - - diff --git a/metadata/cache/dev-vcs/git-1.7.7.3 b/metadata/cache/dev-vcs/git-1.7.7.3 deleted file mode 100644 index 58500ee234f0..000000000000 --- a/metadata/cache/dev-vcs/git-1.7.7.3 +++ /dev/null @@ -1,22 +0,0 @@ -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) -0 -http://git-core.googlecode.com/files/git-1.7.7.3.tar.gz mirror://kernel/software/scm/git/git-1.7.7.3.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.7.3.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.7.3.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.7.3.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.7.3.tar.gz ) - -http://www.git-scm.com/ -GPL-2 -GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team -~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -base bash-completion-r1 elisp-common eutils multilib perl-module portability python toolchain-funcs user -+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion -cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl ) - - -4 - -compile configure install postinst postrm prepare setup test unpack - - - - - diff --git a/metadata/cache/dev-vcs/git-1.7.7.4 b/metadata/cache/dev-vcs/git-1.7.7.6 similarity index 81% rename from metadata/cache/dev-vcs/git-1.7.7.4 rename to metadata/cache/dev-vcs/git-1.7.7.6 index bd7df0f42bdb..e8939a1026ee 100644 --- a/metadata/cache/dev-vcs/git-1.7.7.4 +++ b/metadata/cache/dev-vcs/git-1.7.7.6 @@ -1,7 +1,7 @@ !blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) !blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) 0 -http://git-core.googlecode.com/files/git-1.7.7.4.tar.gz mirror://kernel/software/scm/git/git-1.7.7.4.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.7.4.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.7.4.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.7.4.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.7.4.tar.gz ) +http://git-core.googlecode.com/files/git-1.7.7.6.tar.gz mirror://kernel/software/scm/git/git-1.7.7.6.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.7.6.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.7.6.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.7.6.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.7.6.tar.gz ) http://www.git-scm.com/ GPL-2 diff --git a/metadata/cache/dev-vcs/git-1.7.8.4 b/metadata/cache/dev-vcs/git-1.7.8.4 new file mode 100644 index 000000000000..7ea591992b5e --- /dev/null +++ b/metadata/cache/dev-vcs/git-1.7.8.4 @@ -0,0 +1,22 @@ +!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) +!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) +0 +http://git-core.googlecode.com/files/git-1.7.8.4.tar.gz mirror://kernel/software/scm/git/git-1.7.8.4.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.8.4.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.8.4.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.8.4.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.8.4.tar.gz ) + +http://www.git-scm.com/ +GPL-2 +GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team +~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +base bash-completion-r1 elisp-common eutils multilib perl-module portability python toolchain-funcs user ++blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion +cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl ) + + +4 + +compile configure install postinst postrm prepare setup test unpack + + + + + diff --git a/metadata/cache/dev-vcs/git-1.7.9_rc2 b/metadata/cache/dev-vcs/git-1.7.9_rc2 new file mode 100644 index 000000000000..6b7c654f3064 --- /dev/null +++ b/metadata/cache/dev-vcs/git-1.7.9_rc2 @@ -0,0 +1,22 @@ +!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) test? ( app-crypt/gnupg ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) +!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-crypt/gnupg perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) +0 +http://git-core.googlecode.com/files/git-1.7.9.rc2.tar.gz mirror://kernel/software/scm/git/git-1.7.9.rc2.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.9.rc2.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.9.rc2.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.9.rc2.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.9.rc2.tar.gz ) + +http://www.git-scm.com/ +GPL-2 +GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team + +base bash-completion-r1 elisp-common eutils multilib perl-module portability python toolchain-funcs user ++blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion +cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl ) + + +4 + +compile configure install postinst postrm prepare setup test unpack + + + + + diff --git a/metadata/cache/dev-vcs/git-9999 b/metadata/cache/dev-vcs/git-9999 index 22aa180677a0..280921949d6b 100644 --- a/metadata/cache/dev-vcs/git-9999 +++ b/metadata/cache/dev-vcs/git-9999 @@ -1,5 +1,5 @@ -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) app-text/asciidoc app-text/xmlto >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) dev-vcs/git -!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) +!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) test? ( app-crypt/gnupg ) app-text/asciidoc app-text/xmlto >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) dev-vcs/git +!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-crypt/gnupg perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) 0 diff --git a/metadata/cache/games-arcade/stardork-0.6 b/metadata/cache/games-arcade/stardork-0.6 index 49b03e22b651..a5f3bb188324 100644 --- a/metadata/cache/games-arcade/stardork-0.6 +++ b/metadata/cache/games-arcade/stardork-0.6 @@ -6,7 +6,7 @@ mirror://sourceforge/stardork/stardork-0.6.tar.gz http://stardork.sourceforge.net/ GPL-2 An ncurses-based space shooter -~amd64 ~ppc ppc64 x86 +~amd64 ~ppc ~ppc64 x86 base eutils games multilib portability toolchain-funcs user diff --git a/metadata/cache/games-misc/robotfindskitten-1.7320508.406 b/metadata/cache/games-misc/robotfindskitten-1.7320508.406 index eff490a366dc..2849b0e6ee4e 100644 --- a/metadata/cache/games-misc/robotfindskitten-1.7320508.406 +++ b/metadata/cache/games-misc/robotfindskitten-1.7320508.406 @@ -6,7 +6,7 @@ mirror://sourceforge/rfk/robotfindskitten-1.7320508.406.tar.gz http://robotfindskitten.org/ GPL-2 Help robot find kitten -~amd64 ~ppc ~sparc ~x86 +amd64 ~ppc ~sparc ~x86 base eutils games multilib portability toolchain-funcs user diff --git a/metadata/cache/mail-filter/imapfilter-2.4.2 b/metadata/cache/mail-filter/imapfilter-2.4.2 new file mode 100644 index 000000000000..9a651c973a57 --- /dev/null +++ b/metadata/cache/mail-filter/imapfilter-2.4.2 @@ -0,0 +1,22 @@ +dev-libs/openssl dev-libs/libpcre >=dev-lang/lua-5.1 +dev-libs/openssl dev-libs/libpcre >=dev-lang/lua-5.1 +0 +https://github.com/downloads/lefcha/imapfilter/imapfilter-2.4.2.tar.gz + +http://imapfilter.hellug.gr +MIT +An IMAP mail filtering utility +~amd64 ~ppc ~x86 +multilib toolchain-funcs + + + + +4 + +compile install prepare + + + + + diff --git a/metadata/cache/media-libs/libmikmod-3.1.12 b/metadata/cache/media-libs/libmikmod-3.1.12 index 32efda848b24..01838e85cd5f 100644 --- a/metadata/cache/media-libs/libmikmod-3.1.12 +++ b/metadata/cache/media-libs/libmikmod-3.1.12 @@ -6,7 +6,7 @@ mirror://sourceforge/mikmod/libmikmod-3.1.12.tar.gz http://mikmod.raphnet.net/ || ( LGPL-2.1 LGPL-2 ) A library to play a wide range of module formats -~amd64 ~x86 +amd64 ~x86 autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user +oss raw diff --git a/metadata/cache/media-sound/alsaplayer-0.99.81 b/metadata/cache/media-sound/alsaplayer-0.99.81 index 08f5f89f4137..6bdecbd00111 100644 --- a/metadata/cache/media-sound/alsaplayer-0.99.81 +++ b/metadata/cache/media-sound/alsaplayer-0.99.81 @@ -1,5 +1,5 @@ -media-libs/libsndfile sys-libs/zlib alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) flac? ( media-libs/flac ) gtk? ( >=x11-libs/gtk+-2.10:2 ) id3tag? ( media-libs/libid3tag ) jack? ( >=media-sound/jack-audio-connection-kit-0.80 ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) nas? ( media-libs/nas ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) xosd? ( x11-libs/xosd ) dev-util/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) oss? ( virtual/os-headers ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool -media-libs/libsndfile sys-libs/zlib alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) flac? ( media-libs/flac ) gtk? ( >=x11-libs/gtk+-2.10:2 ) id3tag? ( media-libs/libid3tag ) jack? ( >=media-sound/jack-audio-connection-kit-0.80 ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) nas? ( media-libs/nas ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) xosd? ( x11-libs/xosd ) +media-libs/libsndfile sys-libs/zlib alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) flac? ( media-libs/flac ) gtk? ( >=x11-libs/gtk+-2.10:2 ) id3tag? ( media-libs/libid3tag ) jack? ( >=media-sound/jack-audio-connection-kit-0.80 ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) nas? ( media-libs/nas ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) xosd? ( x11-libs/xosd ) dev-util/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) oss? ( virtual/os-headers ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +media-libs/libsndfile sys-libs/zlib alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) flac? ( media-libs/flac ) gtk? ( >=x11-libs/gtk+-2.10:2 ) id3tag? ( media-libs/libid3tag ) jack? ( >=media-sound/jack-audio-connection-kit-0.80 ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) nas? ( media-libs/nas ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) xosd? ( x11-libs/xosd ) 0 http://www.alsaplayer.org/alsaplayer-0.99.81.tar.bz2 diff --git a/metadata/cache/media-sound/cmus-2.4.2 b/metadata/cache/media-sound/cmus-2.4.2 index 6ba2e38e239f..b22b1fe35991 100644 --- a/metadata/cache/media-sound/cmus-2.4.2 +++ b/metadata/cache/media-sound/cmus-2.4.2 @@ -1,5 +1,5 @@ -sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( >=media-libs/libvorbis-1.0 ) wavpack? ( media-sound/wavpack ) wma? ( virtual/ffmpeg ) dev-util/pkgconfig -sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( >=media-libs/libvorbis-1.0 ) wavpack? ( media-sound/wavpack ) wma? ( virtual/ffmpeg ) zsh-completion? ( app-shells/zsh ) pidgin? ( net-im/pidgin dev-python/dbus-python ) +sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( >=media-libs/libvorbis-1.0 ) wavpack? ( media-sound/wavpack ) wma? ( virtual/ffmpeg ) dev-util/pkgconfig +sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( >=media-libs/libvorbis-1.0 ) wavpack? ( media-sound/wavpack ) wma? ( virtual/ffmpeg ) zsh-completion? ( app-shells/zsh ) pidgin? ( net-im/pidgin dev-python/dbus-python ) 0 mirror://sourceforge/cmus/cmus-v2.4.2.tar.bz2 diff --git a/metadata/cache/media-sound/cmus-2.4.3 b/metadata/cache/media-sound/cmus-2.4.3 index cf3f4763dc79..6ff17e172c64 100644 --- a/metadata/cache/media-sound/cmus-2.4.3 +++ b/metadata/cache/media-sound/cmus-2.4.3 @@ -1,5 +1,5 @@ -sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( >=media-libs/libvorbis-1.0 ) wavpack? ( media-sound/wavpack ) wma? ( virtual/ffmpeg ) dev-util/pkgconfig -sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( >=media-libs/libvorbis-1.0 ) wavpack? ( media-sound/wavpack ) wma? ( virtual/ffmpeg ) zsh-completion? ( app-shells/zsh ) pidgin? ( net-im/pidgin dev-python/dbus-python ) +sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( >=media-libs/libvorbis-1.0 ) wavpack? ( media-sound/wavpack ) wma? ( virtual/ffmpeg ) dev-util/pkgconfig +sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( >=media-libs/libvorbis-1.0 ) wavpack? ( media-sound/wavpack ) wma? ( virtual/ffmpeg ) zsh-completion? ( app-shells/zsh ) pidgin? ( net-im/pidgin dev-python/dbus-python ) 0 mirror://sourceforge/cmus/cmus-v2.4.3.tar.bz2 diff --git a/metadata/cache/media-sound/ecasound-2.6.0 b/metadata/cache/media-sound/ecasound-2.6.0 index 133b1480164c..9574b85d6791 100644 --- a/metadata/cache/media-sound/ecasound-2.6.0 +++ b/metadata/cache/media-sound/ecasound-2.6.0 @@ -1,5 +1,5 @@ -python? ( dev-lang/python ) jack? ( media-sound/jack-audio-connection-kit ) media-libs/ladspa-sdk audiofile? ( media-libs/audiofile ) alsa? ( media-libs/alsa-lib ) vorbis? ( media-libs/libvorbis ) libsamplerate? ( media-libs/libsamplerate ) mikmod? ( media-libs/libmikmod ) ruby? ( dev-lang/ruby ) python? ( dev-lang/python ) ncurses? ( sys-libs/ncurses ) sndfile? ( media-libs/libsndfile ) sys-libs/readline >=app-admin/eselect-python-20091230 -python? ( dev-lang/python ) jack? ( media-sound/jack-audio-connection-kit ) media-libs/ladspa-sdk audiofile? ( media-libs/audiofile ) alsa? ( media-libs/alsa-lib ) vorbis? ( media-libs/libvorbis ) libsamplerate? ( media-libs/libsamplerate ) mikmod? ( media-libs/libmikmod ) ruby? ( dev-lang/ruby ) python? ( dev-lang/python ) ncurses? ( sys-libs/ncurses ) sndfile? ( media-libs/libsndfile ) sys-libs/readline >=app-admin/eselect-python-20091230 +python? ( dev-lang/python ) jack? ( media-sound/jack-audio-connection-kit ) media-libs/ladspa-sdk audiofile? ( media-libs/audiofile ) alsa? ( media-libs/alsa-lib ) vorbis? ( media-libs/libvorbis ) libsamplerate? ( media-libs/libsamplerate ) mikmod? ( media-libs/libmikmod:0 ) ruby? ( dev-lang/ruby ) python? ( dev-lang/python ) ncurses? ( sys-libs/ncurses ) sndfile? ( media-libs/libsndfile ) sys-libs/readline >=app-admin/eselect-python-20091230 +python? ( dev-lang/python ) jack? ( media-sound/jack-audio-connection-kit ) media-libs/ladspa-sdk audiofile? ( media-libs/audiofile ) alsa? ( media-libs/alsa-lib ) vorbis? ( media-libs/libvorbis ) libsamplerate? ( media-libs/libsamplerate ) mikmod? ( media-libs/libmikmod:0 ) ruby? ( dev-lang/ruby ) python? ( dev-lang/python ) ncurses? ( sys-libs/ncurses ) sndfile? ( media-libs/libsndfile ) sys-libs/readline >=app-admin/eselect-python-20091230 1 http://ecasound.seul.org/download/ecasound-2.6.0.tar.gz diff --git a/metadata/cache/media-sound/ecasound-2.8.1 b/metadata/cache/media-sound/ecasound-2.8.1 index a181076ef0e5..9d86b6ff4443 100644 --- a/metadata/cache/media-sound/ecasound-2.8.1 +++ b/metadata/cache/media-sound/ecasound-2.8.1 @@ -1,5 +1,5 @@ -sys-libs/readline alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) media-libs/ladspa-sdk mikmod? ( media-libs/libmikmod ) ncurses? ( sys-libs/ncurses ) oil? ( dev-libs/liboil ) osc? ( media-libs/liblo ) ruby? ( dev-lang/ruby ) sndfile? ( media-libs/libsndfile ) dev-util/pkgconfig >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool -sys-libs/readline alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) media-libs/ladspa-sdk mikmod? ( media-libs/libmikmod ) ncurses? ( sys-libs/ncurses ) oil? ( dev-libs/liboil ) osc? ( media-libs/liblo ) ruby? ( dev-lang/ruby ) sndfile? ( media-libs/libsndfile ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) +sys-libs/readline alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) media-libs/ladspa-sdk mikmod? ( media-libs/libmikmod:0 ) ncurses? ( sys-libs/ncurses ) oil? ( dev-libs/liboil ) osc? ( media-libs/liblo ) ruby? ( dev-lang/ruby ) sndfile? ( media-libs/libsndfile ) dev-util/pkgconfig >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +sys-libs/readline alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) media-libs/ladspa-sdk mikmod? ( media-libs/libmikmod:0 ) ncurses? ( sys-libs/ncurses ) oil? ( dev-libs/liboil ) osc? ( media-libs/liblo ) ruby? ( dev-lang/ruby ) sndfile? ( media-libs/libsndfile ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) 1 http://ecasound.seul.org/download/ecasound-2.8.1.tar.gz diff --git a/metadata/cache/media-sound/mikmod-3.2.1 b/metadata/cache/media-sound/mikmod-3.2.1 index 73f657c81915..166641304477 100644 --- a/metadata/cache/media-sound/mikmod-3.2.1 +++ b/metadata/cache/media-sound/mikmod-3.2.1 @@ -1,5 +1,5 @@ ->=media-libs/libmikmod-3.1.5 ->=media-libs/libmikmod-3.1.5 +media-libs/libmikmod:0 +media-libs/libmikmod:0 0 http://mikmod.raphnet.net/files/mikmod-3.2.1.tar.gz @@ -12,9 +12,9 @@ amd64 ~ppc sparc x86 +4 - -install +- diff --git a/metadata/cache/media-sound/mikmod-3.2.2_beta1 b/metadata/cache/media-sound/mikmod-3.2.2_beta1 index 0a88d3b6262b..c5685134041a 100644 --- a/metadata/cache/media-sound/mikmod-3.2.2_beta1 +++ b/metadata/cache/media-sound/mikmod-3.2.2_beta1 @@ -1,5 +1,5 @@ ->=media-libs/libmikmod-3.1.5 ->=media-libs/libmikmod-3.1.5 +media-libs/libmikmod:0 +media-libs/libmikmod:0 0 http://mikmod.raphnet.net/files/mikmod-3.2.2_beta1.tar.gz @@ -12,9 +12,9 @@ MikMod is a console MOD-Player based on libmikmod +4 - -install +- diff --git a/metadata/cache/media-sound/mpd-0.16.2 b/metadata/cache/media-sound/mpd-0.16.2 index f6304a18e9bc..33e59e3af4d2 100644 --- a/metadata/cache/media-sound/mpd-0.16.2 +++ b/metadata/cache/media-sound/mpd-0.16.2 @@ -1,5 +1,5 @@ -!=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) dev-util/pkgconfig -!=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) +!=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) dev-util/pkgconfig +!=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) 0 mirror://sourceforge/musicpd/mpd-0.16.2.tar.bz2 diff --git a/metadata/cache/media-sound/mpd-0.16.5 b/metadata/cache/media-sound/mpd-0.16.5 index 6528870405c2..6363e9e525e3 100644 --- a/metadata/cache/media-sound/mpd-0.16.5 +++ b/metadata/cache/media-sound/mpd-0.16.5 @@ -1,5 +1,5 @@ -!=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) dev-util/pkgconfig -!=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) +!=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) dev-util/pkgconfig +!=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) 0 mirror://sourceforge/musicpd/mpd-0.16.5.tar.bz2 diff --git a/metadata/cache/media-sound/mpd-0.16.6 b/metadata/cache/media-sound/mpd-0.16.6 index ab48eb7ccf91..2f6f52ffa1c6 100644 --- a/metadata/cache/media-sound/mpd-0.16.6 +++ b/metadata/cache/media-sound/mpd-0.16.6 @@ -1,5 +1,5 @@ -!=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) dev-util/pkgconfig -!=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) +!=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) dev-util/pkgconfig +!=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) 0 mirror://sourceforge/musicpd/mpd-0.16.6.tar.bz2 diff --git a/metadata/cache/media-sound/mpd-9999 b/metadata/cache/media-sound/mpd-9999 index 87cb9788ca27..e4b7500c0627 100644 --- a/metadata/cache/media-sound/mpd-9999 +++ b/metadata/cache/media-sound/mpd-9999 @@ -1,5 +1,5 @@ -!=media-libs/libshout-2 ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool dev-vcs/git -!=media-libs/libshout-2 ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) +!=media-libs/libshout-2 ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool dev-vcs/git +!=media-libs/libshout-2 ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) 0 diff --git a/metadata/cache/media-sound/mup-5.7 b/metadata/cache/media-sound/mup-5.7 index c3568d57e633..7c0284165c37 100644 --- a/metadata/cache/media-sound/mup-5.7 +++ b/metadata/cache/media-sound/mup-5.7 @@ -6,7 +6,7 @@ ftp://ftp.arkkra.com/pub/unix/mup57src.tar.gz http://www.arkkra.com/ Arkkra Program for printing music scores -~amd64 ~ppc ~sparc ~x86 +amd64 ~ppc ~sparc ~x86 eutils multilib portability toolchain-funcs user diff --git a/metadata/cache/media-video/vlc-1.2.9999 b/metadata/cache/media-video/vlc-1.2.9999 index ab251f9eecc1..6c11536c047b 100644 --- a/metadata/cache/media-video/vlc-1.2.9999 +++ b/metadata/cache/media-video/vlc-1.2.9999 @@ -1,5 +1,5 @@ ->=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvb? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.02 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) libv4l2? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool dev-vcs/git ->=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvb? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.02 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) libv4l2? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) +>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvb? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) libv4l2? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool dev-vcs/git +>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvb? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) libv4l2? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) 0 mirror://gentoo/vlc-patches-101.tar.bz2 diff --git a/metadata/cache/net-libs/aqbanking-5.0.14 b/metadata/cache/net-libs/aqbanking-5.0.14 index a5197bfb95c4..5ecbabf87c57 100644 --- a/metadata/cache/net-libs/aqbanking-5.0.14 +++ b/metadata/cache/net-libs/aqbanking-5.0.14 @@ -6,7 +6,7 @@ http://www.aquamaniac.de/sites/download/download.php?package=03&release=85&file= http://www.aquamaniac.de/aqbanking/ GPL-2 Generic Online Banking Interface -~amd64 ~ppc ~ppc64 ~sparc ~x86 +amd64 ~ppc ~ppc64 ~sparc ~x86 +chipcard debug doc examples gtk ofx diff --git a/metadata/cache/net-libs/gtk-vnc-0.5.0 b/metadata/cache/net-libs/gtk-vnc-0.5.0 index 9d2d107bb95e..96b8c7cf1e79 100644 --- a/metadata/cache/net-libs/gtk-vnc-0.5.0 +++ b/metadata/cache/net-libs/gtk-vnc-0.5.0 @@ -1,5 +1,5 @@ ->=dev-libs/glib-2.10:2 dev-libs/libgcrypt dev-libs/libgpg-error media-sound/pulseaudio >=net-libs/gnutls-1.4 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 gtk3? ( >=x11-libs/gtk+-2.91.3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9.4 ) python? ( >=dev-python/pygtk-2:2 ) sasl? ( dev-libs/cyrus-sasl ) >=dev-lang/perl-5 dev-util/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40 vala? ( dev-lang/vala:0.14[vapigen] >=dev-libs/gobject-introspection-0.9.4 ) app-arch/xz-utils >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) ->=dev-libs/glib-2.10:2 dev-libs/libgcrypt dev-libs/libgpg-error media-sound/pulseaudio >=net-libs/gnutls-1.4 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 gtk3? ( >=x11-libs/gtk+-2.91.3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9.4 ) python? ( >=dev-python/pygtk-2:2 ) sasl? ( dev-libs/cyrus-sasl ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) +>=dev-libs/glib-2.30.1:2 dev-libs/libgcrypt dev-libs/libgpg-error media-sound/pulseaudio >=net-libs/gnutls-1.4 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 gtk3? ( >=x11-libs/gtk+-2.91.3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9.4 ) python? ( >=dev-python/pygtk-2:2 ) sasl? ( dev-libs/cyrus-sasl ) >=dev-lang/perl-5 dev-util/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40 vala? ( dev-lang/vala:0.14[vapigen] >=dev-libs/gobject-introspection-0.9.4 ) app-arch/xz-utils >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) +>=dev-libs/glib-2.30.1:2 dev-libs/libgcrypt dev-libs/libgpg-error media-sound/pulseaudio >=net-libs/gnutls-1.4 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 gtk3? ( >=x11-libs/gtk+-2.91.3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9.4 ) python? ( >=dev-python/pygtk-2:2 ) sasl? ( dev-libs/cyrus-sasl ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) 0 mirror://gnome/sources/gtk-vnc/0.5/gtk-vnc-0.5.0.tar.xz diff --git a/metadata/cache/net-libs/nodejs-0.6.7 b/metadata/cache/net-libs/nodejs-0.6.8 similarity index 64% rename from metadata/cache/net-libs/nodejs-0.6.7 rename to metadata/cache/net-libs/nodejs-0.6.8 index a1464f5309b4..9de1ce64139d 100644 --- a/metadata/cache/net-libs/nodejs-0.6.7 +++ b/metadata/cache/net-libs/nodejs-0.6.8 @@ -1,13 +1,13 @@ >=dev-lang/v8-3.5.10.22 dev-libs/openssl >=dev-lang/v8-3.5.10.22 dev-libs/openssl 0 -http://nodejs.org/dist/v0.6.7/node-v0.6.7.tar.gz +http://nodejs.org/dist/v0.6.8/node-v0.6.8.tar.gz test http://nodejs.org/ GPL-2 Evented IO for V8 Javascript ~x86 ~amd64 -eutils multilib portability toolchain-funcs user +eutils multilib pax-utils portability toolchain-funcs user diff --git a/metadata/cache/net-misc/flexget-9999 b/metadata/cache/net-misc/flexget-9999 index e544756b0057..699fe9092678 100644 --- a/metadata/cache/net-misc/flexget-9999 +++ b/metadata/cache/net-misc/flexget-9999 @@ -1,5 +1,5 @@ -dev-python/setuptools dev-python/paver test? ( >=dev-python/feedparser-5.1 >=dev-python/sqlalchemy-0.7 dev-python/pyyaml dev-python/beautifulsoup:python-2 dev-python/html5lib dev-python/jinja dev-python/PyRSS2Gen dev-python/pynzb dev-python/progressbar dev-python/flask dev-python/cherrypy dev-python/requests dev-python/nose ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) dev-vcs/subversion net-misc/rsync ->=dev-python/feedparser-5.1 >=dev-python/sqlalchemy-0.7 dev-python/pyyaml dev-python/beautifulsoup:python-2 dev-python/html5lib dev-python/jinja dev-python/PyRSS2Gen dev-python/pynzb dev-python/progressbar dev-python/flask dev-python/cherrypy dev-python/requests dev-python/setuptools deluge? ( net-p2p/deluge ) transmission? ( dev-python/transmissionrpc ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) +dev-python/setuptools dev-python/paver test? ( >=dev-python/feedparser-5.1 >=dev-python/sqlalchemy-0.7 dev-python/pyyaml dev-python/beautifulsoup:python-2 dev-python/html5lib dev-python/jinja dev-python/PyRSS2Gen dev-python/pynzb dev-python/progressbar dev-python/flask dev-python/cherrypy >=dev-python/requests-0.9.1 dev-python/nose ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) dev-vcs/subversion net-misc/rsync +>=dev-python/feedparser-5.1 >=dev-python/sqlalchemy-0.7 dev-python/pyyaml dev-python/beautifulsoup:python-2 dev-python/html5lib dev-python/jinja dev-python/PyRSS2Gen dev-python/pynzb dev-python/progressbar dev-python/flask dev-python/cherrypy >=dev-python/requests-0.9.1 dev-python/setuptools deluge? ( net-p2p/deluge ) transmission? ( dev-python/transmissionrpc ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) 0 diff --git a/metadata/cache/net-print/foomatic-filters-4.0.9 b/metadata/cache/net-print/foomatic-filters-4.0.9 index b11fc08dc8a7..8bba66700cbf 100644 --- a/metadata/cache/net-print/foomatic-filters-4.0.9 +++ b/metadata/cache/net-print/foomatic-filters-4.0.9 @@ -6,7 +6,7 @@ http://www.openprinting.org/download/foomatic/foomatic-filters-4.0.9.tar.gz http://www.linuxprinting.org/foomatic.html GPL-2 Foomatic wrapper scripts -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 libtool multilib portability toolchain-funcs user versionator cups dbus diff --git a/metadata/cache/sci-libs/amd-2.2.3 b/metadata/cache/sci-libs/amd-2.2.3 new file mode 100644 index 000000000000..fa79cc4b69e5 --- /dev/null +++ b/metadata/cache/sci-libs/amd-2.2.3 @@ -0,0 +1,22 @@ +virtual/fortran sci-libs/ufconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +virtual/fortran sci-libs/ufconfig +0 +http://www.cise.ufl.edu/research/sparse/amd/AMD-2.2.3.tar.gz + +http://www.cise.ufl.edu/research/sparse/amd +LGPL-2.1 +Library to order a sparse matrix prior to Cholesky factorization +~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos +autotools autotools-utils eutils fortran-2 libtool multilib portability toolchain-funcs user +doc static-libs + + + +4 + +compile configure install prepare setup test + + + + + diff --git a/metadata/cache/sci-libs/btf-1.1.3 b/metadata/cache/sci-libs/btf-1.1.3 new file mode 100644 index 000000000000..71dc4b0a8965 --- /dev/null +++ b/metadata/cache/sci-libs/btf-1.1.3 @@ -0,0 +1,22 @@ +sci-libs/ufconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool + +0 +http://www.cise.ufl.edu/research/sparse/btf/BTF-1.1.3.tar.gz + +http://www.cise.ufl.edu/research/sparse/btf/ +LGPL-2.1 +Algorithm for matrix permutation into block triangular form +~amd64 ~x86 +autotools autotools-utils eutils libtool multilib portability toolchain-funcs user +static-libs + + + +4 + +compile configure install prepare test + + + + + diff --git a/metadata/cache/sci-libs/camd-2.2.3 b/metadata/cache/sci-libs/camd-2.2.3 new file mode 100644 index 000000000000..57ce95fda924 --- /dev/null +++ b/metadata/cache/sci-libs/camd-2.2.3 @@ -0,0 +1,22 @@ +sci-libs/ufconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +sci-libs/ufconfig +0 +http://www.cise.ufl.edu/research/sparse/camd/CAMD-2.2.3.tar.gz + +http://www.cise.ufl.edu/research/sparse/camd/ +LGPL-2 +Library to order a sparse matrix prior to Cholesky factorization +~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos +autotools autotools-utils eutils libtool multilib portability toolchain-funcs user +doc static-libs + + + +4 + +compile configure install prepare test + + + + + diff --git a/metadata/cache/sci-libs/ccolamd-2.7.4 b/metadata/cache/sci-libs/ccolamd-2.7.4 new file mode 100644 index 000000000000..7eff6f14cdba --- /dev/null +++ b/metadata/cache/sci-libs/ccolamd-2.7.4 @@ -0,0 +1,22 @@ +sci-libs/ufconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +sci-libs/ufconfig +0 +http://www.cise.ufl.edu/research/sparse/ccolamd/CCOLAMD-2.7.4.tar.gz + +http://www.cise.ufl.edu/research/sparse/ccolamd/ +LGPL-2.1 +Constrained column approximate minimum degree ordering algorithm +~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos +autotools autotools-utils eutils libtool multilib portability toolchain-funcs user +static-libs + + + +4 + +compile configure install prepare test + + + + + diff --git a/metadata/cache/sci-libs/cholmod-1.7.4 b/metadata/cache/sci-libs/cholmod-1.7.4 new file mode 100644 index 000000000000..97c71594ef88 --- /dev/null +++ b/metadata/cache/sci-libs/cholmod-1.7.4 @@ -0,0 +1,22 @@ +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 ) ) +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 +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 + + + +4 + +compile configure install prepare test + + + + + diff --git a/metadata/cache/sci-libs/colamd-2.7.4 b/metadata/cache/sci-libs/colamd-2.7.4 new file mode 100644 index 000000000000..fb5b5f21d2d0 --- /dev/null +++ b/metadata/cache/sci-libs/colamd-2.7.4 @@ -0,0 +1,22 @@ +sci-libs/ufconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +sci-libs/ufconfig +0 +http://www.cise.ufl.edu/research/sparse/colamd/COLAMD-2.7.4.tar.gz +test +http://www.cise.ufl.edu/research/sparse/colamd/ +LGPL-2.1 +Column approximate minimum degree ordering algorithm +~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos +autotools autotools-utils eutils libtool multilib portability toolchain-funcs user +static-libs + + + +4 + +compile configure install prepare test + + + + + diff --git a/metadata/cache/sci-libs/cxsparse-2.2.6 b/metadata/cache/sci-libs/cxsparse-2.2.6 new file mode 100644 index 000000000000..4ea59891bb03 --- /dev/null +++ b/metadata/cache/sci-libs/cxsparse-2.2.6 @@ -0,0 +1,22 @@ +sci-libs/ufconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool + +0 +http://www.cise.ufl.edu/research/sparse/CXSparse/versions/CXSparse-2.2.6.tar.gz + +http://www.cise.ufl.edu/research/sparse/CXSparse/ +LGPL-2.1 +Extended sparse matrix package. +~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos +autotools autotools-utils eutils libtool multilib portability toolchain-funcs user +static-libs + + + +4 + +compile configure install prepare test + + + + + diff --git a/metadata/cache/sci-libs/klu-1.1.3 b/metadata/cache/sci-libs/klu-1.1.3 new file mode 100644 index 000000000000..707b69875dce --- /dev/null +++ b/metadata/cache/sci-libs/klu-1.1.3 @@ -0,0 +1,22 @@ +sci-libs/amd sci-libs/btf sci-libs/colamd || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +sci-libs/amd sci-libs/btf sci-libs/colamd +0 +http://www.cise.ufl.edu/research/sparse/klu/KLU-1.1.3.tar.gz + +http://www.cise.ufl.edu/research/sparse/klu/ +LGPL-2.1 +Sparse LU factorization for circuit simulation +~amd64 ~x86 +autotools autotools-utils eutils libtool multilib portability toolchain-funcs user +doc static-libs + + + +4 + +compile configure install prepare test + + + + + diff --git a/metadata/cache/sci-libs/ldl-2.0.4 b/metadata/cache/sci-libs/ldl-2.0.4 new file mode 100644 index 000000000000..321a27066c28 --- /dev/null +++ b/metadata/cache/sci-libs/ldl-2.0.4 @@ -0,0 +1,22 @@ +sci-libs/ufconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool + +0 +http://www.cise.ufl.edu/research/sparse/ldl/LDL-2.0.4.tar.gz + +http://www.cise.ufl.edu/research/sparse/ldl +LGPL-2.1 +Simple but educational LDL^T matrix factorization algorithm +~amd64 ~x86 +autotools autotools-utils eutils libtool multilib portability toolchain-funcs user +doc static-libs + + + +4 + +compile configure install prepare test + + + + + diff --git a/metadata/cache/sci-libs/spqr-1.2.1 b/metadata/cache/sci-libs/spqr-1.2.1 deleted file mode 100644 index dd4e1cf19d3d..000000000000 --- a/metadata/cache/sci-libs/spqr-1.2.1 +++ /dev/null @@ -1,22 +0,0 @@ -sci-libs/cholmod[supernodal] tbb? ( dev-cpp/tbb ) metis? ( >=sci-libs/cholmod-1.7.0-r1[metis] ) dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool -sci-libs/cholmod[supernodal] tbb? ( dev-cpp/tbb ) metis? ( >=sci-libs/cholmod-1.7.0-r1[metis] ) -0 -http://www.cise.ufl.edu/research/sparse/SPQR/SPQR-1.2.1.tar.gz - -http://www.cise.ufl.edu/research/sparse/SPQR -GPL-2 -Multithreaded multifrontal sparse QR factorization library -~amd64 ~x86 -autotools eutils libtool multilib portability toolchain-funcs user -doc metis static-libs tbb - - - -2 - -configure install prepare - - - - - diff --git a/metadata/cache/sci-libs/spqr-1.2.2 b/metadata/cache/sci-libs/spqr-1.2.3 similarity index 70% rename from metadata/cache/sci-libs/spqr-1.2.2 rename to metadata/cache/sci-libs/spqr-1.2.3 index 47859f499e2f..34428e46f948 100644 --- a/metadata/cache/sci-libs/spqr-1.2.2 +++ b/metadata/cache/sci-libs/spqr-1.2.3 @@ -1,20 +1,20 @@ sci-libs/cholmod[supernodal] tbb? ( dev-cpp/tbb ) metis? ( >=sci-libs/cholmod-1.7.0-r1[metis] ) dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool sci-libs/cholmod[supernodal] tbb? ( dev-cpp/tbb ) metis? ( >=sci-libs/cholmod-1.7.0-r1[metis] ) 0 -http://www.cise.ufl.edu/research/sparse/SPQR/SPQR-1.2.2.tar.gz +http://www.cise.ufl.edu/research/sparse/SPQR/SPQR-1.2.3.tar.gz http://www.cise.ufl.edu/research/sparse/SPQR GPL-2 Multithreaded multifrontal sparse QR factorization library ~amd64 ~x86 -autotools eutils libtool multilib portability toolchain-funcs user +autotools autotools-utils eutils libtool multilib portability toolchain-funcs user doc metis static-libs tbb 4 -configure install prepare +compile configure install prepare test diff --git a/metadata/cache/sci-libs/suitesparse-3.7.0 b/metadata/cache/sci-libs/suitesparse-3.7.0 new file mode 100644 index 000000000000..4ca38630a0da --- /dev/null +++ b/metadata/cache/sci-libs/suitesparse-3.7.0 @@ -0,0 +1,22 @@ + +>=sci-libs/ufconfig-3.7.0 >=sci-libs/amd-2.2.3[doc?] >=sci-libs/btf-1.1.3 >=sci-libs/camd-2.2.3[doc?] >=sci-libs/ccolamd-2.7.4 >=sci-libs/cholmod-1.7.4[doc?,metis?] >=sci-libs/colamd-2.7.4 >=sci-libs/cxsparse-2.2.6 >=sci-libs/klu-1.1.3[doc?] >=sci-libs/ldl-2.0.4[doc?] >=sci-libs/spqr-1.2.3[doc?,metis?] >=sci-libs/umfpack-5.5.2[doc?,metis?] +0 + + +http://www.cise.ufl.edu/research/sparse/SuiteSparse/ +LGPL-2.1 GPL-2 +Meta package for a suite of sparse matrix tools +~amd64 ~x86 + +metis doc + + + +4 + +- + + + + + diff --git a/metadata/cache/sci-libs/ufconfig-3.7.0 b/metadata/cache/sci-libs/ufconfig-3.7.0 new file mode 100644 index 000000000000..9ef71dd15da8 --- /dev/null +++ b/metadata/cache/sci-libs/ufconfig-3.7.0 @@ -0,0 +1,22 @@ + + +0 +http://www.cise.ufl.edu/research/sparse/UFconfig/UFconfig-3.7.0.tar.gz + +http://www.cise.ufl.edu/research/sparse/UFconfig +LGPL-2.1 +Common configuration scripts for the SuiteSparse libraries +~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos +multilib toolchain-funcs +static-libs + + + +4 + +compile install + + + + + diff --git a/metadata/cache/sci-libs/umfpack-5.5.2 b/metadata/cache/sci-libs/umfpack-5.5.2 new file mode 100644 index 000000000000..ef1f6f33f00d --- /dev/null +++ b/metadata/cache/sci-libs/umfpack-5.5.2 @@ -0,0 +1,22 @@ +virtual/fortran virtual/blas sci-libs/amd metis? ( sci-libs/cholmod[metis] ) dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +virtual/fortran virtual/blas sci-libs/amd metis? ( sci-libs/cholmod[metis] ) +0 +http://www.cise.ufl.edu/research/sparse/umfpack/UMFPACK-5.5.2.tar.gz + +http://www.cise.ufl.edu/research/sparse/umfpack +GPL-2 +Unsymmetric multifrontal sparse LU factorization library +~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos +autotools autotools-utils eutils fortran-2 libtool multilib portability toolchain-funcs user +doc metis static-libs + + + +4 + +compile configure install prepare setup test + + + + + diff --git a/metadata/cache/sys-apps/pciutils-3.1.9 b/metadata/cache/sys-apps/pciutils-3.1.9 new file mode 100644 index 000000000000..96cdf236fe0e --- /dev/null +++ b/metadata/cache/sys-apps/pciutils-3.1.9 @@ -0,0 +1,22 @@ +zlib? ( sys-libs/zlib ) +zlib? ( sys-libs/zlib ) +0 +ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-3.1.9.tar.gz + +http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html +GPL-2 +Various utilities dealing with the PCI bus +~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux +eutils multilib portability toolchain-funcs user +network-cron static-libs zlib + + + +4 + +compile install postinst prepare + + + + + diff --git a/metadata/cache/sys-apps/pmount-0.9.99_alpha-r1 b/metadata/cache/sys-apps/pmount-0.9.99_alpha-r1 index 595db0208dba..d54bc608d5b3 100644 --- a/metadata/cache/sys-apps/pmount-0.9.99_alpha-r1 +++ b/metadata/cache/sys-apps/pmount-0.9.99_alpha-r1 @@ -6,7 +6,7 @@ mirror://debian/pool/main/p/pmount/pmount_0.9.99-alpha.orig.tar.bz2 http://pmount.alioth.debian.org/ GPL-2 Policy based mounter that gives the ability to mount removable devices as a user -~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 +~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 eutils multilib portability toolchain-funcs user crypt diff --git a/metadata/cache/sys-apps/seabios-1.6.3 b/metadata/cache/sys-apps/seabios-1.6.3 index 17b32582047d..df7adf1f1f24 100644 --- a/metadata/cache/sys-apps/seabios-1.6.3 +++ b/metadata/cache/sys-apps/seabios-1.6.3 @@ -6,7 +6,7 @@ http://www.linuxtogo.org/~kevin/SeaBIOS/seabios-1.6.3.tar.gz http://www.seabios.org LGPL-3 GPL-3 Open Source implementation of a 16-bit x86 BIOS -~amd64 ~x86 +amd64 ~x86 multilib python toolchain-funcs diff --git a/metadata/cache/sys-cluster/knem-0.9.7 b/metadata/cache/sys-cluster/knem-0.9.7 new file mode 100644 index 000000000000..278ea54f2e90 --- /dev/null +++ b/metadata/cache/sys-cluster/knem-0.9.7 @@ -0,0 +1,22 @@ +sys-apps/hwloc virtual/linux-sources || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool kernel_linux? ( sys-apps/module-init-tools ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) +sys-apps/hwloc sys-apps/module-init-tools kernel_linux? ( sys-apps/module-init-tools ) +0 +http://runtime.bordeaux.inria.fr/knem/download/knem-0.9.7.tar.gz + +http://runtime.bordeaux.inria.fr/knem/ +GPL-2 LGPL-2 +High-Performance Intra-Node MPI Communication +~amd64 ~x86 +autotools eutils libtool linux-info linux-mod multilib portability toolchain-funcs user versionator +debug modules kernel_linux + + + +4 + +compile configure install postinst postrm preinst prepare setup + + + + + diff --git a/metadata/cache/sys-cluster/openmpi-1.5.4-r2 b/metadata/cache/sys-cluster/openmpi-1.5.4-r2 new file mode 100644 index 000000000000..8bbd18bfdcd3 --- /dev/null +++ b/metadata/cache/sys-cluster/openmpi-1.5.4-r2 @@ -0,0 +1,22 @@ +fortran? ( virtual/fortran ) pbs? ( sys-cluster/torque ) infiniband? ( sys-infiniband/openib ) sctp? ( net-misc/lksctp-tools ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) elibc_FreeBSD? ( dev-libs/libexecinfo ) knem? ( sys-cluster/knem ) numa? ( sys-process/numactl ) open-mx? ( sys-cluster/open-mx ) psm? ( sys-infiniband/infinipath-psm ) >=sys-apps/hwloc-1.3 !sys-cluster/mpich !sys-cluster/lam-mpi !sys-cluster/mpich2 !sys-cluster/mpiexec +fortran? ( virtual/fortran ) pbs? ( sys-cluster/torque ) infiniband? ( sys-infiniband/openib ) sctp? ( net-misc/lksctp-tools ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) elibc_FreeBSD? ( dev-libs/libexecinfo ) knem? ( sys-cluster/knem ) numa? ( sys-process/numactl ) open-mx? ( sys-cluster/open-mx ) psm? ( sys-infiniband/infinipath-psm ) >=sys-apps/hwloc-1.3 !sys-cluster/mpich !sys-cluster/lam-mpi !sys-cluster/mpich2 !sys-cluster/mpiexec +0 +http://www.open-mpi.org/software/ompi/v1.5/downloads/openmpi-1.5.4.tar.bz2 + +http://www.open-mpi.org +BSD +A high-performance message passing library (MPI) +~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux +eutils flag-o-matic fortran-2 multilib portability toolchain-funcs user ++cxx elibc_FreeBSD fortran heterogeneous infiniband ipv6 knem mpi-threads +numa pbs open-mx psm romio sctp slurm threads vt +^^ ( ( !slurm !pbs ) ( slurm !pbs ) ( !slurm pbs ) ) psm? ( infiniband ) + + +4 + +configure install prepare setup test + + + + + diff --git a/metadata/cache/sys-infiniband/infinipath-psm-1.14 b/metadata/cache/sys-infiniband/infinipath-psm-1.14 new file mode 100644 index 000000000000..5ebfbdeba557 --- /dev/null +++ b/metadata/cache/sys-infiniband/infinipath-psm-1.14 @@ -0,0 +1,22 @@ +>=sys-infiniband/libibverbs-1.1.4 >=app-arch/rpm2targz-9.0.0.3g +>=sys-infiniband/libibverbs-1.1.4 +0 +http://www.openfabrics.org/downloads/OFED/ofed-1.5.3/OFED-1.5.3.1.tgz + +http://www.openfabrics.org/ +|| ( GPL-2 BSD-2 ) +OpenIB userspace driver for the PathScale InfiniBand HCAs +~amd64 ~x86 ~amd64-linux +base eutils multilib openib portability rpm toolchain-funcs user versionator + + + + +4 + +compile configure install prepare unpack + + + + + diff --git a/metadata/cache/sys-libs/libchipcard-5.0.2 b/metadata/cache/sys-libs/libchipcard-5.0.2 index e724f1612b58..7ee768fdafa6 100644 --- a/metadata/cache/sys-libs/libchipcard-5.0.2 +++ b/metadata/cache/sys-libs/libchipcard-5.0.2 @@ -6,7 +6,7 @@ http://www.aquamaniac.de/sites/download/download.php?package=02&release=26&file= http://www.aquamaniac.de/aqbanking/ LGPL-2.1 Libchipcard is a library for easy access to chip cards via chip card readers (terminals). -~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 +amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 doc examples diff --git a/metadata/cache/www-apps/mediawiki-1.18.1 b/metadata/cache/www-apps/mediawiki-1.18.1 index 977adbe4d403..c1e99757dd94 100644 --- a/metadata/cache/www-apps/mediawiki-1.18.1 +++ b/metadata/cache/www-apps/mediawiki-1.18.1 @@ -6,7 +6,7 @@ test http://www.mediawiki.org GPL-2 The MediaWiki wiki web application (as used on wikipedia.org) -~alpha amd64 ~ppc ~sparc ~x86 +~alpha amd64 ~ppc ~sparc x86 depend.php eutils multilib phpconfutils portability toolchain-funcs user versionator webapp imagemagick mysql postgres sqlite vhosts diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index 34dc32a6e0de..deb3e2beda44 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Fri, 20 Jan 2012 01:36:46 +0000 +Fri, 20 Jan 2012 15:06:50 +0000 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index 34dc32a6e0de..f735890b7a2e 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Fri, 20 Jan 2012 01:36:46 +0000 +Fri, 20 Jan 2012 15:06:51 +0000 diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index 0b36b0e32065..ba076b1cdd61 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Fri, 20 Jan 2012 01:36:48 +0000 +Fri, 20 Jan 2012 15:06:52 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index b6215bc6bd02..eef90a377e41 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Fri Jan 20 01:36:46 UTC 2012 +Fri Jan 20 15:06:50 UTC 2012 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index 193c81ce5630..2594601da0a6 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Fri, 20 Jan 2012 02:00:01 +0000 +Fri, 20 Jan 2012 15:30:01 +0000 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index eecae52b6189..63b844269b7e 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1327023301 Fri Jan 20 01:35:01 2012 UTC +1327071901 Fri Jan 20 15:05:01 2012 UTC diff --git a/net-libs/aqbanking/aqbanking-5.0.14.ebuild b/net-libs/aqbanking/aqbanking-5.0.14.ebuild index a3e39d9b919b..815510af2a32 100644 --- a/net-libs/aqbanking/aqbanking-5.0.14.ebuild +++ b/net-libs/aqbanking/aqbanking-5.0.14.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-libs/aqbanking/aqbanking-5.0.14.ebuild,v 1.1 2011/08/21 20:02:18 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/aqbanking/aqbanking-5.0.14.ebuild,v 1.2 2012/01/20 13:23:17 ago Exp $ EAPI=2 @@ -10,7 +10,7 @@ SRC_URI="http://www.aquamaniac.de/sites/download/download.php?package=03&release LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="+chipcard debug doc examples gtk ofx" RDEPEND=">=app-misc/ktoblzcheck-1.33 diff --git a/net-libs/gtk-vnc/gtk-vnc-0.5.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.5.0.ebuild index 1d4b83c5b8e7..c135044d8384 100644 --- a/net-libs/gtk-vnc/gtk-vnc-0.5.0.ebuild +++ b/net-libs/gtk-vnc/gtk-vnc-0.5.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/net-libs/gtk-vnc/gtk-vnc-0.5.0.ebuild,v 1.1 2012/01/15 05:04:57 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/gtk-vnc-0.5.0.ebuild,v 1.2 2012/01/20 03:06:06 tetromino Exp $ EAPI="4" @@ -17,9 +17,10 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="examples gtk3 +introspection python sasl vala" # libview is used in examples/gvncviewer -- no need +# glib-2.30.1 needed to avoid linking failure due to .la files (bug #399129) # TODO: review nsplugin when it will be considered less experimental # XXX: automagic pulseaudio. Is it worth patching? -COMMON_DEPEND=">=dev-libs/glib-2.10:2 +COMMON_DEPEND=">=dev-libs/glib-2.30.1:2 dev-libs/libgcrypt dev-libs/libgpg-error media-sound/pulseaudio diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest index 93f10d678e1a..d9f4a301d800 100644 --- a/net-libs/nodejs/Manifest +++ b/net-libs/nodejs/Manifest @@ -2,3 +2,4 @@ DIST node-v0.4.11.tar.gz 12419274 RMD160 0512138fbf05d472a42bfa5453c5dd851c06c71 DIST node-v0.4.12.tar.gz 12421469 RMD160 3861afdcbe49516c018fa0d5a5416b15a10b8f05 SHA1 1c6e34b90ad6b989658ee85e0d0cb16797b16460 SHA256 c01af05b933ad4d2ca39f63cac057f54f032a4d83cff8711e42650ccee24fce4 DIST node-v0.6.6.tar.gz 10446671 RMD160 e17ff8daae7ed7ad945092a71e8e0678e5c4ba60 SHA1 7d3f48e517763f08a34896946afdb643a52cacbe SHA256 7abea518b1b63fd669c9ca436bf33d0bb0b09b252f06d700ccbd290fe5222102 DIST node-v0.6.7.tar.gz 10473188 RMD160 be61a1be37812738eb0dd1dabe448b7bccd20f62 SHA1 f739156c44196b2191cc32937706725bdf76c42a SHA256 b34387449723352d2f5b7a51d8c1358c247908a5f7acd7849cac45f980246d54 +DIST node-v0.6.8.tar.gz 10488841 RMD160 b605df38bb906f7a9f8c22ecfd760ef832d2aa80 SHA1 c3f755b5dfd0de3f306d06573fa9433d845623dd SHA256 e6cbfc5ccdbe10128dbbd4dc7a88c154d80f8a39c3a8477092cf7d25eef78c9c diff --git a/net-libs/nodejs/nodejs-0.6.7.ebuild b/net-libs/nodejs/nodejs-0.6.8.ebuild similarity index 79% rename from net-libs/nodejs/nodejs-0.6.7.ebuild rename to net-libs/nodejs/nodejs-0.6.8.ebuild index d1a6e5b7c597..43207aef777f 100644 --- a/net-libs/nodejs/nodejs-0.6.7.ebuild +++ b/net-libs/nodejs/nodejs-0.6.8.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/net-libs/nodejs/nodejs-0.6.7.ebuild,v 1.1 2012/01/11 07:44:30 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.6.8.ebuild,v 1.1 2012/01/20 09:21:28 patrick Exp $ EAPI="2" -inherit eutils +inherit eutils pax-utils # omgwtf RESTRICT="test" @@ -35,6 +35,7 @@ src_compile() { src_install() { emake DESTDIR="${D}" install || die + pax-mark -m "${D}"/usr/bin/node } src_test() { diff --git a/net-misc/flexget/flexget-9999.ebuild b/net-misc/flexget/flexget-9999.ebuild index 275f1d2e2261..4aceb62fa0cb 100644 --- a/net-misc/flexget/flexget-9999.ebuild +++ b/net-misc/flexget/flexget-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/net-misc/flexget/flexget-9999.ebuild,v 1.6 2012/01/03 04:23:21 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/flexget-9999.ebuild,v 1.7 2012/01/20 05:54:22 floppym Exp $ EAPI=4 @@ -33,7 +33,7 @@ RDEPEND=" dev-python/progressbar dev-python/flask dev-python/cherrypy - dev-python/requests + >=dev-python/requests-0.9.1 " DEPEND=" dev-python/setuptools diff --git a/net-print/foomatic-filters/foomatic-filters-4.0.9.ebuild b/net-print/foomatic-filters/foomatic-filters-4.0.9.ebuild index 8ae6965fb29c..49f13e69f830 100644 --- a/net-print/foomatic-filters/foomatic-filters-4.0.9.ebuild +++ b/net-print/foomatic-filters/foomatic-filters-4.0.9.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/net-print/foomatic-filters/foomatic-filters-4.0.9.ebuild,v 1.4 2012/01/18 20:00:23 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/foomatic-filters-4.0.9.ebuild,v 1.5 2012/01/20 10:52:37 tomka Exp $ EAPI=4 @@ -12,7 +12,7 @@ SRC_URI="http://www.openprinting.org/download/foomatic/${P}.tar.gz" LICENSE="GPL-2" 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="cups dbus" RDEPEND=" diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask index 6608c323634a..9af3ea2df119 100644 --- a/profiles/arch/alpha/package.use.mask +++ b/profiles/arch/alpha/package.use.mask @@ -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/profiles/arch/alpha/package.use.mask,v 1.74 2011/12/26 10:58:37 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.75 2012/01/20 13:11:02 alexxy Exp $ # Raúl Porcel (26 Dec 2011) @@ -9,7 +9,7 @@ www-client/firefox crashreporter # Alexey Shvetsov (17 Dec 2011) # mask use numa for openmpi -sys-cluster/openmpi numa +sys-cluster/openmpi numa open-mx psm knem # Alexandre Rostovtsev (25 Nov 2011) # Mask USE flags on gnome-3.2 packages due to missing keywords on deps; diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask index db916132ede4..b44f2c3b25ed 100644 --- a/profiles/arch/ia64/package.use.mask +++ b/profiles/arch/ia64/package.use.mask @@ -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/profiles/arch/ia64/package.use.mask,v 1.67 2012/01/04 18:34:33 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/package.use.mask,v 1.68 2012/01/20 13:11:02 alexxy Exp $ # Ralph Sennhauser (31 Dec 2011) # Needs dev-java/fop which is not available for ia64 due to missing JVM #345433 @@ -12,7 +12,7 @@ www-client/firefox crashreporter # Alexey Shvetsov (17 Dec 2011) # Mask use numa for openmpi -sys-cluster/openmpi numa +sys-cluster/openmpi numa psm knem open-mx # Alexandre Rostovtsev (25 Nov 2011) # Mask USE flags on gnome-3.2 packages due to missing keywords on deps; diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask index fd8dee7cc35f..a55f3b9a1596 100644 --- a/profiles/arch/powerpc/package.use.mask +++ b/profiles/arch/powerpc/package.use.mask @@ -1,6 +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/profiles/arch/powerpc/package.use.mask,v 1.104 2011/12/07 21:27:03 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.105 2012/01/20 13:11:02 alexxy Exp $ + +# Alexey Shvetsov (20 Jan 2012) +# Mask some use flags for openmpi due to unkeyworded deps +sys-cluster/openmpi psm knem open-mx # Alexandre Rostovtsev (25 Nov 2011) # Mask USE flags on gnome-3.2 packages due to missing keywords on deps; diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask index c367dfc4c8b2..e42f964a20e3 100644 --- a/profiles/arch/sparc/package.use.mask +++ b/profiles/arch/sparc/package.use.mask @@ -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/profiles/arch/sparc/package.use.mask,v 1.90 2011/12/17 21:59:56 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.use.mask,v 1.91 2012/01/20 13:11:02 alexxy Exp $ # Alexey Shvetsov (17 Dec 2011) # Mask use numa for openmpi -sys-cluster/openmpi numa +sys-cluster/openmpi numa psm knem open-mx # Alexandre Rostovtsev (25 Nov 2011) # Mask USE flags on gnome-3.2 packages due to missing keywords on deps; diff --git a/profiles/use.local.desc b/profiles/use.local.desc index c6e6ab9a2b98..20084ed0689e 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -4736,9 +4736,12 @@ sys-cluster/mvapich2:medium-cluster - Automatically generated description for me sys-cluster/mvapich2:romio - Automatically generated description for romio sys-cluster/ocfs:aio - Add aio support sys-cluster/openmpi:heterogeneous - Enable features required for heterogeneous platform support +sys-cluster/openmpi:knem - Add High-Performance intranode communication sys-cluster/openmpi:mpi-threads - Enable MPI_THREAD_MULTIPLE sys-cluster/openmpi:numa - Enable numa memory allocation support +sys-cluster/openmpi:open-mx - Add support for Myrinet Express over Ethernet> sys-cluster/openmpi:pbs - Add support for the Portable Batch System (PBS) +sys-cluster/openmpi:psm - Add support for Qlogic psm driver for IB sys-cluster/openmpi:romio - Build the ROMIO MPI-IO component sys-cluster/openmpi:sctp - Enable SCTP support sys-cluster/openmpi:slurm - Add support for SLURM diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest index 7108890b9e15..44ac777d9b1b 100644 --- a/sci-libs/amd/Manifest +++ b/sci-libs/amd/Manifest @@ -1,3 +1,4 @@ DIST AMD-2.2.0.tar.gz 267728 RMD160 1cbc9f5a0abe2ccd132a1509b2d2b5ee0da9822c SHA1 862d2fd3538f31f37e9d133204e04ff36ed59c0f SHA256 b4978ed99f61204456a27b1c86aa149f49dbead5df12decd8c34e15547e75ff8 DIST AMD-2.2.1.tar.gz 268478 RMD160 a4a4621c14a1ff857ecd9402afb8cbc722538c00 SHA1 d04b68d51a6eb41068ae20bdf74bd7c32d2690db SHA256 cc2b3c2a25f06ef273062a22cb2fb4296ece002de2e4d28487d4dd93c4c605a2 DIST AMD-2.2.2.tar.gz 268666 RMD160 a04ac35d107b8d850cd5b65b77bd46abd511c19a SHA1 ae8a42da490a537889a46036545d867423ec7c73 SHA256 5b3f538d558169169d05f5b020f965bd1b25e7a927466b010f9f063f874b7b1a +DIST AMD-2.2.3.tar.gz 261613 RMD160 98e51ee284b110f7dd5040f09900c0967537474e SHA1 cedd6c37c7d214655a0b967a45994e7ec5c38251 SHA256 36656973da99afcde631e7f6185d44bd57eb7d1b0b4f220da10eb3defbd68382 diff --git a/sci-libs/amd/amd-2.2.3.ebuild b/sci-libs/amd/amd-2.2.3.ebuild new file mode 100644 index 000000000000..5b48523b48cb --- /dev/null +++ b/sci-libs/amd/amd-2.2.3.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/amd-2.2.3.ebuild,v 1.1 2012/01/20 05:51:11 bicatali Exp $ + +EAPI=4 + +AUTOTOOLS_AUTORECONF=yes +inherit autotools-utils fortran-2 + +MY_PN=AMD + +DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization" +HOMEPAGE="http://www.cise.ufl.edu/research/sparse/amd" +SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="doc static-libs" + +RDEPEND="virtual/fortran + sci-libs/ufconfig" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_PN}" + +PATCHES=( "${FILESDIR}"/${PN}-2.2.0-autotools.patch ) +DOCS=( README.txt Doc/ChangeLog ) + +src_install() { + autotools-utils_src_install + use doc && doins Doc/AMD_UserGuide.pdf +} diff --git a/sci-libs/btf/Manifest b/sci-libs/btf/Manifest index 4a7ff3ad1f76..f5e3313c82b6 100644 --- a/sci-libs/btf/Manifest +++ b/sci-libs/btf/Manifest @@ -1,3 +1,4 @@ DIST BTF-1.0.1.tar.gz 38254 RMD160 6cf6fe2a4532f56cca81e92654d5410831c79e6f SHA1 15459bdece0a7a87444a7bc2b243368b2522d2b4 SHA256 ba267a3f59e0c447438c6e930282de6289fd5c45af5d6b4072c037d489df8310 DIST BTF-1.1.0.tar.gz 38771 RMD160 85f4acc48ca11db0c344e5b5e2cc8ac73278589f SHA1 9e0098224f19ffa1df2ff6e45eae9949b5c0d4ea SHA256 a2edf02977cd7c128b825bff81d5713732b597d8277e671ea2ed4b74091e955a DIST BTF-1.1.2.tar.gz 39229 RMD160 5f913ae51d7dc29e2c5756ba72813b364ad1f716 SHA1 35652c34926e25d5ac22be16a51f3681dd753f8e SHA256 5c7ca932212eafc5c460373e1c8fdd093f4886a415a4ac2a103259e1cbec8d68 +DIST BTF-1.1.3.tar.gz 38276 RMD160 1b041d81fab62c70762071eda511dd87e9cdcb45 SHA1 17c42b606ba5751514f509adaa352a51e086762d SHA256 01032ba79baba9a90e3c03e9500c42cce9250c2ecab03c48323bc940f3a7cbfe diff --git a/sci-libs/btf/btf-1.1.3.ebuild b/sci-libs/btf/btf-1.1.3.ebuild new file mode 100644 index 000000000000..bc15e831d232 --- /dev/null +++ b/sci-libs/btf/btf-1.1.3.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/btf/btf-1.1.3.ebuild,v 1.1 2012/01/20 05:51:46 bicatali Exp $ + +EAPI=4 + +AUTOTOOLS_AUTORECONF=yes +inherit autotools-utils + +MY_PN=BTF + +DESCRIPTION="Algorithm for matrix permutation into block triangular form" +HOMEPAGE="http://www.cise.ufl.edu/research/sparse/btf/" +SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="static-libs" + +DEPEND="sci-libs/ufconfig" +RDEPEND="" + +DOCS=( README.txt Doc/ChangeLog ) +PATCHES=( "${FILESDIR}"/${PN}-1.0.1-autotools.patch ) + +S="${WORKDIR}/${MY_PN}" diff --git a/sci-libs/camd/Manifest b/sci-libs/camd/Manifest index b83d3875acc1..96b6cdcf62f9 100644 --- a/sci-libs/camd/Manifest +++ b/sci-libs/camd/Manifest @@ -1,2 +1,3 @@ DIST CAMD-2.2.0.tar.gz 227593 RMD160 ac91f020edac556d19fb23a5f88dfd0837f85b0a SHA1 02d323da119d3203714b3c1948f62c9813ba39a7 SHA256 a8a2254335e7dfbca7e19904fdf1a5e6149c41e141356d08121e6f806b209f45 DIST CAMD-2.2.2.tar.gz 226804 RMD160 06187f3505d5e3b03481dd97fe8a549c9e79941c SHA1 86da449b064cd603a865e3b3238c177092f11604 SHA256 68e66c62b77bba9f1f580eea2aa0319d53f183c25d30b707caa8b036382cefbf +DIST CAMD-2.2.3.tar.gz 222561 RMD160 7575550bda28c77cf9eb65064af08906a1a360ad SHA1 a1490548d79814dc4d6a9903d2f2a4545ceb19ea SHA256 a902f4162866477dc44839c0dc4fa9b0247f0652bf4b7c32e9cb631418a0fce6 diff --git a/sci-libs/camd/camd-2.2.3.ebuild b/sci-libs/camd/camd-2.2.3.ebuild new file mode 100644 index 000000000000..3dc9d8b73f6e --- /dev/null +++ b/sci-libs/camd/camd-2.2.3.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/camd/camd-2.2.3.ebuild,v 1.1 2012/01/20 05:48:09 bicatali Exp $ + +EAPI=4 + +AUTOTOOLS_AUTORECONF=yes +inherit autotools-utils + +MY_PN=CAMD + +DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization" +HOMEPAGE="http://www.cise.ufl.edu/research/sparse/camd/" +SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="doc static-libs" + +DEPEND="sci-libs/ufconfig" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${PN}-2.2.0-autotools.patch ) +DOCS=( README.txt Doc/ChangeLog ) + +S="${WORKDIR}/${MY_PN}" + +src_install() { + autotools-utils_src_install + use doc && dodoc Doc/CAMD_UserGuide.pdf +} diff --git a/sci-libs/camd/files/camd-2.2.0-autotools.patch b/sci-libs/camd/files/camd-2.2.0-autotools.patch index 0de6b6b45b4f..d112a5f17169 100644 --- a/sci-libs/camd/files/camd-2.2.0-autotools.patch +++ b/sci-libs/camd/files/camd-2.2.0-autotools.patch @@ -35,7 +35,7 @@ + @for i in $(check_PROGRAMS); do \ + echo "Testing $$i"; \ + ./$$i > my_$$i.out; \ -+ if ! diff $$i.out my_$$i.out; then \ ++ if ! diff $(srcdir)/$$i.out my_$$i.out; then \ + echo "Test $$i failed!"; \ + exit 1; \ + fi \ diff --git a/sci-libs/ccolamd/Manifest b/sci-libs/ccolamd/Manifest index 86c2daa731b4..fa0272e5e14f 100644 --- a/sci-libs/ccolamd/Manifest +++ b/sci-libs/ccolamd/Manifest @@ -1,2 +1,3 @@ DIST CCOLAMD-2.7.1.tar.gz 62591 RMD160 91c0aa53f5d20b75d4754242c2eaaa8750ff299d SHA1 fae4127f72f9409360ebc1f5927c62ad1d8e2a2c SHA256 9fd040484e092d857e5c6678faa91a17397b1057c95881f22a92ac8bf2f1e09c DIST CCOLAMD-2.7.3.tar.gz 62042 RMD160 98635285685d97a603e9d55e2780aabd08cc8c8d SHA1 b9a1371df268b82bbb992d728207bd951205a35f SHA256 47cca1a15670c254858976998c43cdb6fe14f3f31b69ff3d9d92dd2f935e06dd +DIST CCOLAMD-2.7.4.tar.gz 61709 RMD160 3a97c3707e26b29df5b00986adf04f5c899361b6 SHA1 f95ab5482fa2e1a2f07b18586d394d6a74b0c1c2 SHA256 ec0c6813c0683190ee0d0ef435da008b366838988a755f79292f987981b4d51a diff --git a/sci-libs/ccolamd/ccolamd-2.7.4.ebuild b/sci-libs/ccolamd/ccolamd-2.7.4.ebuild new file mode 100644 index 000000000000..80bd30f2b995 --- /dev/null +++ b/sci-libs/ccolamd/ccolamd-2.7.4.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccolamd/ccolamd-2.7.4.ebuild,v 1.1 2012/01/20 06:03:25 bicatali Exp $ + +EAPI=4 + +AUTOTOOLS_AUTORECONF=yes +inherit autotools-utils + +MY_PN=CCOLAMD + +DESCRIPTION="Constrained column approximate minimum degree ordering algorithm" +HOMEPAGE="http://www.cise.ufl.edu/research/sparse/ccolamd/" +SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="static-libs" + +DEPEND="sci-libs/ufconfig" +RDEPEND="${DEPEND}" + +DOCS=( README.txt Doc/ChangeLog ) +PATCHES=( "${FILESDIR}"/${PN}-2.7.1-autotools.patch ) + +S="${WORKDIR}/${MY_PN}" diff --git a/sci-libs/ccolamd/files/ccolamd-2.7.1-autotools.patch b/sci-libs/ccolamd/files/ccolamd-2.7.1-autotools.patch index baf3a48240fe..8386325da742 100644 --- a/sci-libs/ccolamd/files/ccolamd-2.7.1-autotools.patch +++ b/sci-libs/ccolamd/files/ccolamd-2.7.1-autotools.patch @@ -50,7 +50,7 @@ + @for i in $(check_PROGRAMS); do \ + echo "Testing $$i"; \ + ./$$i > my_$$i.out; \ -+ if ! diff $$i.out my_$$i.out; then \ ++ if ! diff $(srcdir)/$$i.out my_$$i.out; then \ + echo "Test $$i failed!"; \ + exit 1; \ + fi \ diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest index 242560cd261e..4d2ee78686bb 100644 --- a/sci-libs/cholmod/Manifest +++ b/sci-libs/cholmod/Manifest @@ -1,5 +1,6 @@ DIST CHOLMOD-1.6.0.tar.gz 1092883 RMD160 0c0b8b6f9e9bab2d95791c4ca12d0d8cc692c0e5 SHA1 be19fa1ac19d190e9f3aa1aee7ba88a7ce0111db SHA256 6e13d49c5452cd99e5eb828d50a55dc56d399751fe5dee82b0a5a3dbefd24e0e DIST CHOLMOD-1.7.1.tar.gz 1110783 RMD160 a7dba8e0e383d7591d765c7feae669864bbf2a5c SHA1 f6f731466f6bc5c2892618261439c608b8eb4939 SHA256 4b974f794b5027c7575482ccb90a1638f22e2553594d808ff567dc42acc050ba DIST CHOLMOD-1.7.3.tar.gz 1180532 RMD160 434dca8d923721d89421d7c4c674aa3fb2335c34 SHA1 c85ce011da25337f53c0a5b11e329d855698caa0 SHA256 f89b3a0db56add3f78139db258a7868a72ccb8d57361ef6645e6a47db7ce9680 +DIST CHOLMOD-1.7.4.tar.gz 1169002 RMD160 88ac3bc3bed3d241d893ede7b42bd67a9c230149 SHA1 7b960f22126addb2e6e92159f8bfcc72733d16d4 SHA256 0cefc540d4e341afd614dfc107fe9f38afb504df6566e8d2cd209ae3321afbaf DIST cholmod-1.6.0-autotools.patch.bz2 5388 RMD160 4c835c95f8d64a2032b37ee136e4d4faf70586e8 SHA1 4593f97658fc841e939bc697125748d4106f6d93 SHA256 141762b6657924f52a557d8d79ea672dcc16a3f08022ac6b4f2ff3f5c895798e DIST cholmod-1.7.0-autotools.patch.bz2 5534 RMD160 883ba50e6516f7666dc2933470d1c76f14ce5424 SHA1 0c15bc824b590d096998417f07b1849cc6f645fb SHA256 901b83939ce09a51baa9431639d4fbebde1bfd70998b4b66d2753a91daed931c diff --git a/sci-libs/cholmod/cholmod-1.7.4.ebuild b/sci-libs/cholmod/cholmod-1.7.4.ebuild new file mode 100644 index 000000000000..aa08ddbf8fe8 --- /dev/null +++ b/sci-libs/cholmod/cholmod-1.7.4.ebuild @@ -0,0 +1,96 @@ +# 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 $ + +EAPI=4 + +AUTOTOOLS_AUTORECONF=yes +inherit eutils autotools autotools-utils + +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 + 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" + +RDEPEND="supernodal? ( virtual/lapack ) + sci-libs/amd + sci-libs/colamd + metis? ( sci-libs/camd + sci-libs/ccolamd + || ( sci-libs/metis sci-libs/parmetis ) )" + +DEPEND="${RDEPEND} + supernodal? ( dev-util/pkgconfig ) + metis? ( dev-util/pkgconfig )" + +DOCS=( README.txt Doc/ChangeLog ) + +S="${WORKDIR}/${MY_PN}" + +src_prepare() { + cd "${WORKDIR}" + epatch "${WORKDIR}"/${PN}-${PPV}-autotools.patch + cd "${S}" + # 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. + if use minimal; then + sed -i '/^#define CHOLMOD_/{N; + s:\(#define\) \(CHOLMOD_CONFIG_H\)\n:\1 \2\n\1 NMODIFY 1\n\1 NMATRIXOPS 1\n:}' \ + Include/cholmod_config.h + fi + + if ! use supernodal; then + sed -i '/^#define CHOLMOD_/{N; + s:\(#define\) \(CHOLMOD_CONFIG_H\)\n:\1 \2\n\1 NSUPERNODAL 1\n:}' \ + Include/cholmod_config.h + fi + + if ! use metis; then + sed -i '/^#define CHOLMOD_/{N; + s:\(#define\) \(CHOLMOD_CONFIG_H\)\n:\1 \2\n\1 NPARTITION 1\n:}' \ + Include/cholmod_config.h + fi + eautoreconf +} + +src_configure() { + local lapack_libs=no + local blas_libs=no + if use supernodal; then + blas_libs=$(pkg-config --libs blas) + lapack_libs=$(pkg-config --libs lapack) + fi + myeconfargs+=( + --with-blas="${blas_libs}" + --with-lapack="${lapack_libs}" + $(use_enable supernodal mod-supernodal) + $(use_enable !minimal mod-modify) + $(use_enable !minimal mod-matrixops) + $(use_enable metis mod-partition) + ) + autotools-utils_src_configure +} + +src_test() { + if ! use supernodal || ! use metis || use minimal; then + ewarn "According to your useflags, some modules were not built on" + ewarn "purpose. This can cause the tests included with Cholmod" + ewarn "to fail. Rebuild with USE=\"supernodal metis -minimal\"" + ewarn "if you care." + fi + autotools-utils_src_test -C Demo test +} + +src_install() { + autotools-utils_src_install + use doc && dodoc Doc/UserGuide.pdf +} diff --git a/sci-libs/colamd/Manifest b/sci-libs/colamd/Manifest index 84599ba2ca63..b355aafd275c 100644 --- a/sci-libs/colamd/Manifest +++ b/sci-libs/colamd/Manifest @@ -1,2 +1,3 @@ DIST COLAMD-2.7.1.tar.gz 55906 RMD160 04acdf4a2d9d16050258a973213686a94544277a SHA1 263803878f8d9abdfa5dd6d5209c73414d99d350 SHA256 b6362c7c8454a5ef305443d44fa4a7d6a3ad19e9b2431c8356a266fd258f35af DIST COLAMD-2.7.3.tar.gz 55151 RMD160 f88a93b336bac9cfd6bade68b16d4c4c89bcaa96 SHA1 75d490967b180c86cc33e04daeebf217ed179987 SHA256 5535061fd834f881ff270c6a8bd19e689cb85b213fe0fe6380529224cd7e1ece +DIST COLAMD-2.7.4.tar.gz 55241 RMD160 947a32276c666b99421edc423fe3cef8e5f5d5b7 SHA1 2d72ffb3018f580ce8ed99ab7bcb7cb7b37e41b5 SHA256 1df73da9b915d6c79be08554250459bee0393794d2acab6d5c2cd50b186e7304 diff --git a/sci-libs/colamd/colamd-2.7.4.ebuild b/sci-libs/colamd/colamd-2.7.4.ebuild new file mode 100644 index 000000000000..de0198b4e3af --- /dev/null +++ b/sci-libs/colamd/colamd-2.7.4.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/colamd/colamd-2.7.4.ebuild,v 1.1 2012/01/20 06:00:24 bicatali Exp $ + +EAPI=4 + +AUTOTOOLS_AUTORECONF=yes + +inherit autotools-utils + +MY_PN=COLAMD +DESCRIPTION="Column approximate minimum degree ordering algorithm" +HOMEPAGE="http://www.cise.ufl.edu/research/sparse/colamd/" +SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="static-libs" + +DEPEND="sci-libs/ufconfig" +RDEPEND="${DEPEND}" + +DOCS=( README.txt Doc/ChangeLog ) +PATCHES=( "${FILESDIR}"/${PN}-2.7.1-autotools.patch ) + +# Needs manual inspection of the result, useless. +RESTRICT="test" + +S="${WORKDIR}/${MY_PN}" diff --git a/sci-libs/colamd/files/colamd-2.7.1-autotools.patch b/sci-libs/colamd/files/colamd-2.7.1-autotools.patch index bb7b80fcc6f0..5778d20e2f05 100644 --- a/sci-libs/colamd/files/colamd-2.7.1-autotools.patch +++ b/sci-libs/colamd/files/colamd-2.7.1-autotools.patch @@ -48,7 +48,7 @@ + @for i in $(check_PROGRAMS); do \ + echo "Testing $$i"; \ + ./$$i > my_$$i.out; \ -+ if ! diff $$i.out my_$$i.out; then \ ++ if ! diff $(srcdir)/$$i.out my_$$i.out; then \ + echo "Testing $$i failed"; \ + exit 1; \ + fi \ diff --git a/sci-libs/cxsparse/Manifest b/sci-libs/cxsparse/Manifest index 9a88392419ad..45a28fc6f108 100644 --- a/sci-libs/cxsparse/Manifest +++ b/sci-libs/cxsparse/Manifest @@ -1,3 +1,4 @@ DIST CXSparse-2.2.1.tar.gz 1906557 RMD160 9939568820cc21fd8fb683a0f28b10281dd3fa35 SHA1 a2f9daeb028b1603ac0815c8d6a97d7851c9cd41 SHA256 07d6b6877f86c2a771b7ac001b6e6edc01480fbc851421282ede3f92dc2a00c7 DIST CXSparse-2.2.3.tar.gz 1925923 RMD160 c3aae6e349fc518fcdac0b74116d111b6777eead SHA1 d1c9dea08d9702471a4fd461f9aea00aa36d4034 SHA256 053a97a9c3c25d8e2d3a441f1918fe01bfb512750aefb5f62f0e56caa91f12bc DIST CXSparse-2.2.5.tar.gz 2044668 RMD160 b0dc0fef6cd5042a5375b7f4c889faee122b4e52 SHA1 d020e90d482c9a5d1a438e6e866f44676a750f52 SHA256 b732836c288c44f0e695b6d9dad72ee5e49d404e8609f4360264a87ea178f12a +DIST CXSparse-2.2.6.tar.gz 1987681 RMD160 bcabf6dcf9ba65ba6d62fbf20118dc13442b861b SHA1 b801fe4b04214529fdceea1d2bd348fc93c466e3 SHA256 5614aa3df9f6e6e21c85d3855a1f3a24581503a4fe62dc824e61e0a1036707b3 diff --git a/sci-libs/cxsparse/cxsparse-2.2.6.ebuild b/sci-libs/cxsparse/cxsparse-2.2.6.ebuild new file mode 100644 index 000000000000..c8c4a2ad6df0 --- /dev/null +++ b/sci-libs/cxsparse/cxsparse-2.2.6.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/cxsparse/cxsparse-2.2.6.ebuild,v 1.1 2012/01/20 05:49:19 bicatali Exp $ + +EAPI=4 + +AUTOTOOLS_AUTORECONF=yes +inherit autotools-utils + +MY_PN=CXSparse + +DESCRIPTION="Extended sparse matrix package." +HOMEPAGE="http://www.cise.ufl.edu/research/sparse/CXSparse/" +SRC_URI="http://www.cise.ufl.edu/research/sparse/${MY_PN}/versions/${MY_PN}-${PV}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="static-libs" + +DEPEND="sci-libs/ufconfig" +RDEPEND="" + +DOCS=( README.txt Doc/ChangeLog ) +PATCHES=( "${FILESDIR}"/${PN}-2.2.2-autotools.patch ) + +S="${WORKDIR}/${MY_PN}" diff --git a/sci-libs/klu/Manifest b/sci-libs/klu/Manifest index 5f912bee392a..6a69244863fa 100644 --- a/sci-libs/klu/Manifest +++ b/sci-libs/klu/Manifest @@ -1,2 +1,3 @@ DIST KLU-1.1.1.tar.gz 558482 RMD160 771997f4da4cac8533f3a31bb1450e6be401c4c1 SHA1 6bac59215173c949d4aeef3cc854116169e9f8ff SHA256 42ca14a7b57ce21012a17727befd4f6a237dc033d414a6b181a2f9769b946f42 DIST KLU-1.1.2.tar.gz 665615 RMD160 54c39f3c76aadb9071703850dfc5727c52a0f5b0 SHA1 a1a2a0700553bb63051932a6a39db9786ed15f4c SHA256 e9ac648fe1b7e326c042bef5f9bf4111bbe355351cffcf07d1be12745ac26cba +DIST KLU-1.1.3.tar.gz 670949 RMD160 54f27f40d4a9273e551e901e7140e0192749088e SHA1 2b13e0c378466c2ddcd19986111ebcb882321f42 SHA256 905392d7d7fece175b644806e6f4ca18c322b7ad0985a438269c7f875ce05e61 diff --git a/sci-libs/klu/klu-1.1.3.ebuild b/sci-libs/klu/klu-1.1.3.ebuild new file mode 100644 index 000000000000..2c8f119200b6 --- /dev/null +++ b/sci-libs/klu/klu-1.1.3.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/klu/klu-1.1.3.ebuild,v 1.1 2012/01/20 05:52:52 bicatali Exp $ + +EAPI=4 + +AUTOTOOLS_AUTORECONF=yes +inherit autotools-utils + +MY_PN=KLU + +DESCRIPTION="Sparse LU factorization for circuit simulation" +HOMEPAGE="http://www.cise.ufl.edu/research/sparse/klu/" +SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc static-libs" + +DEPEND="sci-libs/amd + sci-libs/btf + sci-libs/colamd" +RDEPEND="${DEPEND}" + +DOCS=( README.txt Doc/ChangeLog ) +PATCHES=( "${FILESDIR}"/${PN}-1.0.1-autotools.patch ) + +S="${WORKDIR}/${MY_PN}" + +src_install() { + autotools-utils_src_install + use doc && dodoc Doc/*.pdf +} diff --git a/sci-libs/ldl/Manifest b/sci-libs/ldl/Manifest index 02bdec09e123..c5604086d655 100644 --- a/sci-libs/ldl/Manifest +++ b/sci-libs/ldl/Manifest @@ -1 +1,2 @@ DIST LDL-2.0.3.tar.gz 325632 RMD160 a6c6d720ac254029b5b81f53e2d47e9c27ce6878 SHA1 c85cc1cd370f19208839cbcedb68dd2a47f043b6 SHA256 6809cdedf592e130b8416808401f38928a76e5975bb4ce05bde510a299de20a0 +DIST LDL-2.0.4.tar.gz 326840 RMD160 7dde3c5e9f29557ebc86b5c07fa7548aec010710 SHA1 b9bfbadb82c3f87803c726f7c30ba7d1f8a8d5b7 SHA256 b699df725404d6f94871336f4f87d6f81c5e1921f7fb83e2287eb8f66443d1ac diff --git a/sci-libs/ldl/files/ldl-2.0.1-autotools.patch b/sci-libs/ldl/files/ldl-2.0.1-autotools.patch deleted file mode 100644 index d76524c000d4..000000000000 --- a/sci-libs/ldl/files/ldl-2.0.1-autotools.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ configure.ac 2008-01-30 12:45:53.174426797 +0000 -@@ -0,0 +1,10 @@ -+# -*- Autoconf -*- -+AC_PREREQ(2.59) -+AC_INIT(ldl, 2.0.1, davis@cise.ufl.edu) -+AM_INIT_AUTOMAKE([foreign]) -+AC_PROG_INSTALL -+AC_PROG_LIBTOOL -+AC_CHECK_LIB(m, sqrt) -+AC_CHECK_HEADERS(UFconfig.h) -+AC_CONFIG_FILES([Makefile Source/Makefile Demo/Makefile]) -+AC_OUTPUT ---- Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ Makefile.am 2008-01-30 15:49:41.835515468 +0000 -@@ -0,0 +1,4 @@ -+SUBDIRS = Source Demo -+EXTRA_DIST = README.txt -+include_HEADERS = Include/ldl.h -+ ---- Source/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ Source/Makefile.am 2008-01-30 12:49:25.858546974 +0000 -@@ -0,0 +1,10 @@ -+AM_CPPFLAGS = -I$(top_srcdir)/Include -+ -+lib_LTLIBRARIES = libldl.la -+noinst_LTLIBRARIES = libldli.la libldll.la -+libldli_la_SOURCES = $(LDLSRC) -+libldli_la_CPPFLAGS = $(AM_CPPFLAGS) -+libldll_la_SOURCES = $(LDLSRC) -+libldll_la_CPPFLAGS = $(AM_CPPFLAGS) -DLDL_LONG -+libldl_la_SOURCES = -+libldl_la_LIBADD = libldll.la libldli.la ---- Demo/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ Demo/Makefile.am 2008-01-30 15:43:45.603214946 +0000 -@@ -0,0 +1,27 @@ -+LDADD = $(top_builddir)/Source/libldl.la -lm -+AM_CPPFLAGS = -I$(top_srcdir)/Include -+check_PROGRAMS = ldlsimple ldllsimple ldlmain ldllmain ldlamd ldllamd -+ -+ldlmain_SOURCES = ldlmain.c -+ldllmain_SOURCES = ldlmain.c -+ldllmain_CPPFLAGS = $(AM_CPPFLAGS) -DLDL_LONG -+ -+ldlsimple_SOURCES = ldlsimple.c -+ldllsimple_SOURCES = ldlsimple.c -+ldllsimple_CPPFLAGS = $(AM_CPPFLAGS) -DLDL_LONG -+ -+ldlamd_SOURCES = ldlamd.c -+ldllamd_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_AMD -+ldllamd_SOURCES = ldlamd.c -+ldllamd_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_AMD -DLDL_LONG -+ldllamd_LDADD = $(LDADD) -lamd -+ -+check-local: $(check_PROGRAMS) -+ @for i in $(check_PROGRAMS); do \ -+ echo "Testing $$i"; \ -+ ./$$i > my_$$i.out; \ -+ if ! diff $$i.out my_$$i.out; then \ -+ echo "Testing $$i failed"; \ -+ exit 1; \ -+ fi \ -+ done; diff --git a/sci-libs/ldl/ldl-2.0.4.ebuild b/sci-libs/ldl/ldl-2.0.4.ebuild new file mode 100644 index 000000000000..1c6b1a284794 --- /dev/null +++ b/sci-libs/ldl/ldl-2.0.4.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/sci-libs/ldl/ldl-2.0.4.ebuild,v 1.1 2012/01/20 05:53:22 bicatali Exp $ + +EAPI=4 + +AUTOTOOLS_AUTORECONF=yes +inherit autotools-utils + +MY_PN=LDL + +DESCRIPTION="Simple but educational LDL^T matrix factorization algorithm" +HOMEPAGE="http://www.cise.ufl.edu/research/sparse/ldl" +SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc static-libs" +DEPEND="sci-libs/ufconfig" +RDEPEND="" + +PATCHES=( "${FILESDIR}"/${PN}-2.0.3-autotools.patch ) +DOCS=( README.txt Doc/ChangeLog ) + +S="${WORKDIR}/${MY_PN}" + +src_install() { + autotools-utils_src_install + use doc && dodoc Doc/ldl_userguide.pdf +} diff --git a/sci-libs/spqr/Manifest b/sci-libs/spqr/Manifest index 9c8c4a2f955f..0fdff83fc003 100644 --- a/sci-libs/spqr/Manifest +++ b/sci-libs/spqr/Manifest @@ -1,2 +1 @@ -DIST SPQR-1.2.1.tar.gz 1163533 RMD160 8a7d3c35575fbefa06b29b6623f1cb708a4cdf5c SHA1 941c7ffb247f2f7f5c97efa8a80640d7139e5530 SHA256 4c9d5949678743cef3b1224843d420e64875fbea6af66c322d0fa8f7b9c430b1 -DIST SPQR-1.2.2.tar.gz 1166274 RMD160 fb30f296822aa6237bb5c69d187e8f1dd23242d4 SHA1 60526599208f58bfa5541c3c8550d7400e1dec9e SHA256 4b896cd20013b6cb9ebe037ba89cbd449f1930ff0023fe35b2c08392db31388f +DIST SPQR-1.2.3.tar.gz 1090017 RMD160 9f312b67f7239c254a37477f90ed7541206655b7 SHA1 5eccdef30e156374a44989ad3745ff443a3dca78 SHA256 43c31708d4de9fbb59c00ef8c2a2df98cdf2aa1dd16887d6f4f5090df2f63abf diff --git a/sci-libs/spqr/files/spqr-1.1.0-autotools.patch b/sci-libs/spqr/files/spqr-1.1.0-autotools.patch deleted file mode 100644 index 02e7f89f7395..000000000000 --- a/sci-libs/spqr/files/spqr-1.1.0-autotools.patch +++ /dev/null @@ -1,208 +0,0 @@ -diff -Naur SPQR.orig/Demo/Makefile.am SPQR/Demo/Makefile.am ---- SPQR.orig/Demo/Makefile.am 1969-12-31 19:00:00.000000000 -0500 -+++ SPQR/Demo/Makefile.am 2009-10-22 23:42:08.000000000 -0400 -@@ -0,0 +1,78 @@ -+AM_CPPFLAGS = -I$(top_srcdir)/Include -+ -+LDADD = $(top_builddir)/Source/libspqr.la \ -+ $(CHOLMOD_LIBS) $(AMD_LIBS) $(CAMD_LIBS) \ -+ $(COLAMD_LIBS) $(CCOLAMD_LIBS) \ -+ $(METIS_LIBS) $(BLAS_LIBS) $(LAPACK_LIBS) $(TBB_LIBS) -+ -+check_PROGRAMS = \ -+ qrsimple qrsimplec \ -+ qrdemo qrdemoc -+ -+qrsimple_SOURCES = qrsimple.cpp -+qrsimplec = qrsimplec.c -+qrsimplec_CFLAGS = -ansi -+qrdemo_SOURCES = qrdemo.cpp -+qrdemoc_SOURCES = qrdemoc.c -+qrdemoc_CFLAGS = -ansi -+ -+ -+check-local: $(check_PROGRAMS) -+ ./qrsimple < ../Matrix/ash219.mtx || exit 1 -+ ./qrsimplec < ../Matrix/ash219.mtx || exit 1 -+ ./qrsimple < ../Matrix/west0067.mtx || exit 1 -+ ./qrsimplec < ../Matrix/west0067.mtx || exit 1 -+ ./qrdemo < ../Matrix/a2.mtx || exit 1 -+ ./qrdemo < ../Matrix/r2.mtx || exit 1 -+ ./qrdemo < ../Matrix/a04.mtx || exit 1 -+ ./qrdemo < ../Matrix/a2.mtx || exit 1 -+ ./qrdemo < ../Matrix/west0067.mtx || exit 1 -+ ./qrdemo < ../Matrix/c2.mtx || exit 1 -+ ./qrdemo < ../Matrix/a0.mtx || exit 1 -+ ./qrdemo < ../Matrix/lfat5b.mtx || exit 1 -+ ./qrdemo < ../Matrix/bfwa62.mtx || exit 1 -+ ./qrdemo < ../Matrix/LFAT5.mtx || exit 1 -+ ./qrdemo < ../Matrix/b1_ss.mtx || exit 1 -+ ./qrdemo < ../Matrix/bcspwr01.mtx || exit 1 -+ ./qrdemo < ../Matrix/lpi_galenet.mtx || exit 1 -+ ./qrdemo < ../Matrix/lpi_itest6.mtx || exit 1 -+ ./qrdemo < ../Matrix/ash219.mtx || exit 1 -+ ./qrdemo < ../Matrix/a4.mtx || exit 1 -+ ./qrdemo < ../Matrix/s32.mtx || exit 1 -+ ./qrdemo < ../Matrix/c32.mtx || exit 1 -+ ./qrdemo < ../Matrix/lp_share1b.mtx || exit 1 -+ ./qrdemo < ../Matrix/a1.mtx || exit 1 -+ ./qrdemo < ../Matrix/GD06_theory.mtx || exit 1 -+ ./qrdemo < ../Matrix/GD01_b.mtx || exit 1 -+ ./qrdemo < ../Matrix/Tina_AskCal_perm.mtx || exit 1 -+ ./qrdemo < ../Matrix/Tina_AskCal.mtx || exit 1 -+ ./qrdemo < ../Matrix/GD98_a.mtx || exit 1 -+ ./qrdemo < ../Matrix/Ragusa16.mtx || exit 1 -+ ./qrdemo < ../Matrix/young1c.mtx || exit 1 -+ ./qrdemoc < ../Matrix/a2.mtx || exit 1 -+ ./qrdemoc < ../Matrix/r2.mtx || exit 1 -+ ./qrdemoc < ../Matrix/a04.mtx || exit 1 -+ ./qrdemoc < ../Matrix/a2.mtx || exit 1 -+ ./qrdemoc < ../Matrix/west0067.mtx || exit 1 -+ ./qrdemoc < ../Matrix/c2.mtx || exit 1 -+ ./qrdemoc < ../Matrix/a0.mtx || exit 1 -+ ./qrdemoc < ../Matrix/lfat5b.mtx || exit 1 -+ ./qrdemoc < ../Matrix/bfwa62.mtx || exit 1 -+ ./qrdemoc < ../Matrix/LFAT5.mtx || exit 1 -+ ./qrdemoc < ../Matrix/b1_ss.mtx || exit 1 -+ ./qrdemoc < ../Matrix/bcspwr01.mtx || exit 1 -+ ./qrdemoc < ../Matrix/lpi_galenet.mtx || exit 1 -+ ./qrdemoc < ../Matrix/lpi_itest6.mtx || exit 1 -+ ./qrdemoc < ../Matrix/ash219.mtx || exit 1 -+ ./qrdemoc < ../Matrix/a4.mtx || exit 1 -+ ./qrdemoc < ../Matrix/s32.mtx || exit 1 -+ ./qrdemoc < ../Matrix/c32.mtx || exit 1 -+ ./qrdemoc < ../Matrix/lp_share1b.mtx || exit 1 -+ ./qrdemoc < ../Matrix/a1.mtx || exit 1 -+ ./qrdemoc < ../Matrix/GD06_theory.mtx || exit 1 -+ ./qrdemoc < ../Matrix/GD01_b.mtx || exit 1 -+ ./qrdemoc < ../Matrix/Tina_AskCal_perm.mtx || exit 1 -+ ./qrdemoc < ../Matrix/Tina_AskCal.mtx || exit 1 -+ ./qrdemoc < ../Matrix/GD98_a.mtx || exit 1 -+ ./qrdemoc < ../Matrix/Ragusa16.mtx || exit 1 -+ ./qrdemoc < ../Matrix/young1c.mtx || exit 1 -diff -Naur SPQR.orig/Include/Makefile.am SPQR/Include/Makefile.am ---- SPQR.orig/Include/Makefile.am 1969-12-31 19:00:00.000000000 -0500 -+++ SPQR/Include/Makefile.am 2009-10-22 23:42:08.000000000 -0400 -@@ -0,0 +1,5 @@ -+include_HEADERS = \ -+ spqr.hpp \ -+ SuiteSparseQR_C.h \ -+ SuiteSparseQR_definitions.h \ -+ SuiteSparseQR.hpp -diff -Naur SPQR.orig/Makefile.am SPQR/Makefile.am ---- SPQR.orig/Makefile.am 1969-12-31 19:00:00.000000000 -0500 -+++ SPQR/Makefile.am 2009-10-22 23:42:08.000000000 -0400 -@@ -0,0 +1,2 @@ -+SUBDIRS = Include Source Demo -+EXTRA_DIST = README.txt -diff -Naur SPQR.orig/Source/Makefile.am SPQR/Source/Makefile.am ---- SPQR.orig/Source/Makefile.am 1969-12-31 19:00:00.000000000 -0500 -+++ SPQR/Source/Makefile.am 2009-10-22 23:43:03.000000000 -0400 -@@ -0,0 +1,48 @@ -+AM_CPPFLAGS=-I$(top_srcdir)/Include -+ -+lib_LTLIBRARIES = libspqr.la -+ -+libspqr_la_SOURCES = \ -+ spqr_rmap.cpp \ -+ SuiteSparseQR_C.cpp \ -+ SuiteSparseQR_expert.cpp \ -+ spqr_parallel.cpp \ -+ spqr_kernel.cpp \ -+ spqr_analyze.cpp \ -+ spqr_assemble.cpp \ -+ spqr_cpack.cpp \ -+ spqr_csize.cpp \ -+ spqr_fcsize.cpp \ -+ spqr_debug.cpp \ -+ spqr_front.cpp \ -+ spqr_factorize.cpp \ -+ spqr_freenum.cpp \ -+ spqr_freesym.cpp \ -+ spqr_freefac.cpp \ -+ spqr_fsize.cpp \ -+ spqr_maxcolnorm.cpp \ -+ spqr_rconvert.cpp \ -+ spqr_rcount.cpp \ -+ spqr_rhpack.cpp \ -+ spqr_rsolve.cpp \ -+ spqr_stranspose1.cpp \ -+ spqr_stranspose2.cpp \ -+ spqr_hpinv.cpp \ -+ spqr_1fixed.cpp \ -+ spqr_1colamd.cpp \ -+ SuiteSparseQR.cpp \ -+ spqr_1factor.cpp \ -+ spqr_cumsum.cpp \ -+ spqr_shift.cpp \ -+ spqr_happly.cpp \ -+ spqr_panel.cpp \ -+ spqr_happly_work.cpp \ -+ SuiteSparseQR_qmult.cpp \ -+ spqr_trapezoidal.cpp \ -+ spqr_larftb.cpp \ -+ spqr_append.cpp \ -+ spqr_type.cpp \ -+ spqr_tol.cpp -+ -+libspqr_la_CPPFLAGS = $(AM_CPPFLAGS) $(METIS_CFLAGS) $(TBB_CFLAGS) $(LAPACK_CFLAGS) -+libspqr_la_LIBADD = $(METIS_LIBS) $(TBB_LIBS) $(LAPACK_LIBS) -diff -Naur SPQR.orig/configure.ac SPQR/configure.ac ---- SPQR.orig/configure.ac 1969-12-31 19:00:00.000000000 -0500 -+++ SPQR/configure.ac 2009-10-22 23:42:32.000000000 -0400 -@@ -0,0 +1,55 @@ -+AC_PREREQ(2.59) -+AC_INIT(spqr, 1.1.0, davis@cise.ufl.edu) -+AM_INIT_AUTOMAKE([foreign]) -+AC_CONFIG_SRCDIR([Source/spqr_kernel.cpp]) -+AM_INIT_AUTOMAKE([foreign]) -+ -+AC_PROG_LIBTOOL -+AC_PROG_CXX -+AC_LANG(C++) -+ -+AC_CHECK_LIB(m, sqrt) -+AC_CHECK_LIB(lapack,zlarft_) -+AC_CHECK_HEADERS(UFconfig.h) -+AC_CHECK_HEADERS(cholmod.h) -+AC_CHECK_LIB(cholmod, cholmod_solve, [], \ -+ [AC_MSG_ERROR([Cannot find libcholmod])]) -+ -+AC_ARG_WITH(metis, -+ [AC_HELP_STRING([--with-metis], -+ [Use METIS for partitioning])], -+ [with_metis=$withval], -+ [with_metis="yes"]) -+if test x$with_metis = xyes; then -+ PKG_PROG_PKG_CONFIG -+ if test -n "$PKG_CONFIG"; then -+ PKG_CHECK_MODULES([metis], [metis]) -+ else -+ AC_CHECK_HEADERS(metis.h) -+ AC_CHECK_LIB(metis, METIS_NodeND, [METIS_LIBS=-lmetis], \ -+ [AC_MSG_ERROR([Cannot find libmetis])]) -+ fi -+ AC_DEFINE(NPARTITION) -+fi -+AM_CONDITIONAL([METIS], [test x$with_metis = xyes]) -+ -+AC_ARG_WITH(tbb, -+ [AC_HELP_STRING([--with-tbb], -+ [Use Intel Threading Building Block for multithreading])], -+ [with_tbb=$withval], -+ [with_tbb="yes"]) -+if test x$with_tbb = xyes; then -+ AC_CHECK_HEADERS(tbb/task.h) -+ TBB_CFLAGS="" -+ TBB_LIBS="-ltbb" -+ AC_SUBST(TBB_CFLAGS) -+ AC_SUBST(TBB_LIBS) -+ AC_DEFINE(HAVE_TBB) -+fi -+AM_CONDITIONAL([WITH_TBB], [test x$with_tbb = xyes]) -+ -+AC_CONFIG_FILES([Makefile -+ Source/Makefile -+ Include/Makefile -+ Demo/Makefile]) -+AC_OUTPUT diff --git a/sci-libs/spqr/files/spqr-1.1.0-gcc43.patch b/sci-libs/spqr/files/spqr-1.1.0-gcc43.patch deleted file mode 100644 index d9adb2093bb8..000000000000 --- a/sci-libs/spqr/files/spqr-1.1.0-gcc43.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- SPQR.orig/Source/spqr_factorize.cpp 2009-03-09 15:12:47.091289398 +0000 -+++ SPQR/Source/spqr_factorize.cpp 2009-03-14 09:30:18.570989288 +0000 -@@ -30,6 +30,7 @@ - // === macros ================================================================== - // ============================================================================= - -+#include - #include "spqr.hpp" - - #define FCHUNK 32 // FUTURE: make a parameter; Householder block size diff --git a/sci-libs/spqr/files/1.2.2-autotools.patch b/sci-libs/spqr/files/spqr-1.2.3-autotools.patch similarity index 54% rename from sci-libs/spqr/files/1.2.2-autotools.patch rename to sci-libs/spqr/files/spqr-1.2.3-autotools.patch index d56ecdc54313..be5d15f188c3 100644 --- a/sci-libs/spqr/files/1.2.2-autotools.patch +++ b/sci-libs/spqr/files/spqr-1.2.3-autotools.patch @@ -21,64 +21,64 @@ + + +check-local: $(check_PROGRAMS) -+ ./qrsimple < ../Matrix/ash219.mtx || exit 1 -+ ./qrsimplec < ../Matrix/ash219.mtx || exit 1 -+ ./qrsimple < ../Matrix/west0067.mtx || exit 1 -+ ./qrsimplec < ../Matrix/west0067.mtx || exit 1 -+ ./qrdemo < ../Matrix/a2.mtx || exit 1 -+ ./qrdemo < ../Matrix/r2.mtx || exit 1 -+ ./qrdemo < ../Matrix/a04.mtx || exit 1 -+ ./qrdemo < ../Matrix/a2.mtx || exit 1 -+ ./qrdemo < ../Matrix/west0067.mtx || exit 1 -+ ./qrdemo < ../Matrix/c2.mtx || exit 1 -+ ./qrdemo < ../Matrix/a0.mtx || exit 1 -+ ./qrdemo < ../Matrix/lfat5b.mtx || exit 1 -+ ./qrdemo < ../Matrix/bfwa62.mtx || exit 1 -+ ./qrdemo < ../Matrix/LFAT5.mtx || exit 1 -+ ./qrdemo < ../Matrix/b1_ss.mtx || exit 1 -+ ./qrdemo < ../Matrix/bcspwr01.mtx || exit 1 -+ ./qrdemo < ../Matrix/lpi_galenet.mtx || exit 1 -+ ./qrdemo < ../Matrix/lpi_itest6.mtx || exit 1 -+ ./qrdemo < ../Matrix/ash219.mtx || exit 1 -+ ./qrdemo < ../Matrix/a4.mtx || exit 1 -+ ./qrdemo < ../Matrix/s32.mtx || exit 1 -+ ./qrdemo < ../Matrix/c32.mtx || exit 1 -+ ./qrdemo < ../Matrix/lp_share1b.mtx || exit 1 -+ ./qrdemo < ../Matrix/a1.mtx || exit 1 -+ ./qrdemo < ../Matrix/GD06_theory.mtx || exit 1 -+ ./qrdemo < ../Matrix/GD01_b.mtx || exit 1 -+ ./qrdemo < ../Matrix/Tina_AskCal_perm.mtx || exit 1 -+ ./qrdemo < ../Matrix/Tina_AskCal.mtx || exit 1 -+ ./qrdemo < ../Matrix/GD98_a.mtx || exit 1 -+ ./qrdemo < ../Matrix/Ragusa16.mtx || exit 1 -+ ./qrdemo < ../Matrix/young1c.mtx || exit 1 -+ ./qrdemoc < ../Matrix/a2.mtx || exit 1 -+ ./qrdemoc < ../Matrix/r2.mtx || exit 1 -+ ./qrdemoc < ../Matrix/a04.mtx || exit 1 -+ ./qrdemoc < ../Matrix/a2.mtx || exit 1 -+ ./qrdemoc < ../Matrix/west0067.mtx || exit 1 -+ ./qrdemoc < ../Matrix/c2.mtx || exit 1 -+ ./qrdemoc < ../Matrix/a0.mtx || exit 1 -+ ./qrdemoc < ../Matrix/lfat5b.mtx || exit 1 -+ ./qrdemoc < ../Matrix/bfwa62.mtx || exit 1 -+ ./qrdemoc < ../Matrix/LFAT5.mtx || exit 1 -+ ./qrdemoc < ../Matrix/b1_ss.mtx || exit 1 -+ ./qrdemoc < ../Matrix/bcspwr01.mtx || exit 1 -+ ./qrdemoc < ../Matrix/lpi_galenet.mtx || exit 1 -+ ./qrdemoc < ../Matrix/lpi_itest6.mtx || exit 1 -+ ./qrdemoc < ../Matrix/ash219.mtx || exit 1 -+ ./qrdemoc < ../Matrix/a4.mtx || exit 1 -+ ./qrdemoc < ../Matrix/s32.mtx || exit 1 -+ ./qrdemoc < ../Matrix/c32.mtx || exit 1 -+ ./qrdemoc < ../Matrix/lp_share1b.mtx || exit 1 -+ ./qrdemoc < ../Matrix/a1.mtx || exit 1 -+ ./qrdemoc < ../Matrix/GD06_theory.mtx || exit 1 -+ ./qrdemoc < ../Matrix/GD01_b.mtx || exit 1 -+ ./qrdemoc < ../Matrix/Tina_AskCal_perm.mtx || exit 1 -+ ./qrdemoc < ../Matrix/Tina_AskCal.mtx || exit 1 -+ ./qrdemoc < ../Matrix/GD98_a.mtx || exit 1 -+ ./qrdemoc < ../Matrix/Ragusa16.mtx || exit 1 -+ ./qrdemoc < ../Matrix/young1c.mtx || exit 1 ++ ./qrsimple < $(top_srcdir)/Matrix/ash219.mtx || exit 1 ++ ./qrsimplec < $(top_srcdir)/Matrix/ash219.mtx || exit 1 ++ ./qrsimple < $(top_srcdir)/Matrix/west0067.mtx || exit 1 ++ ./qrsimplec < $(top_srcdir)/Matrix/west0067.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/a2.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/r2.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/a04.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/a2.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/west0067.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/c2.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/a0.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/lfat5b.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/bfwa62.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/LFAT5.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/b1_ss.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/bcspwr01.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/lpi_galenet.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/lpi_itest6.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/ash219.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/a4.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/s32.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/c32.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/lp_share1b.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/a1.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/GD06_theory.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/GD01_b.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/Tina_AskCal_perm.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/Tina_AskCal.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/GD98_a.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/Ragusa16.mtx || exit 1 ++ ./qrdemo < $(top_srcdir)/Matrix/young1c.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/a2.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/r2.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/a04.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/a2.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/west0067.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/c2.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/a0.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/lfat5b.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/bfwa62.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/LFAT5.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/b1_ss.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/bcspwr01.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/lpi_galenet.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/lpi_itest6.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/ash219.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/a4.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/s32.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/c32.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/lp_share1b.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/a1.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/GD06_theory.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/GD01_b.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/Tina_AskCal_perm.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/Tina_AskCal.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/GD98_a.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/Ragusa16.mtx || exit 1 ++ ./qrdemoc < $(top_srcdir)/Matrix/young1c.mtx || exit 1 --- Include/Makefile.am 1969-12-31 19:00:00.000000000 -0500 +++ Include/Makefile.am 2009-10-22 23:42:08.000000000 -0400 @@ -0,0 +1,5 @@ @@ -147,7 +147,7 @@ +++ configure.ac 2009-10-22 23:42:32.000000000 -0400 @@ -0,0 +1,55 @@ +AC_PREREQ(2.59) -+AC_INIT(spqr, 1.2.2, davis@cise.ufl.edu) ++AC_INIT(spqr, 1.2, davis@cise.ufl.edu) +AM_INIT_AUTOMAKE([foreign]) +AC_CONFIG_SRCDIR([Source/spqr_kernel.cpp]) +AM_INIT_AUTOMAKE([foreign]) diff --git a/sci-libs/spqr/spqr-1.2.1.ebuild b/sci-libs/spqr/spqr-1.2.1.ebuild deleted file mode 100644 index 8d1cb1556084..000000000000 --- a/sci-libs/spqr/spqr-1.2.1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/spqr/spqr-1.2.1.ebuild,v 1.1 2011/02/23 20:16:51 bicatali Exp $ - -EAPI=2 -inherit eutils autotools - -MY_PN=SPQR -DESCRIPTION="Multithreaded multifrontal sparse QR factorization library" -HOMEPAGE="http://www.cise.ufl.edu/research/sparse/SPQR" -SRC_URI="http://www.cise.ufl.edu/research/sparse/${MY_PN}/${MY_PN}-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc metis static-libs tbb" -RDEPEND="sci-libs/cholmod[supernodal] - tbb? ( dev-cpp/tbb ) - metis? ( >=sci-libs/cholmod-1.7.0-r1[metis] )" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -S="${WORKDIR}/${MY_PN}" - -src_prepare() { - cd "${WORKDIR}" - epatch "${FILESDIR}"/${PN}-1.1.0-autotools.patch - epatch "${FILESDIR}"/${PN}-1.1.0-gcc43.patch - cd "${S}" - eautoreconf -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_with metis) \ - $(use_with tbb) -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc README.txt Doc/ChangeLog || die "dodoc failed" - if use doc; then - insinto /usr/share/doc/${PF} - doins Doc/*.pdf || die - fi -} diff --git a/sci-libs/spqr/spqr-1.2.2.ebuild b/sci-libs/spqr/spqr-1.2.3.ebuild similarity index 62% rename from sci-libs/spqr/spqr-1.2.2.ebuild rename to sci-libs/spqr/spqr-1.2.3.ebuild index 9c14cf026b6d..8672398e08fd 100644 --- a/sci-libs/spqr/spqr-1.2.2.ebuild +++ b/sci-libs/spqr/spqr-1.2.3.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/sci-libs/spqr/spqr-1.2.2.ebuild,v 1.1 2011/08/07 03:47:10 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/spqr/spqr-1.2.3.ebuild,v 1.1 2012/01/20 05:53:50 bicatali Exp $ EAPI=4 -inherit eutils autotools +AUTOTOOLS_AUTORECONF=yes +inherit autotools-utils MY_PN=SPQR DESCRIPTION="Multithreaded multifrontal sparse QR factorization library" @@ -20,22 +21,20 @@ RDEPEND="sci-libs/cholmod[supernodal] DEPEND="${RDEPEND} dev-util/pkgconfig" -S="${WORKDIR}/${MY_PN}" +DOCS=( README.txt Doc/ChangeLog ) +PATCHES=( "${FILESDIR}"/${P}-autotools.patch ) -src_prepare() { - epatch "${FILESDIR}"/${PV}-autotools.patch - eautoreconf -} +S="${WORKDIR}/${MY_PN}" src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_with metis) \ + myeconfargs+=( + $(use_with metis) $(use_with tbb) + ) + autotools-utils_src_configure } src_install() { - default - dodoc README.txt Doc/ChangeLog + autotools-utils_src_install use doc && doins Doc/*.pdf } diff --git a/sci-libs/suitesparse/suitesparse-3.7.0.ebuild b/sci-libs/suitesparse/suitesparse-3.7.0.ebuild new file mode 100644 index 000000000000..f543632319f2 --- /dev/null +++ b/sci-libs/suitesparse/suitesparse-3.7.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/suitesparse/suitesparse-3.7.0.ebuild,v 1.1 2012/01/20 06:01:39 bicatali Exp $ + +EAPI=4 + +DESCRIPTION="Meta package for a suite of sparse matrix tools" +HOMEPAGE="http://www.cise.ufl.edu/research/sparse/SuiteSparse/" + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0" + +KEYWORDS="~amd64 ~x86" +IUSE="metis doc" +DEPEND="" +RDEPEND=">=sci-libs/ufconfig-${PV} + >=sci-libs/amd-2.2.3[doc?] + >=sci-libs/btf-1.1.3 + >=sci-libs/camd-2.2.3[doc?] + >=sci-libs/ccolamd-2.7.4 + >=sci-libs/cholmod-1.7.4[doc?,metis?] + >=sci-libs/colamd-2.7.4 + >=sci-libs/cxsparse-2.2.6 + >=sci-libs/klu-1.1.3[doc?] + >=sci-libs/ldl-2.0.4[doc?] + >=sci-libs/spqr-1.2.3[doc?,metis?] + >=sci-libs/umfpack-5.5.2[doc?,metis?]" diff --git a/sci-libs/ufconfig/Manifest b/sci-libs/ufconfig/Manifest index e74fe849f576..0d230dbfa122 100644 --- a/sci-libs/ufconfig/Manifest +++ b/sci-libs/ufconfig/Manifest @@ -2,3 +2,4 @@ DIST UFconfig-3.1.0.tar.gz 6573 RMD160 ecbeaf3d6dec796e9002a12669f07e9e30b942d4 DIST UFconfig-3.5.0.tar.gz 8001 RMD160 8f973bdd549c3eb23ce9bfb5669334fbc6be3c9f SHA1 8b7f9328039f8cdb0b0cdc1a29cac1f3030d505e SHA256 32614de9acc4aec534e41d61201d805e4c353cb23cce9c715f8cf2cb078378c1 DIST UFconfig-3.6.0.tar.gz 8166 RMD160 c0f33b9d7433ed428a7981272aa7826e08e0bf52 SHA1 3e57a55e284ab98459ddbac2ba8d6a2619335128 SHA256 6df4f0d4d525b31e1593bbce3423968a7575d0fe5711d37fda9559bd27f86b3e DIST UFconfig-3.6.1.tar.gz 8163 RMD160 7fa7ffe77a823e04afe54e1edf625d576152b77d SHA1 2cf8f557787b462de3427e979d1b0de82466326f SHA256 7640438363114c250ed24bc5d7afa9810f4b082b3f1a02bb445d2e4cafc6b3bf +DIST UFconfig-3.7.0.tar.gz 8557 RMD160 388b97c8efe82ff7d5fd455fc89f85117b6bb7d4 SHA1 a08fab8e88a768d25b39716e4302603c40686d26 SHA256 2f6b7bd0d01502586d11cc1f262ba41599b33eeb070dd637a53ec600a3e98215 diff --git a/sci-libs/ufconfig/ufconfig-3.7.0.ebuild b/sci-libs/ufconfig/ufconfig-3.7.0.ebuild new file mode 100644 index 000000000000..e7ced18612b4 --- /dev/null +++ b/sci-libs/ufconfig/ufconfig-3.7.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/ufconfig/ufconfig-3.7.0.ebuild,v 1.1 2012/01/20 06:01:06 bicatali Exp $ + +EAPI=4 +inherit multilib toolchain-funcs + +MY_PN=UFconfig +DESCRIPTION="Common configuration scripts for the SuiteSparse libraries" +HOMEPAGE="http://www.cise.ufl.edu/research/sparse/UFconfig" +SRC_URI="http://www.cise.ufl.edu/research/sparse/${MY_PN}/${MY_PN}-${PV}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="static-libs" +DEPEND="" + +S="${WORKDIR}/${MY_PN}" + +src_compile() { + echo "$(tc-getCC) ${CFLAGS} -fPIC -c UFconfig.c -o UFconfig.lo" + $(tc-getCC) ${CFLAGS} -fPIC -c UFconfig.c -o UFconfig.lo || die + echo "$(tc-getCC) ${LDFLAGS} -shared -Wl,-soname,libufconfig.so.${PV} -o libufconfig.so.${PV} UFconfig.lo" + $(tc-getCC) ${LDFLAGS} -shared -Wl,-soname,libufconfig.so.${PV} -o libufconfig.so.${PV} UFconfig.lo || die + if use static-libs; then + echo "$(tc-getCC) ${CFLAGS} -c UFconfig.c -o UFconfig.o" + $(tc-getCC) ${CFLAGS} -c UFconfig.c -o UFconfig.o || die + echo "$(tc-getAR) libufconfig.a UFconfig.o" + $(tc-getAR) cr libufconfig.a UFconfig.o + fi +} + +src_install() { + dolib.so libufconfig.so.${PV} + dosym libufconfig.so.${PV} /usr/$(get_libdir)/libufconfig.so + use static-libs && dolib.a libufconfig.a + insinto /usr/include + doins UFconfig.h + dodoc README.txt +} diff --git a/sci-libs/umfpack/Manifest b/sci-libs/umfpack/Manifest index 5d10417f5eb8..682abac0c0e4 100644 --- a/sci-libs/umfpack/Manifest +++ b/sci-libs/umfpack/Manifest @@ -1,2 +1,3 @@ DIST UMFPACK-5.2.0.tar.gz 1122066 RMD160 98cb8c6f3d62d0f78018f82714b063e9a4aaa4c0 SHA1 056df2b498c97a5e4ed0b396f55e4e4faf4ca346 SHA256 cdf1061c551625f7d572f6f887bad978b4e0e90c6e448a08013ba72c95691c1c DIST UMFPACK-5.5.1.tar.gz 1306153 RMD160 25aac43e40a2620977b95f959668d0c61e170853 SHA1 9443c9ec6278f469048356f089e7c3ef099930ce SHA256 79526b74d31aa3630a62bf4cf587b04b8b949837c2a357a4e99c61932475cb50 +DIST UMFPACK-5.5.2.tar.gz 1302074 RMD160 5b61c0c9dab89bc3402cab2259dc8277d0d41830 SHA1 e118c5cece7469b54b7fa56a021eb137097ef2a6 SHA256 4a6fec454671ea5619bfaaa913ad6e37e37ca3361ba717eba2740d5df4d06a3f diff --git a/sci-libs/umfpack/umfpack-5.5.2.ebuild b/sci-libs/umfpack/umfpack-5.5.2.ebuild new file mode 100644 index 000000000000..83b79ffaea9f --- /dev/null +++ b/sci-libs/umfpack/umfpack-5.5.2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/umfpack-5.5.2.ebuild,v 1.1 2012/01/20 05:54:40 bicatali Exp $ + +EAPI=4 +AUTOTOOLS_AUTORECONF=yes +inherit autotools-utils fortran-2 + +MY_PN=UMFPACK + +DESCRIPTION="Unsymmetric multifrontal sparse LU factorization library" +HOMEPAGE="http://www.cise.ufl.edu/research/sparse/umfpack" +SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="doc metis static-libs" +RDEPEND="virtual/fortran + virtual/blas + sci-libs/amd + metis? ( sci-libs/cholmod[metis] )" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +PATCHES=( "${FILESDIR}"/5.5.1-autotools.patch ) +DOCS=( README.txt Doc/ChangeLog ) + +S="${WORKDIR}/${MY_PN}" + +src_configure() { + myeconfargs+=( + --with-blas="$(pkg-config --libs blas)" + $(use_with metis cholmod) + ) + autotools-utils_src_configure +} + +src_install() { + autotools-utils_src_install + use doc && dodoc Doc/*.pdf +} diff --git a/skel.ebuild b/skel.ebuild index 2be7715854ba..0e5d2dc35f07 100644 --- a/skel.ebuild +++ b/skel.ebuild @@ -30,7 +30,7 @@ inherit eutils # epatch "${FILESDIR}"/patch-name-here # # eclasses tend to list descriptions of how to use their functions properly. -# take a look at /usr/portage/eclasses/ for more examples. +# take a look at /usr/portage/eclass/ for more examples. # Short one-line description of this package. DESCRIPTION="This is a sample skeleton ebuild file" diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest index e4d716706434..12963fc4a542 100644 --- a/sys-apps/pciutils/Manifest +++ b/sys-apps/pciutils/Manifest @@ -1,3 +1,4 @@ DIST pciutils-3.1.4.tar.gz 305747 RMD160 86ed925d1345e8050aa990ce212fff114e569111 SHA1 eafde87ac5bb3f0bcabc98461f22a23f8e7229f2 SHA256 676b941ddaf912387092c6925597b14cef4f35f495bdbb229c1e5947151a1b20 DIST pciutils-3.1.7.tar.gz 320603 RMD160 2d81a6a7fdf06889f7d5954dff716bb0516ffd20 SHA1 58336ef8c1bbe870f2cc0ed9481a8cf8a58e039c SHA256 0f39818eabd793bb48d5b98ca52141d8247306a85876482c0075d0c95aeccea2 DIST pciutils-3.1.8.tar.gz 376199 RMD160 9375f3000352ee246fd3dd76b4c59a1596a2dfe4 SHA1 9eed8510309d17d19863a62fe6d5fe238460a723 SHA256 15a7de19f23f95eeda2487bedc6b4c11eddea9c30bba35573775b4d46b7a46ca +DIST pciutils-3.1.9.tar.gz 340215 RMD160 536d2a05477eb242d434a96995b5e22e9d2f90a6 SHA1 6b0fc73ec0fe6a4fa4acb7dab13f3a83f3a45098 SHA256 8ae7d320c50f02b015f5e2bb17a9f815cf201dae81b6bbd46b8a45552d00a178 diff --git a/sys-apps/pciutils/pciutils-3.1.9.ebuild b/sys-apps/pciutils/pciutils-3.1.9.ebuild new file mode 100644 index 000000000000..2dccbaa97322 --- /dev/null +++ b/sys-apps/pciutils/pciutils-3.1.9.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.9.ebuild,v 1.1 2012/01/20 05:13:33 radhermit Exp $ + +EAPI="4" + +inherit eutils multilib toolchain-funcs + +DESCRIPTION="Various utilities dealing with the PCI bus" +HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html" +SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="network-cron static-libs zlib" + +DEPEND="zlib? ( sys-libs/zlib )" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-3.1.7-install-lib.patch #273489 + epatch "${FILESDIR}"/${PN}-3.1.7-fbsd.patch #262321 + + if use static-libs ; then + cp -pPR "${S}" "${S}.static" || die + fi +} + +pemake() { + emake \ + HOST="${CHOST}" \ + CROSS_COMPILE="${CHOST}-" \ + CC="$(tc-getCC)" \ + DNS="yes" \ + IDSDIR='$(SHAREDIR)/misc' \ + MANDIR='$(SHAREDIR)/man' \ + PREFIX="${EPREFIX}/usr" \ + SHARED="yes" \ + STRIP="" \ + ZLIB=$(usex zlib) \ + LIBDIR="\${PREFIX}/$(get_libdir)" \ + "$@" +} + +src_compile() { + pemake OPT="${CFLAGS}" all + if use static-libs ; then + pemake \ + -C "${S}.static" \ + OPT="${CFLAGS}" \ + SHARED="no" \ + lib/libpci.a + fi +} + +src_install() { + pemake DESTDIR="${D}" install install-lib + use static-libs && dolib.a "${S}.static/lib/libpci.a" + dodoc ChangeLog README TODO + + if use network-cron ; then + exeinto /etc/cron.monthly + newexe "${FILESDIR}"/pciutils.cron update-pciids + fi + + newinitd "${FILESDIR}"/init.d-pciparm pciparm + newconfd "${FILESDIR}"/conf.d-pciparm pciparm +} + +pkg_postinst() { + elog "The 'pcimodules' program has been replaced by 'lspci -k'" +} diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r1.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r1.ebuild index ac72dd7cfbf6..d44cd4409e87 100644 --- a/sys-apps/pmount/pmount-0.9.99_alpha-r1.ebuild +++ b/sys-apps/pmount/pmount-0.9.99_alpha-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/sys-apps/pmount/pmount-0.9.99_alpha-r1.ebuild,v 1.1 2011/12/08 18:04:06 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/pmount-0.9.99_alpha-r1.ebuild,v 1.2 2012/01/20 09:22:43 ago Exp $ EAPI=4 inherit eutils @@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV/_/-}.orig.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" IUSE="crypt" RDEPEND=">=sys-apps/util-linux-2.17.2 diff --git a/sys-apps/seabios/seabios-1.6.3.ebuild b/sys-apps/seabios/seabios-1.6.3.ebuild index 0fabeee50c1d..fc57ddfd77ba 100644 --- a/sys-apps/seabios/seabios-1.6.3.ebuild +++ b/sys-apps/seabios/seabios-1.6.3.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/seabios/seabios-1.6.3.ebuild,v 1.2 2011/10/25 14:09:06 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/seabios/seabios-1.6.3.ebuild,v 1.3 2012/01/20 10:52:41 ago Exp $ EAPI=4 @@ -20,7 +20,7 @@ inherit ${GIT_ECLASS} python if [[ ${PV} = *9999* ]]; then KEYWORDS="" else - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS" diff --git a/sys-cluster/knem/Manifest b/sys-cluster/knem/Manifest new file mode 100644 index 000000000000..59fd9613216a --- /dev/null +++ b/sys-cluster/knem/Manifest @@ -0,0 +1 @@ +DIST knem-0.9.7.tar.gz 288491 RMD160 e75a56c5ff8a80d670562a117f9c8d04338e29da SHA1 f43608720b8f59083794c4d368760bdb39a8438c SHA256 2a730bbaedd5374b391a93353d26f49378432e5a04fb31d4507c633e69774261 diff --git a/sys-cluster/knem/files/45-knem.rules b/sys-cluster/knem/files/45-knem.rules new file mode 100644 index 000000000000..c27f4e0fd6a2 --- /dev/null +++ b/sys-cluster/knem/files/45-knem.rules @@ -0,0 +1 @@ +KERNEL=="knem", NAME="%k", MODE="0666" diff --git a/sys-cluster/knem/knem-0.9.7.ebuild b/sys-cluster/knem/knem-0.9.7.ebuild new file mode 100644 index 000000000000..e6bf4f932362 --- /dev/null +++ b/sys-cluster/knem/knem-0.9.7.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/knem/knem-0.9.7.ebuild,v 1.1 2012/01/20 11:40:59 alexxy Exp $ + +EAPI=4 + +inherit autotools linux-mod multilib + +DESCRIPTION="High-Performance Intra-Node MPI Communication" +HOMEPAGE="http://runtime.bordeaux.inria.fr/knem/" +SRC_URI="http://runtime.bordeaux.inria.fr/knem/download/${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug modules" + +DEPEND=" + sys-apps/hwloc + virtual/linux-sources" +RDEPEND=" + sys-apps/hwloc + sys-apps/module-init-tools" + +MODULE_NAMES="knem(misc:${S}/driver/linux)" +BUILD_TARGETS="all" +BUILD_PARAMS="KDIR=${KERNEL_DIR}" + +pkg_setup() { + linux-mod_pkg_setup +} + +src_prepare() { + sed 's:driver/linux::g' -i Makefile.am + eautoreconf +} + +src_configure() { + econf \ + --enable-hwloc \ + --with-linux="${KERNEL_DIR}" \ + --with-linux-release=${KV_FULL} \ + $(use_enable debug) +} + +src_compile() { + default + if use modules; then + cd "${S}/driver/linux" + linux-mod_src_compile || die "failed to build driver" + fi +} + +src_install() { + default + if use modules; then + cd "${S}/driver/linux" + linux-mod_src_install || die "failed to install driver" + fi + + # Drop funny unneded stuff + rm "${ED}/usr/sbin/knem_local_install" || die + rmdir "${ED}/usr/sbin" || die + # install udev rules + dodir /etc/udev/rules.d + insinto /etc/udev/rules.d + doins "${FILESDIR}/45-knem.rules" || die + rm "${ED}/etc/10-knem.rules" || die +} diff --git a/sys-cluster/knem/metadata.xml b/sys-cluster/knem/metadata.xml new file mode 100644 index 000000000000..a64f2d240d92 --- /dev/null +++ b/sys-cluster/knem/metadata.xml @@ -0,0 +1,9 @@ + + + + cluster + + alexxy@gentoo.org + Alexey Shvetsov + + diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml index 5455cf790366..014cce3b763e 100644 --- a/sys-cluster/openmpi/metadata.xml +++ b/sys-cluster/openmpi/metadata.xml @@ -15,5 +15,8 @@ Enable SCTP support Add support for SLURM Enable bundled VampirTrace support + Add High-Performance intranode communication + Add support for Qlogic psm driver for IB + Add support for Myrinet Express over Ethernet> diff --git a/sys-cluster/openmpi/openmpi-1.5.4-r2.ebuild b/sys-cluster/openmpi/openmpi-1.5.4-r2.ebuild new file mode 100644 index 000000000000..624de8b2b87f --- /dev/null +++ b/sys-cluster/openmpi/openmpi-1.5.4-r2.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.5.4-r2.ebuild,v 1.1 2012/01/20 13:15:19 alexxy Exp $ + +EAPI=4 +inherit eutils fortran-2 multilib flag-o-matic toolchain-funcs + +MY_P=${P/-mpi} +S=${WORKDIR}/${MY_P} + +DESCRIPTION="A high-performance message passing library (MPI)" +HOMEPAGE="http://www.open-mpi.org" +SRC_URI="http://www.open-mpi.org/software/ompi/v1.5/downloads/${MY_P}.tar.bz2" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux" +IUSE="+cxx elibc_FreeBSD fortran heterogeneous infiniband ipv6 knem mpi-threads + +numa pbs open-mx psm romio sctp slurm threads vt" + +REQUIRED_USE="^^ ( + ( !slurm !pbs ) + ( slurm !pbs ) + ( !slurm pbs ) + ) + psm? ( infiniband )" + +RDEPEND=" + fortran? ( virtual/fortran ) + pbs? ( sys-cluster/torque ) + infiniband? ( sys-infiniband/openib ) + sctp? ( net-misc/lksctp-tools ) + vt? ( + !dev-libs/libotf + !app-text/lcdf-typetools + ) + elibc_FreeBSD? ( dev-libs/libexecinfo ) + knem? ( sys-cluster/knem ) + numa? ( sys-process/numactl ) + open-mx? ( sys-cluster/open-mx ) + psm? ( sys-infiniband/infinipath-psm ) + >=sys-apps/hwloc-1.3 + !sys-cluster/mpich + !sys-cluster/lam-mpi + !sys-cluster/mpich2 + !sys-cluster/mpiexec" +DEPEND="${RDEPEND}" + +pkg_setup() { + use fortran && fortran-2_pkg_setup + if use mpi-threads; then + echo + ewarn "WARNING: use of MPI_THREAD_MULTIPLE is still disabled by" + ewarn "default and officially unsupported by upstream." + ewarn "You may stop now and set USE=-mpi-threads" + echo + fi + + echo + elog "OpenMPI has an overwhelming count of configuration options." + elog "Don't forget the EXTRA_ECONF environment variable can let you" + elog "specify configure options if you find them necessary." + echo +} + +src_prepare() { + # Necessary for scalibility, see + # http://www.open-mpi.org/community/lists/users/2008/09/6514.php + if use threads; then + echo 'oob_tcp_listen_mode = listen_thread' \ + >> opal/etc/openmpi-mca-params.conf + fi + + epatch "${FILESDIR}"/openmpi-r24328.patch +} + +src_configure() { + local myconf=( + --sysconfdir="${EPREFIX}/etc/${PN}" + --enable-pretty-print-stacktrace + --enable-orterun-prefix-by-default + --with-hwloc="${EPREFIX}/usr" + ) + + if use mpi-threads; then + myconf+=( + --enable-mpi-thread-multiple + --enable-opal-multi-threads + ) + fi + + if use fortran; then + if [[ $(tc-getFC) =~ g77 ]]; then + myconf+=(--disable-mpi-f90) + elif [[ $(tc-getFC) =~ if ]]; then + # Enabled here as gfortran compile times are huge with this enabled. + myconf+=( --with-mpi-f90-size=medium ) + fi + else + myconf+=( --disable-mpi-f90 --disable-mpi-f77 ) + fi + + ! use vt && myconf+=(--enable-contrib-no-build=vt) + + use numa && myconf+=( --with-libnuma="${EPREFIX}/usr" ) + use infiniband && myconf+=( --with-openib="${EPREFIX}/usr" ) + use open-mx && myconf+=( --with-mx="${EPREFIX}/usr" ) + use psm && myconf+=( --with-psm="${EPREFIX}/usr" ) + use knem && myconf+=( --with-knem="${EPREFIX}/usr" ) + + econf "${myconf[@]}" \ + $(use_enable cxx mpi-cxx) \ + $(use_enable romio io-romio) \ + $(use_enable heterogeneous) \ + $(use_with pbs tm) \ + $(use_with slurm) \ + $(use_enable ipv6) \ + $(use_with sctp sctp) +} + +src_install () { + emake DESTDIR="${D}" install || die "make install failed" + # From USE=vt see #359917 + rm "${ED}"/usr/share/libtool &> /dev/null + dodoc README AUTHORS NEWS VERSION || die +} + +src_test() { + # Doesn't work with the default src_test as the dry run (-n) fails. + emake -j1 check || die "emake check failed" +} diff --git a/sys-infiniband/infinipath-psm/Manifest b/sys-infiniband/infinipath-psm/Manifest new file mode 100644 index 000000000000..bd74aebce35a --- /dev/null +++ b/sys-infiniband/infinipath-psm/Manifest @@ -0,0 +1 @@ +DIST OFED-1.5.3.1.tgz 75331712 RMD160 03675604e228c30d630d95f514522a091326c213 SHA1 7d56d4904124cc3ea926f7a4c862069611c25334 SHA256 9cdf2e78ce1a3c0b367d75593cbd344390a1f3f02ac13d6ecfa37b0d05ac89e4 diff --git a/sys-infiniband/infinipath-psm/files/42-infinipath-psm.rules b/sys-infiniband/infinipath-psm/files/42-infinipath-psm.rules new file mode 100644 index 000000000000..8cc1339c16e9 --- /dev/null +++ b/sys-infiniband/infinipath-psm/files/42-infinipath-psm.rules @@ -0,0 +1,2 @@ +KERNEL=="ipath", MODE="0666" +KERNEL=="kcopy[0-6][0-9]", NAME="kcopy/%n", MODE="0666" diff --git a/sys-infiniband/infinipath-psm/files/infinipath-psm-include.patch b/sys-infiniband/infinipath-psm/files/infinipath-psm-include.patch new file mode 100644 index 000000000000..dd13ae0d1501 --- /dev/null +++ b/sys-infiniband/infinipath-psm/files/infinipath-psm-include.patch @@ -0,0 +1,10 @@ +--- ./ptl_ips/ips_proto_header.h.orig 2012-01-20 15:49:17.000000000 +0400 ++++ ./ptl_ips/ips_proto_header.h 2012-01-20 15:49:24.000000000 +0400 +@@ -72,7 +72,6 @@ + union { + struct { + __u16 mqhdr : 14; /* PSM matched queues */ +- __u16 dst_subcontext : 2; /* Destination subcontext */ + }; + struct { /* for PSM Active Messages */ + __u16 amhdr_hidx : 8; diff --git a/sys-infiniband/infinipath-psm/infinipath-psm-1.14.ebuild b/sys-infiniband/infinipath-psm/infinipath-psm-1.14.ebuild new file mode 100644 index 000000000000..73348ddd48b0 --- /dev/null +++ b/sys-infiniband/infinipath-psm/infinipath-psm-1.14.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/infinipath-psm/infinipath-psm-1.14.ebuild,v 1.2 2012/01/20 13:19:38 alexxy Exp $ + +EAPI="4" + +OFED_VER="1.5.3.1" +OFED_SUFFIX="1" + +inherit openib + +DESCRIPTION="OpenIB userspace driver for the PathScale InfiniBand HCAs" +KEYWORDS="~amd64 ~x86 ~amd64-linux" +IUSE="" + +DEPEND=">=sys-infiniband/libibverbs-1.1.4" +RDEPEND="${DEPEND}" + +src_prepare() { + sed -e 's:uname -p:uname -m:g' \ + -e 's:-Werror::g' \ + -i buildflags.mak || die + epatch "${FILESDIR}/${PN}-include.patch" +} + +src_install() { + make DESTDIR="${D}" install || die "install failed" + dodoc README + # install udev rules + dodir /etc/udev/rules.d + insinto /etc/udev/rules.d + doins "${FILESDIR}/42-infinipath-psm.rules" || die +} diff --git a/sys-infiniband/infinipath-psm/metadata.xml b/sys-infiniband/infinipath-psm/metadata.xml new file mode 100644 index 000000000000..348e6c4de815 --- /dev/null +++ b/sys-infiniband/infinipath-psm/metadata.xml @@ -0,0 +1,5 @@ + + + +cluster + diff --git a/sys-libs/libchipcard/libchipcard-5.0.2.ebuild b/sys-libs/libchipcard/libchipcard-5.0.2.ebuild index eaadd4523b19..1a95c12034e5 100644 --- a/sys-libs/libchipcard/libchipcard-5.0.2.ebuild +++ b/sys-libs/libchipcard/libchipcard-5.0.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-libs/libchipcard/libchipcard-5.0.2.ebuild,v 1.1 2011/08/21 19:59:58 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libchipcard/libchipcard-5.0.2.ebuild,v 1.2 2012/01/20 13:21:45 ago Exp $ EAPI=2 @@ -10,7 +10,7 @@ SRC_URI="http://www.aquamaniac.de/sites/download/download.php?package=02&release LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="doc examples" RDEPEND=">=sys-libs/gwenhywfar-4.2.1 diff --git a/www-apps/mediawiki/mediawiki-1.18.1.ebuild b/www-apps/mediawiki/mediawiki-1.18.1.ebuild index 2c4fee310f31..b6db7b1d9c4d 100644 --- a/www-apps/mediawiki/mediawiki-1.18.1.ebuild +++ b/www-apps/mediawiki/mediawiki-1.18.1.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/www-apps/mediawiki/mediawiki-1.18.1.ebuild,v 1.2 2012/01/15 15:06:14 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.18.1.ebuild,v 1.3 2012/01/20 11:45:08 tomka Exp $ EAPI="4" inherit webapp depend.php versionator eutils @@ -12,7 +12,7 @@ HOMEPAGE="http://www.mediawiki.org" SRC_URI="http://download.wikimedia.org/mediawiki/${MY_BRANCH}/${P}.tar.gz" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~ppc ~sparc x86" IUSE="imagemagick mysql postgres sqlite" RDEPEND="${DEPEND}