Update HOMEPAGE. Merge changes from Portage tree.

Package-Manager: portage-2.1.13.7

6 files changed, 28 insertions, 31 deletions

diff --git a/app-admin/emacs-updater/ChangeLog b/app-admin/emacs-updater/ChangeLog
index 640322c..b4cd78c 100644
--- a/app-admin/emacs-updater/ChangeLog
+++ b/app-admin/emacs-updater/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for app-admin/emacs-updater
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-updater-9999.ebuild:
+  Update HOMEPAGE. Merge changes from Portage tree.
+
   08 Oct 2012; Ulrich Müller <ulm@gentoo.org> emacs-updater-9999.ebuild:
   Update version of portage-utils dependency. Specify LICENSE more precisely.
 
diff --git a/app-admin/emacs-updater/emacs-updater-9999.ebuild b/app-admin/emacs-updater/emacs-updater-9999.ebuild
index 20c51f4..d4425f8 100644
--- a/app-admin/emacs-updater/emacs-updater-9999.ebuild
+++ b/app-admin/emacs-updater/emacs-updater-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/emacs-tools.git"
 EGIT_BRANCH="${PN}"
@@ -10,22 +10,19 @@ EGIT_BRANCH="${PN}"
 inherit git-2
 
 DESCRIPTION="Rebuild Emacs packages"
-HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
-#SRC_URI="mirror://gentoo/${P}.tar.bz2"
-SRC_URI=""
+HOMEPAGE="http://wiki.gentoo.org/wiki/Project:Emacs"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
-RDEPEND="!<=app-admin/eselect-emacs-1.5
-	>=app-portage/portage-utils-0.3
+RDEPEND=">=app-portage/portage-utils-0.3
 	virtual/emacs"
 
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
-	if [ -n "${EPREFIX}" ]; then
+	if [[ -n ${EPREFIX} ]]; then
 		sed -i -e "1s:/:${EPREFIX%/}/:" \
 			-e "s:^\(EMACS\|SITELISP\)=:&${EPREFIX%/}:" \
 			emacs-updater || die
diff --git a/app-admin/eselect-ctags/ChangeLog b/app-admin/eselect-ctags/ChangeLog
index 16c4f0a..5c60d4f 100644
--- a/app-admin/eselect-ctags/ChangeLog
+++ b/app-admin/eselect-ctags/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for app-admin/eselect-ctags
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Aug 2013; Ulrich Müller <ulm@gentoo.org> eselect-ctags-9999.ebuild:
+  Update HOMEPAGE. Merge changes from Portage tree.
+
   09 Jun 2012; Ulrich Müller <ulm@gentoo.org> eselect-ctags-9999.ebuild:
   Change live ebuild to use Git. Update to EAPI 4.
 
diff --git a/app-admin/eselect-ctags/eselect-ctags-9999.ebuild b/app-admin/eselect-ctags/eselect-ctags-9999.ebuild
index 400db15..f5fdbad 100644
--- a/app-admin/eselect-ctags/eselect-ctags-9999.ebuild
+++ b/app-admin/eselect-ctags/eselect-ctags-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 MY_PN="eselect-emacs"
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/emacs-tools.git"
@@ -11,18 +11,13 @@ EGIT_BRANCH="${MY_PN}"
 inherit git-2
 
 DESCRIPTION="Manages ctags implementations"
-HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
-#SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-SRC_URI=""
+HOMEPAGE="http://wiki.gentoo.org/wiki/Project:Emacs"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
-DEPEND=""
-RDEPEND=">=app-admin/eselect-1.2.3
-	!<=app-admin/eselect-emacs-1.3"
+RDEPEND=">=app-admin/eselect-1.2.3"
 
 S="${WORKDIR}/${MY_PN}"
 
@@ -30,6 +25,6 @@ src_compile() { :; }
 
 src_install() {
 	insinto /usr/share/eselect/modules
-	doins ctags.eselect || die
-	doman ctags.eselect.5 || die
+	doins ctags.eselect
+	doman ctags.eselect.5
 }
diff --git a/app-admin/eselect-emacs/ChangeLog b/app-admin/eselect-emacs/ChangeLog
index 77e9073..178a1a7 100644
--- a/app-admin/eselect-emacs/ChangeLog
+++ b/app-admin/eselect-emacs/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for app-admin/eselect-emacs
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Aug 2013; Ulrich Müller <ulm@gentoo.org> eselect-emacs-9999-r1.ebuild:
+  Update HOMEPAGE. Merge changes from Portage tree.
+
   09 Jun 2012; Ulrich Müller <ulm@gentoo.org> eselect-emacs-9999-r1.ebuild:
   Change live ebuild to use Git. Update to EAPI 4.
 
diff --git a/app-admin/eselect-emacs/eselect-emacs-9999-r1.ebuild b/app-admin/eselect-emacs/eselect-emacs-9999-r1.ebuild
index fe31ab9..17546e4 100644
--- a/app-admin/eselect-emacs/eselect-emacs-9999-r1.ebuild
+++ b/app-admin/eselect-emacs/eselect-emacs-9999-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/emacs-tools.git"
 EGIT_BRANCH="${PN}"
@@ -10,16 +10,12 @@ EGIT_BRANCH="${PN}"
 inherit git-2
 
 DESCRIPTION="Manage multiple Emacs versions on one system"
-HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
-#SRC_URI="mirror://gentoo/${P}.tar.bz2"
-SRC_URI=""
+HOMEPAGE="http://wiki.gentoo.org/wiki/Project:Emacs"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
 
-DEPEND=""
 RDEPEND=">=app-admin/eselect-1.2.6
 	~app-admin/eselect-ctags-${PV}"