From 8671eac142b69b1b20b84b569bed49af2e2a222f Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Mon, 13 Jul 2015 21:27:16 +0300 Subject: [avahi-gtk] reparat avahi-gtk --- net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild b/net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild index a05ca09d..b5e277db 100644 --- a/net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild +++ b/net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild @@ -159,7 +159,8 @@ multilib_src_install() { # Workaround for avahi-ui.h collision between avahi-gtk and avahi-gtk3 root_avahi_ui="${ROOT}usr/include/avahi-ui/avahi-ui.h" if [ -e "${root_avahi_ui}" ]; then - rm -f "${D}usr/include/avahi-ui/avahi-ui.h" + rm -f "${D}/usr/include/avahi-ui/avahi-ui.h" + rm -f "${ED}/usr/include/avahi-ui/avahi-ui.h" fi # provided by avahi-gtk3 -- cgit v1.2.3 From 66116b2ad7176c2cfe19a297e9f0f9ce6ba1bc49 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Mon, 13 Jul 2015 21:57:31 +0300 Subject: [avahi-libs] trebuie sa contina doar libraria avahi-ui.h standard --- net-dns/avahi-libs/avahi-libs-0.6.31-r6.ebuild | 9 --------- 1 file changed, 9 deletions(-) diff --git a/net-dns/avahi-libs/avahi-libs-0.6.31-r6.ebuild b/net-dns/avahi-libs/avahi-libs-0.6.31-r6.ebuild index 8c4a2638..3f5eb860 100644 --- a/net-dns/avahi-libs/avahi-libs-0.6.31-r6.ebuild +++ b/net-dns/avahi-libs/avahi-libs-0.6.31-r6.ebuild @@ -80,15 +80,6 @@ src_configure() { } src_install() { - if use abi_x86_32 ; then insinto /usr/include/ doins avahi-ui/avahi-ui.h - insinto /usr/include/${CHOST}/avahi-ui/ - doins "${WORKDIR}"/avahi-0.6.31-abi_x86_32.x86/avahi-ui/avahi-ui.h - elif use abi_x86_64 ; then - insinto /usr/include/ - doins avahi-ui/avahi-ui.h - insinto /usr/include/${CHOST}/avahi-ui/ - doins "${WORKDIR}"/avahi-0.6.31-abi_x86_64.amd64/avahi-ui/avahi-ui.h - fi } -- cgit v1.2.3 From 2e170a7d65d2688ff5cb806afefe8568b2e8a17b Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Tue, 14 Jul 2015 01:51:01 +0300 Subject: [kogaion-dark-theme] scoatem temporar support-ul pentru cinnamon artwork --- x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.0.ebuild | 2 +- x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.1.ebuild | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.0.ebuild b/x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.0.ebuild index 98f87573..779188e1 100644 --- a/x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.0.ebuild +++ b/x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.0.ebuild @@ -7,7 +7,7 @@ EAPI=4 DESCRIPTION="Kogaion dark theme" HOMEPAGE="http://rogentos.ro" SRC_URI="http://pkg.rogentos.ro/~rogentos/distro/${CATEGORY}/${PN}/${PN}-${PVR}.tar.gz - https://buildserver.rogentos.ro/~kogaion/distro/${CATEGORY}/${PN}/${PN}-${PVR}.tar.gz" + http://bpr.bluepink.ro/~rogentos/kogaion/${CATEGORY}/${PN}/${PN}-${PVR}.tar.gz" LICENSE="GPL" SLOT="0" diff --git a/x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.1.ebuild b/x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.1.ebuild index 6db84e33..8eddd8f4 100644 --- a/x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.1.ebuild +++ b/x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.1.ebuild @@ -7,14 +7,13 @@ EAPI=4 DESCRIPTION="Kogaion dark theme" HOMEPAGE="http://rogentos.ro" SRC_URI="http://pkg.rogentos.ro/~rogentos/distro/${CATEGORY}/${PN}/${PN}-${PVR}.tar.gz - https://buildserver.rogentos.ro/~kogaion/distro/${CATEGORY}/${PN}/${PN}-${PVR}.tar.gz http://bpr.bluepink.ro/~rogentos/distro/${CATEGORY}/${PN}/${PN}-${PVR}.tar.gz mirror://kogaion/${CATEGORY}/"${PN}"/${PN}-${PVR}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~arm ~amd64 ~x86" -IUSE="gtk3 gtk2 gnome-shell unity cinnamon xfwm4" +IUSE="gtk3 gtk2 gnome-shell unity xfwm4" #cinnamon xfwm4" RDEPEND="gtk3? ( x11-themes/gtk-engines-unico ) x11-themes/gtk-engines-equinox @@ -52,11 +51,11 @@ src_install() { ewarn "Gnome-shell Files were not copied" fi - if use cinnamon; then - doins -r "${S}"/cinnamon || die "Cannot copy cinnamon" - else - ewarn "Cinnamon Files were not copied" - fi + #if use cinnamon; then + # doins -r "${S}"/cinnamon || die "Cannot copy cinnamon" + #else + #ewarn "Cinnamon Files were not copied" + #fi if use unity; then doins -r "${S}"/unity || die "Cannot copy unity" -- cgit v1.2.3 From 6551727ee43f9194ae26521f16d5cf4f324c1fe3 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Tue, 14 Jul 2015 01:56:24 +0300 Subject: [kogaion-dark-theme] sters si unity, nu avem support din partea lui @bionel nici pe partea asta --- x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.1.ebuild | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.1.ebuild b/x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.1.ebuild index 8eddd8f4..7812f94b 100644 --- a/x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.1.ebuild +++ b/x11-themes/kogaion-dark-theme/kogaion-dark-theme-2.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://pkg.rogentos.ro/~rogentos/distro/${CATEGORY}/${PN}/${PN}-${PVR}. LICENSE="GPL-2" SLOT="0" KEYWORDS="~arm ~amd64 ~x86" -IUSE="gtk3 gtk2 gnome-shell unity xfwm4" #cinnamon xfwm4" +IUSE="gtk3 gtk2 gnome-shell xfwm4" #cinnamon unity" RDEPEND="gtk3? ( x11-themes/gtk-engines-unico ) x11-themes/gtk-engines-equinox @@ -57,11 +57,11 @@ src_install() { #ewarn "Cinnamon Files were not copied" #fi - if use unity; then - doins -r "${S}"/unity || die "Cannot copy unity" - else - ewarn "Unity Files were not copied" - fi + #if use unity; then + # doins -r "${S}"/unity || die "Cannot copy unity" + #else + #ewarn "Unity Files were not copied" + #fi if use xfwm4; then doins -r "${S}"/xfwm4 || die "Cannot copy xfwm" -- cgit v1.2.3 From 4417f6ba1c8e7b6ea05afe3173ba4142829dc79c Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Tue, 14 Jul 2015 02:05:37 +0300 Subject: [kogaion-light-theme] se pare ca nici asta nu are support pentru cinnamon si unity --- .../kogaion-light-theme-2.1.ebuild | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/x11-themes/kogaion-light-theme/kogaion-light-theme-2.1.ebuild b/x11-themes/kogaion-light-theme/kogaion-light-theme-2.1.ebuild index 7411e403..f5192a8c 100644 --- a/x11-themes/kogaion-light-theme/kogaion-light-theme-2.1.ebuild +++ b/x11-themes/kogaion-light-theme/kogaion-light-theme-2.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://pkg.rogentos.ro/~rogentos/distro/${CATEGORY}/${PN}/${PN}-${PVR}. LICENSE="GPL-2" SLOT="0" KEYWORDS="~arm ~amd64 ~x86" -IUSE="gtk3 gtk2 gnome-shell unity cinnamon xfwm4" +IUSE="gtk3 gtk2 gnome-shell xfwm4" #unity cinnamon" RDEPEND="gtk3? ( x11-themes/gtk-engines-unico ) x11-themes/gtk-engines-murrine @@ -52,17 +52,17 @@ src_install() { ewarn "Gnome-shell Files were not copied" fi - if use cinnamon; then - doins -r "${S}"/cinnamon || die "Cannot copy cinnamon" - else - ewarn "Cinnamon Files were not copied" - fi + #if use cinnamon; then + # doins -r "${S}"/cinnamon || die "Cannot copy cinnamon" + #else + #ewarn "Cinnamon Files were not copied" + #fi - if use unity; then - doins -r "${S}"/unity || die "Cannot copy unity" - else - ewarn "Unity Files were not copied" - fi + #if use unity; then + # doins -r "${S}"/unity || die "Cannot copy unity" + #else + #ewarn "Unity Files were not copied" + #fi if use xfwm4; then doins -r "${S}"/xfwm4 || die "Cannot copy xfwm" -- cgit v1.2.3 From e1c25a865aeaa3ae9e84c4131690cbbb948f434d Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Tue, 14 Jul 2015 16:56:58 +0300 Subject: [lightdm-qt4] fixed lightdm-qt compiling --- x11-misc/lightdm-qt4/lightdm-qt4-1.12.2.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/x11-misc/lightdm-qt4/lightdm-qt4-1.12.2.ebuild b/x11-misc/lightdm-qt4/lightdm-qt4-1.12.2.ebuild index cf7dc90e..91a02042 100644 --- a/x11-misc/lightdm-qt4/lightdm-qt4-1.12.2.ebuild +++ b/x11-misc/lightdm-qt4/lightdm-qt4-1.12.2.ebuild @@ -43,6 +43,7 @@ src_configure() { --disable-static \ --disable-tests \ --disable-introspection \ + --enable-liblightdm-gobject \ --enable-liblightdm-qt \ --disable-liblightdm-qt5 } -- cgit v1.2.3 From 0228ecd114396c7698a3de575886de4422b128bd Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Tue, 14 Jul 2015 23:15:55 +0300 Subject: dropped unuseful syntax --- eclass/live-artwork.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/live-artwork.eclass b/eclass/live-artwork.eclass index bfe99b3b..4f7ddbb1 100644 --- a/eclass/live-artwork.eclass +++ b/eclass/live-artwork.eclass @@ -18,9 +18,9 @@ GFX_SPLASH_NAME="${GFX_SPLASH_NAME:-live}" # @ECLASS-VARIABLE: PLYMOUTH_THEME # @DESCRIPTION: # Default plymouth theme name to use -if [ $(cat /etc/hostname) == "kogaion" ] ; then +if $(cat /etc/hostname) == "kogaion" ; then PLYMOUTH_THEME="${PLYMOUTH_THEME:-kogaion}" -elif [ $(cat /etc/hostname) == "argent" ] ; then +elif $(cat /etc/hostname) == "argent" ; then PLYMOUTH_THEME="${PLYMOUTH_THEME:-argent}" fi -- cgit v1.2.3 From d18495755ffc8ad403b4c33ea04a03c7054ad7ac Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Wed, 15 Jul 2015 22:39:43 +0300 Subject: [lightdm-base] reparat sed-ul sa trimita catre /etc/lightdm, si nu /etc/lightdm-base --- x11-misc/lightdm-base/lightdm-base-1.10.3.ebuild | 3 ++- x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild | 3 ++- x11-misc/lightdm-base/lightdm-base-1.12.3.ebuild | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/x11-misc/lightdm-base/lightdm-base-1.10.3.ebuild b/x11-misc/lightdm-base/lightdm-base-1.10.3.ebuild index ca1c16e7..baff4b25 100644 --- a/x11-misc/lightdm-base/lightdm-base-1.10.3.ebuild +++ b/x11-misc/lightdm-base/lightdm-base-1.10.3.ebuild @@ -8,6 +8,7 @@ inherit autotools eutils pam readme.gentoo systemd versionator TRUNK_VERSION="$(get_version_component_range 1-2)" REAL_PN="${PN/-base}" REAL_P="${P/-base}" +MY_PN="lightdm" DESCRIPTION="A lightweight display manager, base libraries and programs" HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM" SRC_URI="http://launchpad.net/${REAL_PN}/${TRUNK_VERSION}/${PV}/+download/${REAL_P}.tar.xz @@ -44,7 +45,7 @@ src_prepare() { einfo "Fixing the session-wrapper variable in lightdm.conf" sed -i -e \ - "/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \ + "/session-wrapper/s@^.*@session-wrapper=/etc/${MY_PN}/Xsession@" \ data/lightdm.conf || die "Failed to fix lightdm.conf" epatch_user diff --git a/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild b/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild index 1657b27c..5b5ba3a7 100644 --- a/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild +++ b/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild @@ -8,6 +8,7 @@ inherit autotools eutils pam readme.gentoo systemd versionator TRUNK_VERSION="$(get_version_component_range 1-2)" REAL_PN="${PN/-base}" REAL_P="${P/-base}" +MY_PN="lightdm" DESCRIPTION="A lightweight display manager, base libraries and programs" HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM" SRC_URI="http://launchpad.net/${REAL_PN}/${TRUNK_VERSION}/${PV}/+download/${REAL_P}.tar.xz @@ -44,7 +45,7 @@ src_prepare() { einfo "Fixing the session-wrapper variable in lightdm.conf" sed -i -e \ - "/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \ + "/session-wrapper/s@^.*@session-wrapper=/etc/${MY_PN}/Xsession@" \ data/lightdm.conf || die "Failed to fix lightdm.conf" epatch_user diff --git a/x11-misc/lightdm-base/lightdm-base-1.12.3.ebuild b/x11-misc/lightdm-base/lightdm-base-1.12.3.ebuild index 5055d565..f9c04258 100644 --- a/x11-misc/lightdm-base/lightdm-base-1.12.3.ebuild +++ b/x11-misc/lightdm-base/lightdm-base-1.12.3.ebuild @@ -8,6 +8,7 @@ inherit autotools eutils pam readme.gentoo systemd versionator TRUNK_VERSION="$(get_version_component_range 1-2)" REAL_PN="${PN/-base}" REAL_P="${P/-base}" +MY_PN="lightdm" DESCRIPTION="A lightweight display manager, base libraries and programs" HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM" SRC_URI="http://launchpad.net/${REAL_PN}/${TRUNK_VERSION}/${PV}/+download/${REAL_P}.tar.xz @@ -44,7 +45,7 @@ src_prepare() { einfo "Fixing the session-wrapper variable in lightdm.conf" sed -i -e \ - "/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \ + "/session-wrapper/s@^.*@session-wrapper=/etc/${MY_PN}/Xsession@" \ data/lightdm.conf || die "Failed to fix lightdm.conf" epatch_user -- cgit v1.2.3 From 8a5cc999888fa49f2ae74aba9db0ed108b787fd2 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Fri, 17 Jul 2015 21:35:22 +0300 Subject: [mdm] 3 versiuni compilabile adaugate, insa fara pam --- mate-base/mdm/Manifest | 3 + .../files/gdm-2.13.0.1-selinux-remove-attr.patch | 11 ++ .../mdm/files/gdm-2.20.10-custom-session.patch | 42 +++++++ mate-base/mdm/mdm-2.0.2.ebuild | 137 +++++++++++++++++++++ mate-base/mdm/mdm-2.0.3.ebuild | 137 +++++++++++++++++++++ mate-base/mdm/mdm-2.0.4.ebuild | 137 +++++++++++++++++++++ 6 files changed, 467 insertions(+) create mode 100644 mate-base/mdm/Manifest create mode 100644 mate-base/mdm/files/gdm-2.13.0.1-selinux-remove-attr.patch create mode 100644 mate-base/mdm/files/gdm-2.20.10-custom-session.patch create mode 100644 mate-base/mdm/mdm-2.0.2.ebuild create mode 100644 mate-base/mdm/mdm-2.0.3.ebuild create mode 100644 mate-base/mdm/mdm-2.0.4.ebuild diff --git a/mate-base/mdm/Manifest b/mate-base/mdm/Manifest new file mode 100644 index 00000000..30f0a293 --- /dev/null +++ b/mate-base/mdm/Manifest @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..0f9137da --- /dev/null +++ b/mate-base/mdm/files/gdm-2.13.0.1-selinux-remove-attr.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 00000000..b1f70c00 --- /dev/null +++ b/mate-base/mdm/files/gdm-2.20.10-custom-session.patch @@ -0,0 +1,42 @@ +--- + 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 new file mode 100644 index 00000000..9e479f00 --- /dev/null +++ b/mate-base/mdm/mdm-2.0.2.ebuild @@ -0,0 +1,137 @@ +# 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 new file mode 100644 index 00000000..9e479f00 --- /dev/null +++ b/mate-base/mdm/mdm-2.0.3.ebuild @@ -0,0 +1,137 @@ +# 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 new file mode 100644 index 00000000..9e479f00 --- /dev/null +++ b/mate-base/mdm/mdm-2.0.4.ebuild @@ -0,0 +1,137 @@ +# 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 + +} -- cgit v1.2.3 From 2acc193a3d9a028594e7ceeed41a7b289955b98f Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Fri, 17 Jul 2015 21:36:17 +0300 Subject: [eclass/mate*] adaugat ce mai e necesar pentru ca mdm sa compileze --- eclass/mate-desktop.org.eclass | 32 +++++++++++++++++++++++ eclass/mate.eclass | 58 ++++++++++++++++++++++++++++++++++++++++++ mate-base/mdm/mdm-2.0.2.ebuild | 4 +-- mate-base/mdm/mdm-2.0.3.ebuild | 4 +-- mate-base/mdm/mdm-2.0.4.ebuild | 4 +-- 5 files changed, 96 insertions(+), 6 deletions(-) create mode 100644 eclass/mate-desktop.org.eclass create mode 100644 eclass/mate.eclass diff --git a/eclass/mate-desktop.org.eclass b/eclass/mate-desktop.org.eclass new file mode 100644 index 00000000..cc305b82 --- /dev/null +++ b/eclass/mate-desktop.org.eclass @@ -0,0 +1,32 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +# @ECLASS: mate-desktop.org.eclass +# @MAINTAINER: +# micia@sabayon.org +# @AUTHOR: +# Authors: Spidler with help of carparski. +# eclass variable additions and documentation: Gilles Dartiguelongue +# @BLURB: Helper eclass for gnome.org hosted archives +# @DESCRIPTION: +# Provide a default SRC_URI for tarball hosted on mate-desktop.org mirrors. + +inherit versionator + +DEPEND="${DEPEND} app-arch/xz-utils" + +# @ECLASS-VARIABLE: MATE_DESKTOP_ORG_MODULE +# @DESCRIPTION: +# Name of the module as hosted on mate-desktop.org mirrors. +# Leave unset if package name matches module name. +: ${MATE_DESKTOP_ORG_MODULE:=$PN} + +# @ECLASS-VARIABLE: GNOME_ORG_PVP +# @INTERNAL +# @DESCRIPTION: +# Major and minor numbers of the version number. +: ${GNOME_ORG_PVP:=$(get_version_component_range 1-2)} + +SRC_URI="http://pub.mate-desktop.org/releases/${GNOME_ORG_PVP}/${MATE_DESKTOP_ORG_MODULE}-${PV}.tar.xz" +S="${WORKDIR}/${MATE_DESKTOP_ORG_MODULE}-${PV}" diff --git a/eclass/mate.eclass b/eclass/mate.eclass new file mode 100644 index 00000000..1f4584b8 --- /dev/null +++ b/eclass/mate.eclass @@ -0,0 +1,58 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit autotools eutils libtool gnome2 mate-desktop.org + +# FIXME Not all package have proper build system/docs +# Once this is fixed upstream remove DEPEND and move to ebuild. +DEPEND="dev-util/gtk-doc + dev-util/gtk-doc-am" + +# @FUNCTION: mate_gen_build_system +# @DESCRIPTION: +# Generate autotools build system for releases that don't have one. +# We need this as early releases did not have a proper build system. +mate_gen_build_system() { + einfo "Generating mate build system" + # Retrieve configure script + local mate_conf_in + if [[ -f "${S}/configure.in" ]]; then + mate_conf_in="${S}/configure.in" + elif [[ -f "${S}/configure.ac" ]]; then + mate_conf_in="${S}/configure.ac" + else + einfo "no configure.in or configure.ac file were found" + return 0 + fi + # Mate preparation, doing similar to autotools eclass stuff. (Do we need die here?) + if grep -q "^AM_GLIB_GNU_GETTEXT" "${mate_conf_in}"; then + autotools_run_tool glib-gettextize --copy --force || die + elif grep -q "^AM_GNU_GETTEXT" "${mate_conf_in}"; then + eautopoint --force + fi + + if grep -q "^A[CM]_PROG_LIBTOOL" "${mate_conf_in}" || grep -q "^LT_INIT" "${mate_conf_in}"; then + _elibtoolize --copy --force --install + fi + + + if grep -q "^AC_PROG_INTLTOOL" "${mate_conf_in}" || grep -q "^IT_PROG_INTLTOOL" "${mate_conf_in}"; then + mkdir -p "${S}/m4" + autotools_run_tool intltoolize --automake --copy --force || die + fi + + if grep -q "^GTK_DOC_CHECK" "${mate_conf_in}"; then + autotools_run_tool gtkdocize --copy || die + fi + + if grep -q "^MATE_DOC_INIT" "${mate_conf_in}"; then + autotools_run_tool mate-doc-prepare --force --copy || die + autotools_run_tool mate-doc-common --copy || die + fi + + eaclocal + eautoconf + eautoheader + eautomake +} diff --git a/mate-base/mdm/mdm-2.0.2.ebuild b/mate-base/mdm/mdm-2.0.2.ebuild index 9e479f00..932d61af 100644 --- a/mate-base/mdm/mdm-2.0.2.ebuild +++ b/mate-base/mdm/mdm-2.0.2.ebuild @@ -114,8 +114,8 @@ src_install() { doenvd 99xdg-mdm # add a custom sound playing script (#248253) - mv "${gentoodir}/gdmplay" mdmplay - dobin mdmplay + #mv "${gentoodir}/gdmplay" mdmplay + #dobin mdmplay # avoid file collision, bug #213118 rm -f "${D}/usr/share/xsessions/gnome.desktop" diff --git a/mate-base/mdm/mdm-2.0.3.ebuild b/mate-base/mdm/mdm-2.0.3.ebuild index 9e479f00..932d61af 100644 --- a/mate-base/mdm/mdm-2.0.3.ebuild +++ b/mate-base/mdm/mdm-2.0.3.ebuild @@ -114,8 +114,8 @@ src_install() { doenvd 99xdg-mdm # add a custom sound playing script (#248253) - mv "${gentoodir}/gdmplay" mdmplay - dobin mdmplay + #mv "${gentoodir}/gdmplay" mdmplay + #dobin mdmplay # avoid file collision, bug #213118 rm -f "${D}/usr/share/xsessions/gnome.desktop" diff --git a/mate-base/mdm/mdm-2.0.4.ebuild b/mate-base/mdm/mdm-2.0.4.ebuild index 9e479f00..932d61af 100644 --- a/mate-base/mdm/mdm-2.0.4.ebuild +++ b/mate-base/mdm/mdm-2.0.4.ebuild @@ -114,8 +114,8 @@ src_install() { doenvd 99xdg-mdm # add a custom sound playing script (#248253) - mv "${gentoodir}/gdmplay" mdmplay - dobin mdmplay + #mv "${gentoodir}/gdmplay" mdmplay + #dobin mdmplay # avoid file collision, bug #213118 rm -f "${D}/usr/share/xsessions/gnome.desktop" -- cgit v1.2.3 From 0ca6518ca9d692249b43abc3ffcf0da8d0b982fe Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sat, 18 Jul 2015 15:00:25 +0300 Subject: [git] adaugat git noile versiuni + stabila 2.4.4 --- dev-vcs/git/Manifest | 6 + dev-vcs/git/git-2.2.1.ebuild | 2 +- dev-vcs/git/git-2.2.2.ebuild | 2 +- dev-vcs/git/git-2.3.0.ebuild | 2 +- dev-vcs/git/git-2.3.1.ebuild | 2 +- dev-vcs/git/git-2.4.0.ebuild | 2 +- dev-vcs/git/git-2.4.2.ebuild | 2 +- dev-vcs/git/git-2.4.4.ebuild | 647 +++++++++++++++++++++++++++++++++++++++++++ dev-vcs/git/git-2.4.6.ebuild | 647 +++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 1306 insertions(+), 6 deletions(-) create mode 100644 dev-vcs/git/git-2.4.4.ebuild create mode 100644 dev-vcs/git/git-2.4.6.ebuild diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index b3c5fad2..bb05db44 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -5,15 +5,21 @@ DIST git-2.3.0.tar.xz 3608648 SHA256 94b23a14d66df536cfe7de37551f55acf908f8bddf3 DIST git-2.3.1.tar.xz 3609908 SHA256 1acc4b051576143eb41d80f5675476629588c7c5fb4e6a1dc2c4590f47c498b7 SHA512 f113a9e8c7f9879088de6fa6bfbe9363f25eac279d5eb218ea1f5186cd1c45609760f498a5c066196b3a6e15dd931960e94dcdc14685e8ef1c5c72524113c0cf WHIRLPOOL f1c15ded4f4785d244a5242c823fcf8d63d1c3408c1a1696c99926fdbcab76e23e40d3ee8225925e786ce8eae7597a73a7f9f6cd8e5f1ef7d599ac8b254f9951 DIST git-2.4.0.tar.xz 3681516 SHA256 b33438dd94659958a74850aacae4a2b3a626baec36d7f29c266130b08045bb24 SHA512 0114c5d0dbfeed46e0ba1c8c0da463c52cae6954238547502f44d9050af0d921906beea96ff2c5f56a7c822200d9daa0f1d040f883c701b88a23ec81ac777138 WHIRLPOOL 1f4667b295e541d4f035de9e415636f317f590e104119a1b212cb321f25120df31e45ba88470ee883d1ea9a0033f2b307981c9d9e5807919475dbc5f81b6b22e 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-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 DIST git-htmldocs-2.3.1.tar.xz 981748 SHA256 03bfc92c813a5cbbb34b61fdd7b9cf1226ad9b2b8388d24c649d915df3b93dad SHA512 da371b5a2b73a60681cd6f3b5385bee2668e0d617788194e454a531c2dab652c9b70920cb307858eb5ba15fd0c2d24635862e8f432946b0e9dfee8ee3fcb731a WHIRLPOOL 9334037067d797fd02ae0fd9f6d400ee14d68246755ac48e5897b404214923417728b04added2e05cb52cdc345b3ac9975752507e1e1278cedd74a33cac64b1b DIST git-htmldocs-2.4.0.tar.xz 990744 SHA256 70ee1fdb70507c74832ac021e8940c8249d9b69f2b86aeaf0888ae41772e93a7 SHA512 03837e671a08f08ab7bd70676e234995b44a53ce27c648c50a6dd5ff97ba4400beb3d4b7874d6c8bde3a00624a7c2dc15d15299eb7ad9874d7dfd722f2c2256a WHIRLPOOL 4877dd0c5fb94f032d11d5d22a3e90e8352f68afb50400eca8c2f42e72adf40c7b9878c7998cacf16ed2011b85f965bcc5c44ecb3fd931783bd07b75b84b800b 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-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 DIST git-manpages-2.3.1.tar.xz 370756 SHA256 c58b033af1b26baba78ffc940f4f5a0f16c3491a3f5708375d0bcf0d8031a940 SHA512 391ecf5e38921c9494b5f94e8f59d62f509934d1ef10f3b582632255a2bc62cbc894aa1bcd3018eb619516c1834b95bf7acbab6d73f859dbdcab094588fd4b61 WHIRLPOOL 01ed334a73bbb57c977e7f96fd63a7196b88be5560166df78c7250aa98e04dd48558a9775ddffba34d7c23318bc7d89eb53d06fae38b027349cdaabd39f107f2 DIST git-manpages-2.4.0.tar.xz 372716 SHA256 b616dc6aa02dcac312e6aeae7af148913f76e1f851ba03ba340b4d2db316ecc7 SHA512 158bff66b9f73fc72d3ac6ac3246bebf831551c0ff1e9571913b952f5b891407ab4408ca2daa247869e50d43bb2e951eed6fdb3c39708c769630bbfc618f0efb WHIRLPOOL afed2ad93d6cf3deb571839d268a9aea66d4c2c8571b85a377a6ecd866df8ec8d07d22b65ddb9bc49ec7f16f8c9ecc54e936cd35325f2270264ae8d42e708b01 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 diff --git a/dev-vcs/git/git-2.2.1.ebuild b/dev-vcs/git/git-2.2.1.ebuild index a742f587..45e1f4f2 100644 --- a/dev-vcs/git/git-2.2.1.ebuild +++ b/dev-vcs/git/git-2.2.1.ebuild @@ -12,7 +12,7 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.1-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" diff --git a/dev-vcs/git/git-2.2.2.ebuild b/dev-vcs/git/git-2.2.2.ebuild index fd35d71c..64e2dfb7 100644 --- a/dev-vcs/git/git-2.2.2.ebuild +++ b/dev-vcs/git/git-2.2.2.ebuild @@ -12,7 +12,7 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" diff --git a/dev-vcs/git/git-2.3.0.ebuild b/dev-vcs/git/git-2.3.0.ebuild index fd35d71c..64e2dfb7 100644 --- a/dev-vcs/git/git-2.3.0.ebuild +++ b/dev-vcs/git/git-2.3.0.ebuild @@ -12,7 +12,7 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" diff --git a/dev-vcs/git/git-2.3.1.ebuild b/dev-vcs/git/git-2.3.1.ebuild index fd35d71c..64e2dfb7 100644 --- a/dev-vcs/git/git-2.3.1.ebuild +++ b/dev-vcs/git/git-2.3.1.ebuild @@ -12,7 +12,7 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" diff --git a/dev-vcs/git/git-2.4.0.ebuild b/dev-vcs/git/git-2.4.0.ebuild index 4b3417c8..43b546dc 100644 --- a/dev-vcs/git/git-2.4.0.ebuild +++ b/dev-vcs/git/git-2.4.0.ebuild @@ -12,7 +12,7 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" diff --git a/dev-vcs/git/git-2.4.2.ebuild b/dev-vcs/git/git-2.4.2.ebuild index 4b3417c8..43b546dc 100644 --- a/dev-vcs/git/git-2.4.2.ebuild +++ b/dev-vcs/git/git-2.4.2.ebuild @@ -12,7 +12,7 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" diff --git a/dev-vcs/git/git-2.4.4.ebuild b/dev-vcs/git/git-2.4.4.ebuild new file mode 100644 index 00000000..ba64111b --- /dev/null +++ b/dev-vcs/git/git-2.4.4.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 + +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} + +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 + +sab-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 + + sab-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 + sab-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/git/git-2.4.6.ebuild b/dev-vcs/git/git-2.4.6.ebuild new file mode 100644 index 00000000..f923384f --- /dev/null +++ b/dev-vcs/git/git-2.4.6.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 + +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} + +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 + +sab-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 + + sab-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 + sab-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 +} -- cgit v1.2.3 From 3bd3ce08aa0654ac6ca605649af518705be61875 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sat, 18 Jul 2015 15:00:43 +0300 Subject: [git-gui-tools] adaugat GUI pentru git --- dev-vcs/git-gui-tools/Manifest | 2 + dev-vcs/git-gui-tools/git-gui-tools-2.2.1.ebuild | 2 +- dev-vcs/git-gui-tools/git-gui-tools-2.2.2.ebuild | 2 +- dev-vcs/git-gui-tools/git-gui-tools-2.3.0.ebuild | 2 +- dev-vcs/git-gui-tools/git-gui-tools-2.3.1.ebuild | 2 +- dev-vcs/git-gui-tools/git-gui-tools-2.4.0.ebuild | 2 +- dev-vcs/git-gui-tools/git-gui-tools-2.4.2.ebuild | 2 +- dev-vcs/git-gui-tools/git-gui-tools-2.4.4.ebuild | 205 +++++++++++++++++++++++ dev-vcs/git-gui-tools/git-gui-tools-2.4.6.ebuild | 205 +++++++++++++++++++++++ 9 files changed, 418 insertions(+), 6 deletions(-) create mode 100644 dev-vcs/git-gui-tools/git-gui-tools-2.4.4.ebuild create mode 100644 dev-vcs/git-gui-tools/git-gui-tools-2.4.6.ebuild diff --git a/dev-vcs/git-gui-tools/Manifest b/dev-vcs/git-gui-tools/Manifest index 8e423306..6c531a97 100644 --- a/dev-vcs/git-gui-tools/Manifest +++ b/dev-vcs/git-gui-tools/Manifest @@ -5,3 +5,5 @@ DIST git-2.3.0.tar.xz 3608648 SHA256 94b23a14d66df536cfe7de37551f55acf908f8bddf3 DIST git-2.3.1.tar.xz 3609908 SHA256 1acc4b051576143eb41d80f5675476629588c7c5fb4e6a1dc2c4590f47c498b7 SHA512 f113a9e8c7f9879088de6fa6bfbe9363f25eac279d5eb218ea1f5186cd1c45609760f498a5c066196b3a6e15dd931960e94dcdc14685e8ef1c5c72524113c0cf WHIRLPOOL f1c15ded4f4785d244a5242c823fcf8d63d1c3408c1a1696c99926fdbcab76e23e40d3ee8225925e786ce8eae7597a73a7f9f6cd8e5f1ef7d599ac8b254f9951 DIST git-2.4.0.tar.xz 3681516 SHA256 b33438dd94659958a74850aacae4a2b3a626baec36d7f29c266130b08045bb24 SHA512 0114c5d0dbfeed46e0ba1c8c0da463c52cae6954238547502f44d9050af0d921906beea96ff2c5f56a7c822200d9daa0f1d040f883c701b88a23ec81ac777138 WHIRLPOOL 1f4667b295e541d4f035de9e415636f317f590e104119a1b212cb321f25120df31e45ba88470ee883d1ea9a0033f2b307981c9d9e5807919475dbc5f81b6b22e 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 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 ffd4d0e3..d21acec3 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,7 +14,7 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.1-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" 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 51ca88a2..87712853 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,7 +14,7 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" 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 51ca88a2..87712853 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,7 +14,7 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" 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 51ca88a2..87712853 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,7 +14,7 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" 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 1d30fbe7..58c3a173 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,7 +14,7 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" 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 1d30fbe7..58c3a173 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,7 +14,7 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" 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 new file mode 100644 index 00000000..3b9111b0 --- /dev/null +++ b/dev-vcs/git-gui-tools/git-gui-tools-2.4.4.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 + +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} + +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 + +sab-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 + + sab-patches_unpack +} + +src_prepare() { + # see the git ebuild for the list of patches + sab-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-gui-tools/git-gui-tools-2.4.6.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.4.6.ebuild new file mode 100644 index 00000000..58c3a173 --- /dev/null +++ b/dev-vcs/git-gui-tools/git-gui-tools-2.4.6.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 + +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} + +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 + +sab-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 + + sab-patches_unpack +} + +src_prepare() { + # see the git ebuild for the list of patches + sab-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 +} -- cgit v1.2.3 From 65c4c7831797916dbe3e2bcf5deb5ecaa466dcf6 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sat, 18 Jul 2015 15:01:05 +0300 Subject: [git-cvs] adaugat noile versiuni de support pentru cvs pentru git --- dev-vcs/git-cvs/Manifest | 6 + dev-vcs/git-cvs/git-cvs-2.2.1.ebuild | 2 +- dev-vcs/git-cvs/git-cvs-2.2.2.ebuild | 2 +- dev-vcs/git-cvs/git-cvs-2.3.0.ebuild | 2 +- dev-vcs/git-cvs/git-cvs-2.3.1.ebuild | 2 +- dev-vcs/git-cvs/git-cvs-2.4.0.ebuild | 2 +- dev-vcs/git-cvs/git-cvs-2.4.2.ebuild | 2 +- dev-vcs/git-cvs/git-cvs-2.4.4.ebuild | 232 +++++++++++++++++++++++++++++++++++ dev-vcs/git-cvs/git-cvs-2.4.6.ebuild | 232 +++++++++++++++++++++++++++++++++++ 9 files changed, 476 insertions(+), 6 deletions(-) create mode 100644 dev-vcs/git-cvs/git-cvs-2.4.4.ebuild create mode 100644 dev-vcs/git-cvs/git-cvs-2.4.6.ebuild diff --git a/dev-vcs/git-cvs/Manifest b/dev-vcs/git-cvs/Manifest index b3c5fad2..bb05db44 100644 --- a/dev-vcs/git-cvs/Manifest +++ b/dev-vcs/git-cvs/Manifest @@ -5,15 +5,21 @@ DIST git-2.3.0.tar.xz 3608648 SHA256 94b23a14d66df536cfe7de37551f55acf908f8bddf3 DIST git-2.3.1.tar.xz 3609908 SHA256 1acc4b051576143eb41d80f5675476629588c7c5fb4e6a1dc2c4590f47c498b7 SHA512 f113a9e8c7f9879088de6fa6bfbe9363f25eac279d5eb218ea1f5186cd1c45609760f498a5c066196b3a6e15dd931960e94dcdc14685e8ef1c5c72524113c0cf WHIRLPOOL f1c15ded4f4785d244a5242c823fcf8d63d1c3408c1a1696c99926fdbcab76e23e40d3ee8225925e786ce8eae7597a73a7f9f6cd8e5f1ef7d599ac8b254f9951 DIST git-2.4.0.tar.xz 3681516 SHA256 b33438dd94659958a74850aacae4a2b3a626baec36d7f29c266130b08045bb24 SHA512 0114c5d0dbfeed46e0ba1c8c0da463c52cae6954238547502f44d9050af0d921906beea96ff2c5f56a7c822200d9daa0f1d040f883c701b88a23ec81ac777138 WHIRLPOOL 1f4667b295e541d4f035de9e415636f317f590e104119a1b212cb321f25120df31e45ba88470ee883d1ea9a0033f2b307981c9d9e5807919475dbc5f81b6b22e 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-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 DIST git-htmldocs-2.3.1.tar.xz 981748 SHA256 03bfc92c813a5cbbb34b61fdd7b9cf1226ad9b2b8388d24c649d915df3b93dad SHA512 da371b5a2b73a60681cd6f3b5385bee2668e0d617788194e454a531c2dab652c9b70920cb307858eb5ba15fd0c2d24635862e8f432946b0e9dfee8ee3fcb731a WHIRLPOOL 9334037067d797fd02ae0fd9f6d400ee14d68246755ac48e5897b404214923417728b04added2e05cb52cdc345b3ac9975752507e1e1278cedd74a33cac64b1b DIST git-htmldocs-2.4.0.tar.xz 990744 SHA256 70ee1fdb70507c74832ac021e8940c8249d9b69f2b86aeaf0888ae41772e93a7 SHA512 03837e671a08f08ab7bd70676e234995b44a53ce27c648c50a6dd5ff97ba4400beb3d4b7874d6c8bde3a00624a7c2dc15d15299eb7ad9874d7dfd722f2c2256a WHIRLPOOL 4877dd0c5fb94f032d11d5d22a3e90e8352f68afb50400eca8c2f42e72adf40c7b9878c7998cacf16ed2011b85f965bcc5c44ecb3fd931783bd07b75b84b800b 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-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 DIST git-manpages-2.3.1.tar.xz 370756 SHA256 c58b033af1b26baba78ffc940f4f5a0f16c3491a3f5708375d0bcf0d8031a940 SHA512 391ecf5e38921c9494b5f94e8f59d62f509934d1ef10f3b582632255a2bc62cbc894aa1bcd3018eb619516c1834b95bf7acbab6d73f859dbdcab094588fd4b61 WHIRLPOOL 01ed334a73bbb57c977e7f96fd63a7196b88be5560166df78c7250aa98e04dd48558a9775ddffba34d7c23318bc7d89eb53d06fae38b027349cdaabd39f107f2 DIST git-manpages-2.4.0.tar.xz 372716 SHA256 b616dc6aa02dcac312e6aeae7af148913f76e1f851ba03ba340b4d2db316ecc7 SHA512 158bff66b9f73fc72d3ac6ac3246bebf831551c0ff1e9571913b952f5b891407ab4408ca2daa247869e50d43bb2e951eed6fdb3c39708c769630bbfc618f0efb WHIRLPOOL afed2ad93d6cf3deb571839d268a9aea66d4c2c8571b85a377a6ecd866df8ec8d07d22b65ddb9bc49ec7f16f8c9ecc54e936cd35325f2270264ae8d42e708b01 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 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 351731f3..8075eeeb 100644 --- a/dev-vcs/git-cvs/git-cvs-2.2.1.ebuild +++ b/dev-vcs/git-cvs/git-cvs-2.2.1.ebuild @@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.1-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" 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 567f8745..88d95690 100644 --- a/dev-vcs/git-cvs/git-cvs-2.2.2.ebuild +++ b/dev-vcs/git-cvs/git-cvs-2.2.2.ebuild @@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" 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 567f8745..88d95690 100644 --- a/dev-vcs/git-cvs/git-cvs-2.3.0.ebuild +++ b/dev-vcs/git-cvs/git-cvs-2.3.0.ebuild @@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" 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 567f8745..88d95690 100644 --- a/dev-vcs/git-cvs/git-cvs-2.3.1.ebuild +++ b/dev-vcs/git-cvs/git-cvs-2.3.1.ebuild @@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" 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 2318a2fa..378e1df3 100644 --- a/dev-vcs/git-cvs/git-cvs-2.4.0.ebuild +++ b/dev-vcs/git-cvs/git-cvs-2.4.0.ebuild @@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" 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 2318a2fa..378e1df3 100644 --- a/dev-vcs/git-cvs/git-cvs-2.4.2.ebuild +++ b/dev-vcs/git-cvs/git-cvs-2.4.2.ebuild @@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" diff --git a/dev-vcs/git-cvs/git-cvs-2.4.4.ebuild b/dev-vcs/git-cvs/git-cvs-2.4.4.ebuild new file mode 100644 index 00000000..ed7700ae --- /dev/null +++ b/dev-vcs/git-cvs/git-cvs-2.4.4.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 + +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} + +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 + +sab-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 + + sab-patches_unpack +} + +src_prepare() { + # see the git ebuild for the list of patches + sab-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-cvs/git-cvs-2.4.6.ebuild b/dev-vcs/git-cvs/git-cvs-2.4.6.ebuild new file mode 100644 index 00000000..378e1df3 --- /dev/null +++ b/dev-vcs/git-cvs/git-cvs-2.4.6.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 + +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} + +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 + +sab-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 + + sab-patches_unpack +} + +src_prepare() { + # see the git ebuild for the list of patches + sab-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 +} -- cgit v1.2.3 From b5f2b03e435f9ea6501caa534988436541806d29 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sat, 18 Jul 2015 15:01:20 +0300 Subject: [git-subversion] adaugat support subversion pt git --- dev-vcs/git-subversion/Manifest | 6 + dev-vcs/git-subversion/git-subversion-2.2.1.ebuild | 2 +- dev-vcs/git-subversion/git-subversion-2.2.2.ebuild | 2 +- dev-vcs/git-subversion/git-subversion-2.3.0.ebuild | 2 +- dev-vcs/git-subversion/git-subversion-2.3.1.ebuild | 2 +- dev-vcs/git-subversion/git-subversion-2.4.0.ebuild | 2 +- dev-vcs/git-subversion/git-subversion-2.4.2.ebuild | 2 +- dev-vcs/git-subversion/git-subversion-2.4.4.ebuild | 262 +++++++++++++++++++++ dev-vcs/git-subversion/git-subversion-2.4.6.ebuild | 262 +++++++++++++++++++++ 9 files changed, 536 insertions(+), 6 deletions(-) create mode 100644 dev-vcs/git-subversion/git-subversion-2.4.4.ebuild create mode 100644 dev-vcs/git-subversion/git-subversion-2.4.6.ebuild diff --git a/dev-vcs/git-subversion/Manifest b/dev-vcs/git-subversion/Manifest index b3c5fad2..bb05db44 100644 --- a/dev-vcs/git-subversion/Manifest +++ b/dev-vcs/git-subversion/Manifest @@ -5,15 +5,21 @@ DIST git-2.3.0.tar.xz 3608648 SHA256 94b23a14d66df536cfe7de37551f55acf908f8bddf3 DIST git-2.3.1.tar.xz 3609908 SHA256 1acc4b051576143eb41d80f5675476629588c7c5fb4e6a1dc2c4590f47c498b7 SHA512 f113a9e8c7f9879088de6fa6bfbe9363f25eac279d5eb218ea1f5186cd1c45609760f498a5c066196b3a6e15dd931960e94dcdc14685e8ef1c5c72524113c0cf WHIRLPOOL f1c15ded4f4785d244a5242c823fcf8d63d1c3408c1a1696c99926fdbcab76e23e40d3ee8225925e786ce8eae7597a73a7f9f6cd8e5f1ef7d599ac8b254f9951 DIST git-2.4.0.tar.xz 3681516 SHA256 b33438dd94659958a74850aacae4a2b3a626baec36d7f29c266130b08045bb24 SHA512 0114c5d0dbfeed46e0ba1c8c0da463c52cae6954238547502f44d9050af0d921906beea96ff2c5f56a7c822200d9daa0f1d040f883c701b88a23ec81ac777138 WHIRLPOOL 1f4667b295e541d4f035de9e415636f317f590e104119a1b212cb321f25120df31e45ba88470ee883d1ea9a0033f2b307981c9d9e5807919475dbc5f81b6b22e 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-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 DIST git-htmldocs-2.3.1.tar.xz 981748 SHA256 03bfc92c813a5cbbb34b61fdd7b9cf1226ad9b2b8388d24c649d915df3b93dad SHA512 da371b5a2b73a60681cd6f3b5385bee2668e0d617788194e454a531c2dab652c9b70920cb307858eb5ba15fd0c2d24635862e8f432946b0e9dfee8ee3fcb731a WHIRLPOOL 9334037067d797fd02ae0fd9f6d400ee14d68246755ac48e5897b404214923417728b04added2e05cb52cdc345b3ac9975752507e1e1278cedd74a33cac64b1b DIST git-htmldocs-2.4.0.tar.xz 990744 SHA256 70ee1fdb70507c74832ac021e8940c8249d9b69f2b86aeaf0888ae41772e93a7 SHA512 03837e671a08f08ab7bd70676e234995b44a53ce27c648c50a6dd5ff97ba4400beb3d4b7874d6c8bde3a00624a7c2dc15d15299eb7ad9874d7dfd722f2c2256a WHIRLPOOL 4877dd0c5fb94f032d11d5d22a3e90e8352f68afb50400eca8c2f42e72adf40c7b9878c7998cacf16ed2011b85f965bcc5c44ecb3fd931783bd07b75b84b800b 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-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 DIST git-manpages-2.3.1.tar.xz 370756 SHA256 c58b033af1b26baba78ffc940f4f5a0f16c3491a3f5708375d0bcf0d8031a940 SHA512 391ecf5e38921c9494b5f94e8f59d62f509934d1ef10f3b582632255a2bc62cbc894aa1bcd3018eb619516c1834b95bf7acbab6d73f859dbdcab094588fd4b61 WHIRLPOOL 01ed334a73bbb57c977e7f96fd63a7196b88be5560166df78c7250aa98e04dd48558a9775ddffba34d7c23318bc7d89eb53d06fae38b027349cdaabd39f107f2 DIST git-manpages-2.4.0.tar.xz 372716 SHA256 b616dc6aa02dcac312e6aeae7af148913f76e1f851ba03ba340b4d2db316ecc7 SHA512 158bff66b9f73fc72d3ac6ac3246bebf831551c0ff1e9571913b952f5b891407ab4408ca2daa247869e50d43bb2e951eed6fdb3c39708c769630bbfc618f0efb WHIRLPOOL afed2ad93d6cf3deb571839d268a9aea66d4c2c8571b85a377a6ecd866df8ec8d07d22b65ddb9bc49ec7f16f8c9ecc54e936cd35325f2270264ae8d42e708b01 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 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 7aa9d9eb..9694e461 100644 --- a/dev-vcs/git-subversion/git-subversion-2.2.1.ebuild +++ b/dev-vcs/git-subversion/git-subversion-2.2.1.ebuild @@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.1-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" 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 b975448f..51267960 100644 --- a/dev-vcs/git-subversion/git-subversion-2.2.2.ebuild +++ b/dev-vcs/git-subversion/git-subversion-2.2.2.ebuild @@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" 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 b975448f..51267960 100644 --- a/dev-vcs/git-subversion/git-subversion-2.3.0.ebuild +++ b/dev-vcs/git-subversion/git-subversion-2.3.0.ebuild @@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" 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 b975448f..51267960 100644 --- a/dev-vcs/git-subversion/git-subversion-2.3.1.ebuild +++ b/dev-vcs/git-subversion/git-subversion-2.3.1.ebuild @@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_{6,7} ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" 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 4cf7a57c..785c134c 100644 --- a/dev-vcs/git-subversion/git-subversion-2.4.0.ebuild +++ b/dev-vcs/git-subversion/git-subversion-2.4.0.ebuild @@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" 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 4cf7a57c..785c134c 100644 --- a/dev-vcs/git-subversion/git-subversion-2.4.2.ebuild +++ b/dev-vcs/git-subversion/git-subversion-2.4.2.ebuild @@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://kogaion/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" ) +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} MY_PV="${PV/_rc/.rc}" diff --git a/dev-vcs/git-subversion/git-subversion-2.4.4.ebuild b/dev-vcs/git-subversion/git-subversion-2.4.4.ebuild new file mode 100644 index 00000000..00b9f492 --- /dev/null +++ b/dev-vcs/git-subversion/git-subversion-2.4.4.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 + +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} + +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 + +sab-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 + + sab-patches_unpack + +} + +src_prepare() { + # see the git ebuild for the list of patches + sab-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-subversion/git-subversion-2.4.6.ebuild b/dev-vcs/git-subversion/git-subversion-2.4.6.ebuild new file mode 100644 index 00000000..785c134c --- /dev/null +++ b/dev-vcs/git-subversion/git-subversion-2.4.6.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 + +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} + +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 + +sab-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 + + sab-patches_unpack + +} + +src_prepare() { + # see the git ebuild for the list of patches + sab-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 +} -- cgit v1.2.3 From a900658dfacbae02101c5a1206a8979fba9f5b2c Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sat, 18 Jul 2015 15:01:38 +0300 Subject: [subversion*] adaugat subversion si subversion-java versiuni noi --- dev-vcs/subversion-java/Manifest | 3 +- .../subversion-java/subversion-java-1.8.10.ebuild | 2 +- .../subversion-java/subversion-java-1.8.11.ebuild | 6 +- .../subversion-java/subversion-java-1.8.13.ebuild | 153 +++++++++++++++++++++ dev-vcs/subversion/Manifest | 2 +- dev-vcs/subversion/subversion-1.8.10.ebuild | 2 +- dev-vcs/subversion/subversion-1.8.11.ebuild | 6 +- dev-vcs/subversion/subversion-1.8.13.ebuild | 2 +- 8 files changed, 167 insertions(+), 9 deletions(-) create mode 100644 dev-vcs/subversion-java/subversion-java-1.8.13.ebuild diff --git a/dev-vcs/subversion-java/Manifest b/dev-vcs/subversion-java/Manifest index 2d004a41..e5bbdbfa 100644 --- a/dev-vcs/subversion-java/Manifest +++ b/dev-vcs/subversion-java/Manifest @@ -1,3 +1,4 @@ -DIST subversion-1.8.10.tar.bz2 6899384 SHA256 1cc900c8a7974337c3ed389dc6b5c59012ec48c7d4107ae31fd7c929ded47dcc SHA512 a03e618ee700132a1668668519cccc34dbd46777acfbaa9c3f1769d53a1ee4499a10c53c9b212d27e17b259e19d071b672f247cfcc6502e10122a852ae1b6bd0 WHIRLPOOL bff8ce6509263a6de6a19d135c96f50f4bba24c539a3d0a7300b547c8a264ddd6d3ba38b78680a9dceb171306819ca2835f00d1cf4afa7a9001ae104567c4022 +DIST subversion-1.8.10.tar.bz2 19423 SHA256 e5c6a67c491959687e8ea068a2bb69b24f475fd5367eadfca9a4273762a48ed9 SHA512 961f4abb5e558760e9053071f914da6879802f61e8fb8db3fad36948fdd04bd6dc80ba3362f95f55048e2c3aba82b67df14ef66ccc4372d1ec7b927e684e4adc WHIRLPOOL 9c2f9223d746c32b3757901692cffd9b40d86aa0ce56a2ff988341f345f576e7079afbb26479264511976adaeda757efd5594423c05b2fe8542ffb6741c6ca61 DIST subversion-1.8.11.tar.bz2 6896225 SHA256 10b056420e1f194c12840368f6bf58842e6200f9cb8cc5ebbf9be2e89e56e4d9 SHA512 86c4ff71a0f448895f26cb1674d1e7230ceacfa5cb2a0ccf28589b8c7f30ff65d2bb6b2c201b95ce53b7b877de98e1a69bf291a8cea4e4005afbbb1d0a62aae1 WHIRLPOOL 08c782e2f578a613e5c380922c05230b3ed0114b28f0dbd6a976089db5f563b160641158682e1d53481b06a961a401e26114452517e51e16a0fc12c0c88b3247 +DIST subversion-1.8.13.tar.bz2 6863330 SHA256 1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579 SHA512 5b145888fdd294b871066483f9cc5af811aadd88c537c3859b005b73efaf66bd8d5c7c4dc6562897c00331be2ddfd834688a90eb5c229bc6625ab3c45c02045f WHIRLPOOL d79c71385e21ee3254a798687fd1de3e01a1577287b03d9a0f87e0a31621501e749ee9b37f40c59cb206fc68ba9968132e724f3c4a12c7aa8d5aa59d66a4ade4 DIST subversion-1.8.9-Gentoo-patches.tar.gz 3179 SHA256 95847de918a22c51120ead7695034b587a4654c78d1ac18c26f1be891ffe8ffa SHA512 4f4ad2b900b25c3dfe72a0a41097402e0f96d6c12ab410c595262d586be37c7284a1b38b013aaf20bbed301704b2676b4f6e80544039b1ef47071049704131b8 WHIRLPOOL be5d33bd34bfea2a6f4b1e002522bb51407042e2ea5c8bf0beb2c8185238df4567eceeda993fd6b13b3022499e338da66483c044e5480f3f455b0cc12d705aad 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 fe5117f2..5f3fb2c2 100644 --- a/dev-vcs/subversion-java/subversion-java-1.8.10.ebuild +++ b/dev-vcs/subversion-java/subversion-java-1.8.10.ebuild @@ -12,7 +12,7 @@ MY_SVN_PF="${MY_SVN_PN}-${PVR}" MY_SVN_CATEGORY="${CATEGORY}" # note: java-pkg-2, not java-pkt-opt-2 -SAB_PATCHES_SRC=( mirror://kogaion/dev-vcs/${MY_SVN_PN}-1.8.9-Gentoo-patches.tar.gz ) +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 DESCRIPTION="Java bindings for Subversion" 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 6f9b006a..3357bc09 100644 --- a/dev-vcs/subversion-java/subversion-java-1.8.11.ebuild +++ b/dev-vcs/subversion-java/subversion-java-1.8.11.ebuild @@ -12,14 +12,16 @@ MY_SVN_PF="${MY_SVN_PN}-${PVR}" MY_SVN_CATEGORY="${CATEGORY}" # note: java-pkg-2, not java-pkt-opt-2 -SAB_PATCHES_SRC=( mirror://kogaion/dev-vcs/${MY_SVN_PN}-1.8.9-Gentoo-patches.tar.gz ) +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 DESCRIPTION="Java bindings for Subversion" HOMEPAGE="http://subversion.apache.org/" -SRC_URI+=" mirror://apache/${PN}/${MY_SVN_P}.tar.bz2" +SRC_URI="mirror://apache/${PN}/${MY_SVN_P}.tar.bz2" S="${WORKDIR}/${MY_SVN_P/_/-}" +sab-patches_update_SRC_URI + LICENSE="Subversion" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" diff --git a/dev-vcs/subversion-java/subversion-java-1.8.13.ebuild b/dev-vcs/subversion-java/subversion-java-1.8.13.ebuild new file mode 100644 index 00000000..3cba280d --- /dev/null +++ b/dev-vcs/subversion-java/subversion-java-1.8.13.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 +WANT_AUTOMAKE="none" +MY_P="${P/_/-}" + +MY_SVN_PN="subversion" +MY_SVN_P="${MY_SVN_PN}-${PV}" +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 + +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 + +LICENSE="Subversion" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +IUSE="debug doc nls" + +COMMON_DEPEND="~dev-vcs/subversion-${PV} + >=dev-libs/apr-1.3:1 + >=dev-libs/apr-util-1.3:1 + sys-apps/file" +RDEPEND=" + ${COMMON_DEPEND} + app-arch/bzip2 + >=virtual/jre-1.5" +DEPEND="${COMMON_DEPEND} + >=virtual/jdk-1.5" + +pkg_setup() { + java-pkg-2_pkg_setup + + if use debug ; then + append-cppflags -DSVN_DEBUG -DAP_DEBUG + fi + # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E + [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__ +} + +src_prepare() { + local SAB_PATCHES_SKIP=( subversion-1.8.9-po_fixes.patch ) + sab-patches_apply_all + epatch_user + + fperms +x build/transform_libtool_scripts.sh + + sed -i \ + -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \ + -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac + + # this bites us in particular on Solaris + sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \ + die "/bin/sh is not POSIX shell!" + + eautoconf + elibtoolize + + sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \ + -i build-outputs.mk || die "sed failed" +} + +src_configure() { + local myconf + + myconf+=" --without-swig" + myconf+=" --without-junit" + + case ${CHOST} in + *-aix*) + # avoid recording immediate path to sharedlibs into executables + append-ldflags -Wl,-bnoipath + ;; + *-interix*) + # loader crashes on the LD_PRELOADs... + myconf+=" --disable-local-library-preloading" + ;; + *-solaris*) + # need -lintl to link + use nls && append-libs intl + # this breaks installation, on x64 echo replacement is 32-bits + myconf+=" --disable-local-library-preloading" + ;; + *-mint*) + myconf+=" --enable-all-static --disable-local-library-preloading" + ;; + *) + # inject LD_PRELOAD entries for easy in-tree development + myconf+=" --enable-local-library-preloading" + ;; + esac + + #version 1.7.7 again tries to link against the older installed version and fails, when trying to + #compile for x86 on amd64, so workaround this issue again + #check newer versions, if this is still/again needed + myconf+=" --disable-disallowing-of-undefined-references" + + econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --without-apache-libexecdir \ + --without-apxs \ + --without-berkeley-db \ + --without-ctypesgen \ + --disable-runtime-module-search \ + --without-gnome-keyring \ + --enable-javahl \ + --with-jdk="${JAVA_HOME}" \ + --without-kwallet \ + $(use_enable nls) \ + --without-sasl \ + --without-serf \ + ${myconf} \ + --with-apr="${EPREFIX}/usr/bin/apr-1-config" \ + --with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \ + --disable-experimental-libtool \ + --without-jikes \ + --disable-mod-activation \ + --disable-static +} + +src_compile() { + emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl + + if use doc ; then + emake doc-javahl + fi +} + +src_install() { + emake DESTDIR="${D}" install-javahl + java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname) + java-pkg_jarinto /usr/share/"${MY_SVN_PN}"/lib + java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar + rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar + + mv "${ED}usr/share/${PN}/package.env" "${ED}/usr/share/${MY_SVN_PN}/" || die + + if use doc ; then + java-pkg_dojavadoc doc/javadoc + fi + + prune_libtool_files --all +} diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest index b8d96dfe..e5bbdbfa 100644 --- a/dev-vcs/subversion/Manifest +++ b/dev-vcs/subversion/Manifest @@ -1,4 +1,4 @@ -DIST subversion-1.8.10.tar.bz2 6899384 SHA256 1cc900c8a7974337c3ed389dc6b5c59012ec48c7d4107ae31fd7c929ded47dcc SHA512 a03e618ee700132a1668668519cccc34dbd46777acfbaa9c3f1769d53a1ee4499a10c53c9b212d27e17b259e19d071b672f247cfcc6502e10122a852ae1b6bd0 WHIRLPOOL bff8ce6509263a6de6a19d135c96f50f4bba24c539a3d0a7300b547c8a264ddd6d3ba38b78680a9dceb171306819ca2835f00d1cf4afa7a9001ae104567c4022 +DIST subversion-1.8.10.tar.bz2 19423 SHA256 e5c6a67c491959687e8ea068a2bb69b24f475fd5367eadfca9a4273762a48ed9 SHA512 961f4abb5e558760e9053071f914da6879802f61e8fb8db3fad36948fdd04bd6dc80ba3362f95f55048e2c3aba82b67df14ef66ccc4372d1ec7b927e684e4adc WHIRLPOOL 9c2f9223d746c32b3757901692cffd9b40d86aa0ce56a2ff988341f345f576e7079afbb26479264511976adaeda757efd5594423c05b2fe8542ffb6741c6ca61 DIST subversion-1.8.11.tar.bz2 6896225 SHA256 10b056420e1f194c12840368f6bf58842e6200f9cb8cc5ebbf9be2e89e56e4d9 SHA512 86c4ff71a0f448895f26cb1674d1e7230ceacfa5cb2a0ccf28589b8c7f30ff65d2bb6b2c201b95ce53b7b877de98e1a69bf291a8cea4e4005afbbb1d0a62aae1 WHIRLPOOL 08c782e2f578a613e5c380922c05230b3ed0114b28f0dbd6a976089db5f563b160641158682e1d53481b06a961a401e26114452517e51e16a0fc12c0c88b3247 DIST subversion-1.8.13.tar.bz2 6863330 SHA256 1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579 SHA512 5b145888fdd294b871066483f9cc5af811aadd88c537c3859b005b73efaf66bd8d5c7c4dc6562897c00331be2ddfd834688a90eb5c229bc6625ab3c45c02045f WHIRLPOOL d79c71385e21ee3254a798687fd1de3e01a1577287b03d9a0f87e0a31621501e749ee9b37f40c59cb206fc68ba9968132e724f3c4a12c7aa8d5aa59d66a4ade4 DIST subversion-1.8.9-Gentoo-patches.tar.gz 3179 SHA256 95847de918a22c51120ead7695034b587a4654c78d1ac18c26f1be891ffe8ffa SHA512 4f4ad2b900b25c3dfe72a0a41097402e0f96d6c12ab410c595262d586be37c7284a1b38b013aaf20bbed301704b2676b4f6e80544039b1ef47071049704131b8 WHIRLPOOL be5d33bd34bfea2a6f4b1e002522bb51407042e2ea5c8bf0beb2c8185238df4567eceeda993fd6b13b3022499e338da66483c044e5480f3f455b0cc12d705aad diff --git a/dev-vcs/subversion/subversion-1.8.10.ebuild b/dev-vcs/subversion/subversion-1.8.10.ebuild index 3cb6b716..59540163 100644 --- a/dev-vcs/subversion/subversion-1.8.10.ebuild +++ b/dev-vcs/subversion/subversion-1.8.10.ebuild @@ -8,7 +8,7 @@ DISTUTILS_OPTIONAL=1 WANT_AUTOMAKE="none" GENTOO_DEPEND_ON_PERL="no" -SAB_PATCHES_SRC=( mirror://kogaion/dev-vcs/${PN}-1.8.9-Gentoo-patches.tar.gz ) +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 MY_P="${P/_/-}" diff --git a/dev-vcs/subversion/subversion-1.8.11.ebuild b/dev-vcs/subversion/subversion-1.8.11.ebuild index fea0ac1f..2b3220c3 100644 --- a/dev-vcs/subversion/subversion-1.8.11.ebuild +++ b/dev-vcs/subversion/subversion-1.8.11.ebuild @@ -8,15 +8,17 @@ DISTUTILS_OPTIONAL=1 WANT_AUTOMAKE="none" GENTOO_DEPEND_ON_PERL="no" -SAB_PATCHES_SRC=( mirror://kogaion/dev-vcs/${PN}-1.8.9-Gentoo-patches.tar.gz ) +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 MY_P="${P/_/-}" DESCRIPTION="Advanced version control system" HOMEPAGE="http://subversion.apache.org/" -SRC_URI+=" mirror://apache/${PN}/${MY_P}.tar.bz2" +SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2" S="${WORKDIR}/${MY_P}" +sab-patches_update_SRC_URI + LICENSE="Subversion GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" diff --git a/dev-vcs/subversion/subversion-1.8.13.ebuild b/dev-vcs/subversion/subversion-1.8.13.ebuild index 31614b52..5c3122bb 100644 --- a/dev-vcs/subversion/subversion-1.8.13.ebuild +++ b/dev-vcs/subversion/subversion-1.8.13.ebuild @@ -8,7 +8,7 @@ DISTUTILS_OPTIONAL=1 WANT_AUTOMAKE="none" GENTOO_DEPEND_ON_PERL="no" -SAB_PATCHES_SRC=( mirror://kogaion/dev-vcs/${PN}-1.8.9-Gentoo-patches.tar.gz ) +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 MY_P="${P/_/-}" -- cgit v1.2.3 From 5981ee8be65fe8c89de90516faee4eeb9934891c Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sat, 18 Jul 2015 17:54:27 +0300 Subject: [calamares] adaugat keyword stabil --- app-admin/calamares/calamares-1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/calamares/calamares-1.1.ebuild b/app-admin/calamares/calamares-1.1.ebuild index 228a5fa3..9dc37615 100644 --- a/app-admin/calamares/calamares-1.1.ebuild +++ b/app-admin/calamares/calamares-1.1.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://calamares.io" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+python" S="${WORKDIR}/${PN}-${PV}" -- cgit v1.2.3 From 01971e739ceca4be087a792b2b0ecc51275a3131 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Mon, 20 Jul 2015 00:32:33 +0300 Subject: [kogaion-elementary-icons] fixat symlink-uri interne catre iconitele principale --- x11-themes/kogaion-elementary-icons/Manifest | 2 +- .../kogaion-elementary-icons-1.0.ebuild | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/x11-themes/kogaion-elementary-icons/Manifest b/x11-themes/kogaion-elementary-icons/Manifest index 2c805843..59365700 100644 --- a/x11-themes/kogaion-elementary-icons/Manifest +++ b/x11-themes/kogaion-elementary-icons/Manifest @@ -1 +1 @@ -DIST kogaion-elementary-icons-1.0.tar.gz 13559327 SHA256 9d3dc457a8c891c6e7982931d9b454ffcae47e75e27e63fd02076dd3c2c0863c SHA512 c7fa4545721b109bbc026421468d3d672336c1955353b2dcaa8efaa976f5eaf5653ffad8cd18b9340a2c55ff6476390a26771fbeb8a95543877a2defe9249dbe WHIRLPOOL 4d612164339f46eebef13945ec01d4e45f5081de47a8fa50fa00439b4620df5189f6b418977a48c7e3a42e3a23db9662e49bebdd9519cdcc6c3f44c90ab98ac5 +DIST kogaion-elementary-icons-1.0.tar.gz 2656220 SHA256 989acc6fe4063594ac41c83562f4bcc79094dba9aeff481d4de111d601a82547 SHA512 67bd1b79b391b48179d9ec828432fcde9d71bcb871ff8b23ef6dc933b6a3e3fdc9c5da7d52b00de58de53f20c52100305ae5ef421a9225fcaebec6bfdff7b9cd WHIRLPOOL c101e8d4834b3a5751159a248133888b8957c0d21781261e822d27bdde6004ee77b0cb58b13a66b91de0b3648a53763908ea009b3c065d8eef287678c3f457d8 diff --git a/x11-themes/kogaion-elementary-icons/kogaion-elementary-icons-1.0.ebuild b/x11-themes/kogaion-elementary-icons/kogaion-elementary-icons-1.0.ebuild index 9cc86395..8135ba51 100644 --- a/x11-themes/kogaion-elementary-icons/kogaion-elementary-icons-1.0.ebuild +++ b/x11-themes/kogaion-elementary-icons/kogaion-elementary-icons-1.0.ebuild @@ -2,14 +2,12 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 DESCRIPTION="Kogaion elementary icons" HOMEPAGE="https://github.com/bionel/kogaion-src" -SRC_URI="http://pkg.rogentos.ro/~rogentos/distro/${CATEGORY}/${PN}/${P}.tar.gz - https://buildserver.rogentos.ro/~kogaion/distro/${CATEGORY}/${PN}/${P}.tar.gz - http://bpr.bluepink.ro/~rogentos/distro/${CATEGORY}/${PN}/${PN}-${PVR}.tar.gz - mirror://kogaion/${CATEGORY}/"${PN}"/${PN}-${PVR}.tar.gz" +SRC_URI="http://bpr.bluepink.ro/~rogentos/distro/${CATEGORY}/${PN}/${PN}-${PVR}.tar.gz" + #mirror://kogaion/${CATEGORY}/"${PN}"/${PN}-${PVR}.tar.gz LICENSE="GPL-2" SLOT="0" @@ -20,7 +18,7 @@ RDEPEND="" DEPEND="${RDEPEND}" DEST="/usr/share/icons" -S="${WORKDIR}" +S="${WORKDIR}/${PN}" src_install() { insinto ${DEST} || die -- cgit v1.2.3 From 2cb1fac3d6e7dc923b08adb509fd4836c3fc6d3f Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Mon, 20 Jul 2015 00:36:16 +0300 Subject: [kogaion-elementary-icons] fixat tipul arhivei --- x11-themes/kogaion-elementary-icons/Manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-themes/kogaion-elementary-icons/Manifest b/x11-themes/kogaion-elementary-icons/Manifest index 59365700..cd774f07 100644 --- a/x11-themes/kogaion-elementary-icons/Manifest +++ b/x11-themes/kogaion-elementary-icons/Manifest @@ -1 +1 @@ -DIST kogaion-elementary-icons-1.0.tar.gz 2656220 SHA256 989acc6fe4063594ac41c83562f4bcc79094dba9aeff481d4de111d601a82547 SHA512 67bd1b79b391b48179d9ec828432fcde9d71bcb871ff8b23ef6dc933b6a3e3fdc9c5da7d52b00de58de53f20c52100305ae5ef421a9225fcaebec6bfdff7b9cd WHIRLPOOL c101e8d4834b3a5751159a248133888b8957c0d21781261e822d27bdde6004ee77b0cb58b13a66b91de0b3648a53763908ea009b3c065d8eef287678c3f457d8 +DIST kogaion-elementary-icons-1.0.tar.gz 15766945 SHA256 62b3a445afd212c0991b1fd98cc1e6b51445faf8ced522facfbdc68a7418222a SHA512 fedf78bec293fa6871e97768d2f4ffd102fca2e813292c82103cc706432af2205824c8b0e350eace42ee3f40e0e3918e4ba63db2938ee64df85c042cdc409266 WHIRLPOOL 0c83843cb6cee75d69c2d0fbd4bb3a459c3adfe0a52ea1eaf813690100bf0bd626a1c6edf7498d640af0542f86afd0e08257bc07d4f33cf7a5ef64956aa1721c -- cgit v1.2.3 From 376878d34c7fec7b1757f0971b90647898115028 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Tue, 21 Jul 2015 02:51:57 +0300 Subject: [calamares-runtime] adaugat keyword pentru calamares-runtime pe 32biti --- app-misc/calamares-runtime/calamares-runtime-2.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/calamares-runtime/calamares-runtime-2.0.ebuild b/app-misc/calamares-runtime/calamares-runtime-2.0.ebuild index dee4ed68..f76741de 100644 --- a/app-misc/calamares-runtime/calamares-runtime-2.0.ebuild +++ b/app-misc/calamares-runtime/calamares-runtime-2.0.ebuild @@ -9,7 +9,7 @@ SRC_URI="" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" IUSE="+branding +python" DEPEND="" -- cgit v1.2.3 From 72eafcc7db6bfc8067047b485f6ab586b7359462 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Tue, 21 Jul 2015 03:06:33 +0300 Subject: [eclass/live-kernel] fixat artwork-ul pentru kogaion kernel --- eclass/live-kernel.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/live-kernel.eclass b/eclass/live-kernel.eclass index b33b297e..f9509f18 100644 --- a/eclass/live-kernel.eclass +++ b/eclass/live-kernel.eclass @@ -363,7 +363,7 @@ else arm? ( dev-embedded/u-boot-tools ) amd64? ( sys-apps/v86d ) x86? ( sys-apps/v86d ) - splash? ( x11-themes/${PLYMOUTH_THEME}-artwork-core ) + splash? ( x11-themes/kogaion-artwork-core ) lvm? ( sys-fs/lvm2 sys-block/thin-provisioning-tools ) btrfs? ( sys-fs/btrfs-progs ) plymouth? ( -- cgit v1.2.3 From 51f726f069a241e5e73e9f07eb0c43ad8278f8eb Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Tue, 21 Jul 2015 03:17:14 +0300 Subject: [eclass/live-artwork.eclass] reparat cod prost scris cu picioarele in bash --- eclass/live-artwork.eclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eclass/live-artwork.eclass b/eclass/live-artwork.eclass index 4f7ddbb1..e235550c 100644 --- a/eclass/live-artwork.eclass +++ b/eclass/live-artwork.eclass @@ -18,10 +18,10 @@ GFX_SPLASH_NAME="${GFX_SPLASH_NAME:-live}" # @ECLASS-VARIABLE: PLYMOUTH_THEME # @DESCRIPTION: # Default plymouth theme name to use -if $(cat /etc/hostname) == "kogaion" ; then - PLYMOUTH_THEME="${PLYMOUTH_THEME:-kogaion}" -elif $(cat /etc/hostname) == "argent" ; then - PLYMOUTH_THEME="${PLYMOUTH_THEME:-argent}" +if [ -d "/etc/kogaion" ] ; then + PLYMOUTH_THEME="${PLYMOUTH_THEME:-kogaion}" +elif [ -d "/etc/argent" ] ; then + PLYMOUTH_THEME="${PLYMOUTH_THEME:-argent}" fi # @FUNCTION: update_kernel_initramfs_splash -- cgit v1.2.3 From 6f22fe299f3f1853132ef3779fa126cc2b50bc2e Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Tue, 21 Jul 2015 04:34:56 +0300 Subject: [linux-live-brrc] prelucrat kernel live versiunile 3.14.30 pentru kogaion si 3.14.35 pentru argent --- sys-kernel/linux-live-brrc/Manifest | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sys-kernel/linux-live-brrc/Manifest diff --git a/sys-kernel/linux-live-brrc/Manifest b/sys-kernel/linux-live-brrc/Manifest new file mode 100644 index 00000000..bcf1c763 --- /dev/null +++ b/sys-kernel/linux-live-brrc/Manifest @@ -0,0 +1,2 @@ +DIST linux-3.14.30+live-brrc.tar.xz 81201456 SHA256 4aad7e32c14b1be705047a86ac324edb2d3d57c513091cec471a8cfa2eca0bff SHA512 28805ea79b637195611ccd094b5e42c846f22f892ed6f31c2fb046bc53536030b51f76eff9ea07ff51a18e6d9ba070a8d36517238bc0bbb0bd5b184b646c4baa WHIRLPOOL e702514a0c26e7be18ca490feb964977bb41fee447b54ba1cef906f5d1c6bc62fee1c318f3fda99761b7ec257a25c88803471947feb40ad56d0144d874fba019 +DIST linux-3.14.35+live-brrc.tar.xz 81687368 SHA256 76e5f190650e20aece2080a8eaf67d908507b25f6fa4f0a24aaaee0fe43470e9 SHA512 c24d11e960e19db1e838b4da72d6543b668408b58a20f926e8f9b024f11e9c503740c2269ea542dce4281716654940097586e227f7dc0e6191f91d0d9483dff0 WHIRLPOOL 5c33136b42fd2e925bd892e82e48e41d71ffa9bfef80fdb5415c98d695599fda078414107bb31e8cb2246b26f16d6163f5965abbddbb8defc73ae3e0612097a9 -- cgit v1.2.3 From 4205aaf8903f0b2b69a930b83a2e676732c560a1 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Tue, 21 Jul 2015 21:16:12 +0300 Subject: [kogaion-artwork-grub] schimbare sursa + remanifestare ebuild --- x11-themes/kogaion-artwork-grub/Manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-themes/kogaion-artwork-grub/Manifest b/x11-themes/kogaion-artwork-grub/Manifest index e4208e98..71ad7e86 100644 --- a/x11-themes/kogaion-artwork-grub/Manifest +++ b/x11-themes/kogaion-artwork-grub/Manifest @@ -1 +1 @@ -DIST kogaion-artwork-grub-2.1.tar.gz 235174 SHA256 8a43caf517663d00d66b7f24e9a9148ec2eb290fe72ff900751a2c5c51b5aa81 SHA512 2476ab2b3470ed643ba0d3d39d3b16611fde22e0bad6cfad6fec992dfd492da073d772cfd9c35e686a9858a7b8866025493908cb46ce26a24d960b5c10592d32 WHIRLPOOL b3afa770fcf980b7fff3d86926768ec3c056c6e6e1f1163ce15ad0a748b6ba7eced49ec543f2b910aef0f4b2e2ae2312876893599535108d5bebabb944bf94fc +DIST kogaion-artwork-grub-2.1.tar.gz 15426 SHA256 190391044e136a9c98c2d460355323fb1c401f6a1552cd757886bfbe662316fe SHA512 6e53b63b0dd850a828837f73bfe7721adbbd61eb0e47097603b7cd6192e8b698770f8608cabbd7e59eb8b580bbe4ef699f33f7d83d9b2533b6543b4f656a6f94 WHIRLPOOL e903bc74f2de8cb3d14ddde78d314670cac5e45ff2f795fea41a85d422ca3a826ac89f18c7d2a5a7ac25e682069531a41c8564e80226899a397e8821221a65b4 -- cgit v1.2.3 From 5c8180e20f801d69d51cca9c09c773f120e7bb64 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Tue, 21 Jul 2015 21:27:37 +0300 Subject: [linux-live-brrc] remanifestare linux-live-brrc --- sys-kernel/linux-live-brrc/Manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-kernel/linux-live-brrc/Manifest b/sys-kernel/linux-live-brrc/Manifest index bcf1c763..b9aa310f 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 81201456 SHA256 4aad7e32c14b1be705047a86ac324edb2d3d57c513091cec471a8cfa2eca0bff SHA512 28805ea79b637195611ccd094b5e42c846f22f892ed6f31c2fb046bc53536030b51f76eff9ea07ff51a18e6d9ba070a8d36517238bc0bbb0bd5b184b646c4baa WHIRLPOOL e702514a0c26e7be18ca490feb964977bb41fee447b54ba1cef906f5d1c6bc62fee1c318f3fda99761b7ec257a25c88803471947feb40ad56d0144d874fba019 +DIST linux-3.14.30+live-brrc.tar.xz 81790272 SHA256 4e7f1c4de5dbec236246654e055250ee8cbe8b32a001ddea636d1a7ed124c5fc SHA512 44204d0460be45b3e680b09ebcbe85b4f9f98c3fd8f22d7aecf7e13f9b470af1adb72794b10ebe11b3d0b1bedf3f48e5c5fa28b6b7c5f8521799cd76c313db79 WHIRLPOOL 3ca21a961937c949fb5407d420bdc85fefec45dafcbfd7a081a94c1a73608034d1d58aef75bc500cf61f476dc30989047cc5efe45608bd57f3a9e8feb1d8f221 DIST linux-3.14.35+live-brrc.tar.xz 81687368 SHA256 76e5f190650e20aece2080a8eaf67d908507b25f6fa4f0a24aaaee0fe43470e9 SHA512 c24d11e960e19db1e838b4da72d6543b668408b58a20f926e8f9b024f11e9c503740c2269ea542dce4281716654940097586e227f7dc0e6191f91d0d9483dff0 WHIRLPOOL 5c33136b42fd2e925bd892e82e48e41d71ffa9bfef80fdb5415c98d695599fda078414107bb31e8cb2246b26f16d6163f5965abbddbb8defc73ae3e0612097a9 -- cgit v1.2.3