From d7a9b259e87a3d2437d9838b502c567cd964fb96 Mon Sep 17 00:00:00 2001 From: Jauhien Piatlicki Date: Fri, 12 Sep 2014 23:46:21 +0200 Subject: add melpa-stable repository --- README.md | 6 +++--- docs/gs-elpa.8 | 19 ++++++++++--------- docs/gs-elpa.8.rst | 9 +++++---- gs-elpa-overlays.xml | 10 ++++++++++ gs-elpa.json | 10 +++++++--- 5 files changed, 35 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 5b2d32d..f254ea0 100644 --- a/README.md +++ b/README.md @@ -37,8 +37,8 @@ layman -a gnu-elpa -a marmalade emerge -va clojure-mode ``` -There are 3 gs-elpa overlays currently: [gnu-elpa](http://elpa.gnu.org/), [marmalade](http://marmalade-repo.org/) -and [melpa](http://melpa.milkbox.net/). +There are 3 gs-elpa overlays currently: [gnu-elpa](http://elpa.gnu.org/), [marmalade](http://marmalade-repo.org/), +[melpa](http://melpa.milkbox.net/) and [melpa-stable](http://melpa-stable.milkbox.net/). When using **gs-elpa** with layman you can populate overlay only with packages you want. To do so you should add a section named gs-elpa to */etc/g-sorcery/g-sorcery.cfg*. @@ -81,7 +81,7 @@ Install any package you want: gs-elpa -o $OVERLAY_DIRECTORY -r gnu-elpa install $PACKAGE ``` -Repositories you can use are gnu-elpa, marmalade and melpa. You can use them +Repositories you can use are gnu-elpa, marmalade, melpa and melpa-stable. You can use them all in one overlay. Note, that if you call **generate-tree** command your overlay will be wiped and overlay tree for a given repository will be generated. Be careful! diff --git a/docs/gs-elpa.8 b/docs/gs-elpa.8 index 5e912fe..a213ed8 100644 --- a/docs/gs-elpa.8 +++ b/docs/gs-elpa.8 @@ -53,12 +53,12 @@ There are two ways of using \fBgs\-elpa\fP: .IP \(bu 2 use it with \fBlayman\fP .sp -In this case all you need to do is install \fBgs\-elpa\fP. +In this case all you need to do is install \fBgs\-elpa\fP\&. Then you should just run \fIlayman \-L\fP as root and find an overlay you want. Type of overlay will be -displayed as \fIg\-sorcery\fP. Then you add this overlay as +displayed as \fIg\-sorcery\fP\&. Then you add this overlay as usual. It\(aqs all you need to do and it\(aqs the recommended way of -using \fBgs\-elpa\fP. +using \fBgs\-elpa\fP\&. .IP \(bu 2 use it as stand\-alone tool .sp @@ -75,7 +75,8 @@ Overlay directory. This option is mandatory if there is no \fBdefault_overlay\fP entry in a backend config. .TP .B \fB\-\-repository\fP \fIREPO\fP, \fB\-r\fP \fIREPO\fP -Repository name. Can be one of \fBgnu\-elpa\fP, \fBmarmalade\fP, \fBmelpa\fP. +Repository name. Can be one of \fBgnu\-elpa\fP, \fBmarmalade\fP, +\fBmelpa\fP, \fBmelpa\-stable\fP\&. .UNINDENT .SH COMMANDS .INDENT 0.0 @@ -115,7 +116,7 @@ Execute \fBlayman \-L\fP .sp Find there an overlay you need (there are -3 gs\-elpa overlays currently: gnu\-elpa, marmalade and melpa). +3 gs\-elpa overlays currently: gnu\-elpa, marmalade, melpa and melpa\-stable). Add, e.g. .sp \fBlayman \-a gnu\-elpa \-a marmalade\fP @@ -137,21 +138,21 @@ Install any package you want: .sp \fBgs\-elpa \-o\fP \fIOVERLAY_DIRECTORY\fP \fB\-r gnu\-elpa\fP \fBinstall\fP \fIPACKAGE\fP .sp -Repositories you can use are gnu\-elpa, marmalade and melpa. You can use them +Repositories you can use are gnu\-elpa, marmalade, melpa and melpa\-stable. You can use them all in one overlay. Note, that if you call \fBgenerate\-tree\fP command your overlay will be wiped and overlay tree for a given repository will be generated. Be careful! .UNINDENT .SH NOTES .INDENT 0.0 .IP 1. 3 -At the moment the only package mangler \fBgs\-elpa\fP supports is \fBportage\fP. +At the moment the only package mangler \fBgs\-elpa\fP supports is \fBportage\fP\&. .UNINDENT .SH BUGS .sp -Some packages in \fBmarmalade\fP and \fBmelpa\fP depend on packages from gnu\-elpa. \fBinstall\fP and \fBgenerate\fP +Some packages in \fBmarmalade\fP , \fBmelpa\fP, \fBmelpa\-stable\fP depend on packages from gnu\-elpa. \fBinstall\fP and \fBgenerate\fP commands will fail on them as dependencies between overlays are not supported currently. So the recommended way of using gs\-elpa is using it with layman. Even doing so you should always add -gnu\-elpa repository: \fBlayman \-a gnu\-elpa\fP. +gnu\-elpa repository: \fBlayman \-a gnu\-elpa\fP\&. .SH SEE ALSO .sp \fBgs\-pypi\fP(8), \fBg\-sorcery.cfg\fP(8), \fBportage\fP(5), \fBemerge\fP(1), \fBlayman\fP(8) diff --git a/docs/gs-elpa.8.rst b/docs/gs-elpa.8.rst index 3b516ce..2a3a986 100644 --- a/docs/gs-elpa.8.rst +++ b/docs/gs-elpa.8.rst @@ -60,7 +60,8 @@ OPTIONS **default_overlay** entry in a backend config. **--repository** *REPO*, **-r** *REPO* - Repository name. Can be one of **gnu-elpa**, **marmalade**, **melpa**. + Repository name. Can be one of **gnu-elpa**, **marmalade**, + **melpa**, **melpa-stable**. COMMANDS ======== @@ -99,7 +100,7 @@ Using gs-elpa with layman **layman -L** Find there an overlay you need (there are - 3 gs-elpa overlays currently: gnu-elpa, marmalade and melpa). + 3 gs-elpa overlays currently: gnu-elpa, marmalade, melpa and melpa-stable). Add, e.g. **layman -a gnu-elpa -a marmalade** @@ -121,7 +122,7 @@ Generating user ebuilds in user overlay **gs-elpa -o** *OVERLAY_DIRECTORY* **-r gnu-elpa** **install** *PACKAGE* - Repositories you can use are gnu-elpa, marmalade and melpa. You can use them + Repositories you can use are gnu-elpa, marmalade, melpa and melpa-stable. You can use them all in one overlay. Note, that if you call **generate-tree** command your overlay will be wiped and overlay tree for a given repository will be generated. Be careful! @@ -133,7 +134,7 @@ NOTES BUGS ==== -Some packages in **marmalade** and **melpa** depend on packages from gnu-elpa. **install** and **generate** +Some packages in **marmalade** , **melpa**, **melpa-stable** depend on packages from gnu-elpa. **install** and **generate** commands will fail on them as dependencies between overlays are not supported currently. So the recommended way of using gs-elpa is using it with layman. Even doing so you should always add gnu-elpa repository: **layman -a gnu-elpa**. diff --git a/gs-elpa-overlays.xml b/gs-elpa-overlays.xml index 357a79d..bc3768d 100644 --- a/gs-elpa-overlays.xml +++ b/gs-elpa-overlays.xml @@ -31,4 +31,14 @@ gs-elpa melpa + + melpa-stable + packages for emacs + http://melpa-stable.milkbox.net + + jauhien@gentoo.org + Jauhien Piatlicki + + gs-elpa melpa-stable + diff --git a/gs-elpa.json b/gs-elpa.json index a4accde..b2037b0 100644 --- a/gs-elpa.json +++ b/gs-elpa.json @@ -1,17 +1,21 @@ { "backend": "gs-elpa", - "package": "gs_elpa", + "package": "gs_elpa", "repositories": { "gnu-elpa": { "repo_uri": "http://elpa.gnu.org/packages/" - }, + }, "marmalade": { "repo_uri": "http://marmalade-repo.org/packages/", "masters": ["gentoo", "gnu-elpa"] - }, + }, "melpa": { "repo_uri": "http://melpa.milkbox.net/packages/", "masters": ["gentoo", "gnu-elpa"] + }, + "melpa-stable": { + "repo_uri": "http://melpa-stable.milkbox.net/packages/", + "masters": ["gentoo", "gnu-elpa"] } }, "common_config": { -- cgit v1.2.3-65-gdbad