[gentoo-commits] repo/proj/emacs:master commit in: app-emacs/emacs-common-gentoo/, eclass/, app-emacs/emacs-common/, ...
commit: cc28548cb6bcb21b57a207f4f9e69e48b41fccd9
Author: Ulrich Müller gentoo org>
AuthorDate: Mon Mar 22 08:56:58 2021 +
Commit: Ulrich Müller gentoo org>
CommitDate: Mon Mar 22 08:56:58 2021 +
URL:https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=cc28548c
app-emacs/emacs-common: Renamed from app-emacs/emacs-common-gentoo
Signed-off-by: Ulrich Müller gentoo.org>
app-editors/emacs/emacs-24.3-r8.ebuild| 4 ++--
.../emacs-common-.ebuild} | 2 +-
app-emacs/{emacs-common-gentoo => emacs-common}/metadata.xml | 0
eclass/elisp-common.eclass| 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app-editors/emacs/emacs-24.3-r8.ebuild
b/app-editors/emacs/emacs-24.3-r8.ebuild
index 2210ead..c61d069 100644
--- a/app-editors/emacs/emacs-24.3-r8.ebuild
+++ b/app-editors/emacs/emacs-24.3-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ SLOT="24.3"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="alsa aqua athena dbus gconf gif gpm gsettings gtk gtk2 gui gzip-el
imagemagick jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound
source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm"
-RDEPEND="app-emacs/emacs-common-gentoo[gui(-)?]
+RDEPEND="app-emacs/emacs-common[gui(-)?]
net-libs/liblockfile
sys-libs/ncurses:0=
alsa? ( media-libs/alsa-lib )
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
b/app-emacs/emacs-common/emacs-common-.ebuild
similarity index 99%
rename from app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
rename to app-emacs/emacs-common/emacs-common-.ebuild
index 1824157..bb0b926 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
+++ b/app-emacs/emacs-common/emacs-common-.ebuild
@@ -4,7 +4,7 @@
EAPI=7
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/emacs-tools.git";
-EGIT_BRANCH="emacs-common"
+EGIT_BRANCH="${PN}"
EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
inherit elisp-common desktop xdg-utils readme.gentoo-r1 git-r3
diff --git a/app-emacs/emacs-common-gentoo/metadata.xml
b/app-emacs/emacs-common/metadata.xml
similarity index 100%
rename from app-emacs/emacs-common-gentoo/metadata.xml
rename to app-emacs/emacs-common/metadata.xml
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index 66a3a32..ac5fc20 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: elisp-common.eclass
@@ -492,7 +492,7 @@ elisp-site-regen() {
mv "${T}"/site-gentoo.el "${sitelisp}"/site-gentoo.el
eend $? "elisp-site-regen: Replacing site-gentoo.el failed" ||
die
case ${#sflist[@]} in
- 0) [[ ${PN} = emacs-common-gentoo ]] \
+ 0) [[ ${PN} = emacs-common ]] \
|| ewarn "... Huh? No site initialisation files
found." ;;
1) einfo "... ${#sflist[@]} site initialisation file
included." ;;
*) einfo "... ${#sflist[@]} site initialisation files
included." ;;
[gentoo-commits] repo/proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
commit: bd62b1045990d966301c55fb1294382bb2ba085f
Author: Ulrich Müller gentoo org>
AuthorDate: Mon Mar 15 07:59:57 2021 +
Commit: Ulrich Müller gentoo org>
CommitDate: Mon Mar 15 07:59:57 2021 +
URL:https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=bd62b104
app-emacs/emacs-common-gentoo: "Upstream" branch has been renamed
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Ulrich Müller gentoo.org>
app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
index bb0b926..1824157 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
@@ -4,7 +4,7 @@
EAPI=7
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/emacs-tools.git";
-EGIT_BRANCH="${PN}"
+EGIT_BRANCH="emacs-common"
EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
inherit elisp-common desktop xdg-utils readme.gentoo-r1 git-r3
[gentoo-commits] repo/proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
commit: cf1950293a5930e71d029a046c00baef74c881c7
Author: Ulrich Müller gentoo org>
AuthorDate: Thu Feb 25 22:10:46 2021 +
Commit: Ulrich Müller gentoo org>
CommitDate: Thu Feb 25 22:10:46 2021 +
URL:https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=cf195029
app-emacs/emacs-common-gentoo: Sync from gentoo repository
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Ulrich Müller gentoo.org>
app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
index a40b672..bb0b926 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -24,7 +24,8 @@ S="${WORKDIR}/${PN}"
src_install() {
insinto "${SITELISP}"
- doins subdirs.el
+ sed -e "s:@libdir@:$(get_libdir):g" subdirs.el.in | newins - subdirs.el
+ assert
newins site-gentoo.el{,.orig}
keepdir /etc/emacs
[gentoo-commits] repo/proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
commit: d5f63a9dcfedab80f66ac30d839f1fd712417719
Author: Ulrich Müller gentoo org>
AuthorDate: Sat Aug 29 15:38:25 2020 +
Commit: Ulrich Müller gentoo org>
CommitDate: Sat Aug 29 15:38:25 2020 +
URL:https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=d5f63a9d
app-emacs/emacs-common-gentoo: Sync from gentoo repository.
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Ulrich Müller gentoo.org>
app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
index 8b159f4..a40b672 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs";
LICENSE="GPL-3+"
SLOT="0"
-IUSE="games X"
+IUSE="games gui"
RDEPEND="games? ( acct-group/gamestat )"
DEPEND="${RDEPEND}"
@@ -37,7 +37,7 @@ src_install() {
fperms g+w /var/games/emacs
fi
- if use X; then
+ if use gui; then
local i
domenu emacs.desktop emacsclient.desktop
@@ -91,7 +91,7 @@ pkg_preinst() {
}
pkg_postinst() {
- if use X; then
+ if use gui; then
xdg_desktop_database_update
xdg_icon_cache_update
fi
@@ -99,7 +99,7 @@ pkg_postinst() {
}
pkg_postrm() {
- if use X; then
+ if use gui; then
xdg_desktop_database_update
xdg_icon_cache_update
fi
[gentoo-commits] repo/proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
commit: 9b4c7fe86a3f931f7fb8f3371e5dd7976aa0c2bb
Author: Ulrich Müller gentoo org>
AuthorDate: Sat Dec 21 18:27:06 2019 +
Commit: Ulrich Müller gentoo org>
CommitDate: Sat Dec 21 18:27:06 2019 +
URL:https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=9b4c7fe8
app-emacs/emacs-common-gentoo: Sync from gentoo repo.
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Ulrich Müller gentoo.org>
.../emacs-common-gentoo/emacs-common-gentoo-.ebuild | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
index d347806..8b159f4 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
@@ -7,7 +7,7 @@
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/emacs-tools.git";
EGIT_BRANCH="${PN}"
EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
-inherit elisp-common desktop xdg-utils gnome2-utils readme.gentoo-r1 git-r3
+inherit elisp-common desktop xdg-utils readme.gentoo-r1 git-r3
DESCRIPTION="Common files needed by all GNU Emacs versions"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs";
@@ -18,7 +18,7 @@ IUSE="games X"
RDEPEND="games? ( acct-group/gamestat )"
DEPEND="${RDEPEND}"
-PDEPEND="virtual/emacs"
+PDEPEND=">=app-editors/emacs-23.1:*"
S="${WORKDIR}/${PN}"
@@ -39,7 +39,7 @@ src_install() {
if use X; then
local i
- domenu emacs.desktop emacsclient.desktop || die
+ domenu emacs.desktop emacsclient.desktop
pushd icons || die
newicon sink.png emacs-sink.png
@@ -52,8 +52,6 @@ src_install() {
doicon -s scalable emacs23.svg
newicon -s scalable emacs25.svg emacs.svg
popd
-
- gnome2_icon_savelist
fi
DOC_CONTENTS="All site initialisation for Gentoo-installed packages is
@@ -95,7 +93,7 @@ pkg_preinst() {
pkg_postinst() {
if use X; then
xdg_desktop_database_update
- gnome2_icon_cache_update
+ xdg_icon_cache_update
fi
readme.gentoo_print_elog
}
@@ -103,6 +101,6 @@ pkg_postinst() {
pkg_postrm() {
if use X; then
xdg_desktop_database_update
- gnome2_icon_cache_update
+ xdg_icon_cache_update
fi
}
[gentoo-commits] repo/proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
commit: 7e003b58a6657622b55c538e1e41916b3b2525d3
Author: Ulrich Müller gentoo org>
AuthorDate: Sat Aug 17 19:17:38 2019 +
Commit: Ulrich Müller gentoo org>
CommitDate: Sat Aug 17 19:17:38 2019 +
URL:https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=7e003b58
app-emacs/emacs-common-gentoo: Sync from gentoo repo.
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Ulrich Müller gentoo.org>
.../emacs-common-gentoo/emacs-common-gentoo-.ebuild | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
index e82e203..d347806 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/emacs-tools.git";
EGIT_BRANCH="${PN}"
EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
-inherit elisp-common desktop xdg-utils gnome2-utils readme.gentoo-r1 user
git-r3
+inherit elisp-common desktop xdg-utils gnome2-utils readme.gentoo-r1 git-r3
DESCRIPTION="Common files needed by all GNU Emacs versions"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs";
@@ -16,14 +16,12 @@ LICENSE="GPL-3+"
SLOT="0"
IUSE="games X"
+RDEPEND="games? ( acct-group/gamestat )"
+DEPEND="${RDEPEND}"
PDEPEND="virtual/emacs"
S="${WORKDIR}/${PN}"
-pkg_setup() {
- use games && enewgroup gamestat 36
-}
-
src_install() {
insinto "${SITELISP}"
doins subdirs.el
[gentoo-commits] repo/proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
commit: 5c41636d7caf6727155dcd25a5296c1c1f2d0dfb
Author: Ulrich Müller gentoo org>
AuthorDate: Mon Apr 2 17:44:00 2018 +
Commit: Ulrich Müller gentoo org>
CommitDate: Mon Apr 2 17:44:00 2018 +
URL:https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=5c41636d
app-emacs/emacs-common-gentoo: Sync from gentoo repo.
Package-Manager: Portage-2.3.27, Repoman-2.3.9
app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
index b7cc248..e82e203 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
@@ -7,7 +7,7 @@
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/emacs-tools.git";
EGIT_BRANCH="${PN}"
EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
-inherit elisp-common eutils xdg-utils gnome2-utils readme.gentoo-r1 user git-r3
+inherit elisp-common desktop xdg-utils gnome2-utils readme.gentoo-r1 user
git-r3
DESCRIPTION="Common files needed by all GNU Emacs versions"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs";
[gentoo-commits] repo/proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
commit: 6aaa75beef369b79a029bd0bfda080015061f16e
Author: Ulrich Müller gentoo org>
AuthorDate: Mon Feb 19 17:13:26 2018 +
Commit: Ulrich Müller gentoo org>
CommitDate: Mon Feb 19 17:13:26 2018 +
URL:https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=6aaa75be
app-emacs/emacs-common-gentoo: Sync from gentoo repo.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
index 33bd445..b7cc248 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/emacs-tools.git";
EGIT_BRANCH="${PN}"
EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
-inherit elisp-common eutils fdo-mime gnome2-utils readme.gentoo-r1 user git-r3
+inherit elisp-common eutils xdg-utils gnome2-utils readme.gentoo-r1 user git-r3
DESCRIPTION="Common files needed by all GNU Emacs versions"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs";
@@ -96,7 +96,7 @@ pkg_preinst() {
pkg_postinst() {
if use X; then
- fdo-mime_desktop_database_update
+ xdg_desktop_database_update
gnome2_icon_cache_update
fi
readme.gentoo_print_elog
@@ -104,7 +104,7 @@ pkg_postinst() {
pkg_postrm() {
if use X; then
- fdo-mime_desktop_database_update
+ xdg_desktop_database_update
gnome2_icon_cache_update
fi
}
[gentoo-commits] repo/proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
commit: 444b3f355a759d81090fb0fd4f966257fe8d8cce
Author: Ulrich Müller gentoo org>
AuthorDate: Sun Oct 15 11:18:17 2017 +
Commit: Ulrich Müller gentoo org>
CommitDate: Sun Oct 15 11:18:17 2017 +
URL:https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=444b3f35
app-emacs/emacs-common-gentoo: Update EGIT_REPO_URI.
Package-Manager: Portage-2.3.11, Repoman-2.3.3
app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
index 562a4ad..33bd445 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/emacs-tools.git"
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/emacs-tools.git";
EGIT_BRANCH="${PN}"
EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
