diff options
| author |   Jauhien Piatlicki (jauhien) <piatlicki@gmail.com> | 2013-07-16 23:59:34 +0200 |
|---|---|---|
| committer | Jauhien Piatlicki (jauhien) <piatlicki@gmail.com> | 2013-07-16 23:59:34 +0200 |
| commit | 66bca1fabd8e3c844b706db1dafca33ec13cfce4 (patch) | |
| tree | 2a1e1fdc13c4623246e64c51561adb3f7d43527a | |
| parent | g_sorcery/package_db: better variable name, g_elpa/elpa_db: meaningful variab... (diff) | |
| download | gs-elpa-66bca1fabd8e3c844b706db1dafca33ec13cfce4.tar.gz gs-elpa-66bca1fabd8e3c844b706db1dafca33ec13cfce4.tar.bz2 gs-elpa-66bca1fabd8e3c844b706db1dafca33ec13cfce4.zip | |
better template generation
| -rw-r--r-- | g_elpa/data/ebuild_with_digest.tmpl | 23 | ||||
| -rw-r--r-- | g_elpa/data/ebuild_without_digest.tmpl | 22 | ||||
| -rw-r--r-- | g_elpa/ebuild.py | 45 |
3 files changed, 38 insertions, 52 deletions
diff --git a/g_elpa/data/ebuild_with_digest.tmpl b/g_elpa/data/ebuild_with_digest.tmpl deleted file mode 100644 index 4a77430..0000000 --- a/g_elpa/data/ebuild_with_digest.tmpl +++ /dev/null @@ -1,23 +0,0 @@ -# automatically generated by g-elpa -# please do not edit this file - -EAPI=5 - -REPO_URI="%(repo_uri)s" -PKG_TYPE="%(source_type)s" -REALNAME="%(realname)s" -DIGEST_SOURCES="yes" - -inherit g-elpa - -DESCRIPTION="%(description)s" -HOMEPAGE="%(homepage)s" -SRC_URI="${REPO_URI}${REALNAME}-${PV}.${SUFFIX}" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="%(depend)s" -RDEPEND="%(rdepend)s" diff --git a/g_elpa/data/ebuild_without_digest.tmpl b/g_elpa/data/ebuild_without_digest.tmpl deleted file mode 100644 index 37f709f..0000000 --- a/g_elpa/data/ebuild_without_digest.tmpl +++ /dev/null @@ -1,22 +0,0 @@ -# automatically generated by g-elpa -# please do not edit this file - -EAPI=5 - -REPO_URI="%(repo_uri)s" -PKG_TYPE="%(source_type)s" -REALNAME="%(realname)s" - -inherit g-elpa - -DESCRIPTION="%(description)s" -HOMEPAGE="%(homepage)s" -SRC_URI="" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="%(depend)s" -RDEPEND="%(rdepend)s" diff --git a/g_elpa/ebuild.py b/g_elpa/ebuild.py index a9df7ed..cdb6bd7 100644 --- a/g_elpa/ebuild.py +++ b/g_elpa/ebuild.py @@ -11,17 +11,48 @@ :license: GPL-2, see LICENSE for more details. """ +import collections import os -from g_sorcery.ebuild import EbuildGeneratorFromFile +from g_sorcery.ebuild import DefaultEbuildGenerator from g_sorcery.fileutils import get_pkgpath -class ElpaEbuildWithDigestGenerator(EbuildGeneratorFromFile): +Layout = collections.namedtuple("Layout", + ["vars_before_inherit", "inherit", "vars_after_description", "vars_after_keywords"]) + + +class ElpaEbuildWithDigestGenerator(DefaultEbuildGenerator): def __init__(self, package_db): - name = os.path.join(get_pkgpath(__file__), 'data/ebuild_with_digest.tmpl') - super(ElpaEbuildWithDigestGenerator, self).__init__(package_db, filename = name) -class ElpaEbuildWithoutDigestGenerator(EbuildGeneratorFromFile): + vars_before_inherit = \ + ["repo_uri", "source_type", "realname", ("digest_sources", "yes")] + + inherit = ["g-elpa"] + + vars_after_description = \ + ["homepage", ("src_uri", "${REPO_URI}${REALNAME}-${PV}.${SUFFIX}")] + + vars_after_keywords = \ + ["depend", "rdepend"] + + layout = Layout(vars_before_inherit, inherit, vars_after_description, vars_after_keywords) + + super(ElpaEbuildWithDigestGenerator, self).__init__(package_db, layout) + +class ElpaEbuildWithoutDigestGenerator(DefaultEbuildGenerator): def __init__(self, package_db): - name = os.path.join(get_pkgpath(__file__), 'data/ebuild_without_digest.tmpl') - super(ElpaEbuildWithoutDigestGenerator, self).__init__(package_db, filename = name) + + vars_before_inherit = \ + ["repo_uri", "source_type", "realname", ("digest_sources", "yes")] + + inherit = ["g-elpa"] + + vars_after_description = \ + ["homepage"] + + vars_after_keywords = \ + ["depend", "rdepend"] + + layout = Layout(vars_before_inherit, inherit, vars_after_description, vars_after_keywords) + + super(ElpaEbuildWithoutDigestGenerator, self).__init__(package_db, layout) |