diff options
| author |   Jauhien Piatlicki (jauhien) <piatlicki@gmail.com> | 2013-07-13 16:42:44 +0200 |
|---|---|---|
| committer | Jauhien Piatlicki (jauhien) <piatlicki@gmail.com> | 2013-07-13 16:42:44 +0200 |
| commit | 71066f673b44ed1f420306f87c0f7d98098320ff (patch) | |
| tree | 754184791303bd301b022d5faf7122fa3a6a9ccc | |
| parent | cli for generate a single package (diff) | |
| download | gs-elpa-71066f673b44ed1f420306f87c0f7d98098320ff.tar.gz gs-elpa-71066f673b44ed1f420306f87c0f7d98098320ff.tar.bz2 gs-elpa-71066f673b44ed1f420306f87c0f7d98098320ff.zip | |
ebuild string substitution modified as suggested by Brian Dolbec
| -rw-r--r-- | g_elpa/data/ebuild_with_digest.tmpl | 16 | ||||
| -rw-r--r-- | g_elpa/data/ebuild_without_digest.tmpl | 14 | ||||
| -rw-r--r-- | g_elpa/elpa_db.py | 3 |
3 files changed, 17 insertions, 16 deletions
diff --git a/g_elpa/data/ebuild_with_digest.tmpl b/g_elpa/data/ebuild_with_digest.tmpl index 6d599e6..4a77430 100644 --- a/g_elpa/data/ebuild_with_digest.tmpl +++ b/g_elpa/data/ebuild_with_digest.tmpl @@ -3,21 +3,21 @@ EAPI=5 -REPO_URI="$repo_uri" -PKG_TYPE="$source_type" -REALNAME="$realname" +REPO_URI="%(repo_uri)s" +PKG_TYPE="%(source_type)s" +REALNAME="%(realname)s" DIGEST_SOURCES="yes" inherit g-elpa -DESCRIPTION="$description" -HOMEPAGE="$homepage" -SRC_URI="$${REPO_URI}$${REALNAME}-$${PV}.$${SUFFIX}" +DESCRIPTION="%(description)s" +HOMEPAGE="%(homepage)s" +SRC_URI="${REPO_URI}${REALNAME}-${PV}.${SUFFIX}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="#n#depend#" -RDEPEND="#n#rdepend#" +DEPEND="%(depend)s" +RDEPEND="%(rdepend)s" diff --git a/g_elpa/data/ebuild_without_digest.tmpl b/g_elpa/data/ebuild_without_digest.tmpl index 6c0a895..37f709f 100644 --- a/g_elpa/data/ebuild_without_digest.tmpl +++ b/g_elpa/data/ebuild_without_digest.tmpl @@ -3,14 +3,14 @@ EAPI=5 -REPO_URI="$repo_uri" -PKG_TYPE="$source_type" -REALNAME="$realname" +REPO_URI="%(repo_uri)s" +PKG_TYPE="%(source_type)s" +REALNAME="%(realname)s" inherit g-elpa -DESCRIPTION="$description" -HOMEPAGE="$homepage" +DESCRIPTION="%(description)s" +HOMEPAGE="%(homepage)s" SRC_URI="" LICENSE="GPL-2" @@ -18,5 +18,5 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="#n#depend#" -RDEPEND="#n#rdepend#" +DEPEND="%(depend)s" +RDEPEND="%(rdepend)s" diff --git a/g_elpa/elpa_db.py b/g_elpa/elpa_db.py index 070d830..59f30a1 100644 --- a/g_elpa/elpa_db.py +++ b/g_elpa/elpa_db.py @@ -22,7 +22,8 @@ if py2k: else: from urllib.parse import urljoin -from g_sorcery.package_db import Package, PackageDB +from g_sorcery.collections import Package +from g_sorcery.package_db import PackageDB from g_sorcery.fileutils import wget from g_sorcery.exceptions import SyncError |