[gentoo-commits] proj/g-sorcery:master commit in: g_sorcery/, gs_ctan/

[gentoo-commits] proj/g-sorcery:master commit in: g_sorcery/, gs_ctan/

[Jauhien Piatlicki]

commit:     4ff9c9178bcc4b6e422e0f32524b84681a4cb9cd
Author:     Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com>
AuthorDate: Fri Jul 19 17:11:13 2013 +0000
Commit:     Jauhien Piatlicki <piatlicki <AT> gmail <DOT> com>
CommitDate: Fri Jul 19 17:11:13 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/g-sorcery.git;a=commit;h=4ff9c917

g_sorcery/package_db: common convert function

---
 g_sorcery/package_db.py | 12 ++++++------
 gs_ctan/ctan_db.py      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/g_sorcery/package_db.py b/g_sorcery/package_db.py
index 4377c3f..0becf56 100644
--- a/g_sorcery/package_db.py
+++ b/g_sorcery/package_db.py
@@ -207,14 +207,14 @@ class PackageDB(object):
     def process_data(data):
         pass
 
-    def convert_license(self, license_name):
-        result = license_name
+    def convert(self, dict_name, value):
+        result = value
         for config in [self.common_config, self.config]:
             if config:
-                if "licenses" in config:
-                    licenses = config["licenses"]
-                    if license_name in licenses:
-                        result = licenses[license_name]
+                if dict_name in config:
+                    transform = config[dict_name]
+                    if value in transform:
+                        result = transform[value]
         return result
 
     def get_download_uries(self):

diff --git a/gs_ctan/ctan_db.py b/gs_ctan/ctan_db.py
index f46c5e3..690f7d7 100644
--- a/gs_ctan/ctan_db.py
+++ b/gs_ctan/ctan_db.py
@@ -146,7 +146,7 @@ class CtanDB(PackageDB):
                 version = entry["revision"]
 
             if "catalogue-license" in entry:
-                license = self.convert_license(entry["catalogue-license"])
+                license = self.convert("licenses", entry["catalogue-license"])
             else:
                 license = "unknown"
 

[gentoo-commits] proj/g-sorcery:master commit in: g_sorcery/, gs_ctan/

[Jauhien Piatlicki]

commit:     4d19c47fdf6e2126b30f7eb9671628518fc8678a
Author:     Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com>
AuthorDate: Mon Jul 22 16:42:03 2013 +0000
Commit:     Jauhien Piatlicki <piatlicki <AT> gmail <DOT> com>
CommitDate: Mon Jul 22 16:42:03 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/g-sorcery.git;a=commit;h=4d19c47f

CTAN backend: generate a given ebuild works

---
 g_sorcery/package_db.py |  1 -
 gs_ctan/backend.py      |  5 ++---
 gs_ctan/ebuild.py       | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/g_sorcery/package_db.py b/g_sorcery/package_db.py
index 1dc1016..7ff4398 100644
--- a/g_sorcery/package_db.py
+++ b/g_sorcery/package_db.py
@@ -648,4 +648,3 @@ class DBGenerator(object):
                         result = True
                         break
         return result
-

diff --git a/gs_ctan/backend.py b/gs_ctan/backend.py
index 70f2e05..42a4a83 100644
--- a/gs_ctan/backend.py
+++ b/gs_ctan/backend.py
@@ -15,12 +15,11 @@ import os
 
 from g_sorcery.backend import Backend
 from g_sorcery.metadata import MetadataGenerator
-from g_sorcery.ebuild import EbuildGenerator
 from g_sorcery.eclass import EclassGenerator
 from g_sorcery.fileutils import get_pkgpath
 
 from .ctan_db import CtanDBGenerator
-from .ebuild import CtanEbuildWithoutDigestGenerator
+from .ebuild import CtanEbuildWithoutDigestGenerator, CtanEbuildWithDigestGenerator
 
 
 class CtanEclassGenerator(EclassGenerator):
@@ -29,5 +28,5 @@ class CtanEclassGenerator(EclassGenerator):
         
 
 instance = Backend(CtanDBGenerator,
-                   EbuildGenerator, CtanEbuildWithoutDigestGenerator,
+                   CtanEbuildWithDigestGenerator, CtanEbuildWithoutDigestGenerator,
                    CtanEclassGenerator, MetadataGenerator)

diff --git a/gs_ctan/ebuild.py b/gs_ctan/ebuild.py
index 3358605..a800cbd 100644
--- a/gs_ctan/ebuild.py
+++ b/gs_ctan/ebuild.py
@@ -37,3 +37,21 @@ class CtanEbuildWithoutDigestGenerator(DefaultEbuildGenerator):
         layout = Layout(vars_before_inherit, inherit, vars_after_description, vars_after_keywords)
 
         super(CtanEbuildWithoutDigestGenerator, self).__init__(package_db, layout)
+
+class CtanEbuildWithDigestGenerator(DefaultEbuildGenerator):
+    def __init__(self, package_db):
+
+        vars_before_inherit = \
+          ["base_src_uri", "catalogue", "source_type", "realname", ("digest_sources", "yes")]
+
+        inherit = ["gs-ctan"]
+        
+        vars_after_description = \
+          ["homepage", ("src_uri", "${BASE_SRC_URI}${CATALOGUE}${REALNAME}.${SOURCE_TYPE} -> ${P}.${SOURCE_TYPE}"), "license"]
+
+        vars_after_keywords = \
+          ["depend", "rdepend"]
+
+        layout = Layout(vars_before_inherit, inherit, vars_after_description, vars_after_keywords)
+
+        super(CtanEbuildWithDigestGenerator, self).__init__(package_db, layout)