diff options
84 files changed, 2377 insertions, 2115 deletions
diff --git a/app-admin/anaconda/Manifest b/app-admin/anaconda/Manifest deleted file mode 100644 index 2c115915..00000000 --- a/app-admin/anaconda/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST audit-2.1.2.tar.gz 832570 SHA256 74de47b70f8d60035d97d2b2ee73934be132d67569cbe74a427f5aa41f156fb9 SHA512 8b1fb457b29ab0d13b86404bb09fcf7fd54bf11afd0583d4c91150bfe8b7013d43325150935e668bc4904eaca155cb072a3af659fd44acbdccf128ce3c95bc6b WHIRLPOOL e3a9c44056829a74db192fb6a7200e3de50af29b23ac6e309ca6927f181031dc961a2c2c193356d7208d9f18cc7c0beaf4da602af63ac15797b291e4a5ad33e4 -DIST libselinux-2.0.94.tar.gz 205804 SHA256 b8312852306650e9720de5a20fe7560d935d3c90ffedca1cac25bf3f283d8a36 SHA512 fa8d89cb812ee02dc99811c99341acdcadcc088a06e6de736e31ca1c9f84a5b2afe60b24ec870c31afae3f8c317dd802abee2d50621c59ad3e11afddc26ae814 WHIRLPOOL 127eb506e63709b468866875f4aecf84216d4674fe5f8f0f906f59842dd0dba3ce2fb6cdd3e8085626989039e38a1dbb363fc8ec58bccd10195d1e15fdcefe1b diff --git a/app-admin/anaconda/anaconda-9999.ebuild b/app-admin/anaconda/anaconda-9999.ebuild deleted file mode 100644 index 45ba179f..00000000 --- a/app-admin/anaconda/anaconda-9999.ebuild +++ /dev/null @@ -1,225 +0,0 @@ -# Copyri:ght 2004-2012 Rogentos -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" - -if [ "${PV}" = "9999" ]; then - #EGIT_COMMIT="master" - EGIT_REPO_URI="git://github.com/Rogentos/rogentos-anaconda.git" - MY_ECLASS="git-2" -fi -inherit flag-o-matic base python libtool autotools eutils ${MY_ECLASS} - -AUDIT_VER="2.1.2" -AUDIT_SRC_URI="http://people.redhat.com/sgrubb/audit/audit-${AUDIT_VER}.tar.gz" - -SEPOL_VER="2.2" -LSELINUX_VER="2.0.94" -LSELINUX_SRC_URI="http://userspace.selinuxproject.org/releases/20100525/devel/libselinux-${LSELINUX_VER}.tar.gz - http://bpr.bluepink.ro/~rogentos/distro/sys-libs/libselinux-${LSELINUX_VER}.tar.gz" - -DESCRIPTION="Rogentos Redhat Anaconda Installer Port" -HOMEPAGE="http://rogentos.ro/" -if [ "${PV}" = "9999" ]; then - SRC_URI="${AUDIT_SRC_URI} ${LSELINUX_SRC_URI}" - KEYWORDS="" - S="${WORKDIR}"/${PN}-${PVR} -else - SRC_URI="http://pkg.rogentos.ro/~rogentos/distro/${CATEGORY}/${PN}/${PN}-rogentos-${PVR}.tar.bz2 ${AUDIT_SRC_URI} ${LSELINUX_SRC_URI}" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}"/${PN}-rogentos-${PVR} -fi -AUDIT_S="${WORKDIR}/audit-${AUDIT_VER}" -LSELINUX_S="${WORKDIR}/libselinux-${LSELINUX_VER}" - -LICENSE="GPL-2 public-domain" -SLOT="0" -IUSE="-ipv6 +nfs ldap" -RESTRICT="nomirror" - -AUDIT_DEPEND="dev-lang/swig" -AUDIT_RDEPEND="ldap? ( net-nds/openldap )" -LSELINUX_DEPEND="=sys-libs/libsepol-${SEPOL_VER}* dev-lang/swig" -LSELINUX_RDEPEND="=sys-libs/libsepol-${SEPOL_VER}*" -LSELINUX_CONFLICT="!sys-libs/libselinux" # due to pythonX.Y/site-packages+/usr/sbin not being handled -COMMON_DEPEND="app-admin/system-config-keyboard - >=app-arch/libarchive-2.8 - app-crypt/sbsigntool - app-cdr/isomd5sum - dev-libs/newt - nfs? ( net-fs/nfs-utils ) - sys-fs/lvm2 - sys-block/open-iscsi" -DEPEND="${COMMON_DEPEND} ${AUDIT_DEPEND} ${LSELINUX_DEPEND} sys-apps/sed" -RDEPEND="${COMMON_DEPEND} ${AUDIT_RDEPEND} - ${LSELINUX_RDEPEND} ${LSELINUX_CONFLICT} - >=app-misc/anaconda-runtime-1.1" - -# FIXME: -# for anaconda-gtk we would require also -# dev-python/pygtk -# x11-libs/pango - -src_unpack() { - if [ "${PV}" = "9999" ]; then - git-2_src_unpack - base_src_unpack - else - base_src_unpack - fi -} - -src_prepare() { - - # Setup CFLAGS, LDFLAGS - append-cppflags "-I${D}/usr/include/anaconda-runtime" - append-ldflags "-L${D}/usr/$(get_libdir)/anaconda-runtime" - append-cflags "-fexceptions" - - # drop after 0.9.11 - sed -i "s:-O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions::g" \ - "${S}/configure.ac" || die - - # Setup anaconda - cd "${S}" - ./autogen.sh || die "cannot run autogen" - - ## - ## Setup libaudit - ## - cd "${AUDIT_S}" - # Do not build GUI tools - sed -i \ - -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \ - "${AUDIT_S}"/configure.ac || die "cannot sed libaudit configure.ac" - sed -i \ - -e 's,system-config-audit,,g' \ - -e '/^SUBDIRS/s,\\$,,g' \ - "${AUDIT_S}"/Makefile.am || die "cannot sed libaudit Makefile.am" - rm -rf "${AUDIT_S}"/system-config-audit - - if ! use ldap; then - sed -i \ - -e '/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \ - "${AUDIT_S}"/configure.ac || die "cannot sed libaudit configure.ac (ldap)" - sed -i \ - -e '/^SUBDIRS/s,zos-remote,,g' \ - "${AUDIT_S}"/audisp/plugins/Makefile.am || die "cannot sed libaudit Makefile.am (ldap)" - fi - eautoreconf - -} - -copy_audit_data_over() { - dodir "/usr/$(get_libdir)/anaconda-runtime" - cp -Ra "${AUDIT_S}/fakeroot/usr/$(get_libdir)/anaconda-runtime/"* \ - "${D}/usr/$(get_libdir)/anaconda-runtime" || die "cannot cp audit data" - dodir "/usr/include/anaconda-runtime" - cp -Ra "${AUDIT_S}/fakeroot/usr/include/anaconda-runtime/"* \ - "${D}/usr/include/anaconda-runtime" || die "cannot cp audit include data" -} - -src_configure() { - # configure audit - cd "${AUDIT_S}" - einfo "configuring audit" - econf --sbindir=/sbin --libdir=/usr/$(get_libdir)/anaconda-runtime \ - --includedir=/usr/include/anaconda-runtime \ - --without-prelude || die - - # compiling audit here, anaconda configure needs libaudit - einfo "compiling audit" - cd "${AUDIT_S}" || die "cannot cd into ${AUDIT_S}" - base_src_compile - - # installing audit - einfo "installing audit libs into ${AUDIT_S}/fakeroot temporarily" - cd "${AUDIT_S}" || die "cannot cd into ${AUDIT_S}" - ( rm -rf fakeroot && mkdir fakeroot ) || die "cannot mkdir" - emake DESTDIR="${AUDIT_S}/fakeroot" install || die "cannot install libaudit" - copy_audit_data_over # for proper linking - - # configure anaconda - cd "${S}" - einfo "configuring anaconda" - econf \ - $(use_enable ipv6) $(use_enable selinux) \ - $(use_enable nfs) || die "configure failed" -} - -src_compile() { - - cd "${S}" - base_src_compile - - # compiling libselinux - einfo "compiling libselinux" - cd "${LSELINUX_S}" || die "cannot cd into ${LSELINUX_S}" - LD_RUN_PATH="/usr/$(get_libdir)/anaconda-runtime" \ - emake \ - LDFLAGS="-fPIC ${LDFLAGS}" \ - PYLIBVER="python$(python_get_version)" \ - PYTHONLIBDIR="${D}/usr/$(get_libdir)/python$(python_get_version)" \ - SHLIBDIR="${D}/usr/$(get_libdir)/anaconda-runtime" \ - INCDIR="${D}/usr/include/anaconda-runtime" \ - all || die - LD_RUN_PATH="/usr/$(get_libdir)/anaconda-runtime" \ - emake \ - LDFLAGS="-fPIC ${LDFLAGS}" \ - PYLIBVER="python$(python_get_version)" \ - PYTHONLIBDIR="${D}/usr/$(get_libdir)/python$(python_get_version)" \ - SHLIBDIR="${D}/usr/$(get_libdir)/anaconda-runtime" \ - INCDIR="${D}/usr/include/anaconda-runtime" \ - pywrap || die - - # add compatibility aliases to swig wrapper - cat "${FILESDIR}/compat.py" >> "${LSELINUX_S}/src/selinux.py" || die - -} - -src_install() { - - # installing libselinux - cd "${LSELINUX_S}" - python_need_rebuild - LD_RUN_PATH="/usr/$(get_libdir)/anaconda-runtime" \ - emake DESTDIR="${D}" \ - PYLIBVER="python$(python_get_version)" \ - PYTHONLIBDIR="${D}/usr/$(get_libdir)/python$(python_get_version)" \ - LIBDIR="${D}/usr/$(get_libdir)/anaconda-runtime" \ - SHLIBDIR="${D}/usr/$(get_libdir)/anaconda-runtime" \ - INCDIR="${D}/usr/include/anaconda-runtime" \ - install install-pywrap || die - - # fix libselinux.so link - dosym libselinux.so.1 /usr/$(get_libdir)/anaconda-runtime/libselinux.so - # LD_RUN_PATH works with ld >=2.20, so /etc/env.d/99anaconda for now - # will be dropped in future - echo "LDPATH=\"/usr/$(get_libdir)/anaconda-runtime\"" > 99anaconda - doenvd 99anaconda - - cd "${S}" - copy_audit_data_over # ${D} is cleared - base_src_install - - # install liveinst for user - dodir /usr/bin - exeinto /usr/bin - doexe "${FILESDIR}"/liveinst - dosym /usr/bin/liveinst /usr/bin/installer - - # drop .la files for God sake - find "${D}" -name "*.la" | xargs rm - - # Cleanup .pyc .pyo - find "${D}" -name "*.py[co]" -type f -delete -} - -pkg_postrm() { - python_mod_cleanup py${PN} -} - -pkg_postinst() { - python_mod_optimize py${PN} -} diff --git a/app-admin/anaconda/files/compat.py b/app-admin/anaconda/files/compat.py deleted file mode 100644 index b0bf65b5..00000000 --- a/app-admin/anaconda/files/compat.py +++ /dev/null @@ -1,18 +0,0 @@ -# compatability aliases for python-selinux -try: - import selinux_aux - - enabled = selinux_aux.enabled - - get_lsid = selinux_aux.get_lsid - get_sid = selinux_aux.get_sid - set_sid = selinux_aux.set_sid - secure_rename = selinux_aux.secure_rename - secure_copy = selinux_aux.secure_copy - secure_mkdir = selinux_aux.secure_mkdir - secure_symlink = selinux_aux.secure_symlink - setexec = selinux_aux.setexec - getcontext = selinux_aux.getcontext - -except: - pass diff --git a/app-admin/anaconda/files/liveinst b/app-admin/anaconda/files/liveinst deleted file mode 100644 index 986da86f..00000000 --- a/app-admin/anaconda/files/liveinst +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -sudo -E /usr/sbin/liveinst $@ diff --git a/app-admin/anaconda/files/make_liveinst_update_package.sh b/app-admin/anaconda/files/make_liveinst_update_package.sh deleted file mode 100644 index 466408cc..00000000 --- a/app-admin/anaconda/files/make_liveinst_update_package.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -if [ -z "${1}" ]; then - echo "syntax ${0} <ebuild>" - exit 1 -fi -eb="${1}" -eb_name=$(basename "${eb}") -tbz2_name="${eb_name/.ebuild/.tbz2}" -tar_file="py${eb_name/.ebuild}.tar.bz2" -current_dir="${PWD}" - -ebuild "${eb}" clean package || exit 1 -tmp_dir="$(mktemp -d)" - -cp /usr/portage/packages/app-admin/"${tbz2_name}" "${tmp_dir}" || exit 1 -cd "${tmp_dir}" || exit 1 -tar xvf "${tbz2_name}" || exit 1 - -( cd usr/lib*/python*/site-packages && tar cjf \ - "${current_dir}/${tar_file}" pyanaconda ) || exit 1 -( cd "${current_dir}" && md5sum "${tar_file}" > "${tar_file}.md5" ) || exit 1 - -echo "created ${tar_file} and ${tar_file}.md5 in this directory" diff --git a/app-crypt/pinentry-base/Manifest b/app-crypt/pinentry-base/Manifest index d3228d66..31b764d0 100644 --- a/app-crypt/pinentry-base/Manifest +++ b/app-crypt/pinentry-base/Manifest @@ -1,2 +1,3 @@ DIST pinentry-0.8.3.tar.bz2 430753 SHA256 568b0b09b50b2388a4f94d704d5bcb28718ecd4654ed1acc43ab1f97d921a0ad SHA512 942aad8db63d5e2f7b576ef6286edf6ce5fdb7c2a0a82deb864fa22963b183dd12a235f12277a6dade9d914b5e76302f1ab35ae78b0f595e84fff77d8f417a18 WHIRLPOOL 0d0e905b79eb6d7727f1de57be058b3c3885b577124cb1fdebca4e0b81d085070f1953b307b506a602de4055bdca6886e7f56e17b5d6978e161eaedf170785e2 DIST pinentry-0.9.0.tar.bz2 464272 SHA256 90045a07ab8e1a8e1ecf5d19b51691f195525e579fa5d71d7e92c120b05490ab SHA512 2cc53a5c3852edaf6e940228d9b43fe4709344eba5fe230b7afd22b2c0239d0b258917d75661d80590b2d61c6fe9dac8ad15a0b4a0a0e7fba90a9e1c07364edd WHIRLPOOL 3f77a8aa2d44c7206d877e31088ec927473441e61f06e788330545d75ac489e6e9d5bf0026b23d0824304dad54ce8e61c4571d186df7ad0edc2d644ca3af04ac +DIST pinentry-0.9.5.tar.bz2 514677 SHA256 6a57fd3afc0d8aaa5599ffcb3ea4e7c42c113a181e8870122203ea018384688c SHA512 31a190cacf45fd3ff5128a6a1a9f317fb09850fd595d5985392ea306ed65fa9232e2203458a9989eaac3b6e9d07199e01557912051f00a9a395cd1db61b44c39 WHIRLPOOL 52e9664d7cf0e804bb14b9586a89aca4037d3324261ac8931ed26365c32ae038b45eca9b7b6637b46f9231ff2db6a9e0a96a611404e48659c7ba009b84c40727 diff --git a/app-crypt/pinentry-base/pinentry-base-0.9.5.ebuild b/app-crypt/pinentry-base/pinentry-base-0.9.5.ebuild new file mode 100644 index 00000000..68a74d4d --- /dev/null +++ b/app-crypt/pinentry-base/pinentry-base-0.9.5.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit autotools multilib eutils flag-o-matic + +MY_PN=${PN/-base} +MY_P=${P/-base} +DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" +HOMEPAGE="http://gnupg.org/aegypten2/index.html" +SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="gtk qt4 caps static" + +RDEPEND=" + app-eselect/eselect-pinentry + caps? ( sys-libs/libcap ) + sys-libs/ncurses + static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) + ppc-aix? ( dev-libs/gnulib ) +" +DEPEND="${RDEPEND}" + +S=${WORKDIR}/${MY_P} + +DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) + +src_prepare() { + epatch "${FILESDIR}/${MY_PN}-0.8.2-ncurses.patch" + eautoreconf +} + +src_configure() { + use static && append-ldflags -static + + if [[ ${CHOST} == *-aix* ]] ; then + append-flags -I"${EPREFIX}/usr/$(get_libdir)/gnulib/include" + append-ldflags -L"${EPREFIX}/usr/$(get_libdir)/gnulib/$(get_libdir)" + append-libs -lgnu + fi + + econf \ + --enable-pinentry-tty \ + --disable-pinentry-gtk2 \ + --enable-pinentry-curses \ + --enable-fallback-curses \ + --disable-pinentry-qt4 \ + $(use_with caps libcap) +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + default + rm -f "${ED}"/usr/bin/pinentry || die +} + +pkg_postinst() { + if ! has_version 'app-crypt/pinentry-base'; then + # || has_version '<app-crypt/pinentry-0.7.3'; then + elog "We no longer install pinentry-curses and pinentry-qt SUID root by default." + elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes." + elog "The soft resource limit for memory locking specifies the limit an" + elog "unprivileged process may lock into memory. You can also use POSIX" + elog "capabilities to allow pinentry to lock memory. To do so activate the caps" + elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" + elog "your users." + fi + eselect pinentry update ifunset + use gtk && elog "If you want pinentry for Gtk+, please install app-crypt/pinentry-gtk." + use qt4 && elog "If you want pinentry for Qt4, please install app-crypt/pinentry-qt4." +} + +pkg_postrm() { + eselect pinentry update ifunset +} diff --git a/app-crypt/pinentry-gtk2/Manifest b/app-crypt/pinentry-gtk2/Manifest index f6e8451a..b4d26cee 100644 --- a/app-crypt/pinentry-gtk2/Manifest +++ b/app-crypt/pinentry-gtk2/Manifest @@ -1 +1,2 @@ DIST pinentry-0.9.0.tar.bz2 464272 SHA256 90045a07ab8e1a8e1ecf5d19b51691f195525e579fa5d71d7e92c120b05490ab SHA512 2cc53a5c3852edaf6e940228d9b43fe4709344eba5fe230b7afd22b2c0239d0b258917d75661d80590b2d61c6fe9dac8ad15a0b4a0a0e7fba90a9e1c07364edd WHIRLPOOL 3f77a8aa2d44c7206d877e31088ec927473441e61f06e788330545d75ac489e6e9d5bf0026b23d0824304dad54ce8e61c4571d186df7ad0edc2d644ca3af04ac +DIST pinentry-0.9.5.tar.bz2 514677 SHA256 6a57fd3afc0d8aaa5599ffcb3ea4e7c42c113a181e8870122203ea018384688c SHA512 31a190cacf45fd3ff5128a6a1a9f317fb09850fd595d5985392ea306ed65fa9232e2203458a9989eaac3b6e9d07199e01557912051f00a9a395cd1db61b44c39 WHIRLPOOL 52e9664d7cf0e804bb14b9586a89aca4037d3324261ac8931ed26365c32ae038b45eca9b7b6637b46f9231ff2db6a9e0a96a611404e48659c7ba009b84c40727 diff --git a/app-crypt/pinentry-gtk2/pinentry-gtk2-0.9.5.ebuild b/app-crypt/pinentry-gtk2/pinentry-gtk2-0.9.5.ebuild new file mode 100644 index 00000000..846e3fa9 --- /dev/null +++ b/app-crypt/pinentry-gtk2/pinentry-gtk2-0.9.5.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit eutils flag-o-matic + +MY_PN=${PN/-gtk2} +MY_P=${P/-gtk2} +DESCRIPTION="Gtk+2 frontend for pinentry" +HOMEPAGE="http://gnupg.org/aegypten2/index.html" +SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="caps" + +RDEPEND=" + ~app-crypt/pinentry-base-${PV} + !app-crypt/pinentry-base[static] + caps? ( sys-libs/libcap ) + x11-libs/gtk+:2 +" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +src_configure() { + econf \ + --disable-pinentry-tty \ + --enable-pinentry-gtk2 \ + --disable-pinentry-curses \ + --disable-fallback-curses \ + --disable-pinentry-qt4 \ + $(use_with caps libcap) +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + cd gtk+-2 && emake DESTDIR="${D}" install +} + +pkg_postinst() { + eselect pinentry set pinentry-gtk-2 + # eselect pinentry update ifunset +} + +pkg_postrm() { + eselect pinentry update ifunset +} diff --git a/app-crypt/pinentry-qt4/Manifest b/app-crypt/pinentry-qt4/Manifest index f6e8451a..b4d26cee 100644 --- a/app-crypt/pinentry-qt4/Manifest +++ b/app-crypt/pinentry-qt4/Manifest @@ -1 +1,2 @@ DIST pinentry-0.9.0.tar.bz2 464272 SHA256 90045a07ab8e1a8e1ecf5d19b51691f195525e579fa5d71d7e92c120b05490ab SHA512 2cc53a5c3852edaf6e940228d9b43fe4709344eba5fe230b7afd22b2c0239d0b258917d75661d80590b2d61c6fe9dac8ad15a0b4a0a0e7fba90a9e1c07364edd WHIRLPOOL 3f77a8aa2d44c7206d877e31088ec927473441e61f06e788330545d75ac489e6e9d5bf0026b23d0824304dad54ce8e61c4571d186df7ad0edc2d644ca3af04ac +DIST pinentry-0.9.5.tar.bz2 514677 SHA256 6a57fd3afc0d8aaa5599ffcb3ea4e7c42c113a181e8870122203ea018384688c SHA512 31a190cacf45fd3ff5128a6a1a9f317fb09850fd595d5985392ea306ed65fa9232e2203458a9989eaac3b6e9d07199e01557912051f00a9a395cd1db61b44c39 WHIRLPOOL 52e9664d7cf0e804bb14b9586a89aca4037d3324261ac8931ed26365c32ae038b45eca9b7b6637b46f9231ff2db6a9e0a96a611404e48659c7ba009b84c40727 diff --git a/app-crypt/pinentry-qt4/pinentry-qt4-0.9.5.ebuild b/app-crypt/pinentry-qt4/pinentry-qt4-0.9.5.ebuild new file mode 100644 index 00000000..380bea36 --- /dev/null +++ b/app-crypt/pinentry-qt4/pinentry-qt4-0.9.5.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit multilib eutils flag-o-matic + +MY_PN=${PN/-qt4} +MY_P=${P/-qt4} +DESCRIPTION="Qt4 frontend for pinentry" +HOMEPAGE="http://gnupg.org/aegypten2/index.html" +SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="caps" + +RDEPEND=" + ~app-crypt/pinentry-base-${PV} + !app-crypt/pinentry-base[static] + caps? ( sys-libs/libcap ) + >=dev-qt/qtgui-4.4.1:4 +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + #if use qt4; then + local f + for f in qt4/*.moc; do + "${EPREFIX}"/usr/bin/moc ${f/.moc/.h} > ${f} || die + done + #fi +} + +src_configure() { + # Issues finding qt on multilib systems + export QTLIB="${QTDIR}/$(get_libdir)" + + econf \ + --disable-pinentry-tty \ + --disable-pinentry-gtk2 \ + --disable-pinentry-curses \ + --disable-fallback-curses \ + --enable-pinentry-qt4 \ + $(use_with caps libcap) +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + cd qt4 && emake DESTDIR="${D}" install +} + +pkg_postinst() { + eselect pinentry set pinentry-qt4 + # eselect pinentry update ifunset +} + +pkg_postrm() { + eselect pinentry update ifunset +} diff --git a/app-crypt/pinentry/pinentry-0.9.5.ebuild b/app-crypt/pinentry/pinentry-0.9.5.ebuild new file mode 100644 index 00000000..83b66515 --- /dev/null +++ b/app-crypt/pinentry/pinentry-0.9.5.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +DESCRIPTION="Collection of simple PIN/passphrase entry dialogs which utilize the Assuan protocol (meta package)" +HOMEPAGE="http://gnupg.org/aegypten2/index.html" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +# ncurses use flag is fake, used to mimic portage ebuild USE flags +IUSE="gtk ncurses qt4 caps static" + +RDEPEND=" + ~app-crypt/pinentry-base-${PV} + caps? ( ~app-crypt/pinentry-base-${PV}[caps] ) + gtk? ( ~app-crypt/pinentry-gtk2-${PV} ) + qt4? ( ~app-crypt/pinentry-qt4-${PV} ) + static? ( ~app-crypt/pinentry-base-${PV}[static] )" +DEPEND="" + +REQUIRED_USE=" + || ( ncurses gtk qt4 ) + gtk? ( !static ) + qt4? ( !static ) + static? ( ncurses ) +" diff --git a/app-misc/anaconda-runtime/anaconda-runtime-1.1-r1.ebuild b/app-misc/anaconda-runtime/anaconda-runtime-1.1-r1.ebuild deleted file mode 100644 index 206c58ff..00000000 --- a/app-misc/anaconda-runtime/anaconda-runtime-1.1-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2004-2010 Sabayon -# Distributed under the terms of the GNU General Public License v2 -# $ - -EAPI="2" - -DESCRIPTION="Anaconda Installer runtime meta-package (containing all the runtime dependencies)" -SRC_URI="" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -SLOT="0" - -DEPEND="" -RDEPEND="app-admin/system-config-date - app-admin/system-config-users - >=app-misc/rogentoslive-tools-1 - >=app-misc/rogentos-version-1 - app-text/xmlto - dev-libs/elfutils - dev-libs/libnl - dev-libs/libxml2[python] - dev-python/pyblock - >=dev-python/python-cryptsetup-0.1.4 - dev-python/python-meh - dev-python/python-nss - dev-python/python-report - dev-python/urlgrabber - dev-util/pykickstart - net-misc/curl - net-misc/dhcp - net-misc/fcoe-utils - >=net-misc/networkmanager-0.7.2 - sys-apps/dmidecode - sys-apps/language-configuration-helpers - >=sys-boot/grub-1.98 - sys-boot/makebootfat - sys-fs/btrfs-progs - sys-fs/cryptsetup - sys-fs/dosfstools - sys-fs/e2fsprogs - sys-fs/jfsutils - sys-fs/mdadm - sys-fs/multipath-tools - || ( sys-fs/ntfsprogs sys-fs/ntfs3g[ntfsprogs] ) - sys-fs/reiserfsprogs - sys-fs/squashfs-tools - sys-fs/xfsprogs - sys-libs/cracklib - sys-libs/libuser - sys-libs/slang" diff --git a/app-misc/anaconda-runtime/anaconda-runtime-1.1-r3.ebuild b/app-misc/anaconda-runtime/anaconda-runtime-1.1-r3.ebuild deleted file mode 100644 index f9a4aa40..00000000 --- a/app-misc/anaconda-runtime/anaconda-runtime-1.1-r3.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2004-2010 Sabayon -# Distributed under the terms of the GNU General Public License v2 -# $ - -EAPI="2" - -DESCRIPTION="Anaconda Installer runtime meta-package (containing all the runtime dependencies)" -SRC_URI="" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -SLOT="0" - -DEPEND="" -RDEPEND="app-admin/system-config-date - app-admin/system-config-users - >=app-misc/kogaion-live-1 - >=app-misc/kogaion-version-1 - app-text/xmlto - dev-libs/elfutils - dev-libs/libnl - dev-libs/libxml2[python] - dev-python/pyblock - >=dev-python/python-cryptsetup-0.1.4 - dev-python/python-meh - dev-python/python-nss - dev-python/python-report - dev-python/urlgrabber - dev-util/pykickstart - net-misc/curl - net-misc/dhcp - net-misc/fcoe-utils - >=net-misc/networkmanager-0.7.2 - sys-apps/dmidecode - >=sys-boot/grub-1.98 - sys-boot/makebootfat - sys-fs/btrfs-progs - sys-fs/cryptsetup - sys-fs/dosfstools - sys-fs/e2fsprogs - sys-fs/jfsutils - sys-fs/mdadm - sys-fs/multipath-tools - || ( sys-fs/ntfsprogs sys-fs/ntfs3g[ntfsprogs] ) - sys-fs/reiserfsprogs - sys-fs/squashfs-tools - sys-fs/xfsprogs - sys-libs/cracklib - sys-libs/libuser - sys-libs/slang" diff --git a/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r2.ebuild b/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r3.ebuild index e46b065f..e46b065f 100644 --- a/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r2.ebuild +++ b/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r3.ebuild diff --git a/app-misc/calamares-config-kogaion/files/modules/users.conf b/app-misc/calamares-config-kogaion/files/modules/users.conf new file mode 100644 index 00000000..37517aa2 --- /dev/null +++ b/app-misc/calamares-config-kogaion/files/modules/users.conf @@ -0,0 +1,21 @@ +--- +userGroup: users +defaultGroups: + - lp + - video + - network + - storage + - wheel + - audio + - cdrom + - cdrw + - usb + - plugdev + - vboxusers + - vboxsf + - entropy + - portage + - messagebus +autologinGroup: autologin +sudoersGroup: wheel +setRootPassword: true diff --git a/app-misc/calamares-runtime/calamares-runtime-2.0.ebuild b/app-misc/calamares-runtime/calamares-runtime-2.0-r1.ebuild index f76741de..56ce336e 100644 --- a/app-misc/calamares-runtime/calamares-runtime-2.0.ebuild +++ b/app-misc/calamares-runtime/calamares-runtime-2.0-r1.ebuild @@ -48,6 +48,7 @@ RDEPEND=" >=sys-apps/dmidecode-2.12-r1 >=sys-fs/squashfs-tools-4.3:0[xattr] >=sys-power/upower-0.99.0-r1 + sys-boot/os-prober sys-auth/polkit-qt5 sys-fs/udisks:2[systemd] virtual/udev[systemd]" diff --git a/dev-vcs/git-cvs/Manifest b/dev-vcs/git-cvs/Manifest index bb05db44..49e816ea 100644 --- a/dev-vcs/git-cvs/Manifest +++ b/dev-vcs/git-cvs/Manifest @@ -7,6 +7,7 @@ DIST git-2.4.0.tar.xz 3681516 SHA256 b33438dd94659958a74850aacae4a2b3a626baec36d DIST git-2.4.2.tar.xz 3683880 SHA256 4801ec1cd8c2175b58cfdbc721d0bf50d74ae226f36905fceb894c2fb620c9e5 SHA512 0013069b73572fd764489222ad94cf94b9e08fc65223187a300e6662fb56b27dceea0b3a473cf8630793a5bf0c87e3b63264936bc38b66f71c6a548912540326 WHIRLPOOL 52d2fcd44c4da3f0e1f2caa229e1086b92022b992e410f3c20344f527f3cb9a623d3f0b6a8d5d66f3e4f43b9677f0211ebbaaffe85a621b784af1f5bc3f5896c DIST git-2.4.4.tar.xz 3689492 SHA256 f873b15d42281474fcba5921295d01e48a3cd3cddcbeb3d60176bf30f5f30260 SHA512 b4d3401d1e4f40f74f8eb75194d1edf0107786b942cf5e3fd127e4a268ce31ec4954195519444cc84e34caca4569d6fd41edafa2037116f60320f2c59c6e7cdf WHIRLPOOL 6fd9d4076586f25154cb448315a1492ffe7acfa5bb811c54e342acc4fcf28da423ab0042f23aa579adefbefa6b3f5dc45c949a36744c94d5420780a2175bde85 DIST git-2.4.6.tar.xz 3690432 SHA256 bdd944571c03474517b6c9941d6f1fd735eccbb164e59fd133d38644b69453b6 SHA512 2c95a00af81d6fbd8f4984e89d7cb23396caacadd684466aeb5a11f1b3acfbc625f832060cbef5aee0748e36c1fddcd88b3b9c26c4d7aec1d185e5f7311346ef WHIRLPOOL 1ae191666bf27a7e18686b910cbe610f85b5b7a43266232359615fa2a22b80bc659277b71b21394eab53df0c912d9ad911c7793c2a041cd6c7d768a5f0416f5b +DIST git-2.5.0.tar.xz 3740620 SHA256 cc59b1bac6c1c67a9159872863f6c5bbe0d9404cac2a85c3e9d9fa49923ce45c SHA512 ef7538c9f5ba5b2ac08962401c30e5fd51323b54b9fb5315d259adccec346e8fae9362815832dc2b5ce63a259b315c40e419bb2385dde04d84b992e62f6789b6 WHIRLPOOL 653e7aeb966dec44631bbd257a41935b2e957be9324311a4fd91f3a0ba6f1f674e2e59b4c564d70c4eeaea3788f0af9273a1d0a753b3bc820e687f0d63bddf5d DIST git-htmldocs-2.2.1.tar.xz 975488 SHA256 dee32b06ecf26044169adf40d95cb301c4219416a65c94b89c6513a80f03863b SHA512 68843b883e2fd4f14646ff97ba9e5f3fd4de9f6bbf57a40e9c1bceb6578ebf497e50f2b808fdb4174966e26bf9ac068b44cfdf111652d15796f4f84a7406d336 WHIRLPOOL 771af06f8663eaaa6de4d117277ea05680671c6d72010653ad8e2b037b7a8d77b4a3733b6c48e4775971304b680d0df2596ed1cb4eedbf9948135912ac9509a3 DIST git-htmldocs-2.2.2.tar.xz 976312 SHA256 41179ff0816189d583f290a227a73788002a319c7ff8c5cada970878c50b901d SHA512 b51b7d619e82d83b4f0b90d31bfccc30291a5beb48b2f5e5e59e75e91e5d772e89b560534a683648cd5480f4bf241f733efc87b30062ef5bb003bf0b5dbeed7f WHIRLPOOL c9dc7ac1a40559e4306d7d97a1619a272faf83d8b05c5a11f5f7b010566cd02fe853fee7eb550c6ccf744db446966a9696f9eb6feeee7ce4f976c6aa88b097d2 DIST git-htmldocs-2.3.0.tar.xz 980936 SHA256 e8e202bae7a89f22a815e15753e9742f2e140b3c0ca548e9a831cfdbfad3a873 SHA512 c4d226784d89469c8faa72f29ab87594682ba46b1887769e29f87ce0db1ac241c9568a8b1530e6d28d43a9861acf803f93dddcc1db59cbe97e21d7b9e374c565 WHIRLPOOL 5bb37b7e7b317ffbf842616b00caad54d4594748726063d2b66c2ccc5fc125a88001506ddff63b15ebaccd7e8a96399bad383eec13dbd8bdc40d5cf7f8696e2b @@ -15,6 +16,7 @@ DIST git-htmldocs-2.4.0.tar.xz 990744 SHA256 70ee1fdb70507c74832ac021e8940c8249d DIST git-htmldocs-2.4.2.tar.xz 992192 SHA256 792cfc6c8236fdb58dfd66e39766c7b8097080361eed28443207bc6c36e07911 SHA512 e9790b698c50a09724ec9c71001a70f2a6a7094b72326f290f3b5c7b274181f331fdbb71cb4e2db9edf1229ae534a715b2974424b89d515b901b074bdeb30b66 WHIRLPOOL ef3de3704e7c0e34174b1e16f0837c52d9ce9d64c0f61c417a52811ca623ae17304a2b9d484457569d635a269b4dedb3e940bf0fa7d3db1bc4f744bf1d392ff1 DIST git-htmldocs-2.4.4.tar.xz 994376 SHA256 e7f411f3eb3ecccc87e7d96afdcd8e72734a331170412eb37f240b731b2c2580 SHA512 1133dfa8a92358dbe6de35e22822b63bfbd418e8cd6290e1201738e5fc707fed1f50937d921f5323147cae75b89d452e8bd82768046685d7d2017dcd842766aa WHIRLPOOL 4684d5c4b7d8c7477ce658bd804280caab0721957786cb096a0acdf170e01a97d90eed7aca1d1f976ec79347cd9501c3ebed7ddf663ae785988e2abf36d9c054 DIST git-htmldocs-2.4.6.tar.xz 994712 SHA256 5213e8b882293ec3cda247dabbc75c6ee5243b9d330a8fafec004952fae91a88 SHA512 782fbc38a611380c0af2631bd6123d568b02159fb46159c763d97d75bd84debe43105d83ac3f321cd8383e1334806857bce1a48563fd0c19b43f527fe18615a8 WHIRLPOOL 170e4ecc8255e6d5d562274e6e3fb75c2fc62e415586d61498b680a076c74248664fca35bb7c532009f7f22be4ad14d1fe047e14791991fa32373bd7053e0396 +DIST git-htmldocs-2.5.0.tar.xz 1008428 SHA256 0924b290834e2a361a489cbc845a9bf04e56117597dc9c1a40e879cce655e4e2 SHA512 921ae8dd482719912f79f5affb6fa239290a954fb40625ac9fae2edf902989e5126ae7ca5c367b2b55c5387fb3cc3035ddf4e8b360743dbdee0f1b55ec33653c WHIRLPOOL e355781b06fba48d9ada859fe6fb515ddbfbac5a1d5c0918e8570e4566f68d644456606b5b0eb8e3e4cdc7c8b27a96b72cc1907008dff567cae71f0953968843 DIST git-manpages-2.2.1.tar.xz 369796 SHA256 00f8357fd8ab9e3b397dd087b20d405ed141765d04f3f2162e65fdec7cb1e538 SHA512 9fea3a61afa7336c7da9a4c9c130ed4dd05bb3b5b1cc7fe5a3953109085169d9fb92aafd2b932e6b66ad93ac46e3b60ea05c0f311a8178b53bc1c2184773ada5 WHIRLPOOL f5d1f4d47a2bc244beb3a343db37fe6898fc121310cd6bec0d3292a3352a3c86e16b3538b22317419c760870fb511120a3b03c7bc0585bfaa15c1c7418a4e8ac DIST git-manpages-2.2.2.tar.xz 369876 SHA256 d30688bb62763bf1b87f5eaf4c0a66c68999e479ccd2963108a5f6f82138147c SHA512 5c2220bb09f199ad4fe5c1bc20a813a6c62daab5e6e7fa87bf24861d25b7f7e0fdde215c4f59d8895badd7c361ed202e7837de48d2d54a155d24759db39dd4e1 WHIRLPOOL 45acc45663f13faf5b8197516bb934723bf84cd6db929443e2bd9fc3a915baf258ee93e782741e088a5f799115ea4ee6043225fc9ea9ec954feed21ba54c9be4 DIST git-manpages-2.3.0.tar.xz 370864 SHA256 1641d4fb67159961b4c295d2d5a05954bae19ebcaaa67728b6d72b70020b7842 SHA512 aa54b9fd96831a690848ef6df708d45999f03bc45aab3600bf578c998bbb225f54a8999ee5012996cb9d6f28d0d18c97209329cfba557b86d3dd0da7a23b1c1b WHIRLPOOL 817db829cd9e9eba93dc537531fd861278baa410d5a9aca09b2010f299d87c744b8a20d707052c6f8d470a5be74dba7a3bba3d20390915cc2a3eed47e84acb75 @@ -23,3 +25,4 @@ DIST git-manpages-2.4.0.tar.xz 372716 SHA256 b616dc6aa02dcac312e6aeae7af148913f7 DIST git-manpages-2.4.2.tar.xz 372804 SHA256 1b1830e804725e90ff319d801ab25f84ad956564379ef976bdc91bd58b743c32 SHA512 52f28cd537fc9fd34acad8834aa05d7d758e2f639df18b978effb676d5dbb660c99764075eb216c6377adb14b0b2d58584c8b3f635442bd4ded36a31b8757dc4 WHIRLPOOL f30b9293aa594111ce4baa46fee474b114199cc691ae43dea565a346f8ad7eb2cd72574bd6ddf9d5b32af020ad6032778cef3610ccac74d0f94be965b335962f DIST git-manpages-2.4.4.tar.xz 373400 SHA256 4bf125ece40f33872c6d9ccd6d83ec0068de5216b4075eaee78e39d46b08c351 SHA512 548bebf0843beaa3b4962ddb711e002904b940e820815717959a2ada2fd0b2489b5f6112debd5192c47d18c867fc9c7c4fcb2fb219d7ce39356b7807d236c2a3 WHIRLPOOL 2be153a1f04da7062a1fef114fc77ceb35ade4fe773c3777c5469bf0803044022a6dbfd8a7fb16c2c051126142166bad7d9b22fe8b32bdf6c934a74337e4c413 DIST git-manpages-2.4.6.tar.xz 373408 SHA256 f32d267bdaab75812dbd116d2b329d6dc7287a974e929e380e8cbf96e3822b8e SHA512 fa0562b8cc3e0421f7b45940f8cd4b58a5e58a1eb8571e2de85babf8ffd932fd210baa82aefe3c6090cb7dc51f64f299143be51beaacb37be97832b4a8e2a869 WHIRLPOOL 595beed93c621ffd9b7e0b507fc2941156975190eca8b638826ac32b6ea761bbb08f05e152dc88a7a3dbd168ab083a0128d61e72fae51cd0e94a8c91a1adb3ee +DIST git-manpages-2.5.0.tar.xz 377856 SHA256 1a6ea7220b1693eb384af0978a990ea8c0c634a7869d1ef63a2c8e427fc7f6ea SHA512 b3a5f2e8107c529ce81c1570a82472195e205ff1a8ddc75f4f0cbbf25f37a916700156df4418888c8a8a153ab58d5507a31027fb31faadeb5d4ba242847ab28d WHIRLPOOL 09f13622fff6a2b04a8ad584dab54c0b17cbfc6e803ca9e2deadab18071e50b50b37e395bb4746aff2e013f5b0025f8cdb1d439d8e6f3a659fad32646b30f4c7 diff --git a/dev-vcs/git-cvs/git-cvs-2.2.1.ebuild b/dev-vcs/git-cvs/git-cvs-2.2.1.ebuild index 8075eeeb..7089d233 100644 --- a/dev-vcs/git-cvs/git-cvs-2.2.1.ebuild +++ b/dev-vcs/git-cvs/git-cvs-2.2.1.ebuild @@ -11,8 +11,8 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.1-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.1-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PN="${PN/-cvs}" @@ -118,12 +118,12 @@ src_unpack() { git-2_src_unpack fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-cvs/git-cvs-2.2.2.ebuild b/dev-vcs/git-cvs/git-cvs-2.2.2.ebuild index 88d95690..d447893a 100644 --- a/dev-vcs/git-cvs/git-cvs-2.2.2.ebuild +++ b/dev-vcs/git-cvs/git-cvs-2.2.2.ebuild @@ -11,8 +11,8 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PN="${PN/-cvs}" @@ -115,12 +115,12 @@ src_unpack() { git-2_src_unpack fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-cvs/git-cvs-2.3.0.ebuild b/dev-vcs/git-cvs/git-cvs-2.3.0.ebuild index 88d95690..d447893a 100644 --- a/dev-vcs/git-cvs/git-cvs-2.3.0.ebuild +++ b/dev-vcs/git-cvs/git-cvs-2.3.0.ebuild @@ -11,8 +11,8 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PN="${PN/-cvs}" @@ -115,12 +115,12 @@ src_unpack() { git-2_src_unpack fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-cvs/git-cvs-2.3.1.ebuild b/dev-vcs/git-cvs/git-cvs-2.3.1.ebuild index 88d95690..d447893a 100644 --- a/dev-vcs/git-cvs/git-cvs-2.3.1.ebuild +++ b/dev-vcs/git-cvs/git-cvs-2.3.1.ebuild @@ -11,8 +11,8 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PN="${PN/-cvs}" @@ -115,12 +115,12 @@ src_unpack() { git-2_src_unpack fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-cvs/git-cvs-2.4.0.ebuild b/dev-vcs/git-cvs/git-cvs-2.4.0.ebuild index 378e1df3..ef80e1fb 100644 --- a/dev-vcs/git-cvs/git-cvs-2.4.0.ebuild +++ b/dev-vcs/git-cvs/git-cvs-2.4.0.ebuild @@ -11,8 +11,8 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PN="${PN/-cvs}" @@ -37,7 +37,7 @@ if [[ ${PV} != *9999 ]]; then KEYWORDS="~amd64 ~x86" fi -sab-patches_update_SRC_URI +kog-patches_update_SRC_URI LICENSE="GPL-2" SLOT="0" @@ -116,12 +116,12 @@ src_unpack() { git-2_src_unpack fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-cvs/git-cvs-2.4.2.ebuild b/dev-vcs/git-cvs/git-cvs-2.4.2.ebuild index 378e1df3..ef80e1fb 100644 --- a/dev-vcs/git-cvs/git-cvs-2.4.2.ebuild +++ b/dev-vcs/git-cvs/git-cvs-2.4.2.ebuild @@ -11,8 +11,8 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PN="${PN/-cvs}" @@ -37,7 +37,7 @@ if [[ ${PV} != *9999 ]]; then KEYWORDS="~amd64 ~x86" fi -sab-patches_update_SRC_URI +kog-patches_update_SRC_URI LICENSE="GPL-2" SLOT="0" @@ -116,12 +116,12 @@ src_unpack() { git-2_src_unpack fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-cvs/git-cvs-2.4.4.ebuild b/dev-vcs/git-cvs/git-cvs-2.4.4.ebuild index ed7700ae..886a7453 100644 --- a/dev-vcs/git-cvs/git-cvs-2.4.4.ebuild +++ b/dev-vcs/git-cvs/git-cvs-2.4.4.ebuild @@ -11,8 +11,8 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PN="${PN/-cvs}" @@ -37,7 +37,7 @@ if [[ ${PV} != *9999 ]]; then KEYWORDS="amd64 x86" fi -sab-patches_update_SRC_URI +kog-patches_update_SRC_URI LICENSE="GPL-2" SLOT="0" @@ -116,12 +116,12 @@ src_unpack() { git-2_src_unpack fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-cvs/git-cvs-2.4.6.ebuild b/dev-vcs/git-cvs/git-cvs-2.4.6.ebuild index 378e1df3..ef80e1fb 100644 --- a/dev-vcs/git-cvs/git-cvs-2.4.6.ebuild +++ b/dev-vcs/git-cvs/git-cvs-2.4.6.ebuild @@ -11,8 +11,8 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PN="${PN/-cvs}" @@ -37,7 +37,7 @@ if [[ ${PV} != *9999 ]]; then KEYWORDS="~amd64 ~x86" fi -sab-patches_update_SRC_URI +kog-patches_update_SRC_URI LICENSE="GPL-2" SLOT="0" @@ -116,12 +116,12 @@ src_unpack() { git-2_src_unpack fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-cvs/git-cvs-2.5.0.ebuild b/dev-vcs/git-cvs/git-cvs-2.5.0.ebuild new file mode 100644 index 00000000..ef80e1fb --- /dev/null +++ b/dev-vcs/git-cvs/git-cvs-2.5.0.ebuild @@ -0,0 +1,232 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +GENTOO_DEPEND_ON_PERL=no + +PYTHON_COMPAT=( python2_7 ) +[[ ${PV} == *9999 ]] && SCM="git-2" +EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" +EGIT_MASTER=pu + +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} + +MY_PV="${PV/_rc/.rc}" +MY_PN="${PN/-cvs}" +MY_P="${MY_PN}-${MY_PV}" + +DOC_VER=${MY_PV} + +DESCRIPTION="CVS module for GIT, the stupid content tracker" +HOMEPAGE="http://www.git-scm.com/" +if [[ ${PV} != *9999 ]]; then + SRC_URI_SUFFIX="xz" + 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}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + doc? ( + ${SRC_URI_KORG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_GOOG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + )" + KEYWORDS="~amd64 ~x86" +fi + +kog-patches_update_SRC_URI + +LICENSE="GPL-2" +SLOT="0" +IUSE="doc" + +RDEPEND="~dev-vcs/git-${PV}[-cvs,perl] + dev-perl/Error + dev-perl/Net-SMTP-SSL + dev-perl/Authen-SASL + >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite + ${PYTHON_DEPS}" +DEPEND="dev-lang/perl:=[-build(-)] + doc? ( + app-text/asciidoc + app-text/docbook2X + sys-apps/texinfo + app-text/xmlto + )" + +# Live ebuild builds man pages and HTML docs, additionally +if [[ ${PV} == *9999 ]]; then + DEPEND="${DEPEND} + app-text/asciidoc" +fi + +S="${WORKDIR}/${MY_P}" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} +" + +# 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 + + # broken assumptions, because of broken build system ... + myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" + myopts+=" INSTALL=install TAR=tar" + myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" + myopts+=" SANE_TOOL_PATH=" + myopts+=" OLD_ICONV=" + myopts+=" NO_EXTERNAL_GREP=" + + # split ebuild: avoid collisions with dev-vcs/git's .mo files + myopts+=" NO_GETTEXT=YesPlease" + + # can't define this to null, since the entire makefile depends on it + sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile + + myopts+=" INSTALLDIRS=vendor" + myopts+=" NO_SVN_TESTS=YesPlease" + + has_version '>=app-text/asciidoc-8.0' \ + && myopts+=" ASCIIDOC8=YesPlease" + myopts+=" ASCIIDOC_NO_ROFF=YesPlease" + + # Bug 290465: + # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' + [[ "${CHOST}" == *-uclibc* ]] && \ + myopts+=" NO_NSEC=YesPlease" + + export MY_MAKEOPTS="${myopts}" +} + +src_unpack() { + if [[ ${PV} != *9999 ]]; then + unpack ${MY_P}.tar.${SRC_URI_SUFFIX} + cd "${S}" + unpack ${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + use doc && \ + cd "${S}"/Documentation && \ + unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + cd "${S}" + else + git-2_src_unpack + fi + + kog-patches_unpack +} + +src_prepare() { + # see the git ebuild for the list of patches + kog-patches_apply_all + + epatch_user + + sed -i \ + -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ + -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ + -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ + -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + Makefile contrib/svn-fe/Makefile || die "sed failed" + + # Fix docbook2texi command + sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ + Documentation/Makefile || die "sed failed" + + # Never install the private copy of Error.pm (bug #296310) + sed -i \ + -e '/private-Error.pm/s,^,#,' \ + perl/Makefile.PL +} + +git_emake() { + # bug #326625: PERL_PATH, PERL_MM_OPT + # bug #320647: PYTHON_PATH + PYTHON_PATH="${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_MM_OPT="" \ + GIT_TEST_OPTS="--no-color" \ + V=1 \ + "$@" + # 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() { + #if use perl ; then + git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" + git_emake perl/perl.mak || die "emake perl/perl.mak failed" + #fi + git_emake || die "emake failed" + + 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" + + rm -rf "${ED}"usr/share/gitweb || die + rm -rf "${ED}"usr/share/git-core/templates || die + rm -rf "${ED}"usr/share/git-gui || die + rm -rf "${ED}"usr/share/gitk || die + + local myrelfile="" + for myfile in "${ED}"usr/libexec/git-core/* "${ED}"usr/$(get_libdir)/* "${ED}"usr/share/man/*/* "${ED}"usr/bin/* ; do + # image dir contains the keyword "cvs" + myrelfile="${myfile/${ED}}" + case "${myrelfile}" in + *cvs*) + true ;; + *) + rm -rf "${myfile}" || die ;; + esac + done + + local libdir="${ED}"usr/$(get_libdir) + if [ -d "${libdir}" ]; then + # must be empty + rmdir "${libdir}" || die + fi + + doman man*/*cvs* || die + if use doc; then + docinto / + dodoc Documentation/*cvs*.txt + dohtml -p / Documentation/*cvs*.html + fi + + # kill empty dirs from ${ED} + find "${ED}" -type d -empty -delete || die +} diff --git a/dev-vcs/git-gui-tools/Manifest b/dev-vcs/git-gui-tools/Manifest index 6c531a97..c2378c09 100644 --- a/dev-vcs/git-gui-tools/Manifest +++ b/dev-vcs/git-gui-tools/Manifest @@ -7,3 +7,4 @@ DIST git-2.4.0.tar.xz 3681516 SHA256 b33438dd94659958a74850aacae4a2b3a626baec36d DIST git-2.4.2.tar.xz 3683880 SHA256 4801ec1cd8c2175b58cfdbc721d0bf50d74ae226f36905fceb894c2fb620c9e5 SHA512 0013069b73572fd764489222ad94cf94b9e08fc65223187a300e6662fb56b27dceea0b3a473cf8630793a5bf0c87e3b63264936bc38b66f71c6a548912540326 WHIRLPOOL 52d2fcd44c4da3f0e1f2caa229e1086b92022b992e410f3c20344f527f3cb9a623d3f0b6a8d5d66f3e4f43b9677f0211ebbaaffe85a621b784af1f5bc3f5896c DIST git-2.4.4.tar.xz 3689492 SHA256 f873b15d42281474fcba5921295d01e48a3cd3cddcbeb3d60176bf30f5f30260 SHA512 b4d3401d1e4f40f74f8eb75194d1edf0107786b942cf5e3fd127e4a268ce31ec4954195519444cc84e34caca4569d6fd41edafa2037116f60320f2c59c6e7cdf WHIRLPOOL 6fd9d4076586f25154cb448315a1492ffe7acfa5bb811c54e342acc4fcf28da423ab0042f23aa579adefbefa6b3f5dc45c949a36744c94d5420780a2175bde85 DIST git-2.4.6.tar.xz 3690432 SHA256 bdd944571c03474517b6c9941d6f1fd735eccbb164e59fd133d38644b69453b6 SHA512 2c95a00af81d6fbd8f4984e89d7cb23396caacadd684466aeb5a11f1b3acfbc625f832060cbef5aee0748e36c1fddcd88b3b9c26c4d7aec1d185e5f7311346ef WHIRLPOOL 1ae191666bf27a7e18686b910cbe610f85b5b7a43266232359615fa2a22b80bc659277b71b21394eab53df0c912d9ad911c7793c2a041cd6c7d768a5f0416f5b +DIST git-2.5.0.tar.xz 3740620 SHA256 cc59b1bac6c1c67a9159872863f6c5bbe0d9404cac2a85c3e9d9fa49923ce45c SHA512 ef7538c9f5ba5b2ac08962401c30e5fd51323b54b9fb5315d259adccec346e8fae9362815832dc2b5ce63a259b315c40e419bb2385dde04d84b992e62f6789b6 WHIRLPOOL 653e7aeb966dec44631bbd257a41935b2e957be9324311a4fd91f3a0ba6f1f674e2e59b4c564d70c4eeaea3788f0af9273a1d0a753b3bc820e687f0d63bddf5d diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.2.1.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.2.1.ebuild index d21acec3..ba6a10e0 100644 --- a/dev-vcs/git-gui-tools/git-gui-tools-2.2.1.ebuild +++ b/dev-vcs/git-gui-tools/git-gui-tools-2.2.1.ebuild @@ -14,8 +14,8 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.1-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.1-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PV="${MY_PV/-gui-tools}" @@ -121,12 +121,12 @@ src_unpack() { #cp "${FILESDIR}"/GIT-VERSION-GEN . fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.2.2.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.2.2.ebuild index 87712853..43898cec 100644 --- a/dev-vcs/git-gui-tools/git-gui-tools-2.2.2.ebuild +++ b/dev-vcs/git-gui-tools/git-gui-tools-2.2.2.ebuild @@ -14,8 +14,8 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PV="${MY_PV/-gui-tools}" @@ -109,12 +109,12 @@ src_unpack() { #cp "${FILESDIR}"/GIT-VERSION-GEN . fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.3.0.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.3.0.ebuild index 87712853..43898cec 100644 --- a/dev-vcs/git-gui-tools/git-gui-tools-2.3.0.ebuild +++ b/dev-vcs/git-gui-tools/git-gui-tools-2.3.0.ebuild @@ -14,8 +14,8 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PV="${MY_PV/-gui-tools}" @@ -109,12 +109,12 @@ src_unpack() { #cp "${FILESDIR}"/GIT-VERSION-GEN . fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.3.1.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.3.1.ebuild index 87712853..43898cec 100644 --- a/dev-vcs/git-gui-tools/git-gui-tools-2.3.1.ebuild +++ b/dev-vcs/git-gui-tools/git-gui-tools-2.3.1.ebuild @@ -14,8 +14,8 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PV="${MY_PV/-gui-tools}" @@ -109,12 +109,12 @@ src_unpack() { #cp "${FILESDIR}"/GIT-VERSION-GEN . fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.4.0.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.4.0.ebuild index 58c3a173..1def28e8 100644 --- a/dev-vcs/git-gui-tools/git-gui-tools-2.4.0.ebuild +++ b/dev-vcs/git-gui-tools/git-gui-tools-2.4.0.ebuild @@ -14,8 +14,8 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PV="${MY_PV/-gui-tools}" @@ -33,7 +33,7 @@ if [[ ${PV} != *9999 ]]; then KEYWORDS="~amd64 ~x86" fi -sab-patches_update_SRC_URI +kog-patches_update_SRC_URI LICENSE="GPL-2" SLOT="0" @@ -109,12 +109,12 @@ src_unpack() { #cp "${FILESDIR}"/GIT-VERSION-GEN . fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.4.2.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.4.2.ebuild index 58c3a173..1def28e8 100644 --- a/dev-vcs/git-gui-tools/git-gui-tools-2.4.2.ebuild +++ b/dev-vcs/git-gui-tools/git-gui-tools-2.4.2.ebuild @@ -14,8 +14,8 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PV="${MY_PV/-gui-tools}" @@ -33,7 +33,7 @@ if [[ ${PV} != *9999 ]]; then KEYWORDS="~amd64 ~x86" fi -sab-patches_update_SRC_URI +kog-patches_update_SRC_URI LICENSE="GPL-2" SLOT="0" @@ -109,12 +109,12 @@ src_unpack() { #cp "${FILESDIR}"/GIT-VERSION-GEN . fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.4.4.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.4.4.ebuild index 3b9111b0..7583e839 100644 --- a/dev-vcs/git-gui-tools/git-gui-tools-2.4.4.ebuild +++ b/dev-vcs/git-gui-tools/git-gui-tools-2.4.4.ebuild @@ -14,8 +14,8 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PV="${MY_PV/-gui-tools}" @@ -33,7 +33,7 @@ if [[ ${PV} != *9999 ]]; then KEYWORDS="amd64 x86" fi -sab-patches_update_SRC_URI +kog-patches_update_SRC_URI LICENSE="GPL-2" SLOT="0" @@ -109,12 +109,12 @@ src_unpack() { #cp "${FILESDIR}"/GIT-VERSION-GEN . fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.4.6.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.4.6.ebuild index 58c3a173..1def28e8 100644 --- a/dev-vcs/git-gui-tools/git-gui-tools-2.4.6.ebuild +++ b/dev-vcs/git-gui-tools/git-gui-tools-2.4.6.ebuild @@ -14,8 +14,8 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PV="${MY_PV/-gui-tools}" @@ -33,7 +33,7 @@ if [[ ${PV} != *9999 ]]; then KEYWORDS="~amd64 ~x86" fi -sab-patches_update_SRC_URI +kog-patches_update_SRC_URI LICENSE="GPL-2" SLOT="0" @@ -109,12 +109,12 @@ src_unpack() { #cp "${FILESDIR}"/GIT-VERSION-GEN . fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.5.0.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.5.0.ebuild new file mode 100644 index 00000000..1def28e8 --- /dev/null +++ b/dev-vcs/git-gui-tools/git-gui-tools-2.5.0.ebuild @@ -0,0 +1,205 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +# split ebuild providing only ->>> gitk, gitview, git-gui, git-citool + +GENTOO_DEPEND_ON_PERL=no + +# bug #329479: git-remote-testgit is not multiple-version aware +PYTHON_COMPAT=( python2_7 ) +[[ ${PV} == *9999 ]] && SCM="git-2" +EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" +EGIT_MASTER=pu + +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM} + +MY_PV="${PV/_rc/.rc}" +MY_PV="${MY_PV/-gui-tools}" +MY_P="${PN}-${MY_PV}" +MY_P="${MY_P/-gui-tools}" + +DESCRIPTION="GUI tools derived from git: gitk, git-gui and gitview" +HOMEPAGE="http://www.git-scm.com/" +if [[ ${PV} != *9999 ]]; then + SRC_URI_SUFFIX="xz" + 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}" + KEYWORDS="~amd64 ~x86" +fi + +kog-patches_update_SRC_URI + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +# Common to both DEPEND and RDEPEND +CDEPEND=" + sys-libs/zlib + dev-lang/tk:=" + +RDEPEND="${CDEPEND} + ~dev-vcs/git-${PV} + dev-vcs/git[-gtk] + dev-vcs/git[-tk] + dev-vcs/git[python] + >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] + >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] + ${PYTHON_DEPS}" + +DEPEND="${CDEPEND}" + +SITEFILE=50${PN}-gentoo.el +S="${WORKDIR}/${MY_P}" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} +" + +pkg_setup() { + #if use python ; then + python-single-r1_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 + + myopts+=" NO_EXPAT=YesPlease" + myopts+=" NO_CURL=YesPlease" + # broken assumptions, because of broken build system ... + myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" + myopts+=" INSTALL=install TAR=tar" + myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" + myopts+=" SANE_TOOL_PATH=" + myopts+=" OLD_ICONV=" + myopts+=" NO_EXTERNAL_GREP=" + + # split ebuild: avoid collisions with dev-vcs/git's .mo files + myopts+=" NO_GETTEXT=YesPlease" + + # can't define this to null, since the entire makefile depends on it + sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile + + myopts+=" NO_PERL=YesPlease" + + # Bug 290465: + # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' + [[ "${CHOST}" == *-uclibc* ]] && \ + myopts+=" NO_NSEC=YesPlease" + + export MY_MAKEOPTS="${myopts}" +} + +src_unpack() { + if [[ ${PV} != *9999 ]]; then + unpack ${MY_P}.tar.${SRC_URI_SUFFIX} + cd "${S}" + else + git-2_src_unpack + cd "${S}" + #cp "${FILESDIR}"/GIT-VERSION-GEN . + fi + + kog-patches_unpack +} + +src_prepare() { + # see the git ebuild for the list of patches + kog-patches_apply_all + + epatch_user + + sed -i \ + -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ + -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ + -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ + -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + Makefile contrib/svn-fe/Makefile || die "sed failed" + + # Never install the private copy of Error.pm (bug #296310) + sed -i \ + -e '/private-Error.pm/s,^,#,' \ + perl/Makefile.PL +} + +git_emake() { + PYTHON_PATH="${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_MM_OPT="" \ + GIT_TEST_OPTS="--no-color" \ + V=1 \ + "$@" +} + +src_configure() { + exportmakeopts +} + +src_compile() { + git_emake || die "emake failed" +} + +src_install() { + git_emake \ + install || \ + die "make install failed" + + #if use python && use gtk ; then + python_doscript "${S}"/contrib/gitview/gitview + dodoc "${S}"/contrib/gitview/gitview.txt + #fi + + #find "${ED}"/usr/lib64/perl5/ \ + # -name .packlist \ + # -exec rm \{\} \; + + rm -r "${ED}"usr/share/git-core || die + rm -r "${ED}"usr/libexec/git-core/mergetools || die + + local myfile + + # be sure not to remove tools' lib/python-exec/* + for myfile in "${ED}"usr/lib*/python*; do + if [[ ! ${myfile} = */python-exec ]]; then + rm -r "${myfile}" || die "rm ${myfile} failed" + fi + done + + for myfile in "${ED}"usr/bin/*; do + case "$myfile" in + */gitview*|*/gitk*) + true ;; + *) + rm -f "$myfile" ;; + esac + done + + for myfile in "${ED}"usr/libexec/git-core/*; do + case "$myfile" in + */git-gui|*/git-gui--askpass|*/git-citool) + true ;; + *) + rm -f "$myfile" ;; + esac + done +} diff --git a/dev-vcs/git-subversion/Manifest b/dev-vcs/git-subversion/Manifest index bb05db44..49e816ea 100644 --- a/dev-vcs/git-subversion/Manifest +++ b/dev-vcs/git-subversion/Manifest @@ -7,6 +7,7 @@ DIST git-2.4.0.tar.xz 3681516 SHA256 b33438dd94659958a74850aacae4a2b3a626baec36d DIST git-2.4.2.tar.xz 3683880 SHA256 4801ec1cd8c2175b58cfdbc721d0bf50d74ae226f36905fceb894c2fb620c9e5 SHA512 0013069b73572fd764489222ad94cf94b9e08fc65223187a300e6662fb56b27dceea0b3a473cf8630793a5bf0c87e3b63264936bc38b66f71c6a548912540326 WHIRLPOOL 52d2fcd44c4da3f0e1f2caa229e1086b92022b992e410f3c20344f527f3cb9a623d3f0b6a8d5d66f3e4f43b9677f0211ebbaaffe85a621b784af1f5bc3f5896c DIST git-2.4.4.tar.xz 3689492 SHA256 f873b15d42281474fcba5921295d01e48a3cd3cddcbeb3d60176bf30f5f30260 SHA512 b4d3401d1e4f40f74f8eb75194d1edf0107786b942cf5e3fd127e4a268ce31ec4954195519444cc84e34caca4569d6fd41edafa2037116f60320f2c59c6e7cdf WHIRLPOOL 6fd9d4076586f25154cb448315a1492ffe7acfa5bb811c54e342acc4fcf28da423ab0042f23aa579adefbefa6b3f5dc45c949a36744c94d5420780a2175bde85 DIST git-2.4.6.tar.xz 3690432 SHA256 bdd944571c03474517b6c9941d6f1fd735eccbb164e59fd133d38644b69453b6 SHA512 2c95a00af81d6fbd8f4984e89d7cb23396caacadd684466aeb5a11f1b3acfbc625f832060cbef5aee0748e36c1fddcd88b3b9c26c4d7aec1d185e5f7311346ef WHIRLPOOL 1ae191666bf27a7e18686b910cbe610f85b5b7a43266232359615fa2a22b80bc659277b71b21394eab53df0c912d9ad911c7793c2a041cd6c7d768a5f0416f5b +DIST git-2.5.0.tar.xz 3740620 SHA256 cc59b1bac6c1c67a9159872863f6c5bbe0d9404cac2a85c3e9d9fa49923ce45c SHA512 ef7538c9f5ba5b2ac08962401c30e5fd51323b54b9fb5315d259adccec346e8fae9362815832dc2b5ce63a259b315c40e419bb2385dde04d84b992e62f6789b6 WHIRLPOOL 653e7aeb966dec44631bbd257a41935b2e957be9324311a4fd91f3a0ba6f1f674e2e59b4c564d70c4eeaea3788f0af9273a1d0a753b3bc820e687f0d63bddf5d DIST git-htmldocs-2.2.1.tar.xz 975488 SHA256 dee32b06ecf26044169adf40d95cb301c4219416a65c94b89c6513a80f03863b SHA512 68843b883e2fd4f14646ff97ba9e5f3fd4de9f6bbf57a40e9c1bceb6578ebf497e50f2b808fdb4174966e26bf9ac068b44cfdf111652d15796f4f84a7406d336 WHIRLPOOL 771af06f8663eaaa6de4d117277ea05680671c6d72010653ad8e2b037b7a8d77b4a3733b6c48e4775971304b680d0df2596ed1cb4eedbf9948135912ac9509a3 DIST git-htmldocs-2.2.2.tar.xz 976312 SHA256 41179ff0816189d583f290a227a73788002a319c7ff8c5cada970878c50b901d SHA512 b51b7d619e82d83b4f0b90d31bfccc30291a5beb48b2f5e5e59e75e91e5d772e89b560534a683648cd5480f4bf241f733efc87b30062ef5bb003bf0b5dbeed7f WHIRLPOOL c9dc7ac1a40559e4306d7d97a1619a272faf83d8b05c5a11f5f7b010566cd02fe853fee7eb550c6ccf744db446966a9696f9eb6feeee7ce4f976c6aa88b097d2 DIST git-htmldocs-2.3.0.tar.xz 980936 SHA256 e8e202bae7a89f22a815e15753e9742f2e140b3c0ca548e9a831cfdbfad3a873 SHA512 c4d226784d89469c8faa72f29ab87594682ba46b1887769e29f87ce0db1ac241c9568a8b1530e6d28d43a9861acf803f93dddcc1db59cbe97e21d7b9e374c565 WHIRLPOOL 5bb37b7e7b317ffbf842616b00caad54d4594748726063d2b66c2ccc5fc125a88001506ddff63b15ebaccd7e8a96399bad383eec13dbd8bdc40d5cf7f8696e2b @@ -15,6 +16,7 @@ DIST git-htmldocs-2.4.0.tar.xz 990744 SHA256 70ee1fdb70507c74832ac021e8940c8249d DIST git-htmldocs-2.4.2.tar.xz 992192 SHA256 792cfc6c8236fdb58dfd66e39766c7b8097080361eed28443207bc6c36e07911 SHA512 e9790b698c50a09724ec9c71001a70f2a6a7094b72326f290f3b5c7b274181f331fdbb71cb4e2db9edf1229ae534a715b2974424b89d515b901b074bdeb30b66 WHIRLPOOL ef3de3704e7c0e34174b1e16f0837c52d9ce9d64c0f61c417a52811ca623ae17304a2b9d484457569d635a269b4dedb3e940bf0fa7d3db1bc4f744bf1d392ff1 DIST git-htmldocs-2.4.4.tar.xz 994376 SHA256 e7f411f3eb3ecccc87e7d96afdcd8e72734a331170412eb37f240b731b2c2580 SHA512 1133dfa8a92358dbe6de35e22822b63bfbd418e8cd6290e1201738e5fc707fed1f50937d921f5323147cae75b89d452e8bd82768046685d7d2017dcd842766aa WHIRLPOOL 4684d5c4b7d8c7477ce658bd804280caab0721957786cb096a0acdf170e01a97d90eed7aca1d1f976ec79347cd9501c3ebed7ddf663ae785988e2abf36d9c054 DIST git-htmldocs-2.4.6.tar.xz 994712 SHA256 5213e8b882293ec3cda247dabbc75c6ee5243b9d330a8fafec004952fae91a88 SHA512 782fbc38a611380c0af2631bd6123d568b02159fb46159c763d97d75bd84debe43105d83ac3f321cd8383e1334806857bce1a48563fd0c19b43f527fe18615a8 WHIRLPOOL 170e4ecc8255e6d5d562274e6e3fb75c2fc62e415586d61498b680a076c74248664fca35bb7c532009f7f22be4ad14d1fe047e14791991fa32373bd7053e0396 +DIST git-htmldocs-2.5.0.tar.xz 1008428 SHA256 0924b290834e2a361a489cbc845a9bf04e56117597dc9c1a40e879cce655e4e2 SHA512 921ae8dd482719912f79f5affb6fa239290a954fb40625ac9fae2edf902989e5126ae7ca5c367b2b55c5387fb3cc3035ddf4e8b360743dbdee0f1b55ec33653c WHIRLPOOL e355781b06fba48d9ada859fe6fb515ddbfbac5a1d5c0918e8570e4566f68d644456606b5b0eb8e3e4cdc7c8b27a96b72cc1907008dff567cae71f0953968843 DIST git-manpages-2.2.1.tar.xz 369796 SHA256 00f8357fd8ab9e3b397dd087b20d405ed141765d04f3f2162e65fdec7cb1e538 SHA512 9fea3a61afa7336c7da9a4c9c130ed4dd05bb3b5b1cc7fe5a3953109085169d9fb92aafd2b932e6b66ad93ac46e3b60ea05c0f311a8178b53bc1c2184773ada5 WHIRLPOOL f5d1f4d47a2bc244beb3a343db37fe6898fc121310cd6bec0d3292a3352a3c86e16b3538b22317419c760870fb511120a3b03c7bc0585bfaa15c1c7418a4e8ac DIST git-manpages-2.2.2.tar.xz 369876 SHA256 d30688bb62763bf1b87f5eaf4c0a66c68999e479ccd2963108a5f6f82138147c SHA512 5c2220bb09f199ad4fe5c1bc20a813a6c62daab5e6e7fa87bf24861d25b7f7e0fdde215c4f59d8895badd7c361ed202e7837de48d2d54a155d24759db39dd4e1 WHIRLPOOL 45acc45663f13faf5b8197516bb934723bf84cd6db929443e2bd9fc3a915baf258ee93e782741e088a5f799115ea4ee6043225fc9ea9ec954feed21ba54c9be4 DIST git-manpages-2.3.0.tar.xz 370864 SHA256 1641d4fb67159961b4c295d2d5a05954bae19ebcaaa67728b6d72b70020b7842 SHA512 aa54b9fd96831a690848ef6df708d45999f03bc45aab3600bf578c998bbb225f54a8999ee5012996cb9d6f28d0d18c97209329cfba557b86d3dd0da7a23b1c1b WHIRLPOOL 817db829cd9e9eba93dc537531fd861278baa410d5a9aca09b2010f299d87c744b8a20d707052c6f8d470a5be74dba7a3bba3d20390915cc2a3eed47e84acb75 @@ -23,3 +25,4 @@ DIST git-manpages-2.4.0.tar.xz 372716 SHA256 b616dc6aa02dcac312e6aeae7af148913f7 DIST git-manpages-2.4.2.tar.xz 372804 SHA256 1b1830e804725e90ff319d801ab25f84ad956564379ef976bdc91bd58b743c32 SHA512 52f28cd537fc9fd34acad8834aa05d7d758e2f639df18b978effb676d5dbb660c99764075eb216c6377adb14b0b2d58584c8b3f635442bd4ded36a31b8757dc4 WHIRLPOOL f30b9293aa594111ce4baa46fee474b114199cc691ae43dea565a346f8ad7eb2cd72574bd6ddf9d5b32af020ad6032778cef3610ccac74d0f94be965b335962f DIST git-manpages-2.4.4.tar.xz 373400 SHA256 4bf125ece40f33872c6d9ccd6d83ec0068de5216b4075eaee78e39d46b08c351 SHA512 548bebf0843beaa3b4962ddb711e002904b940e820815717959a2ada2fd0b2489b5f6112debd5192c47d18c867fc9c7c4fcb2fb219d7ce39356b7807d236c2a3 WHIRLPOOL 2be153a1f04da7062a1fef114fc77ceb35ade4fe773c3777c5469bf0803044022a6dbfd8a7fb16c2c051126142166bad7d9b22fe8b32bdf6c934a74337e4c413 DIST git-manpages-2.4.6.tar.xz 373408 SHA256 f32d267bdaab75812dbd116d2b329d6dc7287a974e929e380e8cbf96e3822b8e SHA512 fa0562b8cc3e0421f7b45940f8cd4b58a5e58a1eb8571e2de85babf8ffd932fd210baa82aefe3c6090cb7dc51f64f299143be51beaacb37be97832b4a8e2a869 WHIRLPOOL 595beed93c621ffd9b7e0b507fc2941156975190eca8b638826ac32b6ea761bbb08f05e152dc88a7a3dbd168ab083a0128d61e72fae51cd0e94a8c91a1adb3ee +DIST git-manpages-2.5.0.tar.xz 377856 SHA256 1a6ea7220b1693eb384af0978a990ea8c0c634a7869d1ef63a2c8e427fc7f6ea SHA512 b3a5f2e8107c529ce81c1570a82472195e205ff1a8ddc75f4f0cbbf25f37a916700156df4418888c8a8a153ab58d5507a31027fb31faadeb5d4ba242847ab28d WHIRLPOOL 09f13622fff6a2b04a8ad584dab54c0b17cbfc6e803ca9e2deadab18071e50b50b37e395bb4746aff2e013f5b0025f8cdb1d439d8e6f3a659fad32646b30f4c7 diff --git a/dev-vcs/git-subversion/git-subversion-2.2.1.ebuild b/dev-vcs/git-subversion/git-subversion-2.2.1.ebuild index 9694e461..5a9336a6 100644 --- a/dev-vcs/git-subversion/git-subversion-2.2.1.ebuild +++ b/dev-vcs/git-subversion/git-subversion-2.2.1.ebuild @@ -11,8 +11,8 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.1-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.1-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PN="${PN/-subversion}" @@ -124,13 +124,13 @@ src_unpack() { git-2_src_unpack fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-subversion/git-subversion-2.2.2.ebuild b/dev-vcs/git-subversion/git-subversion-2.2.2.ebuild index 51267960..8c0524c8 100644 --- a/dev-vcs/git-subversion/git-subversion-2.2.2.ebuild +++ b/dev-vcs/git-subversion/git-subversion-2.2.2.ebuild @@ -11,8 +11,8 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PN="${PN/-subversion}" @@ -121,13 +121,13 @@ src_unpack() { git-2_src_unpack fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-subversion/git-subversion-2.3.0.ebuild b/dev-vcs/git-subversion/git-subversion-2.3.0.ebuild index 51267960..8c0524c8 100644 --- a/dev-vcs/git-subversion/git-subversion-2.3.0.ebuild +++ b/dev-vcs/git-subversion/git-subversion-2.3.0.ebuild @@ -11,8 +11,8 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PN="${PN/-subversion}" @@ -121,13 +121,13 @@ src_unpack() { git-2_src_unpack fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-subversion/git-subversion-2.3.1.ebuild b/dev-vcs/git-subversion/git-subversion-2.3.1.ebuild index 51267960..8c0524c8 100644 --- a/dev-vcs/git-subversion/git-subversion-2.3.1.ebuild +++ b/dev-vcs/git-subversion/git-subversion-2.3.1.ebuild @@ -11,8 +11,8 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PN="${PN/-subversion}" @@ -121,13 +121,13 @@ src_unpack() { git-2_src_unpack fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-subversion/git-subversion-2.4.0.ebuild b/dev-vcs/git-subversion/git-subversion-2.4.0.ebuild index 785c134c..bdf08653 100644 --- a/dev-vcs/git-subversion/git-subversion-2.4.0.ebuild +++ b/dev-vcs/git-subversion/git-subversion-2.4.0.ebuild @@ -11,8 +11,8 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PN="${PN/-subversion}" @@ -37,7 +37,7 @@ if [[ ${PV} != *9999 ]]; then KEYWORDS="~amd64 ~x86" fi -sab-patches_update_SRC_URI +kog-patches_update_SRC_URI LICENSE="GPL-2" SLOT="0" @@ -122,13 +122,13 @@ src_unpack() { git-2_src_unpack fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-subversion/git-subversion-2.4.2.ebuild b/dev-vcs/git-subversion/git-subversion-2.4.2.ebuild index 785c134c..bdf08653 100644 --- a/dev-vcs/git-subversion/git-subversion-2.4.2.ebuild +++ b/dev-vcs/git-subversion/git-subversion-2.4.2.ebuild @@ -11,8 +11,8 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PN="${PN/-subversion}" @@ -37,7 +37,7 @@ if [[ ${PV} != *9999 ]]; then KEYWORDS="~amd64 ~x86" fi -sab-patches_update_SRC_URI +kog-patches_update_SRC_URI LICENSE="GPL-2" SLOT="0" @@ -122,13 +122,13 @@ src_unpack() { git-2_src_unpack fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-subversion/git-subversion-2.4.4.ebuild b/dev-vcs/git-subversion/git-subversion-2.4.4.ebuild index 00b9f492..dc8d3685 100644 --- a/dev-vcs/git-subversion/git-subversion-2.4.4.ebuild +++ b/dev-vcs/git-subversion/git-subversion-2.4.4.ebuild @@ -11,8 +11,8 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PN="${PN/-subversion}" @@ -37,7 +37,7 @@ if [[ ${PV} != *9999 ]]; then KEYWORDS="amd64 x86" fi -sab-patches_update_SRC_URI +kog-patches_update_SRC_URI LICENSE="GPL-2" SLOT="0" @@ -122,13 +122,13 @@ src_unpack() { git-2_src_unpack fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-subversion/git-subversion-2.4.6.ebuild b/dev-vcs/git-subversion/git-subversion-2.4.6.ebuild index 785c134c..bdf08653 100644 --- a/dev-vcs/git-subversion/git-subversion-2.4.6.ebuild +++ b/dev-vcs/git-subversion/git-subversion-2.4.6.ebuild @@ -11,8 +11,8 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" MY_PN="${PN/-subversion}" @@ -37,7 +37,7 @@ if [[ ${PV} != *9999 ]]; then KEYWORDS="~amd64 ~x86" fi -sab-patches_update_SRC_URI +kog-patches_update_SRC_URI LICENSE="GPL-2" SLOT="0" @@ -122,13 +122,13 @@ src_unpack() { git-2_src_unpack fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { # see the git ebuild for the list of patches - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git-subversion/git-subversion-2.5.0.ebuild b/dev-vcs/git-subversion/git-subversion-2.5.0.ebuild new file mode 100644 index 00000000..bdf08653 --- /dev/null +++ b/dev-vcs/git-subversion/git-subversion-2.5.0.ebuild @@ -0,0 +1,262 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +GENTOO_DEPEND_ON_PERL=no + +PYTHON_COMPAT=( python2_7 ) +[[ ${PV} == *9999 ]] && SCM="git-2" +EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" +EGIT_MASTER=pu + +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} + +MY_PV="${PV/_rc/.rc}" +MY_PN="${PN/-subversion}" +MY_P="${MY_PN}-${MY_PV}" + +DOC_VER=${MY_PV} + +DESCRIPTION="Subversion module for GIT, the stupid content tracker" +HOMEPAGE="http://www.git-scm.com/" +if [[ ${PV} != *9999 ]]; then + SRC_URI_SUFFIX="xz" + 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}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + doc? ( + ${SRC_URI_KORG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_GOOG}/${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + )" + KEYWORDS="~amd64 ~x86" +fi + +kog-patches_update_SRC_URI + +LICENSE="GPL-2" +SLOT="0" +IUSE="doc iconv nls +threads" + +RDEPEND="~dev-vcs/git-${PV}[-subversion,perl] + dev-perl/Error + dev-perl/Net-SMTP-SSL + dev-perl/Authen-SASL + dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey + ${PYTHON_DEPS}" +DEPEND="dev-lang/perl:=[-build(-)] + doc? ( + app-text/asciidoc + app-text/docbook2X + sys-apps/texinfo + app-text/xmlto + )" + +# Live ebuild builds man pages and HTML docs, additionally +if [[ ${PV} == *9999 ]]; then + DEPEND="${DEPEND} + app-text/asciidoc" +fi + +S="${WORKDIR}/${MY_P}" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} +" + +# 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 + + # broken assumptions, because of broken build system ... + myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" + myopts+=" INSTALL=install TAR=tar" + myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" + myopts+=" SANE_TOOL_PATH=" + myopts+=" OLD_ICONV=" + myopts+=" NO_EXTERNAL_GREP=" + + # split ebuild: avoid collisions with dev-vcs/git's .mo files + myopts+=" NO_GETTEXT=YesPlease" + + # For svn-fe + #extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" + extlibs="-lz -lssl -lcrypto ${S}/xdiff/lib.a $(usex threads -lpthread '')" + + # can't define this to null, since the entire makefile depends on it + sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile + + myopts+=" INSTALLDIRS=vendor" + myopts+=" NO_SVN_TESTS=YesPlease" + myopts+=" NO_CVS=YesPlease" + + has_version '>=app-text/asciidoc-8.0' \ + && myopts+=" ASCIIDOC8=YesPlease" + myopts+=" ASCIIDOC_NO_ROFF=YesPlease" + + # Bug 290465: + # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' + [[ "${CHOST}" == *-uclibc* ]] && \ + myopts+=" NO_NSEC=YesPlease" + + export MY_MAKEOPTS="${myopts}" + export EXTLIBS="${extlibs}" +} + +src_unpack() { + if [[ ${PV} != *9999 ]]; then + unpack ${MY_P}.tar.${SRC_URI_SUFFIX} + cd "${S}" + unpack ${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + use doc && \ + cd "${S}"/Documentation && \ + unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + cd "${S}" + else + git-2_src_unpack + fi + + kog-patches_unpack + +} + +src_prepare() { + # see the git ebuild for the list of patches + kog-patches_apply_all + + epatch_user + + sed -i \ + -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ + -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ + -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ + -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + Makefile contrib/svn-fe/Makefile || die "sed failed" + + # Fix docbook2texi command + sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ + Documentation/Makefile || die "sed failed" + + # Never install the private copy of Error.pm (bug #296310) + sed -i \ + -e '/private-Error.pm/s,^,#,' \ + perl/Makefile.PL +} + +git_emake() { + # bug #326625: PERL_PATH, PERL_MM_OPT + # bug #320647: PYTHON_PATH + PYTHON_PATH="${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_MM_OPT="" \ + GIT_TEST_OPTS="--no-color" \ + V=1 \ + "$@" + # 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() { + #if use perl ; then + git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" + git_emake perl/perl.mak || die "emake perl/perl.mak failed" + #fi + + git_emake || die "emake failed" + + 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 + + cd "${S}"/contrib/svn-fe + # by defining EXTLIBS we override the detection for libintl and + # libiconv, bug #516168 + local nlsiconv= + use nls && use !elibc_glibc && nlsiconv+=" -lintl" + use iconv && use !elibc_glibc && nlsiconv+=" -liconv" + git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" + if use doc ; then + git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" + fi +} + +src_install() { + git_emake \ + install || \ + die "make install failed" + + rm -r "${ED}"usr/share/gitweb || die + rm -r "${ED}"usr/bin || die + rm -r "${ED}"usr/share/git-core/templates || die + rm -r "${ED}"usr/share/git-gui || die + rm -r "${ED}"usr/share/gitk || die + + # avoid conflict with dev-vcs/git + # it looks weird but this binary is installed by git ebuild + # so removing in git-subversion + rm "${ED}"usr/libexec/git-core/git-remote-testsvn || die + + for myfile in "${ED}"usr/libexec/git-core/* "${ED}"usr/$(get_libdir)/* "${ED}"usr/share/man/*/*; do + case "$myfile" in + *svn*) + true ;; + *) + rm -r "${myfile}" || die ;; + esac + done + + local libdir=${ED}usr/$(get_libdir) + if [[ -d ${libdir} ]]; then + # must be empty + rmdir "${libdir}" || die + fi + + doman man*/*svn* || die + if use doc; then + docinto / + dodoc Documentation/*svn*.txt + dohtml -p / Documentation/*svn*.html + fi + + cd "${S}"/contrib/svn-fe + dobin svn-fe + dodoc svn-fe.txt + use doc && doman svn-fe.1 && dohtml svn-fe.html + cd "${S}" + + # kill empty dirs from ${ED} + find "${ED}" -type d -empty -delete || die +} diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index bb05db44..49e816ea 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -7,6 +7,7 @@ DIST git-2.4.0.tar.xz 3681516 SHA256 b33438dd94659958a74850aacae4a2b3a626baec36d DIST git-2.4.2.tar.xz 3683880 SHA256 4801ec1cd8c2175b58cfdbc721d0bf50d74ae226f36905fceb894c2fb620c9e5 SHA512 0013069b73572fd764489222ad94cf94b9e08fc65223187a300e6662fb56b27dceea0b3a473cf8630793a5bf0c87e3b63264936bc38b66f71c6a548912540326 WHIRLPOOL 52d2fcd44c4da3f0e1f2caa229e1086b92022b992e410f3c20344f527f3cb9a623d3f0b6a8d5d66f3e4f43b9677f0211ebbaaffe85a621b784af1f5bc3f5896c DIST git-2.4.4.tar.xz 3689492 SHA256 f873b15d42281474fcba5921295d01e48a3cd3cddcbeb3d60176bf30f5f30260 SHA512 b4d3401d1e4f40f74f8eb75194d1edf0107786b942cf5e3fd127e4a268ce31ec4954195519444cc84e34caca4569d6fd41edafa2037116f60320f2c59c6e7cdf WHIRLPOOL 6fd9d4076586f25154cb448315a1492ffe7acfa5bb811c54e342acc4fcf28da423ab0042f23aa579adefbefa6b3f5dc45c949a36744c94d5420780a2175bde85 DIST git-2.4.6.tar.xz 3690432 SHA256 bdd944571c03474517b6c9941d6f1fd735eccbb164e59fd133d38644b69453b6 SHA512 2c95a00af81d6fbd8f4984e89d7cb23396caacadd684466aeb5a11f1b3acfbc625f832060cbef5aee0748e36c1fddcd88b3b9c26c4d7aec1d185e5f7311346ef WHIRLPOOL 1ae191666bf27a7e18686b910cbe610f85b5b7a43266232359615fa2a22b80bc659277b71b21394eab53df0c912d9ad911c7793c2a041cd6c7d768a5f0416f5b +DIST git-2.5.0.tar.xz 3740620 SHA256 cc59b1bac6c1c67a9159872863f6c5bbe0d9404cac2a85c3e9d9fa49923ce45c SHA512 ef7538c9f5ba5b2ac08962401c30e5fd51323b54b9fb5315d259adccec346e8fae9362815832dc2b5ce63a259b315c40e419bb2385dde04d84b992e62f6789b6 WHIRLPOOL 653e7aeb966dec44631bbd257a41935b2e957be9324311a4fd91f3a0ba6f1f674e2e59b4c564d70c4eeaea3788f0af9273a1d0a753b3bc820e687f0d63bddf5d DIST git-htmldocs-2.2.1.tar.xz 975488 SHA256 dee32b06ecf26044169adf40d95cb301c4219416a65c94b89c6513a80f03863b SHA512 68843b883e2fd4f14646ff97ba9e5f3fd4de9f6bbf57a40e9c1bceb6578ebf497e50f2b808fdb4174966e26bf9ac068b44cfdf111652d15796f4f84a7406d336 WHIRLPOOL 771af06f8663eaaa6de4d117277ea05680671c6d72010653ad8e2b037b7a8d77b4a3733b6c48e4775971304b680d0df2596ed1cb4eedbf9948135912ac9509a3 DIST git-htmldocs-2.2.2.tar.xz 976312 SHA256 41179ff0816189d583f290a227a73788002a319c7ff8c5cada970878c50b901d SHA512 b51b7d619e82d83b4f0b90d31bfccc30291a5beb48b2f5e5e59e75e91e5d772e89b560534a683648cd5480f4bf241f733efc87b30062ef5bb003bf0b5dbeed7f WHIRLPOOL c9dc7ac1a40559e4306d7d97a1619a272faf83d8b05c5a11f5f7b010566cd02fe853fee7eb550c6ccf744db446966a9696f9eb6feeee7ce4f976c6aa88b097d2 DIST git-htmldocs-2.3.0.tar.xz 980936 SHA256 e8e202bae7a89f22a815e15753e9742f2e140b3c0ca548e9a831cfdbfad3a873 SHA512 c4d226784d89469c8faa72f29ab87594682ba46b1887769e29f87ce0db1ac241c9568a8b1530e6d28d43a9861acf803f93dddcc1db59cbe97e21d7b9e374c565 WHIRLPOOL 5bb37b7e7b317ffbf842616b00caad54d4594748726063d2b66c2ccc5fc125a88001506ddff63b15ebaccd7e8a96399bad383eec13dbd8bdc40d5cf7f8696e2b @@ -15,6 +16,7 @@ DIST git-htmldocs-2.4.0.tar.xz 990744 SHA256 70ee1fdb70507c74832ac021e8940c8249d DIST git-htmldocs-2.4.2.tar.xz 992192 SHA256 792cfc6c8236fdb58dfd66e39766c7b8097080361eed28443207bc6c36e07911 SHA512 e9790b698c50a09724ec9c71001a70f2a6a7094b72326f290f3b5c7b274181f331fdbb71cb4e2db9edf1229ae534a715b2974424b89d515b901b074bdeb30b66 WHIRLPOOL ef3de3704e7c0e34174b1e16f0837c52d9ce9d64c0f61c417a52811ca623ae17304a2b9d484457569d635a269b4dedb3e940bf0fa7d3db1bc4f744bf1d392ff1 DIST git-htmldocs-2.4.4.tar.xz 994376 SHA256 e7f411f3eb3ecccc87e7d96afdcd8e72734a331170412eb37f240b731b2c2580 SHA512 1133dfa8a92358dbe6de35e22822b63bfbd418e8cd6290e1201738e5fc707fed1f50937d921f5323147cae75b89d452e8bd82768046685d7d2017dcd842766aa WHIRLPOOL 4684d5c4b7d8c7477ce658bd804280caab0721957786cb096a0acdf170e01a97d90eed7aca1d1f976ec79347cd9501c3ebed7ddf663ae785988e2abf36d9c054 DIST git-htmldocs-2.4.6.tar.xz 994712 SHA256 5213e8b882293ec3cda247dabbc75c6ee5243b9d330a8fafec004952fae91a88 SHA512 782fbc38a611380c0af2631bd6123d568b02159fb46159c763d97d75bd84debe43105d83ac3f321cd8383e1334806857bce1a48563fd0c19b43f527fe18615a8 WHIRLPOOL 170e4ecc8255e6d5d562274e6e3fb75c2fc62e415586d61498b680a076c74248664fca35bb7c532009f7f22be4ad14d1fe047e14791991fa32373bd7053e0396 +DIST git-htmldocs-2.5.0.tar.xz 1008428 SHA256 0924b290834e2a361a489cbc845a9bf04e56117597dc9c1a40e879cce655e4e2 SHA512 921ae8dd482719912f79f5affb6fa239290a954fb40625ac9fae2edf902989e5126ae7ca5c367b2b55c5387fb3cc3035ddf4e8b360743dbdee0f1b55ec33653c WHIRLPOOL e355781b06fba48d9ada859fe6fb515ddbfbac5a1d5c0918e8570e4566f68d644456606b5b0eb8e3e4cdc7c8b27a96b72cc1907008dff567cae71f0953968843 DIST git-manpages-2.2.1.tar.xz 369796 SHA256 00f8357fd8ab9e3b397dd087b20d405ed141765d04f3f2162e65fdec7cb1e538 SHA512 9fea3a61afa7336c7da9a4c9c130ed4dd05bb3b5b1cc7fe5a3953109085169d9fb92aafd2b932e6b66ad93ac46e3b60ea05c0f311a8178b53bc1c2184773ada5 WHIRLPOOL f5d1f4d47a2bc244beb3a343db37fe6898fc121310cd6bec0d3292a3352a3c86e16b3538b22317419c760870fb511120a3b03c7bc0585bfaa15c1c7418a4e8ac DIST git-manpages-2.2.2.tar.xz 369876 SHA256 d30688bb62763bf1b87f5eaf4c0a66c68999e479ccd2963108a5f6f82138147c SHA512 5c2220bb09f199ad4fe5c1bc20a813a6c62daab5e6e7fa87bf24861d25b7f7e0fdde215c4f59d8895badd7c361ed202e7837de48d2d54a155d24759db39dd4e1 WHIRLPOOL 45acc45663f13faf5b8197516bb934723bf84cd6db929443e2bd9fc3a915baf258ee93e782741e088a5f799115ea4ee6043225fc9ea9ec954feed21ba54c9be4 DIST git-manpages-2.3.0.tar.xz 370864 SHA256 1641d4fb67159961b4c295d2d5a05954bae19ebcaaa67728b6d72b70020b7842 SHA512 aa54b9fd96831a690848ef6df708d45999f03bc45aab3600bf578c998bbb225f54a8999ee5012996cb9d6f28d0d18c97209329cfba557b86d3dd0da7a23b1c1b WHIRLPOOL 817db829cd9e9eba93dc537531fd861278baa410d5a9aca09b2010f299d87c744b8a20d707052c6f8d470a5be74dba7a3bba3d20390915cc2a3eed47e84acb75 @@ -23,3 +25,4 @@ DIST git-manpages-2.4.0.tar.xz 372716 SHA256 b616dc6aa02dcac312e6aeae7af148913f7 DIST git-manpages-2.4.2.tar.xz 372804 SHA256 1b1830e804725e90ff319d801ab25f84ad956564379ef976bdc91bd58b743c32 SHA512 52f28cd537fc9fd34acad8834aa05d7d758e2f639df18b978effb676d5dbb660c99764075eb216c6377adb14b0b2d58584c8b3f635442bd4ded36a31b8757dc4 WHIRLPOOL f30b9293aa594111ce4baa46fee474b114199cc691ae43dea565a346f8ad7eb2cd72574bd6ddf9d5b32af020ad6032778cef3610ccac74d0f94be965b335962f DIST git-manpages-2.4.4.tar.xz 373400 SHA256 4bf125ece40f33872c6d9ccd6d83ec0068de5216b4075eaee78e39d46b08c351 SHA512 548bebf0843beaa3b4962ddb711e002904b940e820815717959a2ada2fd0b2489b5f6112debd5192c47d18c867fc9c7c4fcb2fb219d7ce39356b7807d236c2a3 WHIRLPOOL 2be153a1f04da7062a1fef114fc77ceb35ade4fe773c3777c5469bf0803044022a6dbfd8a7fb16c2c051126142166bad7d9b22fe8b32bdf6c934a74337e4c413 DIST git-manpages-2.4.6.tar.xz 373408 SHA256 f32d267bdaab75812dbd116d2b329d6dc7287a974e929e380e8cbf96e3822b8e SHA512 fa0562b8cc3e0421f7b45940f8cd4b58a5e58a1eb8571e2de85babf8ffd932fd210baa82aefe3c6090cb7dc51f64f299143be51beaacb37be97832b4a8e2a869 WHIRLPOOL 595beed93c621ffd9b7e0b507fc2941156975190eca8b638826ac32b6ea761bbb08f05e152dc88a7a3dbd168ab083a0128d61e72fae51cd0e94a8c91a1adb3ee +DIST git-manpages-2.5.0.tar.xz 377856 SHA256 1a6ea7220b1693eb384af0978a990ea8c0c634a7869d1ef63a2c8e427fc7f6ea SHA512 b3a5f2e8107c529ce81c1570a82472195e205ff1a8ddc75f4f0cbbf25f37a916700156df4418888c8a8a153ab58d5507a31027fb31faadeb5d4ba242847ab28d WHIRLPOOL 09f13622fff6a2b04a8ad584dab54c0b17cbfc6e803ca9e2deadab18071e50b50b37e395bb4746aff2e013f5b0025f8cdb1d439d8e6f3a659fad32646b30f4c7 diff --git a/dev-vcs/git/git-2.2.1.ebuild b/dev-vcs/git/git-2.2.1.ebuild index 45e1f4f2..0758c91c 100644 --- a/dev-vcs/git/git-2.2.1.ebuild +++ b/dev-vcs/git/git-2.2.1.ebuild @@ -12,8 +12,8 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.1-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.1-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" @@ -222,7 +222,7 @@ src_unpack() { #cp "${FILESDIR}"/GIT-VERSION-GEN . fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { @@ -231,7 +231,7 @@ src_prepare() { # git-...-mw-vendor.patch # git-...-svn-fe-linking.patch - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git/git-2.2.2.ebuild b/dev-vcs/git/git-2.2.2.ebuild index 64e2dfb7..b6cf6bbb 100644 --- a/dev-vcs/git/git-2.2.2.ebuild +++ b/dev-vcs/git/git-2.2.2.ebuild @@ -12,8 +12,8 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" @@ -219,7 +219,7 @@ src_unpack() { #cp "${FILESDIR}"/GIT-VERSION-GEN . fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { @@ -228,7 +228,7 @@ src_prepare() { # git-...-mw-vendor.patch # git-...-svn-fe-linking.patch - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git/git-2.3.0.ebuild b/dev-vcs/git/git-2.3.0.ebuild index 64e2dfb7..b6cf6bbb 100644 --- a/dev-vcs/git/git-2.3.0.ebuild +++ b/dev-vcs/git/git-2.3.0.ebuild @@ -12,8 +12,8 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" @@ -219,7 +219,7 @@ src_unpack() { #cp "${FILESDIR}"/GIT-VERSION-GEN . fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { @@ -228,7 +228,7 @@ src_prepare() { # git-...-mw-vendor.patch # git-...-svn-fe-linking.patch - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git/git-2.3.1.ebuild b/dev-vcs/git/git-2.3.1.ebuild index 64e2dfb7..b6cf6bbb 100644 --- a/dev-vcs/git/git-2.3.1.ebuild +++ b/dev-vcs/git/git-2.3.1.ebuild @@ -12,8 +12,8 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" @@ -219,7 +219,7 @@ src_unpack() { #cp "${FILESDIR}"/GIT-VERSION-GEN . fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { @@ -228,7 +228,7 @@ src_prepare() { # git-...-mw-vendor.patch # git-...-svn-fe-linking.patch - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git/git-2.4.0.ebuild b/dev-vcs/git/git-2.4.0.ebuild index 43b546dc..7d7a470c 100644 --- a/dev-vcs/git/git-2.4.0.ebuild +++ b/dev-vcs/git/git-2.4.0.ebuild @@ -12,8 +12,8 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" @@ -37,7 +37,7 @@ if [[ ${PV} != *9999 ]]; then KEYWORDS="~amd64 ~x86" fi -sab-patches_update_SRC_URI +kog-patches_update_SRC_URI LICENSE="GPL-2" SLOT="0" @@ -220,7 +220,7 @@ src_unpack() { #cp "${FILESDIR}"/GIT-VERSION-GEN . fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { @@ -229,7 +229,7 @@ src_prepare() { # git-...-mw-vendor.patch # git-...-svn-fe-linking.patch - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git/git-2.4.2.ebuild b/dev-vcs/git/git-2.4.2.ebuild index 43b546dc..7d7a470c 100644 --- a/dev-vcs/git/git-2.4.2.ebuild +++ b/dev-vcs/git/git-2.4.2.ebuild @@ -12,8 +12,8 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" @@ -37,7 +37,7 @@ if [[ ${PV} != *9999 ]]; then KEYWORDS="~amd64 ~x86" fi -sab-patches_update_SRC_URI +kog-patches_update_SRC_URI LICENSE="GPL-2" SLOT="0" @@ -220,7 +220,7 @@ src_unpack() { #cp "${FILESDIR}"/GIT-VERSION-GEN . fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { @@ -229,7 +229,7 @@ src_prepare() { # git-...-mw-vendor.patch # git-...-svn-fe-linking.patch - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git/git-2.4.4.ebuild b/dev-vcs/git/git-2.4.4.ebuild index ba64111b..e3e341af 100644 --- a/dev-vcs/git/git-2.4.4.ebuild +++ b/dev-vcs/git/git-2.4.4.ebuild @@ -12,8 +12,8 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" @@ -37,7 +37,7 @@ if [[ ${PV} != *9999 ]]; then KEYWORDS="amd64 x86" fi -sab-patches_update_SRC_URI +kog-patches_update_SRC_URI LICENSE="GPL-2" SLOT="0" @@ -220,7 +220,7 @@ src_unpack() { #cp "${FILESDIR}"/GIT-VERSION-GEN . fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { @@ -229,7 +229,7 @@ src_prepare() { # git-...-mw-vendor.patch # git-...-svn-fe-linking.patch - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git/git-2.4.6.ebuild b/dev-vcs/git/git-2.4.6.ebuild index f923384f..c1da93f2 100644 --- a/dev-vcs/git/git-2.4.6.ebuild +++ b/dev-vcs/git/git-2.4.6.ebuild @@ -12,8 +12,8 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" @@ -37,7 +37,7 @@ if [[ ${PV} != *9999 ]]; then KEYWORDS="~amd64 ~x86" fi -sab-patches_update_SRC_URI +kog-patches_update_SRC_URI LICENSE="GPL-2" SLOT="0" @@ -220,7 +220,7 @@ src_unpack() { #cp "${FILESDIR}"/GIT-VERSION-GEN . fi - sab-patches_unpack + kog-patches_unpack } src_prepare() { @@ -229,7 +229,7 @@ src_prepare() { # git-...-mw-vendor.patch # git-...-svn-fe-linking.patch - sab-patches_apply_all + kog-patches_apply_all epatch_user diff --git a/dev-vcs/git/git-2.5.0.ebuild b/dev-vcs/git/git-2.5.0.ebuild new file mode 100644 index 00000000..c1da93f2 --- /dev/null +++ b/dev-vcs/git/git-2.5.0.ebuild @@ -0,0 +1,647 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +GENTOO_DEPEND_ON_PERL=no + +# bug #329479: git-remote-testgit is not multiple-version aware +PYTHON_COMPAT=( python2_7 ) +[[ ${PV} == *9999 ]] && SCM="git-2" +EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" +EGIT_MASTER=pu + +KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +inherit kog-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${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="xz" + 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="~amd64 ~x86" +fi + +kog-patches_update_SRC_URI + +LICENSE="GPL-2" +SLOT="0" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" + +# Common to both DEPEND and RDEPEND +CDEPEND=" + dev-libs/openssl:0= + sys-libs/zlib + pcre? ( dev-libs/libpcre ) + perl? ( dev-lang/perl:=[-build(-)] ) + tk? ( dev-lang/tk:= ) + curl? ( + net-misc/curl + webdav? ( dev-libs/expat ) + ) + emacs? ( virtual/emacs ) + gnome-keyring? ( gnome-base/libgnome-keyring )" + +RDEPEND="${CDEPEND} + gpg? ( app-crypt/gnupg ) + mediawiki? ( + dev-perl/HTML-Tree + dev-perl/MediaWiki-API + ) + perl? ( dev-perl/Error + dev-perl/Net-SMTP-SSL + dev-perl/Authen-SASL + cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) + cvs? ( >=dev-vcs/cvsps-2.1:0 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[${PYTHON_USEDEP}] + >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] + ) + ${PYTHON_DEPS} )" + +# This is how info docs are created with Git: +# .txt/asciidoc --(asciidoc)---------> .xml/docbook +# .xml/docbook --(docbook2texi.pl)--> .texi +# .texi --(makeinfo)---------> .info +DEPEND="${CDEPEND} + doc? ( + app-text/asciidoc + app-text/docbook2X + sys-apps/texinfo + app-text/xmlto + ) + nls? ( sys-devel/gettext ) + test? ( app-crypt/gnupg )" + +# Live ebuild builds man pages and HTML docs, additionally +if [[ ${PV} == *9999 ]]; then + DEPEND="${DEPEND} + app-text/asciidoc" +fi + +SITEFILE=50${PN}-gentoo.el +S="${WORKDIR}/${MY_P}" + +REQUIRED_USE=" + cgi? ( perl ) + cvs? ( perl ) + mediawiki? ( perl ) + subversion? ( perl ) + webdav? ( curl ) + gtk? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +pkg_setup() { + if use subversion && has_version "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-single-r1_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+=" BLK_SHA1=YesPlease" + elif use ppcsha1 ; then + myopts+=" PPC_SHA1=YesPlease" + fi + + if use curl ; then + use webdav || myopts+=" NO_EXPAT=YesPlease" + else + myopts+=" NO_CURL=YesPlease" + fi + + # broken assumptions, because of broken build system ... + myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" + myopts+=" INSTALL=install TAR=tar" + myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" + myopts+=" SANE_TOOL_PATH=" + myopts+=" OLD_ICONV=" + myopts+=" NO_EXTERNAL_GREP=" + + # For svn-fe + extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" + + # can't define this to null, since the entire makefile depends on it + sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile + + use iconv \ + || myopts+=" NO_ICONV=YesPlease" + use nls \ + || myopts+=" NO_GETTEXT=YesPlease" + use tk \ + || myopts+=" NO_TCLTK=YesPlease" + use pcre \ + && myopts+=" USE_LIBPCRE=yes" \ + && extlibs+=" -lpcre" + use perl \ + && myopts+=" INSTALLDIRS=vendor" \ + || myopts+=" NO_PERL=YesPlease" + use python \ + || myopts+=" NO_PYTHON=YesPlease" + use subversion \ + || myopts+=" NO_SVN_TESTS=YesPlease" + use threads \ + && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ + || myopts+=" NO_PTHREADS=YesPlease" + use cvs \ + || myopts+=" NO_CVS=YesPlease" +# Disabled until ~m68k-mint can be keyworded again +# if [[ ${CHOST} == *-mint* ]] ; then +# myopts+=" NO_MMAP=YesPlease" +# myopts+=" NO_IPV6=YesPlease" +# myopts+=" NO_STRLCPY=YesPlease" +# myopts+=" NO_MEMMEM=YesPlease" +# myopts+=" NO_MKDTEMP=YesPlease" +# myopts+=" NO_MKSTEMPS=YesPlease" +# fi + if [[ ${CHOST} == ia64-*-hpux* ]]; then + myopts+=" NO_NSEC=YesPlease" + fi + if [[ ${CHOST} == *-*-aix* ]]; then + myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" + fi + if [[ ${CHOST} == *-solaris* ]]; then + myopts+=" NEEDS_LIBICONV=YesPlease" + fi + + has_version '>=app-text/asciidoc-8.0' \ + && myopts+=" ASCIIDOC8=YesPlease" + myopts+=" ASCIIDOC_NO_ROFF=YesPlease" + + # Bug 290465: + # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' + [[ "${CHOST}" == *-uclibc* ]] && \ + myopts+=" NO_NSEC=YesPlease" + + export MY_MAKEOPTS="${myopts}" + export EXTLIBS="${extlibs}" +} + +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 + + kog-patches_unpack +} + +src_prepare() { + # bug #350330 - automagic CVS when we don't want it is bad. + # git-...-optional-cvs.patch + + # git-...-mw-vendor.patch + # git-...-svn-fe-linking.patch + kog-patches_apply_all + + epatch_user + + sed -i \ + -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ + -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ + -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ + -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + Makefile contrib/svn-fe/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 -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ + Documentation/Makefile || die "sed failed" + + # Fix git-subtree missing DESTDIR + sed -i \ + -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ + -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ + contrib/subtree/Makefile +} + +git_emake() { + # bug #326625: PERL_PATH, PERL_MM_OPT + # bug #320647: PYTHON_PATH + PYTHON_PATH="" + use python && PYTHON_PATH="${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_MM_OPT="" \ + GIT_TEST_OPTS="--no-color" \ + V=1 \ + "$@" + # 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() { + if use perl ; then + git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" + git_emake perl/perl.mak || die "emake perl/perl.mak failed" + fi + git_emake || die "emake failed" + + if use emacs ; then + elisp-compile contrib/emacs/git{,-blame}.el + fi + + if use perl && use cgi ; then + git_emake \ + gitweb/gitweb.cgi \ + || die "emake gitweb/gitweb.cgi failed" + fi + + if [[ ${CHOST} == *-darwin* ]]; then + cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" + git_emake || die "emake credential-osxkeychain" + 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 + + if use subversion ; then + cd "${S}"/contrib/svn-fe + # by defining EXTLIBS we override the detection for libintl and + # libiconv, bug #516168 + local nlsiconv= + use nls && use !elibc_glibc && nlsiconv+=" -lintl" + use iconv && use !elibc_glibc && nlsiconv+=" -liconv" + git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" + if use doc ; then + git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" + fi + cd "${S}" + fi + + if use gnome-keyring ; then + cd "${S}"/contrib/credential/gnome-keyring + git_emake || die "emake git-credential-gnome-keyring failed" + fi + + cd "${S}"/contrib/subtree + git_emake + use doc && git_emake doc + + if use mediawiki ; then + cd "${S}"/contrib/mw-to-git + git_emake + fi +} + +src_install() { + git_emake \ + install || \ + die "make install failed" + + if [[ ${CHOST} == *-darwin* ]]; then + dobin contrib/credential/osxkeychain/git-credential-osxkeychain + fi + + # Depending on the tarball and manual rebuild of the documentation, the + # manpages may exist in either OR both of these directories. + if ! use cvs; then + find man? -name "*git*cvs*" | xargs rm + fi + 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} + bashcomp_alias git gitk + # Not really a bash-completion file (bug #477920) + # but still needed uncompressed (bug #507480) + insinto /usr/share/${PN} + doins contrib/completion/git-prompt.sh + + if use emacs ; then + elisp-install ${PN} contrib/emacs/git.{el,elc} + elisp-install ${PN} contrib/emacs/git-blame.{el,elc} + #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} + # 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} + fi + + if use python && use gtk ; then + python_doscript "${S}"/contrib/gitview/gitview + dodoc "${S}"/contrib/gitview/gitview.txt + fi + + #dobin contrib/fast-import/git-p4 # Moved upstream + #dodoc contrib/fast-import/git-p4.txt # Moved upstream + newbin contrib/fast-import/import-tars.perl import-tars + exeinto /usr/libexec/git-core/ + newexe contrib/git-resurrect.sh git-resurrect + + # git-subtree + cd "${S}"/contrib/subtree + git_emake install || die "Failed to emake install git-subtree" + if use doc ; then + git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" + fi + newdoc README README.git-subtree + dodoc git-subtree.txt + cd "${S}" + + if use mediawiki ; then + cd "${S}"/contrib/mw-to-git + git_emake install + cd "${S}" + fi + + # diff-highlight + dobin contrib/diff-highlight/diff-highlight + newdoc contrib/diff-highlight/README README.diff-highlight + + # git-jump + exeinto /usr/libexec/git-core/ + doexe contrib/git-jump/git-jump + newdoc contrib/git-jump/README git-jump.txt + + # git-contacts + exeinto /usr/libexec/git-core/ + doexe contrib/contacts/git-contacts + dodoc contrib/contacts/git-contacts.txt + + if use gnome-keyring ; then + cd "${S}"/contrib/credential/gnome-keyring + dobin git-credential-gnome-keyring + fi + + if use subversion ; then + cd "${S}"/contrib/svn-fe + dobin svn-fe + dodoc svn-fe.txt + use doc && doman svn-fe.1 && dohtml svn-fe.html + cd "${S}" + fi + + dodir /usr/share/${PN}/contrib + # The following are excluded: + # completion - installed above + # credential/gnome-keyring TODO + # diff-highlight - done above + # emacs - installed above + # examples - these are stuff that is not used in Git anymore actually + # git-jump - done above + # gitview - installed above + # p4import - excluded because fast-import has a better one + # patches - stuff the Git guys made to go upstream to other places + # persistent-https - TODO + # mw-to-git - TODO + # subtree - build seperately + # svnimport - use git-svn + # thunderbird-patch-inline - fixes thunderbird + for i in \ + buildsystems convert-objects fast-import \ + hg-to-git hooks remotes2config.sh rerere-train.sh \ + stats 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 + + if use !prefix ; then + newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon + newconfd "${FILESDIR}"/git-daemon.confd git-daemon + systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" + systemd_dounit "${FILESDIR}/git-daemon.socket" + fi + + perl_delete_localpod + + # burn CVS with fire, see #373439 + if ! use cvs; then + rm -r "${ED}"/usr/bin/git-cvsserver \ + "${ED}"/usr/libexec/git-core/git-cvs* || die + fi +} + +src_test() { + local disabled="" #t7004-tag.sh" #520270 + local tests_cvs="t9200-git-cvsexportcommit.sh \ + t9400-git-cvsserver-server.sh \ + t9401-git-cvsserver-crlf.sh \ + t9402-git-cvsserver-refs.sh \ + t9600-cvsimport.sh \ + t9601-cvsimport-vendor-branch.sh \ + t9602-cvsimport-branches-tags.sh \ + t9603-cvsimport-patchsets.sh \ + t9604-cvsimport-timestamps.sh" + local tests_perl="t3701-add-interactive.sh \ + t5502-quickfetch.sh \ + t5512-ls-remote.sh \ + t5520-pull.sh \ + t7106-reset-unborn-branch.sh \ + t7501-commit.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" + # t9100 still fails with symlinks in SVN 1.7 + local test_svn="t9100-git-svn-basic.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 ]] && \ + has_version "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 + + einfo "Disabling tests that fail with SVN 1.7" + disabled="${disabled} ${test_svn}" + + # 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, must always run + cd "${S}/t" + nonfatal git_emake clean + + # Now run the tests, keep going if we hit an error, and don't terminate on + # failure + cd "${S}" + einfo "Start test run" + #MAKEOPTS=-j1 + nonfatal git_emake --keep-going test + rc=$? + + # Display nice results, now print the results + cd "${S}/t" + nonfatal git_emake aggregate-results + + # And bail if there was a problem + [ $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 + einfo "Please read /usr/share/bash-completion/git for Git bash command completion" + einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" + einfo "Note that the prompt bash code is now in that separate script" + elog "These additional scripts need some dependencies:" + echo + showpkgdeps git-quiltimport "dev-util/quilt" + showpkgdeps git-instaweb \ + "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" + echo +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-vcs/subversion-java/subversion-java-1.8.10.ebuild b/dev-vcs/subversion-java/subversion-java-1.8.10.ebuild index 5f3fb2c2..2e6bed29 100644 --- a/dev-vcs/subversion-java/subversion-java-1.8.10.ebuild +++ b/dev-vcs/subversion-java/subversion-java-1.8.10.ebuild @@ -12,8 +12,8 @@ MY_SVN_PF="${MY_SVN_PN}-${PVR}" MY_SVN_CATEGORY="${CATEGORY}" # note: java-pkg-2, not java-pkt-opt-2 -SAB_PATCHES_SRC=( http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/${MY_SVN_PN}-1.8.9-Gentoo-patches.tar.gz ) -inherit sab-patches autotools eutils flag-o-matic java-pkg-2 libtool multilib +KOG_PATCHES_SRC=( http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/${MY_SVN_PN}-1.8.9-Gentoo-patches.tar.gz ) +inherit kog-patches autotools eutils flag-o-matic java-pkg-2 libtool multilib DESCRIPTION="Java bindings for Subversion" HOMEPAGE="http://subversion.apache.org/" @@ -47,7 +47,7 @@ pkg_setup() { } src_prepare() { - sab-patches_apply_all + kog-patches_apply_all epatch_user fperms +x build/transform_libtool_scripts.sh diff --git a/dev-vcs/subversion-java/subversion-java-1.8.11.ebuild b/dev-vcs/subversion-java/subversion-java-1.8.11.ebuild index 3357bc09..95bd5678 100644 --- a/dev-vcs/subversion-java/subversion-java-1.8.11.ebuild +++ b/dev-vcs/subversion-java/subversion-java-1.8.11.ebuild @@ -12,15 +12,15 @@ MY_SVN_PF="${MY_SVN_PN}-${PVR}" MY_SVN_CATEGORY="${CATEGORY}" # note: java-pkg-2, not java-pkt-opt-2 -SAB_PATCHES_SRC=( http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/${MY_SVN_PN}-1.8.9-Gentoo-patches.tar.gz ) -inherit sab-patches autotools eutils flag-o-matic java-pkg-2 libtool multilib +KOG_PATCHES_SRC=( http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/${MY_SVN_PN}-1.8.9-Gentoo-patches.tar.gz ) +inherit kog-patches autotools eutils flag-o-matic java-pkg-2 libtool multilib DESCRIPTION="Java bindings for Subversion" HOMEPAGE="http://subversion.apache.org/" SRC_URI="mirror://apache/${PN}/${MY_SVN_P}.tar.bz2" S="${WORKDIR}/${MY_SVN_P/_/-}" -sab-patches_update_SRC_URI +kog-patches_update_SRC_URI LICENSE="Subversion" SLOT="0" @@ -49,8 +49,8 @@ pkg_setup() { } src_prepare() { - local SAB_PATCHES_SKIP=( subversion-1.8.9-po_fixes.patch ) - sab-patches_apply_all + local KOG_PATCHES_SKIP=( subversion-1.8.9-po_fixes.patch ) + kog-patches_apply_all epatch_user fperms +x build/transform_libtool_scripts.sh diff --git a/dev-vcs/subversion-java/subversion-java-1.8.13.ebuild b/dev-vcs/subversion-java/subversion-java-1.8.13.ebuild index 3cba280d..824f4b0a 100644 --- a/dev-vcs/subversion-java/subversion-java-1.8.13.ebuild +++ b/dev-vcs/subversion-java/subversion-java-1.8.13.ebuild @@ -12,15 +12,15 @@ MY_SVN_PF="${MY_SVN_PN}-${PVR}" MY_SVN_CATEGORY="${CATEGORY}" # note: java-pkg-2, not java-pkt-opt-2 -SAB_PATCHES_SRC=( http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/${MY_SVN_PN}-1.8.9-Gentoo-patches.tar.gz ) -inherit sab-patches autotools eutils flag-o-matic java-pkg-2 libtool multilib +KOG_PATCHES_SRC=( http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/${MY_SVN_PN}-1.8.9-Gentoo-patches.tar.gz ) +inherit kog-patches autotools eutils flag-o-matic java-pkg-2 libtool multilib DESCRIPTION="Java bindings for Subversion" HOMEPAGE="http://subversion.apache.org/" SRC_URI="mirror://apache/${PN}/${MY_SVN_P}.tar.bz2" S="${WORKDIR}/${MY_SVN_P/_/-}" -sab-patches_update_SRC_URI +kog-patches_update_SRC_URI LICENSE="Subversion" SLOT="0" @@ -50,8 +50,8 @@ pkg_setup() { } src_prepare() { - local SAB_PATCHES_SKIP=( subversion-1.8.9-po_fixes.patch ) - sab-patches_apply_all + local KOG_PATCHES_SKIP=( subversion-1.8.9-po_fixes.patch ) + kog-patches_apply_all epatch_user fperms +x build/transform_libtool_scripts.sh diff --git a/dev-vcs/subversion/subversion-1.8.10.ebuild b/dev-vcs/subversion/subversion-1.8.10.ebuild index 59540163..cf8d073e 100644 --- a/dev-vcs/subversion/subversion-1.8.10.ebuild +++ b/dev-vcs/subversion/subversion-1.8.10.ebuild @@ -8,8 +8,8 @@ DISTUTILS_OPTIONAL=1 WANT_AUTOMAKE="none" GENTOO_DEPEND_ON_PERL="no" -SAB_PATCHES_SRC=( http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/${PN}-1.8.9-Gentoo-patches.tar.gz ) -inherit sab-patches autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic libtool multilib perl-module eutils +KOG_PATCHES_SRC=( http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/${PN}-1.8.9-Gentoo-patches.tar.gz ) +inherit kog-patches autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic libtool multilib perl-module eutils MY_P="${P/_/-}" DESCRIPTION="Advanced version control system" @@ -113,7 +113,7 @@ pkg_setup() { } src_prepare() { - sab-patches_apply_all + kog-patches_apply_all epatch_user fperms +x build/transform_libtool_scripts.sh diff --git a/dev-vcs/subversion/subversion-1.8.11.ebuild b/dev-vcs/subversion/subversion-1.8.11.ebuild index 2b3220c3..ccab9e37 100644 --- a/dev-vcs/subversion/subversion-1.8.11.ebuild +++ b/dev-vcs/subversion/subversion-1.8.11.ebuild @@ -8,8 +8,8 @@ DISTUTILS_OPTIONAL=1 WANT_AUTOMAKE="none" GENTOO_DEPEND_ON_PERL="no" -SAB_PATCHES_SRC=( mirror://sabayon/dev-vcs/${PN}-1.8.9-Gentoo-patches.tar.gz ) -inherit sab-patches autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic libtool multilib perl-module eutils +KOG_PATCHES_SRC=( mirror://sabayon/dev-vcs/${PN}-1.8.9-Gentoo-patches.tar.gz ) +inherit kog-patches autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic libtool multilib perl-module eutils MY_P="${P/_/-}" DESCRIPTION="Advanced version control system" @@ -17,7 +17,7 @@ HOMEPAGE="http://subversion.apache.org/" SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2" S="${WORKDIR}/${MY_P}" -sab-patches_update_SRC_URI +kog-patches_update_SRC_URI LICENSE="Subversion GPL-2" SLOT="0" @@ -115,8 +115,8 @@ pkg_setup() { } src_prepare() { - local SAB_PATCHES_SKIP=( subversion-1.8.9-po_fixes.patch ) - sab-patches_apply_all + local KOG_PATCHES_SKIP=( subversion-1.8.9-po_fixes.patch ) + kog-patches_apply_all epatch_user fperms +x build/transform_libtool_scripts.sh diff --git a/dev-vcs/subversion/subversion-1.8.13.ebuild b/dev-vcs/subversion/subversion-1.8.13.ebuild index 5c3122bb..15031e5e 100644 --- a/dev-vcs/subversion/subversion-1.8.13.ebuild +++ b/dev-vcs/subversion/subversion-1.8.13.ebuild @@ -8,8 +8,8 @@ DISTUTILS_OPTIONAL=1 WANT_AUTOMAKE="none" GENTOO_DEPEND_ON_PERL="no" -SAB_PATCHES_SRC=( mirror://sabayon/dev-vcs/${PN}-1.8.9-Gentoo-patches.tar.gz ) -inherit sab-patches autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic libtool multilib perl-module eutils +KOG_PATCHES_SRC=( mirror://sabayon/dev-vcs/${PN}-1.8.9-Gentoo-patches.tar.gz ) +inherit kog-patches autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic libtool multilib perl-module eutils MY_P="${P/_/-}" DESCRIPTION="Advanced version control system" @@ -17,7 +17,7 @@ HOMEPAGE="http://subversion.apache.org/" SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2" S="${WORKDIR}/${MY_P}" -sab-patches_update_SRC_URI +kog-patches_update_SRC_URI LICENSE="Subversion GPL-2" SLOT="0" @@ -116,8 +116,8 @@ pkg_setup() { } src_prepare() { - local SAB_PATCHES_SKIP=( subversion-1.8.9-po_fixes.patch ) - sab-patches_apply_all + local KOG_PATCHES_SKIP=( subversion-1.8.9-po_fixes.patch ) + kog-patches_apply_all epatch_user fperms +x build/transform_libtool_scripts.sh diff --git a/eclass/argent-artwork.eclass b/eclass/argent-artwork.eclass deleted file mode 100644 index f430903a..00000000 --- a/eclass/argent-artwork.eclass +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2004-2009 Sabayon Project -# Distributed under the terms of the GNU General Public License v2 -# $ - -inherit eutils - -# @ECLASS-VARIABLE: KERN_INITRAMFS_SEARCH_NAME -# @DESCRIPTION: -# Argument used by `find` to search inside ${ROOT}boot Linux -# Kernel initramfs files to patch -KERN_INITRAMFS_SEARCH_NAME="${KERN_INITRAMFS_SEARCH_NAME:-initramfs-genkernel*}" - -# @ECLASS-VARIABLE: GFX_SPLASH_NAME -# @DESCRIPTION: -# Default splash theme name to use -GFX_SPLASH_NAME="${GFX_SPLASH_NAME:-argent}" - -# @ECLASS-VARIABLE: PLYMOUTH_THEME -# @DESCRIPTION: -# Default plymouth theme name to use -PLYMOUTH_THEME="${PLYMOUTH_THEME:-argent}" - -# @FUNCTION: update_kernel_initramfs_splash -# @USAGE: update_kernel_initramfs_splash [splash_theme] [splash_file] -# @RETURN: 1, if something went wrong -# -# @MAINTAINER: -# Fabio Erculiani -update_kernel_initramfs_splash() { - - [[ -z "${2}" ]] && die "wrong update_kernel_splash arguments" - - if ! has_version "media-gfx/splashutils"; then - ewarn "media-gfx/splashutils not found, cannot update kernel splash" - return 1 - fi - splash_geninitramfs -a "${2}" ${1} - return ${?} - -} - -# @FUNCTION: update_argent_kernel_initramfs_splash -# @USAGE: update_argent_kernel_initramfs_splash -# -# @MAINTAINER: -# Fabio Erculiani -update_argent_kernel_initramfs_splash() { - local splash_name="${GFX_SPLASH_NAME}" - local override_splash_file="${ROOT}etc/oem/splash_name" - if [ -f "${override_splash_file}" ]; then - found_splash_name=$(cat "${override_splash_file}" | cut -d" " -f 1) - if [ -d "/etc/splash/${found_splash_name}" ]; then - splash_name="${found_splash_name}" - fi - fi - for bootfile in `find ${ROOT}boot -name "${KERN_INITRAMFS_SEARCH_NAME}"`; do - einfo "Updating boot splash for ${bootfile}" - update_kernel_initramfs_splash "${GFX_SPLASH_NAME}" "${bootfile}" - done -} diff --git a/eclass/argent-kernel.eclass b/eclass/argent-kernel.eclass deleted file mode 100644 index f5d200ac..00000000 --- a/eclass/argent-kernel.eclass +++ /dev/null @@ -1,967 +0,0 @@ -# Copyright 2004-2014 RogentOS Team -# Distributed under the terms of the GNU General Public License v2 -# $ - -# @ECLASS-VARIABLE: K_ARGKERNEL_NAME -# @DESCRIPTION: -# The kernel name used by the ebuild, it should be the ending ${PN} part -# for example, of linux-argent it is "${PN/${PN/-*}-}" (argent) -K_ARGKERNEL_NAME="${K_ARGKERNEL_NAME:-${PN/${PN/-*}-}}" - -# @ECLASS-VARIABLE: K_ARGKERNEL_SELF_TARBALL_NAME -# @DESCRIPTION: -# If the main kernel sources tarball is generated in-house and available -# on the "argent" mirror, set this variable to the extension name (see example -# below). This will disable ALL the extra/local patches (since they have to -# be applied inside the tarball). Moreover, K_ARGKERNEL_NAME, -# K_KERNEL_PATCH_VER will be ignored. -# Example: -# K_ARGKERNEL_SELF_TARBALL_NAME="argent" -# This would generate: -# SRC_URI="mirror://argent/sys-kernel/linux-${PV}+argent.tar.${K_TARBALL_EXT}" -K_ARGKERNEL_SELF_TARBALL_NAME="${K_ARGKERNEL_SELF_TARBALL_NAME:-}" - -# @ECLASS-VARIABLE: K_ARGKERNEL_PATCH_UPSTREAM_TARBALL -# @DESCRIPTION: -# If set to 1, the ebuild will fetch the upstream kernel tarball and -# apply the RogentOS patch against it. This strategy avoids the need of -# creating complete kernel source tarballs. The default value is 0. -K_ARGKERNEL_PATCH_UPSTREAM_TARBALL="${K_ARGKERNEL_PATCH_UPSTREAM_TARBALL:-0}" - -# @ECLASS-VARIABLE: K_ARGKERNEL_FORCE_SUBLEVEL -# @DESCRIPTION: -# Force the rewrite of SUBLEVEL in kernel sources Makefile -K_ARGKERNEL_FORCE_SUBLEVEL="${K_ARGKERNEL_FORCE_SUBLEVEL:-}" - -# @ECLASS-VARIABLE: K_ARGKERNEL_RESET_EXTRAVERSION -# @DESCRIPTION: -# Force the rewrite of EXTRAVERSION in kernel sources Makefile (setting it to "") -K_ARGKERNEL_RESET_EXTRAVERSION="${K_ARGKERNEL_RESET_EXTRAVERSION:-}" - -# @ECLASS-VARIABLE: K_ARGKERNEL_LONGTERM -# @DESCRIPTION: -# Consider Kernel stable patchset as longterm (changing URL) -K_ARGKERNEL_LONGTERM="${K_ARGKERNEL_LONGTERM:-}" - -# @ECLASS-VARIABLE: K_KERNEL_SOURCES_PKG -# @DESCRIPTION: -# The kernel sources package used to build this kernel binary -K_KERNEL_SOURCES_PKG="${K_KERNEL_SOURCES_PKG:-${CATEGORY}/${PN/*-}-sources-${PVR}}" - -# @ECLASS-VARIABLE: K_KERNEL_PATCH_VER -# @DESCRIPTION: -# If set to "3" for example, it applies the upstream kernel -# patch corresponding to patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.3.${K_TARBALL_EXT} -# @TODO: deprecate and remove once 2.6.x kernels are retired -K_KERNEL_PATCH_VER="${K_KERNEL_PATCH_VER:-}" - -# @ECLASS-VARIABLE: K_KERNEL_PATCH_HOTFIXES -# @DESCRIPTION: -# If there is the need to quickly apply patches to the kernel -# without bumping the kernel patch tarball (for eg. in case -# of just released security fixes), set this variable in your ebuild -# pointing to space separated list of patch paths. -K_KERNEL_PATCH_HOTFIXES="${K_KERNEL_PATCH_HOTFIXES:-}" - -# @ECLASS-VARIABLE: K_KERNEL_DISABLE_PR_EXTRAVERSION -# @DESCRIPTION: -# Set this to "1" if you want to tell kernel-2 eclass to -# not use ${PR} in kernel EXTRAVERSION (K_NOUSEPR). Otherwise, set -# this to "0" to not set K_NOUSEPR at all. -K_KERNEL_DISABLE_PR_EXTRAVERSION="${K_KERNEL_DISABLE_PR_EXTRAVERSION:-1}" - -# @ECLASS-VARIABLE: K_KERNEL_SLOT_USEPVR -# @DESCRIPTION: -# Set this to "1" if you want to use ${PVR} in SLOT variable, instead of ${PV} -# sys-kernel/linux-vserver (vserver-sources) require this. This won't work for -# firmware pkgs. -K_KERNEL_SLOT_USEPVR="${K_KERNEL_SLOT_USEPVR:-0}" - -# @ECLASS-VARIABLE: K_KERNEL_NEW_VERSIONING -# @DESCRIPTION: -# Set this to "1" if your kernel ebuild uses the new Linux kernel upstream -# versioning and ${PV} contains the stable revision, like 3.7.1. -# In the example above, this makes the SLOT variable contain only "3.7". -# The sublevel version can be forced using K_ARGKERNEL_FORCE_SUBLEVEL -K_KERNEL_NEW_VERSIONING="${K_KERNEL_NEW_VERSIONING:-0}" - -# @ECLASS-VARIABLE: K_KERNEL_IMAGE_NAME -# @DESCRIPTION: -# Set this to a custom kernel image make target if the default does not -# fit your needs. This value if set, is passed to genkernel through the -# --kernel-target= flag. -K_KERNEL_IMAGE_NAME="${K_KERNEL_IMAGE_NAME:-}" - -# @ECLASS-VARIABLE: K_KERNEL_LTS -# @DESCRIPTION: -# Set this to 1 to mark the kernel as Long Term Stable. "virtual/linux-binary-lts" -# shall be appended to ${PROVIDE}. -K_KERNEL_LTS="${K_KERNEL_LTS:-}" - -# @ECLASS-VARIABLE: K_KERNEL_IMAGE_PATH -# @DESCRIPTION: -# Set this to a custom relative kernel image path to override the default -# one. This value if set, is passed to genkernel through the -# --kernel-binary= flag. -K_KERNEL_IMAGE_PATH="${K_KERNEL_IMAGE_PATH:-}" - -# @ECLASS-VARIABLE: K_ARGKERNEL_FIRMWARE -# @DESCRIPTION: -# Set this to "1" if your ebuild is a kernel firmware package -K_FIRMWARE_PACKAGE="${K_FIRMWARE_PACKAGE:-}" - -# @ECLASS-VARIABLE: K_ONLY_SOURCES -# @DESCRIPTION: -# For every kernel binary package, there is a kernel source package associated -# if your ebuild is one of them, set this to "1" -K_ONLY_SOURCES="${K_ONLY_SOURCES:-}" - -# @ECLASS-VARIABLE: K_REQUIRED_LINUX_FIRMWARE_VER -# @DESCRIPTION: -# Minimum required version of sys-kernel/linux-formware package, if any -K_REQUIRED_LINUX_FIRMWARE_VER="${K_REQUIRED_LINUX_FIRMWARE_VER:-}" - -# @ECLASS-VARIABLE: K_WORKAROUND_SOURCES_COLLISION -# @DESCRIPTION: -# For kernel binary packages, Workaround file collisions with kernel -# sources already providing certain files (like Makefile). Used -# by linux-openvz and linux-vserver -K_WORKAROUND_SOURCES_COLLISION="${K_WORKAROUND_SOURCES_COLLISION:-}" - -# @ECLASS-VARIABLE: K_WORKAROUND_USE_REAL_EXTRAVERSION -# @DESCRIPTION: -# Some kernel sources are shipped with their own EXTRAVERSION and -# we're kindly asked to not touch it, if this is your case, set -# this variable and depmod will work correctly. -K_WORKAROUND_USE_REAL_EXTRAVERSION="${K_WORKAROUND_USE_REAL_EXTRAVERSION:-}" - -# @ECLASS-VARIABLE: K_ARGKERNEL_ZFS -# @DESCRIPTION: -# If set, this kernel features ZFS. -K_ARGKERNEL_ZFS="${K_ARGKERNEL_ZFS:-}" - -# @ECLASS-VARIABLE: K_GENKERNEL_ARGS -# @DESCRIPTION: -# Provide extra genkernel arguments using K_GENKERNEL_ARGS -K_GENKERNEL_ARGS="${K_GENKERNEL_ARGS:-}" - -# @ECLASS-VARIABLE: K_MKIMAGE_RAMDISK_ADDRESS -# @DESCRIPTION: -# [ARM ONLY] Provide the ramdisk load address to be used with mkimage -K_MKIMAGE_RAMDISK_ADDRESS="${K_MKIMAGE_RAMDISK_ADDRESS:-}" - -# @ECLASS-VARIABLE: K_MKIMAGE_RAMDISK_ENTRYPOINT -# @DESCRIPTION: -# [ARM ONLY] Provide the ramdisk entry point address to be used with mkimage -K_MKIMAGE_RAMDISK_ENTRYPOINT="${K_MKIMAGE_RAMDISK_ENTRYPOINT:-}" - -# @ECLASS-VARIABLE: K_MKIMAGE_WRAP_INITRAMFS -# @DESCRIPTION: -# [ARM ONLY] Execute mkimage against the generated initramfs Default is yes ("1"). -K_MKIMAGE_WRAP_INITRAMFS="${K_MKIMAGE_WRAP_INITRAMFS:-1}" - -# @ECLASS-VARIABLE: K_MKIMAGE_KERNEL_ADDRESS -# @DESCRIPTION: -# [ARM ONLY] Provide the kernel load address to be used with mkimage -K_MKIMAGE_KERNEL_ADDRESS="${K_MKIMAGE_KERNEL_ADDRESS:-}" - -KERN_INITRAMFS_SEARCH_NAME="${KERN_INITRAMFS_SEARCH_NAME:-initramfs-genkernel*${K_ARGKERNEL_NAME}}" - -# Disable deblobbing feature -K_DEBLOB_AVAILABLE=0 -ETYPE="sources" -K_TARBALL_EXT="${K_TARBALL_EXT:-xz}" - -inherit versionator -if [ "${K_KERNEL_NEW_VERSIONING}" = "1" ]; then - CKV="$(get_version_component_range 1-2)" -fi - -inherit eutils multilib kernel-2 argent-artwork mount-boot linux-info - -# from kernel-2 eclass -detect_version -detect_arch - -DESCRIPTION="Argent linux kernel functions and phases" - - -K_LONGTERM_URL_STR="" -if [ -n "${K_ARGKERNEL_LONGTERM}" ]; then - K_LONGTERM_URL_STR="/longterm/v${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" -fi - -## kernel-2 eclass settings -if [ "${K_ARGKERNEL_PATCH_UPSTREAM_TARBALL}" = "1" ]; then - _patch_name="$(get_version_component_range 1-2)-${K_ARGKERNEL_SELF_TARBALL_NAME}-${PVR}.patch.xz" - SRC_URI="${KERNEL_URI}" - UNIPATCH_LIST="${UNIPATCH_LIST} ${DISTDIR}/${_patch_name}" - unset _patch_name -elif [ -n "${K_ARGKERNEL_SELF_TARBALL_NAME}" ]; then - SRC_URI="http://bpr.bluepink.ro/~rogentos/argent/${CATEGORY}/linux-${PVR}+${K_ARGKERNEL_SELF_TARBALL_NAME}.tar.${K_TARBALL_EXT}" -else - SRC_URI="${KERNEL_URI}" -fi - -if [ -z "${K_ARGKERNEL_SELF_TARBALL_NAME}" ]; then - if [ -n "${K_KERNEL_PATCH_VER}" ]; then - K_PATCH_NAME="patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.${K_KERNEL_PATCH_VER}.${K_TARBALL_EXT}" - SRC_URI="${SRC_URI} - mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}${K_LONGTERM_URL_STR}/${K_PATCH_NAME}" - UNIPATCH_LIST="${DISTDIR}/${K_PATCH_NAME} - ${UNIPATCH_LIST}" - fi -fi -if [ -n "${K_KERNEL_PATCH_HOTFIXES}" ]; then - UNIPATCH_LIST="${UNIPATCH_LIST} ${K_KERNEL_PATCH_HOTFIXES}" -fi - -_get_real_kv_full() { - if [[ "${KV_MAJOR}${KV_MINOR}" -eq 26 ]]; then - echo "${ORIGINAL_KV_FULL}" - elif [[ "${OKV/.*}" = "3" ]]; then - # Linux 3.x support, KV_FULL is set to: 3.0-argent - # need to add another final .0 to the version part - echo "${ORIGINAL_KV_FULL/-/.0-}" - else - echo "${ORIGINAL_KV_FULL}" - fi -} - -# replace "linux" with K_ARGKERNEL_NAME, usually replaces -# "linux" with "argent" or "server" or "openvz" -KV_FULL="${KV_FULL/${PN/-*}/${K_ARGKERNEL_NAME}}" -EXTRAVERSION="${EXTRAVERSION/${PN/-*}/${K_ARGKERNEL_NAME}}" -# drop -rX if exists -if [[ -n "${PR//r0}" ]] && [[ "${K_KERNEL_DISABLE_PR_EXTRAVERSION}" = "1" ]] \ - && [[ -z "${K_NOSETEXTRAVERSION}" ]]; then - EXTRAVERSION="${EXTRAVERSION%-r*}" - KV_FULL="${KV_FULL%-r*}" - KV="${KV%-r*}" -fi -# rewrite it -ORIGINAL_KV_FULL="${KV_FULL}" -KV_FULL="$(_get_real_kv_full)" - -# Starting from linux-3.0, we still have to install -# sources stuff into /usr/src/linux-3.0.0-argent (example) -# where the last part must always match uname -r -# otherwise kernel-switcher (and RELEASE_LEVEL file) -# will complain badly -KV_OUT_DIR="/usr/src/linux-${KV_FULL}" -S="${WORKDIR}/linux-${KV_FULL}" - - -if [ -n "${K_FIRMWARE_PACKAGE}" ]; then - SLOT="0" -elif [ "${K_KERNEL_SLOT_USEPVR}" = "1" ]; then - SLOT="${PVR}" -elif [ "${K_KERNEL_NEW_VERSIONING}" = "1" ]; then - SLOT="$(get_version_component_range 1-2)" -else - SLOT="${PV}" -fi - -_is_kernel_binary() { - if [ -z "${K_ONLY_SOURCES}" ] && [ -z "${K_FIRMWARE_PACKAGE}" ]; then - # yes it is - return 0 - else - # no it isn't - return 1 - fi -} - -_is_kernel_lts() { - local _ver="$(get_version_component_range 1-2)" - [ "${_ver}" = "3.0" ] && return 0 - [ "${_ver}" = "3.2" ] && return 0 - [ "${_ver}" = "3.4" ] && return 0 - [ "${_ver}" = "3.10" ] && return 0 - [ "${_ver}" = "3.12" ] && return 0 - [ "${_ver}" = "3.14" ] && return 0 - return 1 -} - -# provide extra virtual pkg -if _is_kernel_binary; then - PROVIDE="virtual/linux-binary" -# LTS support - if [ "${K_KERNEL_LTS}" = "1" ] || _is_kernel_lts; then - PROVIDE+=" virtual/linux-binary-lts" - fi -fi - -if [ -n "${K_ARGKERNEL_SELF_TARBALL_NAME}" ]; then - HOMEPAGE="https://github.com/Rogentos/kernel" -else - HOMEPAGE="http://www.argent.ro" -fi - -# Returns success if _set_config_file_vars was called. -_is_config_file_set() { - [[ ${_config_file_set} = 1 ]] -} - -# Returns the arm kernel config file extension for the current subarch -_get_arm_subarch() { - local target="${CTARGET:-${CHOST}}" - local arm_arch=${target%%-*} - if [[ ${arm_arch} == armv7? ]]; then - echo "armv7" - elif [[ ${arm_arch} == armv6? ]]; then - echo "armv6" - elif [[ ${arm_arch} == armv5? ]]; then - echo "armv5" - fi -} - -_get_arch() { - if use arm; then - _get_arm_subarch - elif use amd64; then - echo "amd64" - elif use x86; then - echo "x86" - fi -} - -_set_config_file_vars() { - # Setup kernel configuration file name - local pvr="${PVR}" - local pv="${PV}" - if [ "${K_KERNEL_NEW_VERSIONING}" = "1" ]; then - pvr="$(get_version_component_range 1-2)" - pv="${pvr}" - if [ "${PR}" != "r0" ]; then - pvr+="-${PR}" - fi - fi - - K_ARGKERNEL_CONFIG_FILES=() - K_ARGKERNEL_CONFIG_FILES+=( "${K_ARGKERNEL_NAME}-${pvr}-$(_get_arch).config" ) - K_ARGKERNEL_CONFIG_FILES+=( "${K_ARGKERNEL_NAME}-${pv}-$(_get_arch).config" ) - K_ARGKERNEL_CONFIG_FILES+=( "${K_ARGKERNEL_NAME}-$(_get_arch).config" ) - - _config_file_set=1 -} - -if [ -n "${K_ONLY_SOURCES}" ] || [ -n "${K_FIRMWARE_PACKAGE}" ]; then - IUSE="${IUSE}" - DEPEND="sys-apps/sed" - RDEPEND="${RDEPEND}" -else - IUSE="dmraid dracut iscsi luks lvm mdadm plymouth splash" - if [ -n "${K_ARGKERNEL_ZFS}" ]; then - IUSE="${IUSE} zfs" - fi - DEPEND="app-arch/xz-utils - sys-apps/sed - sys-devel/autoconf - sys-devel/make - || ( >=sys-kernel/genkernel-next-5 >=sys-kernel/genkernel-3.4.45-r2 ) - arm? ( dev-embedded/u-boot-tools ) - amd64? ( sys-apps/v86d ) - x86? ( sys-apps/v86d ) - splash? ( x11-themes/argent-artwork-core ) - lvm? ( sys-fs/lvm2 sys-block/thin-provisioning-tools ) - plymouth? ( - || ( >=sys-kernel/genkernel-next-5 >=sys-kernel/genkernel-5 ) - sys-boot/plymouth - ) - dracut? ( sys-apps/v86d sys-kernel/dracut )" - RDEPEND="sys-apps/sed - sys-kernel/linux-firmware" - if [ -n "${K_REQUIRED_LINUX_FIRMWARE_VER}" ]; then - RDEPEND+=" >=sys-kernel/linux-firmware-${K_REQUIRED_LINUX_FIRMWARE_VER}" - fi -fi - -# internal function -# -# FUNCTION: _update_depmod -# @USAGE: _update_depmod <-r depmod> -# DESCRIPTION: -# It updates the modules.dep file for the current kernel. -# This is more or less the same of linux-mod update_depmod, with the -# exception of accepting parameter which is passed to depmod -r switch -_update_depmod() { - - # if we haven't determined the version yet, we need too. - get_version; - - ebegin "Updating module dependencies for ${KV_FULL}" - if [ -r "${KV_OUT_DIR}"/System.map ]; then - depmod -ae -F "${KV_OUT_DIR}"/System.map -b "${ROOT}" -r "${1}" - eend $? - else - ewarn - ewarn "${KV_OUT_DIR}/System.map not found." - ewarn "You must manually update the kernel module dependencies using depmod." - eend 1 - ewarn - fi -} - -argent-kernel_pkg_setup() { - if [ -n "${K_FIRMWARE_PACKAGE}" ]; then - einfo "Preparing kernel firmwares" - else - einfo "Preparing kernel and its modules" - fi -} - -argent-kernel_src_unpack() { - local okv="${OKV}" - if [ -n "${K_ARGKERNEL_SELF_TARBALL_NAME}" ] && [ "${K_ARGKERNEL_PATCH_UPSTREAM_TARBALL}" != "1" ]; then - OKV="${PVR}+${K_ARGKERNEL_SELF_TARBALL_NAME}" - fi - if [ "${K_KERNEL_NEW_VERSIONING}" = "1" ]; then - # workaround for kernel-2's universal_unpack assumptions - UNIPATCH_LIST_DEFAULT= KV_MAJOR=0 kernel-2_src_unpack - else - kernel-2_src_unpack - fi - if [ -n "${K_ARGKERNEL_FORCE_SUBLEVEL}" ]; then - # patch out Makefile with proper sublevel - sed -i "s:^SUBLEVEL = .*:SUBLEVEL = ${K_ARGKERNEL_FORCE_SUBLEVEL}:" \ - "${S}/Makefile" || die - fi - if [ -n "${K_ARGKERNEL_RESET_EXTRAVERSION}" ]; then - sed -i "s:^EXTRAVERSION =.*:EXTRAVERSION = :" "${S}/Makefile" || die - # some sources could have multiple append-based EXTRAVERSIONs - sed -i "s/^EXTRAVERSION :=.*//" "${S}/Makefile" || die - fi - OKV="${okv}" - - # Let's handle EAPIs 0 and 1... - case ${EAPI:-0} in - 0|1) argent-kernel_src_prepare ;; - esac -} - -argent-kernel_src_prepare() { - _set_config_file_vars -} - -argent-kernel_src_compile() { - if [ -n "${K_FIRMWARE_PACKAGE}" ]; then - _firmwares_src_compile - elif [ -n "${K_ONLY_SOURCES}" ]; then - kernel-2_src_compile - else - _kernel_src_compile - fi -} - -_firmwares_src_compile() { - einfo "Starting to compile firmwares..." - _kernel_copy_config "${S}/.config" - cd "${S}" || die "cannot find source dir" - - export LDFLAGS="" - OLDARCH="${ARCH}" - unset ARCH - emake firmware || die "cannot compile firmwares" - ARCH="${OLDARCH}" -} - -_kernel_copy_config() { - _is_config_file_set \ - || die "Kernel configuration file not set. Was argent-kernel_src_prepare() called?" - - local base_path="${DISTDIR}" - if [ -n "${K_ARGKERNEL_SELF_TARBALL_NAME}" ]; then - base_path="${S}/argent/config" - fi - - local found= cfg= - for cfg in "${K_ARGKERNEL_CONFIG_FILES[@]}"; do - cfg="${base_path}/${cfg}" - if [ -f "${cfg}" ]; then - cp "${cfg}" "${1}" || die "cannot copy kernel config ${cfg} -> ${1}" - elog "Using kernel config: ${cfg}" - found=1 - break - fi - done - [[ -z "${found}" ]] && die "cannot find kernel configs among: ${K_ARGKERNEL_CONFIG_FILES[*]}" -} - -_kernel_src_compile() { - # disable sandbox - export SANDBOX_ON=0 - - # needed anyway, even if grub use flag is not used here - if use amd64 || use x86; then - mkdir -p "${WORKDIR}"/boot/grub - else - mkdir -p "${WORKDIR}"/boot - fi - - einfo "Starting to compile kernel..." - _kernel_copy_config "${WORKDIR}"/config - - # do some cleanup - rm -rf "${WORKDIR}"/lib - rm -rf "${WORKDIR}"/cache - rm -rf "${S}"/temp - - # creating workdirs - # some kernels fail with make 3.82 if firmware dir is not created - mkdir "${WORKDIR}"/lib/lib/firmware -p - mkdir "${WORKDIR}"/cache - mkdir "${S}"/temp - - cd "${S}" || die - local GKARGS=() - GKARGS+=( "--no-menuconfig" "--no-save-config" "--e2fsprogs" "--udev" ) - # use splash && GKARGS+=( "--splash=argent" ) #NO MORE fbsplash!!! - use plymouth && GKARGS+=( "--plymouth" "--plymouth-theme=${PLYMOUTH_THEME}" ) #reverted to use variable (check the eclass) - use dmraid && GKARGS+=( "--dmraid" ) - use iscsi && GKARGS+=( "--iscsi" ) - use mdadm && GKARGS+=( "--mdadm" ) - use luks && GKARGS+=( "--luks" ) - use lvm && GKARGS+=( "--lvm" ) - if [ -n "${K_ARGKERNEL_ZFS}" ]; then - use zfs && GKARGS+=( "--zfs" ) - fi - - export DEFAULT_KERNEL_SOURCE="${S}" - export CMD_KERNEL_DIR="${S}" - for opt in ${MAKEOPTS}; do - if [ "${opt:0:2}" = "-j" ]; then - mkopts="${opt}" - break - fi - done - [ -z "${mkopts}" ] && mkopts="-j3" - - if [ -n "${K_KERNEL_IMAGE_NAME}" ]; then - GKARGS+=( "--kernel-target=${K_KERNEL_IMAGE_NAME}" ) - elif use arm; then - # backward compat + provide sane defaults. - GKARGS+=( "--kernel-target=uImage" ) - fi - if [ -n "${K_KERNEL_IMAGE_PATH}" ]; then - GKARGS+=( "--kernel-binary=${K_KERNEL_IMAGE_PATH}" ) - elif use arm; then - # backward compat + provide sane defaults. - GKARGS+=( "--kernel-binary=arch/arm/boot/uImage" ) - fi - - # Workaround bug in splash_geninitramfs corrupting the initramfs - # if xz compression is used (newer genkernel >3.4.24) - local support_comp=$(genkernel --help | grep compress-initramfs-type) - if [ -n "${support_comp}" ]; then - GKARGS+=( "--compress-initramfs-type=gzip" ) - fi - - # Use --disklabel if genkernel supports it - local support_disklabel=$(genkernel --help | grep -- --disklabel) - if [ -n "${support_disklabel}" ]; then - GKARGS+=( "--disklabel" ) - fi - - if [ -n "${K_MKIMAGE_KERNEL_ADDRESS}" ]; then - export LOADADDR="${K_MKIMAGE_KERNEL_ADDRESS}" - fi - OLDARCH="${ARCH}" - unset ARCH - unset LDFLAGS - DEFAULT_KERNEL_SOURCE="${S}" CMD_KERNEL_DIR="${S}" genkernel "${GKARGS[@]}" ${K_GENKERNEL_ARGS} \ - --kerneldir="${S}" \ - --kernel-config="${WORKDIR}"/config \ - --cachedir="${WORKDIR}"/cache \ - --makeopts="${mkopts}" \ - --tempdir="${S}"/temp \ - --logfile="${WORKDIR}"/genkernel.log \ - --bootdir="${WORKDIR}"/boot \ - --mountboot \ - --module-prefix="${WORKDIR}"/lib \ - all || die "genkernel failed" - - if [ -n "${K_MKIMAGE_KERNEL_ADDRESS}" ]; then - unset LOADADDR - fi - - ARCH=${OLDARCH} -} - -_setup_mkimage_ramdisk() { - local initramfs=$(ls "${WORKDIR}"/boot/${KERN_INITRAMFS_SEARCH_NAME}* 2> /dev/null) - if [ ! -e "${initramfs}" ] || [ ! -f "${initramfs}" ]; then - ewarn "No initramfs at ${initramfs}, cannot run mkimage on it!" - elif [ "${K_MKIMAGE_WRAP_INITRAMFS}" = "1" ]; then - einfo "Setting up u-boot initramfs for: ${initramfs}" - mkimage -A arm -O linux -T ramdisk -C none -a \ - "${K_MKIMAGE_RAMDISK_ADDRESS}" \ - -e "${K_MKIMAGE_RAMDISK_ENTRYPOINT}" -d "${initramfs}" \ - "${initramfs}.u-boot" || return 1 - mv "${initramfs}.u-boot" "${initramfs}" || return 1 - else - einfo "mkimage won't be called for: ${initramfs}" - fi - return 0 -} - -argent-kernel_src_install() { - if [ -n "${K_FIRMWARE_PACKAGE}" ]; then - _firmwares_src_install - elif [ -n "${K_ONLY_SOURCES}" ]; then - _kernel_sources_src_install - else - _kernel_src_install - fi - # File collisions between slots, debug stuff - # not really needed for a kernel - rm -rf "${D}/usr/lib/debug" -} - -_firmwares_src_install() { - dodir /lib/firmware - keepdir /lib/firmware - cd "${S}" || die - emake INSTALL_FW_PATH="${D}/lib/firmware" firmware_install || die "cannot install firmwares" -} - -_kernel_sources_src_install() { - _kernel_copy_config ".config" - kernel-2_src_install - cd "${D}${KV_OUT_DIR}" || die - local oldarch="${ARCH}" - unset ARCH - if ! use sources_standalone; then - make modules_prepare || die "failed to run modules_prepare" - rm .config || die "cannot remove .config" - rm Makefile || die "cannot remove Makefile" - rm -f include/linux/version.h - rm -f include/generated/uapi/linux/version.h - fi - ARCH="${oldarch}" -} - -_kernel_src_install() { - if use arm; then - _setup_mkimage_ramdisk || die "cannot setup mkimage" - fi - - dodir "${KV_OUT_DIR}" - insinto "${KV_OUT_DIR}" - - _kernel_copy_config ".config" - doins ".config" || die "cannot copy kernel config" - doins Makefile || die "cannot copy Makefile" - doins Module.symvers || die "cannot copy Module.symvers" - doins System.map || die "cannot copy System.map" - - # NOTE: this is a workaround caused by linux-info.eclass not - # being ported to EAPI=2 yet - local version_h_dir="include/linux" - local version_h_dir2="include/generated/uapi/linux" - local version_h= - local version_h_src= - for ver_dir in "${version_h_dir}" "${version_h_dir2}"; do - version_h="${ROOT}${KV_OUT_DIR/\//}/${ver_dir}/version.h" - if [ -f "${version_h}" ]; then - einfo "Discarding previously installed version.h to avoid collisions" - addwrite "${version_h}" - rm -f "${version_h}" - fi - - # Include include/linux/version.h to make Portage happy - version_h_src="${S}/${ver_dir}/version.h" - if [ -f "${version_h_src}" ]; then - dodir "${KV_OUT_DIR}/${ver_dir}" - insinto "${KV_OUT_DIR}/${ver_dir}" - doins "${version_h_src}" || die "cannot copy version.h" - fi - done - - insinto "/boot" - doins "${WORKDIR}"/boot/* || die "cannot copy /boot over" - cp -Rp "${WORKDIR}"/lib/* "${D}/" || die "cannot copy /lib over" - - # Install dtbs if found - if use arm; then - local dtb_dir="/lib/dts/${KV_FULL}" - elog "Installing .dtbs (if any) into ${dtb_dir}" - insinto "${dtb_dir}" - local dtb= - for dtb in "${S}/arch/arm/boot/dts"/*.dtb; do - if [ -f "${dtb}" ]; then - elog "Installing dtb: ${dtb}" - doins "${dtb}" - fi - done - fi - - # This doesn't always work because KV_FULL (when K_NOSETEXTRAVERSION=1) doesn't - # reflect the real value used in Makefile - #dosym "../../..${KV_OUT_DIR}" "/lib/modules/${KV_FULL}/source" || die "cannot install source symlink" - #dosym "../../..${KV_OUT_DIR}" "/lib/modules/${KV_FULL}/build" || die "cannot install build symlink" - cd "${D}"/lib/modules/* || die "cannot enter /lib/modules directory, more than one element?" - # cleanup previous - rm -f build source || die - # create sane symlinks - ln -sf "../../..${KV_OUT_DIR}" source || die "cannot create source symlink" - ln -sf "../../..${KV_OUT_DIR}" build || die "cannot create build symlink" - cd "${S}" || die - - # drop ${D}/lib/firmware, virtual/linux-firmwares provides it - rm -rf "${D}/lib/firmware" - - if [ -n "${K_WORKAROUND_SOURCES_COLLISION}" ]; then - # Fixing up Makefile collision if already installed by - # openvz-sources - einfo "Workarounding source package collisions" - make_file="${KV_OUT_DIR/\//}/Makefile" - einfo "Makefile: ${make_file}" - if [ -f "${ROOT}/${make_file}" ]; then - elog "Removing ${D}/${make_file}" - rm -f "${D}/${make_file}" - fi - fi - - # Install kernel configuration information - # useful for Entropy kernel-switcher - # release level is enough for now - base_dir="/etc/kernels/${P}" - dodir "${base_dir}" - insinto "${base_dir}" - echo "${KV_FULL}" > "RELEASE_LEVEL" - doins "RELEASE_LEVEL" - einfo "Installing ${base_dir}/RELEASE_LEVEL file: ${KV_FULL}" - - use dracut && \ - _dracut_initramfs_create "${KV_FULL}" -} - -argent-kernel_pkg_preinst() { - if _is_kernel_binary; then - mount-boot_pkg_preinst - fi -} -argent-kernel_grub2_mkconfig() { - if [ -x "${ROOT}usr/sbin/grub2-mkconfig" ]; then - # Grub 2.00 - "${ROOT}usr/sbin/grub2-mkconfig" -o "${ROOT}boot/grub/grub.cfg" - elif [ -x "${ROOT}sbin/grub-mkconfig" ]; then - # Grub 1.99 - "${ROOT}sbin/grub-mkdevicemap" --device-map="${ROOT}boot/grub/device.map" - "${ROOT}sbin/grub-mkconfig" -o "${ROOT}boot/grub/grub.cfg" - else - echo - ewarn "Attention, Grub2 is not installed !!!" - ewarn "Grub2 bootloader configuration won't be updated" - echo - fi -} - -_get_real_extraversion() { - make_file="${ROOT}${KV_OUT_DIR}/Makefile" - local extraver=$(grep -r "^EXTRAVERSION =" "${make_file}" | cut -d "=" -f 2 | head -n 1) - local trimmed=${extraver%% } - echo ${trimmed## } -} - -_get_release_level() { - if [[ -n "${K_WORKAROUND_USE_REAL_EXTRAVERSION}" ]]; then - echo "${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}$(_get_real_extraversion)" - elif [[ "${KV_MAJOR}${KV_MINOR}" -eq 26 ]]; then - echo "${KV_FULL}" - elif [[ "${OKV/.*}" = "3" ]] && [[ "${KV_PATCH}" = "0" ]]; then - # Linux 3.x support, KV_FULL is set to: 3.0-argent - # need to add another final .0 to the version part - echo "${KV_FULL/-/.0-}" - else - echo "${KV_FULL}" - fi -} - -argent-kernel_uimage_config() { - # Two cases here: - # 1. /boot/uImage symlink is broken (pkg_postrm) - # 2. /boot/uImage symlink doesn't exist (pkg_postinst) - - if ! has_version app-eselect/uimage; then - ewarn "app-eselect/uimage not installed" - ewarn "If you are using this tool, please install it" - return 0 - fi - - local uimage_file=$(eselect uimage show --quiet 2> /dev/null) - if [ -z "${uimage_file}" ]; then - # pick the first listed, sorry! - local eselect_list=$(eselect uimage list --quiet 2> /dev/null) - if [ -n "${eselect_list}" ]; then - eselect uimage set 1 - else - echo - ewarn "No more kernels available, you won't be able to boot" - echo - fi - else - echo - elog "If you use eselect-bzimage, you are currently booting with kernel:" - elog "${uimage_file}" - elog - elog "Use 'eselect uimage' in order to switch between the available ones" - echo - fi -} - -argent-kernel_bzimage_config() { - # Two cases here: - # 1. /boot/bzImage symlink is broken (pkg_postrm) - # 2. /boot/bzImage symlink doesn't exist (pkg_postinst) - local kern_arch - use x86 && kern_arch="x86" - use amd64 && kern_arch="x86_64" - - if ! has_version app-eselect/eselect-bzimage; then - ewarn "app-eselect/eselect-bzimage not installed" - ewarn "If you are using this tool, please install it" - return 0 - fi - - local bzimage_file=$(eselect bzimage show --quiet 2> /dev/null) - if [ -z "${bzimage_file}" ]; then - # try to pic what's being installed - local eselect_list=$(eselect bzimage list --quiet 2> /dev/null) - if [ -n "${eselect_list}" ]; then - eselect bzimage set "kernel-genkernel-${kern_arch}-${KV_FULL}" - if [ "${?}" != "0" ]; then - # pick the first available, sorry! - echo - eselect bzimage set 1 - ewarn "Unable to select the right kernel, falling back" - ewarn "to the first available entry. You have been warned" - echo - fi - else - echo - ewarn "No more kernels available, you might not be able to boot" - echo - fi - else - echo - ewarn "You are currently booting with kernel:" - ewarn "${bzimage_file}" - ewarn - ewarn "Use 'eselect bzimage' in order to switch between the available ones" - echo - fi -} - -_dracut_initramfs_create() { - local kver="${1}" - - elog "Creating dracut initramfs for ${kver}" - addpredict /etc/ld.so.cache~ - dracut -q -N -f --kver="${kver}" "${D}/boot/initramfs-dracut-${kver}" -} - -argent-kernel_pkg_postinst() { - if _is_kernel_binary; then - fstab_file="${ROOT}etc/fstab" - einfo "Removing extents option for ext4 drives from ${fstab_file}" - # Remove "extents" from /etc/fstab - if [ -f "${fstab_file}" ]; then - sed -i '/ext4/ s/extents//g' "${fstab_file}" - fi - - # Update kernel initramfs to match user customizations - use splash && update_argent_kernel_initramfs_splash - - # Add kernel to grub.conf - if use amd64 || use x86; then - if use amd64; then - local kern_arch="x86_64" - else - local kern_arch="x86" - fi - # grub-legacy - if [ -x "${ROOT}usr/sbin/grub-handler" ]; then - "${ROOT}usr/sbin/grub-handler" add \ - "/boot/kernel-genkernel-${kern_arch}-${KV_FULL}" \ - "/boot/initramfs-genkernel-${kern_arch}-${KV_FULL}" - fi - - argent-kernel_grub2_mkconfig - fi - - # Setup newly installed kernel on ARM - if use arm; then - argent-kernel_uimage_config - fi - # Setup newly installed kernel on x86/amd64 - # This is quite handy for static grub1/grub2 - # configurations (like on Amazon EC2) - if use x86 || use amd64; then - argent-kernel_bzimage_config - fi - - kernel-2_pkg_postinst - local depmod_r=$(_get_release_level) - _update_depmod "${depmod_r}" - - elog "Please report kernel bugs at:" - elog "http://bugs.argent.ro" - - elog "The source code of this kernel is located at" - elog "=${K_KERNEL_SOURCES_PKG}." - elog "RogentOS Team recommends that portage users install" - elog "${K_KERNEL_SOURCES_PKG} if you want" - elog "to build any packages that install kernel modules" - elog "(such as ati-drivers, nvidia-drivers, virtualbox, etc...)." - else - kernel-2_pkg_postinst - fi -} - -argent-kernel_pkg_prerm() { - if _is_kernel_binary; then - mount-boot_pkg_prerm - fi -} - -argent-kernel_pkg_postrm() { - if _is_kernel_binary; then - # Remove kernel from grub.conf - if use amd64 || use x86; then - if use amd64; then - local kern_arch="x86_64" - else - local kern_arch="x86" - fi - if [ -x "${ROOT}usr/sbin/grub-handler" ]; then - "${ROOT}usr/sbin/grub-handler" remove \ - "/boot/kernel-genkernel-${kern_arch}-${KV_FULL}" \ - "/boot/initramfs-genkernel-${kern_arch}-${KV_FULL}" - fi - - argent-kernel_grub2_mkconfig - fi - - # Setup newly installed kernel on ARM - if use arm; then - argent-kernel_uimage_config - fi - # Setup newly installed kernel on x86/amd64 - # This is quite handy for static grub1/grub2 - # configurations (like on Amazon EC2) - if use x86 || use amd64; then - argent-kernel_bzimage_config - fi - fi -} - -# export all the available functions here -case ${EAPI:-0} in - 0|1) extra_export_funcs= ;; - *) extra_export_funcs=src_prepare ;; -esac - -EXPORT_FUNCTIONS pkg_setup src_unpack ${extra_export_funcs} \ - src_compile src_install pkg_preinst pkg_postinst pkg_prerm pkg_postrm diff --git a/eclass/kog-patches.eclass b/eclass/kog-patches.eclass new file mode 100644 index 00000000..17807efd --- /dev/null +++ b/eclass/kog-patches.eclass @@ -0,0 +1,171 @@ +# Copyright 2014 Sabayon +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +# @ECLASS: kog-patches.eclass +# @MAINTAINER: +# slawomir.nizio@sabayon.org +# @AUTHOR: +# Sławomir Nizio <slawomir.nizio@sabayon.org> +# @BLURB: eclass that makes it easier to apply patches from multiple packages +# @DESCRIPTION: +# Makes it easy to apply patches stored in a remote location +# with the intention to make the task easier for Sabayon split ebuilds. +# (Plain patches kept in a VCS are very nice, but in the case of split +# ebuilds, duplicating the patches is not effective.) +# Patches are not added to SRC_URI by default, because it makes ebuilds +# use "SRC_URI+=..." which makes them more diverged from the original +# one than necessary. +# The eclass does not define any phase function. + +# @ECLASS-VARIABLE: KOG_PATCHES_SRC +# @DEFAULT_UNSET +# @DESCRIPTION: +# Array that contains URIs of patches to be added to SRC_URI. Mandatory! + +# @ECLASS-VARIABLE: KOG_PATCHES_SKIP +# @DESCRIPTION: +# Array that contains patterns of patch names to be skipped. +# It does not need to be a global variable. + +inherit eutils + +if [[ ${#KOG_PATCHES_SRC[@]} -eq 0 ]]; then + die "KOG_PATCHES_SRC is not set" +fi + +# @FUNCTION: kog-patches_update_SRC_URI +# @DESCRIPTION: +# Appends patches entries to SRC_URI. If it is not done, an error will +# occur later on. +kog-patches_update_SRC_URI() { + local p + for p in "${KOG_PATCHES_SRC[@]}"; do + SRC_URI+=${SRC_URI:+ }${p} + done +} + +# @FUNCTION: kog-patches_apply_all +# @DESCRIPTION: +# Applies patches specified using KOG_PATCHES_SRC, skipping patches +# with names matched in KOG_PATCHES_SKIP. +# Two possible cases are supported. +# 1. A patch path which is a tarball (assumed file name: *.tar*). +# Such a tarball must unpack to ${WORKDIR}/<tarball name without *.tar*> +# and must contain a file 'order,' which is used to determine order +# of patches to apply. +# 2. A patch which is not a tarball, which will be simply applied (if +# it is not skipped). +kog-patches_apply_all() { + local p + for p in "${KOG_PATCHES_SRC[@]}"; do + if [[ ${p} = *.tar* ]]; then + local dir=${p##*/} + dir=${dir%.tar*} + _kog-patches_apply_from_dir "${WORKDIR}/${dir}" + else + local name=${p##*/} + _kog-patches_apply_nonskipped "${DISTDIR}" "${name}" + fi + done +} + +# @FUNCTION: kog-patches_apply +# @DESCRIPTION: +# Apply selected patches. Arguments are the directory containing +# the patch, followed by one or more patch names. +kog-patches_apply() { + [[ $# -lt 2 ]] && die "kog-patches_apply: missing arguments" + local dir=$1 + shift + local patch + for patch; do + epatch "${dir}/${patch}" + done +} + +# @FUNCTION: kog-patches_unpack +# @DESCRIPTION: +# Unpack every file provided in KOG_PATCHES_SRC. +kog-patches_unpack() { + local p + pushd "${WORKDIR}" > /dev/null || die + + for p in "${KOG_PATCHES_SRC[@]}"; do + local name=${p##*/} + unpack "${name}" + done + + popd > /dev/null || die +} + +# @FUNCTION: _kog-patches_apply_nonskipped +# @INTERNAL +# @DESCRIPTION: +# Apply selected patches - only those which should not be skipped. +# Arguments are the directory containing the patch, followed by +# one or more patch names. +# This function is not intended to be used by ebuilds because there +# is a better way: use kog-patches_apply and skip the unwanted ones. +_kog-patches_apply_nonskipped() { + if [[ $# -lt 2 ]]; then + die "_kog-patches_apply_nonskipped: missing arguments" + fi + + local dir=$1 + shift + + local patch + for patch; do + if [[ ${patch} = */* ]]; then + die "_kog-patches_apply_nonskipped: '${patch}' contains slashes" + fi + + if _kog-patches_is_skipped "${patch}"; then + einfo "(skipping ${patch})" + else + epatch "${dir}/${patch}" + fi + done +} + +# @FUNCTION: _kog-patches_apply_from_dir +# @INTERNAL +# @DESCRIPTION: +# Apply all patches from a directory in order. Obeys KOG_PATCHES_SKIP. +_kog-patches_apply_from_dir() { + local dir=$1 + local order_file=${dir}/order + if [[ ! -r ${order_file} ]] || [[ ! -f ${order_file} ]]; then + die "Problems with '${order_file}'... (Does it exist?)" + fi + + local patch + while read patch; do + local patch_path=${dir}/${patch} + if \ + [[ -z ${patch} ]] || \ + [[ ${patch} = *\ * ]] || \ + [[ ${patch} = */* ]] || \ + [[ ! -f ${patch_path} ]]; then + die "Problems with the patch '${patch}', see ${order_file}." + fi + + _kog-patches_apply_nonskipped "${dir}" "${patch}" + done < "${order_file}" + + [[ $? -ne 0 ]] && die "_kog-patches_apply_from_dir: loop failed" +} + +# @FUNCTION: _kog-patches_is_skipped +# @INTERNAL +# @DESCRIPTION: +# Returns success if the patch should be skipped. O(n). :) +_kog-patches_is_skipped() { + local arg=$1 + local p + for p in "${KOG_PATCHES_SKIP[@]}"; do + [[ ${arg} = ${p} ]] && return 0 + done + return 1 +} diff --git a/eclass/live-artwork.eclass b/eclass/live-artwork.eclass index e235550c..d3ca07a1 100644 --- a/eclass/live-artwork.eclass +++ b/eclass/live-artwork.eclass @@ -19,9 +19,11 @@ GFX_SPLASH_NAME="${GFX_SPLASH_NAME:-live}" # @DESCRIPTION: # Default plymouth theme name to use if [ -d "/etc/kogaion" ] ; then - PLYMOUTH_THEME="${PLYMOUTH_THEME:-kogaion}" + PLYMOUTH_THEME="${PLYMOUTH_THEME:-kogaion}" + SYSTEM_DISTRO="${SYSTEM_DISTRO:-kogaion}" elif [ -d "/etc/argent" ] ; then - PLYMOUTH_THEME="${PLYMOUTH_THEME:-argent}" + PLYMOUTH_THEME="${PLYMOUTH_THEME:-argent}" + SYSTEM_DISTRO="${SYSTEM_DISTRO:-argent}" fi # @FUNCTION: update_kernel_initramfs_splash diff --git a/eclass/live-kernel.eclass b/eclass/live-kernel.eclass index f9509f18..f7d2909d 100644 --- a/eclass/live-kernel.eclass +++ b/eclass/live-kernel.eclass @@ -473,7 +473,7 @@ _kernel_copy_config() { local base_path="${DISTDIR}" if [ -n "${K_ROGKERNEL_SELF_TARBALL_NAME}" ]; then - base_path="${S}/${PLYMOUTH_THEME}/config" + base_path="${S}/${SYSTEM_DISTRO}/config" fi local found= cfg= @@ -516,7 +516,7 @@ _kernel_src_compile() { cd "${S}" || die local GKARGS=() - GKARGS+=( "--no-menuconfig" "--no-save-config" "--e2fsprogs" "--udev" ) + GKARGS+=( "--no-menuconfig" "--all-ramdisk-modules" "--no-save-config" "--e2fsprogs" "--udev" ) # use splash && GKARGS+=( "--splash=argent" ) #NO MORE fbsplash!!! use btrfs && GKARGS+=( "--btrfs" ) use plymouth && GKARGS+=( "--plymouth" "--plymouth-theme=${PLYMOUTH_THEME}" ) #reverted to use variable (check the eclass) @@ -874,7 +874,11 @@ live-kernel_pkg_postinst() { fi # Update kernel initramfs to match user customizations - use splash && update_${PLYMOUTH_THEME}_kernel_initramfs_splash + if [[ "${SYSTEM_DISTRO}" == "kogaion" ]] ; then + use splash && update_kogaion_kernel_initramfs_splash + else + use splash && update_argent_kernel_initramfs_splash + fi # Add kernel to grub.conf if use amd64 || use x86; then diff --git a/eclass/mozconfig-v6.38.eclass b/eclass/mozconfig-v6.38.eclass new file mode 100644 index 00000000..d2990bed --- /dev/null +++ b/eclass/mozconfig-v6.38.eclass @@ -0,0 +1,239 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v5.38.eclass,v 1.1 2015/05/27 19:00:31 axs Exp $ +# +# @ECLASS: mozconfig-v5.33.eclass +# @MAINTAINER: +# mozilla team <mozilla@gentoo.org> +# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v5 +# @DESCRIPTION: +# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey) +# to provide a single common place for the common mozilla engine compoments. +# +# The eclass provides all common dependencies as well as common use flags. +# +# Some use flags which may be optional in particular mozilla packages can be +# supported through setting eclass variables. +# +# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3, +# and so ebuilds inheriting this eclass do not need to inherit that. + +inherit multilib flag-o-matic toolchain-funcs mozcoreconf-v3 + +case ${EAPI} in + 0|1|2|3|4) die "EAPI=${EAPI} not supported" +esac + +# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI +# @DESCRIPTION: +# Set this variable before the inherit line, when an ebuild needs to provide +# optional necko-wifi support via IUSE="wifi". Currently this would include +# ebuilds for firefox, and potentially seamonkey. +# +# Leave the variable UNSET if necko-wifi support should not be available. +# Set the variable to "enabled" if the use flag should be enabled by default. +# Set the variable to any value if the use flag should exist but not be default-enabled. + +# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT +# @DESCRIPTION: +# Set this variable before the inherit line, when an ebuild needs to provide +# optional necko-wifi support via IUSE="jit". Currently this would include +# ebuilds for firefox, and potentially seamonkey. +# +# Leave the variable UNSET if optional jit support should not be available. +# Set the variable to "enabled" if the use flag should be enabled by default. +# Set the variable to any value if the use flag should exist but not be default-enabled. + +# use-flags common among all mozilla ebuilds +IUSE="${IUSE} dbus debug gstreamer gstreamer-0 +jemalloc3 pulseaudio selinux startup-notification system-cairo system-icu system-jpeg system-sqlite system-libvpx" + +# some notes on deps: +# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14 +# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau + +RDEPEND=">=app-text/hunspell-1.2 + dev-libs/atk + dev-libs/expat + >=dev-libs/libevent-1.4.7 + >=x11-libs/cairo-1.10[X] + >=x11-libs/gtk+-2.18:2 + x11-libs/gdk-pixbuf + >=x11-libs/pango-1.22.0 + >=media-libs/libpng-1.6.16:0=[apng] + >=media-libs/mesa-10.2:* + media-libs/fontconfig + >=media-libs/freetype-2.4.10 + kernel_linux? ( media-libs/alsa-lib ) + pulseaudio? ( media-sound/pulseaudio ) + virtual/freedesktop-icon-theme + dbus? ( >=sys-apps/dbus-0.60 + >=dev-libs/dbus-glib-0.72 ) + startup-notification? ( >=x11-libs/startup-notification-0.8 ) + >=dev-libs/glib-2.26:2 + >=sys-libs/zlib-1.2.3 + >=virtual/libffi-3.0.10 + gstreamer? ( + >=media-libs/gstreamer-1.4.5:1.0 + >=media-libs/gst-plugins-base-1.4.5:1.0 + >=media-libs/gst-plugins-good-1.4.5:1.0 + >=media-plugins/gst-plugins-libav-1.4.5:1.0 + ) + gstreamer-0? ( + media-plugins/gst-plugins-meta:0.10[ffmpeg] + ) + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrender + x11-libs/libXt + system-cairo? ( >=x11-libs/cairo-1.12[X] >=x11-libs/pixman-0.19.2 ) + system-icu? ( >=dev-libs/icu-51.1:= ) + system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) + system-sqlite? ( >=dev-db/sqlite-3.8.8.2:3[secure-delete,debug=] ) + system-libvpx? ( >=media-libs/libvpx-1.3.0[postproc] ) +" + +if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then + if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then + IUSE+=" +wifi" + else + IUSE+=" wifi" + fi + RDEPEND+=" + wifi? ( >=sys-apps/dbus-0.60 + >=dev-libs/dbus-glib-0.72 + net-wireless/wireless-tools )" +fi +if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then + if [[ ${MOZCONFIG_OPTIONAL_JIT} = "enabled" ]]; then + IUSE+=" +jit" + else + IUSE+=" jit" + fi +fi + +DEPEND="app-arch/zip + app-arch/unzip + >=sys-devel/binutils-2.16.1 + ${RDEPEND}" + +RDEPEND+=" + selinux? ( sec-policy/selinux-mozilla )" + +# only one of gstreamer and gstreamer-0 can be enabled at a time, so set REQUIRED_USE to signify this +REQUIRED_USE="?? ( gstreamer gstreamer-0 )" + +# @FUNCTION: mozconfig_config +# @DESCRIPTION: +# Set common configure options for mozilla packages. +# Call this within src_configure() phase, after mozconfig_init +# +# Example: +# +# inherit mozconfig-v5.33 +# +# src_configure() { +# mozconfig_init +# mozconfig_config +# # ... misc ebuild-unique settings via calls to +# # ... mozconfig_{annotate,use_with,use_enable} +# mozconfig_final +# } + +mozconfig_config() { + # Migrated from mozcoreconf-2 + mozconfig_annotate 'system_libs' \ + --with-system-zlib \ + --enable-pango \ + --enable-svg \ + --with-system-bz2 + + mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2 + + if has bindist ${IUSE}; then + mozconfig_use_enable !bindist official-branding + if [[ ${PN} == firefox ]] && use bindist ; then + mozconfig_annotate '' --with-branding=browser/branding/aurora + fi + fi + + mozconfig_use_enable debug + mozconfig_use_enable debug tests + + if ! use debug ; then + mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols + else + mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols + fi + + mozconfig_use_enable startup-notification + + if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; then + # wifi pulls in dbus so manage both here + mozconfig_use_enable wifi necko-wifi + if use wifi && ! use dbus; then + echo "Enabling dbus support due to wifi request" + mozconfig_annotate 'dbus required by necko-wifi' --enable-dbus + else + mozconfig_use_enable dbus + fi + else + mozconfig_use_enable dbus + mozconfig_annotate 'disabled' --disable-necko-wifi + fi + + # These are forced-on for webm support + mozconfig_annotate 'required' --enable-ogg + mozconfig_annotate 'required' --enable-wave + + if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then + mozconfig_use_enable jit ion + fi + + # These are enabled by default in all mozilla applications + mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr + mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr + mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir) + mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr + mozconfig_annotate '' --prefix="${EPREFIX}"/usr + mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir) + mozconfig_annotate 'Gentoo default' --enable-system-hunspell + mozconfig_annotate '' --disable-gnomevfs + mozconfig_annotate '' --disable-gnomeui + mozconfig_annotate '' --enable-gio + mozconfig_annotate '' --disable-crashreporter + mozconfig_annotate 'Gentoo default' --with-system-png + mozconfig_annotate '' --enable-system-ffi + mozconfig_annotate 'Gentoo default to honor system linker' --disable-gold + mozconfig_annotate '' --disable-gconf + + # Use jemalloc unless libc is not glibc >= 2.4 + # at this time the minimum glibc in the tree is 2.9 so we should be safe. + if use elibc_glibc && use jemalloc3; then + # We must force-enable jemalloc 3 via .mozconfig + echo "export MOZ_JEMALLOC3=1" >> "${S}"/.mozconfig || die + mozconfig_annotate '' --enable-jemalloc + mozconfig_annotate '' --enable-replace-malloc + fi + + mozconfig_annotate '' --target="${CTARGET:-${CHOST}}" + mozconfig_annotate '' --build="${CTARGET:-${CHOST}}" + + if use gstreamer ; then + mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0 + elif use gstreamer-0 ; then + mozconfig_annotate '+gstreamer-0' --enable-gstreamer=0.10 + else + mozconfig_annotate '' --disable-gstreamer + fi + mozconfig_use_enable pulseaudio + + mozconfig_use_enable system-cairo + mozconfig_use_enable system-sqlite + mozconfig_use_with system-jpeg + mozconfig_use_with system-icu + mozconfig_use_enable system-icu intl-api + mozconfig_use_with system-libvpx +} diff --git a/mate-base/mdm/Manifest b/mate-base/mdm/Manifest deleted file mode 100644 index 30f0a293..00000000 --- a/mate-base/mdm/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST mdm-2.0.2.tar.gz 4304086 SHA256 499494373f6db31b5e98b5d69a87bbdb7fc940021984b715d5e010ad9f3aea11 SHA512 62176ad00d7662cdd1eec8bbed6654e48cf1a8740f2aa95c00a55e378f7c62d15e20f8059aaf521327651b026065ba1694ae70f5c7635b831042f0125d04dd93 WHIRLPOOL 68114ac1f9c3bdd4f557839db73461efecd90c84c93fcce79ebff6ca337b05bce7b457eb18a75ca4dbcf1428b346f2599793423d9eb5304a4e8ea1c19564ab40 -DIST mdm-2.0.3.tar.gz 4304282 SHA256 84e6ca578d41f320bcc83b3f08b76b5b3b30da19407b0051b0cfbda6ddbf1d78 SHA512 cd00c7299ca5eeffd2bc8e727aa44d98e94f3d1aa22f46bbd50c6f1b6f74672b055b7246442f62b9bffc5f5696e5051e9d8ac26f7faa9f6ee4416e51ccc5d800 WHIRLPOOL 5890daac69c4571e02c7b9a84df9ac631147be2c6738cbcae7a698041a3b5006db44591d65987c4544c24b9a2125c0852e32c601b4e83b7ab0e7d38562566f6f -DIST mdm-2.0.4.tar.gz 4304238 SHA256 cf4875345f610b4d00e8edecf454052e5099f417b16abb7549e14ac465fe0ab9 SHA512 e0ba9d3f9d5a6be0a833f5052e872e50beae4533299be26c00878bfa25f62e93ef16f2c9f9aad71fb859c91726269e448725e8e018d52243ed5a3e87281f77be WHIRLPOOL f98343e472fbc695bb6f9ad041614aa203eb550214b3e65f7f5c51e55af5bf677367c2acf9905d66897423c89b451ad02ddca8a485599d72105286e4b058dc91 diff --git a/mate-base/mdm/files/gdm-2.13.0.1-selinux-remove-attr.patch b/mate-base/mdm/files/gdm-2.13.0.1-selinux-remove-attr.patch deleted file mode 100644 index 0f9137da..00000000 --- a/mate-base/mdm/files/gdm-2.13.0.1-selinux-remove-attr.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gdm-2.13.0.1.orig/configure.ac 2005-11-14 17:13:40.000000000 -0500 -+++ gdm-2.13.0.1/configure.ac 2005-11-18 14:59:23.000000000 -0500 -@@ -750,7 +750,7 @@ - AC_CHECK_LIB(selinux,setexeccon,/bin/true) - AC_CHECK_LIB(selinux,is_selinux_enabled,/bin/true) - AC_DEFINE(HAVE_SELINUX) -- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr" -+ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux" - fi - - # diff --git a/mate-base/mdm/files/gdm-2.20.10-custom-session.patch b/mate-base/mdm/files/gdm-2.20.10-custom-session.patch deleted file mode 100644 index b1f70c00..00000000 --- a/mate-base/mdm/files/gdm-2.20.10-custom-session.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- - fix custom sessions (see bug #216984, work done by Gilles, I'm just committing) - - config/Xsession.in | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -Index: b/config/Xsession.in -=================================================================== ---- a/config/Xsession.in -+++ b/config/Xsession.in -@@ -177,15 +177,6 @@ if [ -n "$GDM_LANG" ]; then - fi - fi - --# run all system xinitrc shell scripts. --if [ -d /etc/X11/xinit/xinitrc.d ]; then -- for i in /etc/X11/xinit/xinitrc.d/* ; do -- if [ -x "$i" ]; then -- . "$i" -- fi -- done --fi -- - if [ "x$command" = "xcustom" ] ; then - if [ -x "$HOME/.xsession" ]; then - command="$HOME/.xsession" -@@ -213,6 +204,15 @@ if [ "x$command" = "xdefault" ] ; then - fi - fi - -+# run all system xinitrc shell scripts. -+if [ -d /etc/X11/xinit/xinitrc.d ]; then -+ for i in /etc/X11/xinit/xinitrc.d/* ; do -+ if [ -x "$i" ]; then -+ . "$i" -+ fi -+ done -+fi -+ - # add ssh-agent if found - sshagent="`gdmwhich ssh-agent`" - if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then diff --git a/mate-base/mdm/mdm-2.0.2.ebuild b/mate-base/mdm/mdm-2.0.2.ebuild deleted file mode 100644 index 932d61af..00000000 --- a/mate-base/mdm/mdm-2.0.2.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" - -inherit mate pam user - -DESCRIPTION="Mate Display Manager" -HOMEPAGE="http://mate-desktop.org" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="accessibility afs +consolekit dmx elibc_glibc ipv6 gnome-keyring pam remote selinux tcpd xinerama" -GDM_EXTRA="gdm-2.20.9-gentoo-files-r1" -SRC_URI="https://github.com/linuxmint/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - #mirror://gentoo/${GDM_EXTRA}.tar.bz2" - -RDEPEND=">=dev-libs/glib-2.12:2 - >=x11-libs/gtk+-2.6:2 - >=x11-libs/pango-1.3 - >=gnome-base/libglade-2:2.0 - >=gnome-base/libgnomecanvas-2 - >=gnome-base/librsvg-1.1.1:2 - >=dev-libs/libxml2-2.4.12:2 - >=media-libs/libart_lgpl-2.3.11 - net-libs/webkit-gtk:2 - x11-libs/gksu - x11-libs/libXi - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXext - x11-apps/sessreg - x11-libs/libXdmcp - xinerama? ( x11-libs/libXinerama ) - consolekit? ( - sys-auth/consolekit - dev-libs/dbus-glib ) - accessibility? ( x11-libs/libXevie ) - afs? ( net-fs/openafs sys-libs/lwp ) - dmx? ( x11-libs/libdmx ) - gnome-keyring? ( gnome-base/gnome-keyring[pam] ) - pam? ( virtual/pam ) - !pam? ( elibc_glibc? ( sys-apps/shadow ) ) - remote? ( gnome-extra/zenity ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - >=x11-misc/xdg-utils-1.0.2-r3" -DEPEND="${RDEPEND} - dmx? ( x11-proto/dmxproto ) - xinerama? ( x11-proto/xineramaproto ) - app-text/docbook-xml-dtd:4.1.2 - sys-devel/gettext - x11-proto/inputproto - >=dev-util/intltool-0.35 - virtual/pkgconfig - >=app-text/scrollkeeper-0.1.4 - >=app-text/gnome-doc-utils-0.3.2" - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README TODO" - G2CONF="${G2CONF} - --with-prefetch - --sysconfdir=/etc/X11 - --localstatedir=/var - --with-xdmcp=yes - --with-pam-prefix=/etc - --disable-static - SOUND_PROGRAM=/usr/bin/mdmplay - $(use_enable ipv6) - $(use_enable remote secureremote) - $(use_with accessibility xevie) - $(use_with consolekit console-kit) - $(use_with dmx) - $(use_with selinux) - $(use_with tcpd tcp-wrappers) - $(use_with xinerama)" - - if use pam; then - G2CONF="${G2CONF} --enable-authentication-scheme=pam" - else - G2CONF="${G2CONF} --enable-console-helper=no" - if use elibc_glibc ; then - G2CONF="${G2CONF} --enable-authentication-scheme=shadow" - else - G2CONF="${G2CONF} --enable-authentication-scheme=crypt" - fi - fi - - enewgroup mdm - enewuser mdm -1 -1 /var/lib/mdm mdm -} - -src_prepare() { - # remove unneeded linker directive for selinux (#41022) - epatch "${FILESDIR}/gdm-2.13.0.1-selinux-remove-attr.patch" - - # Make custom session work, bug #216984 - epatch "${FILESDIR}/gdm-2.20.10-custom-session.patch" - - eautoreconf - - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - - local gentoodir="${WORKDIR}/${GDM_EXTRA}" - - # install XDG_DATA_DIRS mdm changes - echo 'XDG_DATA_DIRS="/usr/share/mdm"' > 99xdg-mdm - doenvd 99xdg-mdm - - # add a custom sound playing script (#248253) - #mv "${gentoodir}/gdmplay" mdmplay - #dobin mdmplay - - # avoid file collision, bug #213118 - rm -f "${D}/usr/share/xsessions/gnome.desktop" - - # We replace the pam stuff by our own - rm -rf "${D}/etc/pam.d" - - if use pam ; then - use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/* - - mv "${gentoodir}"/pam.d/{g,m}dm - mv "${gentoodir}"/pam.d/{g,m}dmsetup - mv "${gentoodir}"/pam.d/{g,m}dm-autologin - dopamd "${gentoodir}"/pam.d/* - sed s/gdmsetup/mdmsetup/ "${gentoodir}/security/console.apps/gdmsetup" > "${gentoodir}/security/console.apps/mdmsetup" - dopamsecurity console.apps "${gentoodir}/security/console.apps/mdmsetup" - fi - -} diff --git a/mate-base/mdm/mdm-2.0.3.ebuild b/mate-base/mdm/mdm-2.0.3.ebuild deleted file mode 100644 index 932d61af..00000000 --- a/mate-base/mdm/mdm-2.0.3.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" - -inherit mate pam user - -DESCRIPTION="Mate Display Manager" -HOMEPAGE="http://mate-desktop.org" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="accessibility afs +consolekit dmx elibc_glibc ipv6 gnome-keyring pam remote selinux tcpd xinerama" -GDM_EXTRA="gdm-2.20.9-gentoo-files-r1" -SRC_URI="https://github.com/linuxmint/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - #mirror://gentoo/${GDM_EXTRA}.tar.bz2" - -RDEPEND=">=dev-libs/glib-2.12:2 - >=x11-libs/gtk+-2.6:2 - >=x11-libs/pango-1.3 - >=gnome-base/libglade-2:2.0 - >=gnome-base/libgnomecanvas-2 - >=gnome-base/librsvg-1.1.1:2 - >=dev-libs/libxml2-2.4.12:2 - >=media-libs/libart_lgpl-2.3.11 - net-libs/webkit-gtk:2 - x11-libs/gksu - x11-libs/libXi - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXext - x11-apps/sessreg - x11-libs/libXdmcp - xinerama? ( x11-libs/libXinerama ) - consolekit? ( - sys-auth/consolekit - dev-libs/dbus-glib ) - accessibility? ( x11-libs/libXevie ) - afs? ( net-fs/openafs sys-libs/lwp ) - dmx? ( x11-libs/libdmx ) - gnome-keyring? ( gnome-base/gnome-keyring[pam] ) - pam? ( virtual/pam ) - !pam? ( elibc_glibc? ( sys-apps/shadow ) ) - remote? ( gnome-extra/zenity ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - >=x11-misc/xdg-utils-1.0.2-r3" -DEPEND="${RDEPEND} - dmx? ( x11-proto/dmxproto ) - xinerama? ( x11-proto/xineramaproto ) - app-text/docbook-xml-dtd:4.1.2 - sys-devel/gettext - x11-proto/inputproto - >=dev-util/intltool-0.35 - virtual/pkgconfig - >=app-text/scrollkeeper-0.1.4 - >=app-text/gnome-doc-utils-0.3.2" - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README TODO" - G2CONF="${G2CONF} - --with-prefetch - --sysconfdir=/etc/X11 - --localstatedir=/var - --with-xdmcp=yes - --with-pam-prefix=/etc - --disable-static - SOUND_PROGRAM=/usr/bin/mdmplay - $(use_enable ipv6) - $(use_enable remote secureremote) - $(use_with accessibility xevie) - $(use_with consolekit console-kit) - $(use_with dmx) - $(use_with selinux) - $(use_with tcpd tcp-wrappers) - $(use_with xinerama)" - - if use pam; then - G2CONF="${G2CONF} --enable-authentication-scheme=pam" - else - G2CONF="${G2CONF} --enable-console-helper=no" - if use elibc_glibc ; then - G2CONF="${G2CONF} --enable-authentication-scheme=shadow" - else - G2CONF="${G2CONF} --enable-authentication-scheme=crypt" - fi - fi - - enewgroup mdm - enewuser mdm -1 -1 /var/lib/mdm mdm -} - -src_prepare() { - # remove unneeded linker directive for selinux (#41022) - epatch "${FILESDIR}/gdm-2.13.0.1-selinux-remove-attr.patch" - - # Make custom session work, bug #216984 - epatch "${FILESDIR}/gdm-2.20.10-custom-session.patch" - - eautoreconf - - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - - local gentoodir="${WORKDIR}/${GDM_EXTRA}" - - # install XDG_DATA_DIRS mdm changes - echo 'XDG_DATA_DIRS="/usr/share/mdm"' > 99xdg-mdm - doenvd 99xdg-mdm - - # add a custom sound playing script (#248253) - #mv "${gentoodir}/gdmplay" mdmplay - #dobin mdmplay - - # avoid file collision, bug #213118 - rm -f "${D}/usr/share/xsessions/gnome.desktop" - - # We replace the pam stuff by our own - rm -rf "${D}/etc/pam.d" - - if use pam ; then - use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/* - - mv "${gentoodir}"/pam.d/{g,m}dm - mv "${gentoodir}"/pam.d/{g,m}dmsetup - mv "${gentoodir}"/pam.d/{g,m}dm-autologin - dopamd "${gentoodir}"/pam.d/* - sed s/gdmsetup/mdmsetup/ "${gentoodir}/security/console.apps/gdmsetup" > "${gentoodir}/security/console.apps/mdmsetup" - dopamsecurity console.apps "${gentoodir}/security/console.apps/mdmsetup" - fi - -} diff --git a/mate-base/mdm/mdm-2.0.4.ebuild b/mate-base/mdm/mdm-2.0.4.ebuild deleted file mode 100644 index 932d61af..00000000 --- a/mate-base/mdm/mdm-2.0.4.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" - -inherit mate pam user - -DESCRIPTION="Mate Display Manager" -HOMEPAGE="http://mate-desktop.org" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="accessibility afs +consolekit dmx elibc_glibc ipv6 gnome-keyring pam remote selinux tcpd xinerama" -GDM_EXTRA="gdm-2.20.9-gentoo-files-r1" -SRC_URI="https://github.com/linuxmint/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - #mirror://gentoo/${GDM_EXTRA}.tar.bz2" - -RDEPEND=">=dev-libs/glib-2.12:2 - >=x11-libs/gtk+-2.6:2 - >=x11-libs/pango-1.3 - >=gnome-base/libglade-2:2.0 - >=gnome-base/libgnomecanvas-2 - >=gnome-base/librsvg-1.1.1:2 - >=dev-libs/libxml2-2.4.12:2 - >=media-libs/libart_lgpl-2.3.11 - net-libs/webkit-gtk:2 - x11-libs/gksu - x11-libs/libXi - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXext - x11-apps/sessreg - x11-libs/libXdmcp - xinerama? ( x11-libs/libXinerama ) - consolekit? ( - sys-auth/consolekit - dev-libs/dbus-glib ) - accessibility? ( x11-libs/libXevie ) - afs? ( net-fs/openafs sys-libs/lwp ) - dmx? ( x11-libs/libdmx ) - gnome-keyring? ( gnome-base/gnome-keyring[pam] ) - pam? ( virtual/pam ) - !pam? ( elibc_glibc? ( sys-apps/shadow ) ) - remote? ( gnome-extra/zenity ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - >=x11-misc/xdg-utils-1.0.2-r3" -DEPEND="${RDEPEND} - dmx? ( x11-proto/dmxproto ) - xinerama? ( x11-proto/xineramaproto ) - app-text/docbook-xml-dtd:4.1.2 - sys-devel/gettext - x11-proto/inputproto - >=dev-util/intltool-0.35 - virtual/pkgconfig - >=app-text/scrollkeeper-0.1.4 - >=app-text/gnome-doc-utils-0.3.2" - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README TODO" - G2CONF="${G2CONF} - --with-prefetch - --sysconfdir=/etc/X11 - --localstatedir=/var - --with-xdmcp=yes - --with-pam-prefix=/etc - --disable-static - SOUND_PROGRAM=/usr/bin/mdmplay - $(use_enable ipv6) - $(use_enable remote secureremote) - $(use_with accessibility xevie) - $(use_with consolekit console-kit) - $(use_with dmx) - $(use_with selinux) - $(use_with tcpd tcp-wrappers) - $(use_with xinerama)" - - if use pam; then - G2CONF="${G2CONF} --enable-authentication-scheme=pam" - else - G2CONF="${G2CONF} --enable-console-helper=no" - if use elibc_glibc ; then - G2CONF="${G2CONF} --enable-authentication-scheme=shadow" - else - G2CONF="${G2CONF} --enable-authentication-scheme=crypt" - fi - fi - - enewgroup mdm - enewuser mdm -1 -1 /var/lib/mdm mdm -} - -src_prepare() { - # remove unneeded linker directive for selinux (#41022) - epatch "${FILESDIR}/gdm-2.13.0.1-selinux-remove-attr.patch" - - # Make custom session work, bug #216984 - epatch "${FILESDIR}/gdm-2.20.10-custom-session.patch" - - eautoreconf - - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - - local gentoodir="${WORKDIR}/${GDM_EXTRA}" - - # install XDG_DATA_DIRS mdm changes - echo 'XDG_DATA_DIRS="/usr/share/mdm"' > 99xdg-mdm - doenvd 99xdg-mdm - - # add a custom sound playing script (#248253) - #mv "${gentoodir}/gdmplay" mdmplay - #dobin mdmplay - - # avoid file collision, bug #213118 - rm -f "${D}/usr/share/xsessions/gnome.desktop" - - # We replace the pam stuff by our own - rm -rf "${D}/etc/pam.d" - - if use pam ; then - use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/* - - mv "${gentoodir}"/pam.d/{g,m}dm - mv "${gentoodir}"/pam.d/{g,m}dmsetup - mv "${gentoodir}"/pam.d/{g,m}dm-autologin - dopamd "${gentoodir}"/pam.d/* - sed s/gdmsetup/mdmsetup/ "${gentoodir}/security/console.apps/gdmsetup" > "${gentoodir}/security/console.apps/mdmsetup" - dopamsecurity console.apps "${gentoodir}/security/console.apps/mdmsetup" - fi - -} diff --git a/mate-extra/mintmenu/mintmenu-5.6.0.ebuild b/mate-extra/mintmenu/mintmenu-5.6.0.ebuild deleted file mode 100644 index 5ed53a6b..00000000 --- a/mate-extra/mintmenu/mintmenu-5.6.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit eutils gnome2-utils git-2 - -EGIT_BRANCH=kogaion -EGIT_REPO_URI="https://github.com/Rogentos/mintmenu.git" - -DESCRIPTION="Advanced MATE menu" -HOMEPAGE="http://linuxmint.com" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="" - -DEPEND=" - dev-lang/python:2.7 - dev-python/pygtk:2 - >=dev-python/pyxdg-0.25 - >=dev-python/python-xlib-0.14" -RDEPEND=" - >=mate-base/mate-desktop-1.8.0 - >=mate-base/mate-panel-1.8.0 - >=mate-base/mate-menus-1.8.0[python] - >=x11-misc/mozo-1.8.0 - dev-python/python-xlib" - -S="${WORKDIR}/${PN}" - -src_install() { - exeinto /usr/bin || die - doexe usr/bin/${PN} || die - - insinto /usr/$(get_libdir) || die - doins -r usr/lib/* || die - fperms 755 /usr/$(get_libdir)/linuxmint/mintMenu/mintMenu.py || die - fperms 755 /usr/$(get_libdir)/linuxmint/mintMenu/mintMenuConfig.py || die - - insinto /usr/share || die - doins -r usr/share/* || die -} - -pkg_postinst() { - gnome2_schemas_update -} - -pkg_postrm() { - gnome2_schemas_update -} diff --git a/sys-boot/plymouth/plymouth-0.8.8-r4.ebuild b/sys-boot/plymouth/plymouth-0.8.8-r4.ebuild index 2b2621b8..4d37e0c2 100644 --- a/sys-boot/plymouth/plymouth-0.8.8-r4.ebuild +++ b/sys-boot/plymouth/plymouth-0.8.8-r4.ebuild @@ -41,6 +41,8 @@ DOC_CONTENTS=" " src_prepare() { + epatch "${FILESDIR}/${PN}-kogaion-defaults.patch" + sed -i 's:/bin/systemd-tty-ask-password-agent:/usr/bin/systemd-tty-ask-password-agent:g' \ systemd-units/systemd-ask-password-plymouth.service.in || die \ 'ask-password sed failed' diff --git a/sys-kernel/linux-live-brrc/Manifest b/sys-kernel/linux-live-brrc/Manifest index c34c0d5f..016f1a9e 100644 --- a/sys-kernel/linux-live-brrc/Manifest +++ b/sys-kernel/linux-live-brrc/Manifest @@ -1,2 +1,2 @@ -DIST linux-3.14.30+live-brrc.tar.xz 81789884 SHA256 fae1dd36fa8b58b2defb2880895b22894eec3ff9863bb775b14bcadbd2e5183a SHA512 272766a8e2eb44446a93d1d68be406ee807a04867cc9f3660ed77db959e0f949088b6736875d241132ba4025ebb65ba2759c69c0d67f9080fb7b6a13961d6c66 WHIRLPOOL afe61785b9a75c4c377dcaf2cc70b9263b092e66be595a2bda6634d861a1b62c7d3b0b0191c866e249a27e382c6f04f74f426abf9592e2ef4588c28909b30abd -DIST linux-3.14.35+live-brrc.tar.xz 81687368 SHA256 76e5f190650e20aece2080a8eaf67d908507b25f6fa4f0a24aaaee0fe43470e9 SHA512 c24d11e960e19db1e838b4da72d6543b668408b58a20f926e8f9b024f11e9c503740c2269ea542dce4281716654940097586e227f7dc0e6191f91d0d9483dff0 WHIRLPOOL 5c33136b42fd2e925bd892e82e48e41d71ffa9bfef80fdb5415c98d695599fda078414107bb31e8cb2246b26f16d6163f5965abbddbb8defc73ae3e0612097a9 +DIST linux-3.14.30+live-brrc.tar.xz 81769816 SHA256 befd4f0e777f54a984bd2944facf66ea9f076a92edfc076c68eb91e84c032992 SHA512 d3eb7e1ea568c23894ede1b7f4f301aad1070908362358d48c5800e4575ad565a6fb4a7f02cc983a04295aa1651425021343cb943f5f81ddd354b36887f6af04 WHIRLPOOL 7013194e3eed16d713dce45b239e9c724fa665fecd488f0d27c49d1739b730dd087f21d6b8369f5e06a053940ad3e49b1003f53b411c597c0fbbdbc9a3a8499e +DIST linux-3.14.35+live-brrc.tar.xz 81693532 SHA256 1a84ab1fb574286f105ff42d26129161b97979c020f8e5e1b82851e9a3108398 SHA512 aa224d6183c4d0955d99bc7d0c9eb5371dd8ea86e77c612c7eb9ca9e4442865b439588e85d0ec703c9dac2d65516fce1e300ec4baab5df7f56e06271739a3627 WHIRLPOOL 406e9471e855b5960a9d7764981908b0904a94a3f0c4e11b2181651964eadf56a5c520376244fbb0362d261039beb412e2b8fc4ff2f893c363484e180d208df3 diff --git a/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.30.ebuild b/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.30.ebuild index a70f7720..7d88ed6e 100644 --- a/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.30.ebuild +++ b/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.30.ebuild @@ -1,5 +1,5 @@ # Copyright 2004-2013 Sabayon Linux -# Copyright 2015 Kogaion +# Copyright 2015 Rogentos Team # Distributed under the terms of the GNU General Public License v2 EAPI=5 diff --git a/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.35.ebuild b/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.35.ebuild index a70f7720..7d88ed6e 100644 --- a/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.35.ebuild +++ b/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.35.ebuild @@ -1,5 +1,5 @@ # Copyright 2004-2013 Sabayon Linux -# Copyright 2015 Kogaion +# Copyright 2015 Rogentos Team # Distributed under the terms of the GNU General Public License v2 EAPI=5 diff --git a/sys-kernel/linux-live-brrc/linux-live-brrc.skel b/sys-kernel/linux-live-brrc/linux-live-brrc.skel index 210de18f..a8dff74c 100644 --- a/sys-kernel/linux-live-brrc/linux-live-brrc.skel +++ b/sys-kernel/linux-live-brrc/linux-live-brrc.skel @@ -1,5 +1,5 @@ # Copyright 2004-2013 Sabayon Linux -# Copyright 2015 Kogaion +# Copyright 2015 Rogentos Team # Distributed under the terms of the GNU General Public License v2 EAPI=5 diff --git a/www-apps/gitweb/Manifest b/www-apps/gitweb/Manifest index ba481d02..fddd2904 100644 --- a/www-apps/gitweb/Manifest +++ b/www-apps/gitweb/Manifest @@ -3,3 +3,4 @@ DIST git-2.2.1.tar.xz 3590808 SHA256 09422dc9a0bdddf6bdd5b8634c71e1ed3125256c474 DIST git-2.2.2.tar.xz 3592264 SHA256 aa6d2efcc0c7bb9b9edc6d56d90921706b833972f1d2abe70f71be7838f22d05 SHA512 e3ca6f40de04ed940f521fff4c7e92446e40ad1627acc5b4c090ebf114dcf279d4b1f3efe1189ffa43192fce412165621fc12ea90e2f7d02a6a9ccda655dc69b WHIRLPOOL 9e20def83bbb9b11cb5982fc5f19b09767657ff80f02a237dff6ddaddd3209b4cfb9288bec1b6dc80c6a6db1869cfcaa90e2374279012fc8215771c1a58a1fc2 DIST git-2.3.0.tar.xz 3608648 SHA256 94b23a14d66df536cfe7de37551f55acf908f8bddf30a0f5325a255bb57b0aca SHA512 4be85d3ba3ffac6c55cce648ab6c0a6fe89164e9657480aeee0def79289dbcba486722756b1729d0cedda6012cd582b88129d483ce916bfe06cde5a423f05bc7 WHIRLPOOL d08762cf37536a347aabb2916dce9d482313c41a180b5c440481d9574e9a6c482eb18e0055410171478010e647ae353d70f7113fa07fd8d74bb77909e327ea75 DIST git-2.4.0.tar.xz 3681516 SHA256 b33438dd94659958a74850aacae4a2b3a626baec36d7f29c266130b08045bb24 SHA512 0114c5d0dbfeed46e0ba1c8c0da463c52cae6954238547502f44d9050af0d921906beea96ff2c5f56a7c822200d9daa0f1d040f883c701b88a23ec81ac777138 WHIRLPOOL 1f4667b295e541d4f035de9e415636f317f590e104119a1b212cb321f25120df31e45ba88470ee883d1ea9a0033f2b307981c9d9e5807919475dbc5f81b6b22e +DIST git-2.5.0.tar.xz 3740620 SHA256 cc59b1bac6c1c67a9159872863f6c5bbe0d9404cac2a85c3e9d9fa49923ce45c SHA512 ef7538c9f5ba5b2ac08962401c30e5fd51323b54b9fb5315d259adccec346e8fae9362815832dc2b5ce63a259b315c40e419bb2385dde04d84b992e62f6789b6 WHIRLPOOL 653e7aeb966dec44631bbd257a41935b2e957be9324311a4fd91f3a0ba6f1f674e2e59b4c564d70c4eeaea3788f0af9273a1d0a753b3bc820e687f0d63bddf5d diff --git a/www-apps/gitweb/gitweb-2.5.0.ebuild b/www-apps/gitweb/gitweb-2.5.0.ebuild new file mode 100644 index 00000000..06446b1f --- /dev/null +++ b/www-apps/gitweb/gitweb-2.5.0.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +GENTOO_DEPEND_ON_PERL=no + +[[ ${PV} == *9999 ]] && SCM="git-2" +EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" +EGIT_MASTER=pu + +inherit toolchain-funcs eutils ${SCM} + +MY_PV="${PV/_rc/.rc}" +MY_PV="${MY_PV/gitweb/git}" +MY_P="${PN}-${MY_PV}" +MY_P="${MY_P/gitweb/git}" + +DESCRIPTION="A web interface to git" +HOMEPAGE="http://www.git-scm.com/" +if [[ "$PV" != *9999 ]]; then + SRC_URI_SUFFIX="xz" + 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}" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="highlight" + +# Common to both DEPEND and RDEPEND +CDEPEND=" + ~dev-vcs/git-${PV} + sys-libs/zlib + dev-lang/perl:=[-build(-)] + dev-libs/libpcre + dev-lang/tk:=" + +RDEPEND="${CDEPEND} + dev-vcs/git[-cgi] + dev-perl/Error + dev-perl/Net-SMTP-SSL + dev-perl/Authen-SASL + virtual/perl-CGI highlight? ( app-text/highlight )" + +DEPEND="${CDEPEND}" + +SITEFILE=50${PN}-gentoo.el +S="${WORKDIR}/${MY_P}" + +src_unpack() { + if [[ "${PV}" != *9999 ]]; then + unpack ${MY_P}.tar.${SRC_URI_SUFFIX} + cd "${S}" + else + git-2_src_unpack + cd "${S}" + #cp "${FILESDIR}"/GIT-VERSION-GEN . + fi + +} + +src_prepare() { + epatch_user + + sed -i \ + -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ + -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ + -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ + -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\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 +} + +git_emake() { + local MY_MAKEOPTS="INSTALLDIRS=vendor" + 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 \ + PERL_PATH="${EPREFIX}/usr/bin/env perl" \ + PERL_MM_OPT="" \ + GIT_TEST_OPTS="--no-color" \ + V=1 \ + "$@" +} + +src_configure() { + einfo "Nothing to configure." +} + +src_compile() { + git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" + git_emake perl/perl.mak || die "emake perl/perl.mak failed" + + git_emake \ + gitweb \ + || die "emake gitweb failed" +} + +src_install() { + #if use perl && use cgi ; then + # 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 + + exeinto /usr/share/gitweb/ + doexe "${S}"/gitweb/gitweb.cgi + + insinto /usr/share/gitweb/static + doins "${S}"/gitweb/static/*.png + doins "${S}"/gitweb/static/*.css + doins "${S}"/gitweb/static/*.js + + # Maybe not needed, but it's created when non-split ebuild is used too. + dosym /usr/share/gitweb /usr/share/git/gitweb + + # perl_delete_localpod from perl-module: not needed +} + +showpkgdeps() { + local pkg=$1 + shift + elog " $(printf "%-17s:" ${pkg}) ${@}" +} + +pkg_postinst() { + elog "These additional scripts need some dependencies:" + echo + showpkgdeps git-quiltimport "dev-util/quilt" + showpkgdeps git-instaweb \ + "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" + echo +} diff --git a/www-client/firefox/firefox-38.1.0.ebuild b/www-client/firefox/firefox-38.1.0.ebuild index 4c78928e..37e1cb80 100644 --- a/www-client/firefox/firefox-38.1.0.ebuild +++ b/www-client/firefox/firefox-38.1.0.ebuild @@ -263,21 +263,6 @@ src_compile() { # Reset and cleanup environment variables used by GNOME/XDG gnome2_environment_reset - # Firefox tries to use dri stuff when it's run, see bug 380283 - shopt -s nullglob - cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -z "${cards}"; then - cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g') - if test -n "${cards}"; then - # Binary drivers seem to cause access violations anyway, so - # let's use indirect rendering so that the device files aren't - # touched at all. See bug 394715. - export LIBGL_ALWAYS_INDIRECT=1 - fi - fi - shopt -u nullglob - addpredict "${cards}" - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \ Xemake -f client.mk profiledbuild || die "Xemake failed" |