summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-portage/eix/ChangeLog3
-rw-r--r--app-portage/eix/eix-99999999.ebuild4
-rw-r--r--app-shells/auto-fu-zsh/ChangeLog5
l---------app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r4.ebuild2
-rw-r--r--app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild (renamed from app-shells/auto-fu-zsh/auto-fu-zsh-99999999-r2.ebuild)4
-rw-r--r--app-shells/oh-my-zsh/ChangeLog3
-rw-r--r--app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild3
-rw-r--r--app-shells/zsh-completion/ChangeLog3
-rw-r--r--app-shells/zsh-completion/zsh-completion-99999999.ebuild4
-rw-r--r--app-shells/zsh-syntax-highlighting/ChangeLog5
l---------app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.2.0-r1.ebuild1
l---------app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.2.0.ebuild1
-rw-r--r--app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild (renamed from app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999-r1.ebuild)3
-rw-r--r--app-shells/zsh/ChangeLog3
-rw-r--r--app-shells/zsh/zsh-99999999.ebuild4
-rw-r--r--dev-util/ccache/ChangeLog5
-rw-r--r--dev-util/ccache/ccache-99999999.ebuild3
-rw-r--r--sci-mathematics/genius/ChangeLog3
-rw-r--r--sci-mathematics/genius/Manifest2
-rw-r--r--sci-mathematics/genius/genius-1.0.17.ebuild (renamed from sci-mathematics/genius/genius-1.0.16.ebuild)30
-rw-r--r--sys-fs/aufs-util/ChangeLog3
-rw-r--r--sys-fs/aufs-util/aufs-util-99999999.2-r1.ebuild45
-rw-r--r--sys-fs/aufs-util/aufs-util-99999999.ebuild (renamed from sys-fs/aufs-util/aufs-util-99999999.3-r1.ebuild)9
-rw-r--r--sys-fs/aufs/ChangeLog3
-rw-r--r--sys-fs/aufs/aufs-99999999.2-r1.ebuild203
-rw-r--r--sys-fs/aufs/aufs-99999999.ebuild (renamed from sys-fs/aufs/aufs-99999999.3-r2.ebuild)8
26 files changed, 63 insertions, 299 deletions
diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog
index 55a5c9ca..aa8f43b4 100644
--- a/app-portage/eix/ChangeLog
+++ b/app-portage/eix/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 14 Sep 2013; Martin Väth <martin@mvath.de>:
+ Bump to git-r3.eclass
+
10 Sep 2013; Martin Väth <martin@mvath.de>:
Install zsh-completion unconditionally according to gentoo policy
diff --git a/app-portage/eix/eix-99999999.ebuild b/app-portage/eix/eix-99999999.ebuild
index 7d2bfac9..4063eece 100644
--- a/app-portage/eix/eix-99999999.ebuild
+++ b/app-portage/eix/eix-99999999.ebuild
@@ -5,11 +5,9 @@
EAPI=5
EGIT_REPO_URI="git://git.berlios.de/${PN}"
-EGIT_PROJECT="${PN}.git"
-[ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true
WANT_LIBTOOL=none
PLOCALES="de ru"
-inherit autotools bash-completion-r1 eutils git-2 l10n multilib
+inherit autotools bash-completion-r1 eutils git-r3 l10n multilib
DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
HOMEPAGE="http://eix.berlios.de"
diff --git a/app-shells/auto-fu-zsh/ChangeLog b/app-shells/auto-fu-zsh/ChangeLog
index a14ffd97..76835e38 100644
--- a/app-shells/auto-fu-zsh/ChangeLog
+++ b/app-shells/auto-fu-zsh/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*auto-fu-zsh-99999999 (14 Sep 2013)
+
+ 14 Sep 2013; Martin Väth <martin@mvath.de>:
+ Rename live-version back. Bump to git-r3
+
*auto-fu-zsh-0.0.1.12-r4, auto-fu-zsh-99999999-r2 (26 Jan 2012)
26 Jan 2013; Martin Väth <martin@mvath.de>:
diff --git a/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r4.ebuild b/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r4.ebuild
index 85b5b98c..fe5fb670 120000
--- a/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r4.ebuild
+++ b/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r4.ebuild
@@ -1 +1 @@
-auto-fu-zsh-99999999-r2.ebuild \ No newline at end of file
+auto-fu-zsh-99999999.ebuild \ No newline at end of file
diff --git a/app-shells/auto-fu-zsh/auto-fu-zsh-99999999-r2.ebuild b/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild
index daf4241d..a502a806 100644
--- a/app-shells/auto-fu-zsh/auto-fu-zsh-99999999-r2.ebuild
+++ b/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild
@@ -11,10 +11,8 @@ case ${PV} in
99999999*)
LIVE=:
EGIT_REPO_URI="git://github.com/hchbaw/${mPN}.git"
- EGIT_PROJECT="${PN}.git"
EGIT_BRANCH="pu"
- [ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true
- inherit git-2
+ inherit git-r3
PROPERTIES="live"
SRC_URI=""
KEYWORDS="";;
diff --git a/app-shells/oh-my-zsh/ChangeLog b/app-shells/oh-my-zsh/ChangeLog
index 3e774380..bcfb2d26 100644
--- a/app-shells/oh-my-zsh/ChangeLog
+++ b/app-shells/oh-my-zsh/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 14 Sep 2013; Martin Väth <martin@mvath.de>:
+ Bump to git-r3.eclass
+
14 Aug 2013; Martin Väth <martin@mvath.de>:
Simplify EPREFIX (without revision bump)
diff --git a/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild b/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild
index 9b906190..4103b9e1 100644
--- a/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild
+++ b/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild
@@ -5,8 +5,7 @@
EAPI=5
EGIT_REPO_URI="git://github.com/robbyrussell/${PN}.git"
-[ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true
-inherit eutils git-2
+inherit eutils git-r3
DESCRIPTION="A ready-to-use zsh configuration with plugins"
HOMEPAGE="https://github.com/robbyrussell/oh-my-zsh"
diff --git a/app-shells/zsh-completion/ChangeLog b/app-shells/zsh-completion/ChangeLog
index cef4425d..042b122f 100644
--- a/app-shells/zsh-completion/ChangeLog
+++ b/app-shells/zsh-completion/ChangeLog
@@ -4,6 +4,9 @@
*zsh-completion-20130808.ebuild (09 Aug 2013)
+ 14 Sep 2013; Martin Väth <martin@mvath.de>:
+ Bump to git-r3.eclass
+
09 Aug 2013; Martin Väth <martin@mvath.de>:
Bump version. Remove old ebuild. Add new completion files to USE
diff --git a/app-shells/zsh-completion/zsh-completion-99999999.ebuild b/app-shells/zsh-completion/zsh-completion-99999999.ebuild
index 19fe5c6e..0a7532c5 100644
--- a/app-shells/zsh-completion/zsh-completion-99999999.ebuild
+++ b/app-shells/zsh-completion/zsh-completion-99999999.ebuild
@@ -9,9 +9,7 @@ PNn="${PN}s"
case ${PV} in
99999999*)
EGIT_REPO_URI="git://github.com/zsh-users/${PNn}.git"
- EGIT_PROJECT="${PN}.git"
- [ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true
- inherit git-2
+ inherit git-r3
PROPERTIES="live"
SRC_URI=""
KEYWORDS="";;
diff --git a/app-shells/zsh-syntax-highlighting/ChangeLog b/app-shells/zsh-syntax-highlighting/ChangeLog
index a299bd06..5fa5ebb7 100644
--- a/app-shells/zsh-syntax-highlighting/ChangeLog
+++ b/app-shells/zsh-syntax-highlighting/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*zsh-syntax-highlighting-0.2.0, -99999999 (14 Sep 2013)
+
+ 14 Sep 2013; Martin Väth <martin@mvath.de>:
+ Rename back. Bump to git-r3.eclass
+
*zsh-syntax-highlighting-0.2.0-r1 (10 Aug 2013)
10 Aug 2013; Martin Väth <martin@mvath.de>:
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.2.0-r1.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.2.0-r1.ebuild
deleted file mode 120000
index c2b56b38..00000000
--- a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.2.0-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-zsh-syntax-highlighting-99999999-r1.ebuild \ No newline at end of file
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.2.0.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.2.0.ebuild
new file mode 120000
index 00000000..54239a6c
--- /dev/null
+++ b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.2.0.ebuild
@@ -0,0 +1 @@
+zsh-syntax-highlighting-99999999.ebuild \ No newline at end of file
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999-r1.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild
index bcd68aea..1f1f434b 100644
--- a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999-r1.ebuild
+++ b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild
@@ -9,8 +9,7 @@ inherit eutils
case ${PV} in
99999999*)
EGIT_REPO_URI="git://github.com/zsh-users/${PN}.git"
- [ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true
- inherit git-2
+ inherit git-r3
PROPERTIES="live"
SRC_URI=""
KEYWORDS="";;
diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 5f203188..0f821aea 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -4,6 +4,9 @@
*zsh-99999999 (29 May 2013)
+ 14 Sep 2013; Martin Väth <martin@mvath.de>:
+ Bump to git-r3.eclass
+
11 Aug 2013; Martin Väth <martin@mvath.de>:
app-doc/yodl -> app-text/yodl which is in gentoo tree meanwhile
diff --git a/app-shells/zsh/zsh-99999999.ebuild b/app-shells/zsh/zsh-99999999.ebuild
index 2617f656..a0b47bca 100644
--- a/app-shells/zsh/zsh-99999999.ebuild
+++ b/app-shells/zsh/zsh-99999999.ebuild
@@ -33,9 +33,7 @@ HOMEPAGE="http://www.zsh.org/"
case ${PV} in
9999*)
EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
- EGIT_PROJECT="${PN}"
- [ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true
- inherit git-2
+ inherit git-r3
WANT_LIBTOOL="none"
inherit autotools
KEYWORDS=""
diff --git a/dev-util/ccache/ChangeLog b/dev-util/ccache/ChangeLog
index 3a72f5b2..8fb51920 100644
--- a/dev-util/ccache/ChangeLog
+++ b/dev-util/ccache/ChangeLog
@@ -2,8 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 14 Sep 2013; Martin Väth <martin@mvath.de>:
+ Bump to git-r3.eclass
+
24 Aug 2013; Martin Väth <martin@mvath.de>:
- Convert to git-2
+ Bump to git-2.eclass
13 Jul 2013; Martin Väth <martin@mvath.de>:
Add live ebuild. Remove previous history
diff --git a/dev-util/ccache/ccache-99999999.ebuild b/dev-util/ccache/ccache-99999999.ebuild
index 096934c9..3581944e 100644
--- a/dev-util/ccache/ccache-99999999.ebuild
+++ b/dev-util/ccache/ccache-99999999.ebuild
@@ -6,8 +6,7 @@ EAPI=5
WANT_LIBTOOL=none
EGIT_REPO_URI="git://git.samba.org/ccache.git"
-[ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true
-inherit autotools eutils git-2 multilib
+inherit autotools eutils git-r3 multilib
DESCRIPTION="fast compiler cache"
HOMEPAGE="http://ccache.samba.org/"
diff --git a/sci-mathematics/genius/ChangeLog b/sci-mathematics/genius/ChangeLog
index 1115c86c..f890cf70 100644
--- a/sci-mathematics/genius/ChangeLog
+++ b/sci-mathematics/genius/ChangeLog
@@ -2,5 +2,8 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 14 Sep 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
31 May 2013; Martin Väth <martin@mvath.de>:
Copy from tree to make gnome-doc-utils optional. Clean old ChangeLog.
diff --git a/sci-mathematics/genius/Manifest b/sci-mathematics/genius/Manifest
index d3d38129..e1b78a20 100644
--- a/sci-mathematics/genius/Manifest
+++ b/sci-mathematics/genius/Manifest
@@ -1,2 +1,2 @@
-DIST genius-1.0.16.tar.xz 2254836 SHA256 45ce3e0b02c109588ff9a4c74e7c3541b3de89ea93f20ab08178c51c6ab4fb78 SHA512 130528fb92acb7829444086b0614368ca781838e97da6691d63d16652f8f7cdff2a171200f17331667395122f939be8f82cc9b2595717249edaa622e40a7ba28 WHIRLPOOL 1ec1d2e714b4e08419f86ccedbbba89fc5b5f220238bf3ae4fd12ab9b64249716d7ca087700d4707f6c597b8d08ececf12fff013410934abd4470ee88f104c3b
+DIST genius-1.0.17.tar.xz 2314316 SHA256 2af0cf64a3bae45e8e6c38ce8c0c0724386ae29614a83d9eff179ee09ecef44f SHA512 8047efb1b5d278186b093bca3624f96059670ce3cdf757759abf6e01a27bb4bba82a4158e6baa3b42f349a55fdf6e984388fb7f96f14b0e4faba0ada069e9b6c WHIRLPOOL bb6ba7bb5c635f331e523887e5f5995e83392f58046893ae2bebc56fcaa26f817c8ddd481663fa5818377d721911c430dbd50dd8ab24a07e9dd5c4ad6fcf77bd
DIST genius-reference.pdf 1024944 SHA256 79011ae33ff781507185898ba76b156699061eda78ed16e15aa02195c896ee4b SHA512 04af3870104d2320b1d4b345d74d713a0dfcdf8a228002506508f437659b3ef6037ead0b1f6b37cc335692150750b58c4007fdaaddd9540233474ccd10dac285 WHIRLPOOL 301302145d43843ddd749ab33612438d360462c9d3daa12d7050d9ca6da82bdea3ef53b917989d0c518327780b147a9f74e407f555a62dcdbe0f0c2ef864fa88
diff --git a/sci-mathematics/genius/genius-1.0.16.ebuild b/sci-mathematics/genius/genius-1.0.17.ebuild
index 3cef4197..6de40644 100644
--- a/sci-mathematics/genius/genius-1.0.16.ebuild
+++ b/sci-mathematics/genius/genius-1.0.17.ebuild
@@ -1,18 +1,20 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/genius/genius-1.0.16.ebuild,v 1.2 2013/01/02 08:35:45 grozin Exp $
+# $Header: $
EAPI=4
inherit autotools eutils gnome2
DESCRIPTION="Genius Mathematics Tool and the GEL Language"
HOMEPAGE="http://www.jirka.org/genius.html"
+SRC_URI="
+ http://ftp.gnome.org/pub/GNOME/sources/${PN}/1.0/${P}.tar.xz
+ doc? ( http://www.jirka.org/${PN}-reference.pdf )"
+
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc gnome nls"
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/${PN}/1.0/${P}.tar.xz
- doc? ( http://www.jirka.org/${PN}-reference.pdf )"
RDEPEND="
dev-libs/glib:2
@@ -37,15 +39,6 @@ DEPEND="${RDEPEND}
sys-devel/flex
nls? ( sys-devel/gettext )"
-G2CONF="${G2CONF} $(use_enable gnome) $(use_enable nls) \
- --disable-update-mimedb --disable-scrollkeeper \
- --disable-extra-gcc-optimization"
-# gnome2.eclass adds --disable-gtk-doc or --enable-gtk-doc to G2CONF
-# if there is the USE flag doc, thus leading to QA warnings
-GCONF_DEBUG="no"
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-USE_DESTDIR="1"
-
src_prepare() {
if ! use gnome
then sed -i \
@@ -56,13 +49,18 @@ src_prepare() {
help/Makefile.am
eautoreconf
fi
+ G2CONF="${G2CONF} $(use_enable gnome) $(use_enable nls) \
+ --disable-update-mimedb --disable-scrollkeeper \
+ --disable-extra-gcc-optimization"
+ # gnome2.eclass adds --disable-gtk-doc or --enable-gtk-doc to G2CONF
+ # if there is the USE flag doc, thus leading to QA warnings
+ GCONF_DEBUG="no"
+ DOCS="AUTHORS ChangeLog NEWS README TODO"
+ USE_DESTDIR="1"
gnome2_src_prepare
}
src_install() {
+ use doc && DOCS+=" ${DISTDIR}/${PN}-reference.pdf"
gnome2_src_install
- if use doc; then
- insinto /usr/share/doc/${PF}
- doins "${DISTDIR}"/${PN}-reference.pdf
- fi
}
diff --git a/sys-fs/aufs-util/ChangeLog b/sys-fs/aufs-util/ChangeLog
index cb612266..8905df36 100644
--- a/sys-fs/aufs-util/ChangeLog
+++ b/sys-fs/aufs-util/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 14 Sep 2013; Martin Väth <martin@mvath.de>:
+ Bump to git-r3.eclass. Remove support for aufs2
+
21 Sep 2012; Martin Väth <martin@mvath.de>:
Bump to EAPI=5. Bump revision to force correct subslot.
include linux/compiler.h to fix compilation issues.
diff --git a/sys-fs/aufs-util/aufs-util-99999999.2-r1.ebuild b/sys-fs/aufs-util/aufs-util-99999999.2-r1.ebuild
deleted file mode 100644
index bf051be4..00000000
--- a/sys-fs/aufs-util/aufs-util-99999999.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-EGIT_REPO_URI="http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-util.git"
-EGIT_BRANCH="aufs2.1"
-EGIT_COMMIT=${EGIT_BRANCH}
-EGIT_HAS_SUBMODULES=true
-[ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true
-inherit eutils git-2 linux-info multilib
-
-DESCRIPTION="Userspace tools for aufs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0/2"
-# Since this is a live ebuild, we require ACCEPT_KEYWORDS='**'
-#KEYWORDS="~amd64 ~x86"
-KEYWORDS=""
-IUSE=""
-PROPERTIES="live"
-
-RDEPEND=""
-DEPEND="dev-vcs/git[curl]"
-
-src_prepare() {
- local i l
- ln -s "${KERNEL_DIR}"/include local_kernel
- set -- local_kernel/linux/aufs*.h
- test -e "${1}" || {
- eerror "It seems you do not have installed aufs into your kernel tree."
- die "You might need to emerge >=sys-fs/aufs-99999999::mv"
- }
- l="s|/usr/lib|$(get_libdir)|"
- sed -i -e "1iCFLAGS += -I./local_kernel" -e "${l}" Makefile || \
- die "Patching Makefile failed"
- for i in lib*/Makefile
- do test -e "${i}" || continue
- sed -i -e "1iCFLAGS += -I../local_kernel" -e "${l}" "${i}" || \
- die "Patching ${i} failed"
- done
- epatch_user
-}
diff --git a/sys-fs/aufs-util/aufs-util-99999999.3-r1.ebuild b/sys-fs/aufs-util/aufs-util-99999999.ebuild
index d3a5cc68..d4d4311f 100644
--- a/sys-fs/aufs-util/aufs-util-99999999.3-r1.ebuild
+++ b/sys-fs/aufs-util/aufs-util-99999999.ebuild
@@ -4,18 +4,15 @@
EAPI=5
EGIT_REPO_URI="git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git"
-EGIT_BRANCH="aufs3.0"
-EGIT_COMMIT=${EGIT_BRANCH}
-EGIT_HAS_SUBMODULES=true
-[ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true
-inherit eutils git-2 linux-info multilib
+EGIT_BRANCH="aufs3.9"
+inherit eutils git-r3 linux-info multilib
DESCRIPTION="Userspace tools for aufs"
HOMEPAGE="http://aufs.sourceforge.net/"
SRC_URI=""
LICENSE="GPL-2"
-SLOT="0/3"
+SLOT="0/3.9"
# Since this is a live ebuild, we require ACCEPT_KEYWORDS='**'
#KEYWORDS="~amd64 ~x86"
KEYWORDS=""
diff --git a/sys-fs/aufs/ChangeLog b/sys-fs/aufs/ChangeLog
index 130e90da..dbe34254 100644
--- a/sys-fs/aufs/ChangeLog
+++ b/sys-fs/aufs/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 14 Sep 2013; Martin Väth <martin@mvath.de>:
+ Bump to git-r3.eclass. Remove support for aufs2
+
17 Dec 2012; Martin Väth <martin@mvath.de>:
Add patch for hardened-sources-3.7.0. Improve documentation.
Special case of kernel-3.7 branch name.
diff --git a/sys-fs/aufs/aufs-99999999.2-r1.ebuild b/sys-fs/aufs/aufs-99999999.2-r1.ebuild
deleted file mode 100644
index 412abd23..00000000
--- a/sys-fs/aufs/aufs-99999999.2-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-EGIT_REPO_URI="http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git"
-EGIT_PROJECT="aufs2.git"
-# BRANCH/COMMIT will be overridden in pkg_setup (according to kernel version)
-EGIT_BRANCH="aufs2.2"
-EGIT_COMMIT=${EGIT_BRANCH}
-EGIT_HAS_SUBMODULES=true
-[ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true
-inherit eutils git-2 linux-info
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0/2"
-# Since this is a live ebuild with unstable versions in portage we require
-# that the user unmasks this ebuild with ACCEPT_KEYWORDS='**'
-#KEYWORDS="~amd64 ~x86"
-KEYWORDS=""
-IUSE="kernel-patch all-patches"
-PROPERTIES="live"
-
-RDEPEND="!sys-fs/aufs2
- !sys-fs/aufs3"
-DEPEND="dev-vcs/git[curl]"
-
-declare -a my_patchlist
-
-fill_my_patchlist() {
- local i
- my_patchlist=()
- for i
- do case ${i} in
- *.patch|*.diff)
- ! test -f "${i}" || my_patchlist+=("${i}");;
- esac
- done
-}
-
-apply_my_patch() {
- local r
- r=
- if [ ${#} -gt 1 ]
- then shift
- r='-R'
- fi
- patch ${r} -p1 --dry-run --force <"${1}" >/dev/null || return
- einfo "Applying kernel patch ${1}${r:+ reversely}"
- patch ${r} -p1 --force --no-backup-if-mismatch <"${1}" >/dev/null || {
- eerror "applying kernel patch ${1}${r:+ reversely} failed."
- eerror "Since dry run succeeded this is probably a problem with write permissions."
- die "With USE=-kernel-patch you avoid automatic patching attempts."
- }
-}
-
-apply_my_patchlist() {
- local r i
- r=
- if [ ${#} -gt 0 ]
- then shift
- r='-R'
- fi
- set --
- for i in "${my_patchlist[@]}"
- do if use all-patches || case ${i} in
- aufs*)
- :;;
- *)
- false;;
- esac
- then apply_my_patch ${r} "${i}" || set -- "${@}" "${i}"
- else einfo "Kernel patch ${i} - skipping as all-patches is not set"
- fi
- done
- for i
- do apply_my_patch ${r} "${i}" || \
- ewarn "Kernel patch ${i} cannot be${r:+ reverse} applied - skipping."
- done
-}
-
-pkg_setup() {
- local msg
- linux-info_pkg_setup
-
- # kernel version check
- if kernel_is lt 2 6 26
- then
- eerror "${PN} is being developed and tested on linux-2.6.26 and later."
- eerror "Make sure you have a proper kernel version!"
- die "Wrong kernel version"
- fi
-
- if [ -n "${AUFSBRANCH}" ]
- then EGIT_BRANCH="${AUFSBRANCH}"
- else if kernel_is lt 3 0
- then [ -n "${KV_PATCH}" ] && EGIT_BRANCH="aufs2.2-${KV_PATCH}"
- else [ -n "${KV_MINOR}" ] && EGIT_BRANCH="aufs2.2-${KV_MAJOR}.${KV_MINOR}"
- fi
- fi
- elog
- elog "Using aufs branch: ${EGIT_BRANCH}"
- elog "If this guess for the branch is wrong, set AUFSBRANCH."
- elog "For example, to use the aufs2.2 branch for kernel version 3.0, use:"
- elog " AUFSBRANCH=aufs2.2-3.0 emerge -1 aufs"
- elog "To use the aufs2.1 branch for kernel version 2.6.39 use:"
- elog " AUFSBRANCH=aufs2.1-39 emerge -1 aufs"
- msg=
- if [ -n "${msg}" ]
- then
- elog "Note that it might be necessary in addition to fetch the newest aufs:"
- elog "Set ${msg# } and be sure to be online during emerge."
- fi
- elog
- EGIT_COMMIT=${EGIT_BRANCH}
-
- use kernel-patch || return 0
- (
- set --
- cd -- "${KV_DIR}" >/dev/null 2>&1 && \
- fill_my_patchlist *.patch *.diff && apply_my_patchlist -R
- )
-}
-
-src_prepare() {
- local i j w v newest all
- epatch_user
- all="2.9.1 2.2.0 2.2.1 2.2.2 2.2.2.r1"
- newest=${all##* }
- v=
- for i in ${GRSECURITYPATCHVER-+}
- do case ${i} in
- '+')
- j=${newest};;
- '*')
- j=${all};;
- *)
- w=:
- for j in ${all}
- do [ "${i}" = "${j}" ] && w=false && continue
- done
- if ${w}
- then warn "GRSECURITYPATCHVER contains bad version ${i}"
- else j=${i}
- fi;;
- esac
- v="${v} ${j}"
- done
- v=${v# }
- elog
- elog "Using GRSECURITYPATCHVER: ${v}"
- elog "If you want other patches, set GRSECURITYPATCHVER to some or more of:"
- elog "${all} +"
- elog "The special value + means the newest version (${newest}) and is default."
- elog "The special value * means all versions."
- elog
- for i in ${v}
- do j="grsecurity-${i}.patch"
- cp -p -- "${FILESDIR}/${j}" "aufs-${j}" || die "copying ${j} failed"
- done
-}
-
-src_configure() {
- :
-}
-
-src_compile() {
- :
-}
-
-src_install() {
- local i k dk
- i="Documentation/filesystems/aufs/aufs.5"
- test -e "${i}" && doman "${i}"
- k="$(readlink -f -- "${KV_DIR}")" && [ -n "${k}" ] || k="${KV_DIR}"
- dk="${D}/${k}"
- dodir "${k}/fs/aufs"
- cp -pPR -- fs/aufs/* "${dk}/fs/aufs"
- cp -pPR -- include "${dk}"
- find "${dk}"/include -name Kbuild -type f -exec rm -v -- '{}' ';'
- fill_my_patchlist *.patch *.diff
- cp -pPR -- "${my_patchlist[@]}" "${dk}"
-}
-
-pkg_postinst() {
- [ "${#my_patchlist[@]}" -eq 0 ] && {
- cd -- "${KV_DIR}" >/dev/null 2>&1 && fill_my_patchlist *.patch *.diff
- }
- if use kernel-patch
- then cd -- "${KV_DIR}" >/dev/null 2>&1 || die "cannot cd to ${KV_DIR}"
- apply_my_patchlist
- elog "Your kernel has been patched. Cleanup and recompile it, selecting"
- else elog "You will have to apply the following patch to your kernel:"
- elog " cd ${KV_DIR} && cat ${my_patchlist[*]} | patch -p1 --no-backup-if-mismatch"
- elog "Then cleanup and recompile your kernel, selecting"
- fi
- elog " Filesystems/Miscellaneous Filesystems/aufs"
- elog "in the configuration phase."
-}
diff --git a/sys-fs/aufs/aufs-99999999.3-r2.ebuild b/sys-fs/aufs/aufs-99999999.ebuild
index 53c42263..cc1f31cc 100644
--- a/sys-fs/aufs/aufs-99999999.3-r2.ebuild
+++ b/sys-fs/aufs/aufs-99999999.ebuild
@@ -4,13 +4,8 @@
EAPI=5
EGIT_REPO_URI="git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git"
-EGIT_PROJECT="aufs3.git"
-# BRANCH/COMMIT will be overridden in pkg_setup (according to kernel version)
EGIT_BRANCH="aufs3.0"
-EGIT_COMMIT=${EGIT_BRANCH}
-EGIT_HAS_SUBMODULES=true
-[ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true
-inherit eutils git-2 linux-info
+inherit eutils git-r3 linux-info
DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
HOMEPAGE="http://aufs.sourceforge.net/"
@@ -119,7 +114,6 @@ pkg_setup() {
elog "Set EVCS_OFFLINE='' in the environment and be online during emerge."
fi
elog
- EGIT_COMMIT=${EGIT_BRANCH}
use kernel-patch || return 0
(