diff options
| author |   Michele Beltrame <mb@cattlegrid.info> | 2010-08-09 19:16:19 +0200 |
|---|---|---|
| committer | Michele Beltrame <mb@cattlegrid.info> | 2010-08-09 19:16:19 +0200 |
| commit | 1dd3e953a8f34099c7e73d8740336e0010548e04 (patch) | |
| tree | 31d553cfc24282e599032f1a399bb45f20bb98a9 /dev-perl/KiokuDB | |
| parent | Bumps (diff) | |
| parent | KiokuDB : Bumped to 0.48 (diff) | |
| download | perl-overlay-1dd3e953a8f34099c7e73d8740336e0010548e04.tar.gz perl-overlay-1dd3e953a8f34099c7e73d8740336e0010548e04.tar.bz2 perl-overlay-1dd3e953a8f34099c7e73d8740336e0010548e04.zip | |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/perl-overlay
Conflicts:
dev-perl/Cache-Ref/Cache-Ref-0.02.ebuild
dev-perl/Cache-Ref/ChangeLog
dev-perl/Cache-Ref/Manifest
dev-perl/Cache-Ref/metadata.xml
dev-perl/KiokuDB/ChangeLog
dev-perl/KiokuDB/KiokuDB-0.48.ebuild
dev-perl/KiokuDB/Manifest
Diffstat (limited to 'dev-perl/KiokuDB')
| -rw-r--r-- | dev-perl/KiokuDB/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-perl/KiokuDB/KiokuDB-0.48.ebuild | 43 | ||||
| -rw-r--r-- | dev-perl/KiokuDB/Manifest | 30 |
3 files changed, 57 insertions, 21 deletions
diff --git a/dev-perl/KiokuDB/ChangeLog b/dev-perl/KiokuDB/ChangeLog index d90274c48..97a1f2148 100644 --- a/dev-perl/KiokuDB/ChangeLog +++ b/dev-perl/KiokuDB/ChangeLog @@ -4,9 +4,14 @@ *KiokuDB-0.48 (09 Aug 2010) +<<<<<<< HEAD 09 Aug 2010; Michele Beltrame <m@cattlegrid.info> -KiokuDB-0.34.ebuild, +KiokuDB-0.48.ebuild: Bump +======= + 09 Aug 2010; Kent Fredric <kentfredric@gmail.com> +KiokuDB-0.48.ebuild: + Bumped. Fixed © +>>>>>>> ff1768d5ecab86578d70d4a693563b9767911877 *KiokuDB-0.42 (26 Apr 2010) diff --git a/dev-perl/KiokuDB/KiokuDB-0.48.ebuild b/dev-perl/KiokuDB/KiokuDB-0.48.ebuild index e46dd9976..a0e043b1f 100644 --- a/dev-perl/KiokuDB/KiokuDB-0.48.ebuild +++ b/dev-perl/KiokuDB/KiokuDB-0.48.ebuild @@ -12,36 +12,37 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" COMMON_DEPEND=" - >=dev-perl/Moose-0.92 + >=dev-perl/Cache-Ref-0.02 >=dev-perl/Class-MOP-0.94 - >=dev-perl/MooseX-Role-Parameterized-0.10 + >=dev-perl/Data-Stream-Bulk-0.07 + >=dev-perl/Data-Visitor-0.24 + >=dev-perl/JSON-2.12 + >=dev-perl/JSON-XS-2.2.3.1 + >=dev-perl/Moose-0.92 >=dev-perl/MooseX-Clone-0.04 - dev-perl/Path-Class + >=dev-perl/MooseX-Role-Parameterized-0.10 >=dev-perl/MooseX-YAML-0.04 - dev-perl/Try-Tiny - dev-perl/Throwable - virtual/perl-Scalar-List-Utils + >=dev-perl/PadWalker-1.9 + >=dev-perl/Search-GIN-0.03 + >=dev-perl/Set-Object-1.26 + >=dev-perl/YAML-LibYAML-0.30 >=dev-perl/namespace-clean-0.08 + >=virtual/perl-IO-1.23 dev-perl/Data-UUID - >=dev-perl/Data-Visitor-0.24 - dev-perl/Tie-ToObject - dev-perl/Task-Weaken - >=dev-perl/Data-Stream-Bulk-0.07 dev-perl/Hash-Util-FieldHash-Compat + dev-perl/Path-Class dev-perl/Scope-Guard - >=dev-perl/Set-Object-1.26 - >=dev-perl/Cache-Ref-0.02 - virtual/perl-Module-Pluggable - dev-perl/Test-use-ok + dev-perl/Task-Weaken dev-perl/Test-Exception - virtual/perl-Test-Simple - >=dev-perl/Search-GIN-0.03 - >=dev-perl/JSON-2.12 - >=dev-perl/JSON-XS-2.2.3.1 - >=dev-perl/YAML-LibYAML-0.30 - virtual/perl-Storable - >=dev-perl/PadWalker-1.9 + dev-perl/Test-use-ok + dev-perl/Throwable + dev-perl/Tie-ToObject + dev-perl/Try-Tiny virtual/perl-Digest-SHA + virtual/perl-Module-Pluggable + virtual/perl-Scalar-List-Utils + virtual/perl-Storable + virtual/perl-Test-Simple " DEPEND=" ${COMMON_DEPEND} diff --git a/dev-perl/KiokuDB/Manifest b/dev-perl/KiokuDB/Manifest index d0fc0c0c5..0f93b9bb7 100644 --- a/dev-perl/KiokuDB/Manifest +++ b/dev-perl/KiokuDB/Manifest @@ -1,6 +1,36 @@ +<<<<<<< HEAD DIST KiokuDB-0.42.tar.gz 146180 RMD160 1d94d71f8c3bca653e644669a06eaa6a89e4cc40 SHA1 f60545de1a42b475a931700152128481cda3f65b SHA256 23e2b99dd31195f84b764fc20885ee433b64d9b9ba34550eb5ebeea1d467e800 DIST KiokuDB-0.48.tar.gz 153953 RMD160 2291a36f6832422177f1b49fca385b0dcab978f1 SHA1 325026414de81acc7b62b79b4941ae81affcd0df SHA256 3582a63bc46b440ead83d54a6c12bfec5618fc7987fe37e5b6a100971567bd20 EBUILD KiokuDB-0.42.ebuild 1134 RMD160 a0cfb0eac577cfdcd96e36abe72237521326b0ae SHA1 a70ad16bef811d04556d19b253ee83ff69696b1d SHA256 65e6eb2da33a9d03de4f7cb01c3486ccff0c30244f7ebd68706acd85fb5123c5 EBUILD KiokuDB-0.48.ebuild 1181 RMD160 49e706b168fe51caca44275b6d42daf3cc4ec338 SHA1 272e1f1dc3e4c6f2bc9c25d2367072520176c110 SHA256 f953f85caf4758809f25b55c956cef0f4fae8bd83cbdf592f2385fd46710232e MISC ChangeLog 762 RMD160 09279f1ee28917728c86f498a73c21daed24b91b SHA1 4b6c946643609dd166aaae681e1c96ba9818f09e SHA256 b8e168ab52f67775a7063b0f66dfd244fc00409110123c71d0cc7365d6e22802 +======= +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +DIST KiokuDB-0.34.tar.gz 137758 RMD160 1efdc7985bdf362e2f97b95cb427c920e5b2cad8 SHA1 feb3d1c4f4d3a4598ed495c66ea0cd132b6a87a8 SHA256 7fdab3599bbc5930ed4ad8785b8fe32433ada49e77598f6006d2958f49667eb2 +DIST KiokuDB-0.42.tar.gz 146180 RMD160 1d94d71f8c3bca653e644669a06eaa6a89e4cc40 SHA1 f60545de1a42b475a931700152128481cda3f65b SHA256 23e2b99dd31195f84b764fc20885ee433b64d9b9ba34550eb5ebeea1d467e800 +DIST KiokuDB-0.48.tar.gz 153953 RMD160 2291a36f6832422177f1b49fca385b0dcab978f1 SHA1 325026414de81acc7b62b79b4941ae81affcd0df SHA256 3582a63bc46b440ead83d54a6c12bfec5618fc7987fe37e5b6a100971567bd20 +EBUILD KiokuDB-0.34.ebuild 1088 RMD160 9f4c87cb3062901f9d0fc243af233e9d05b90d7a SHA1 822417ab5caf23b36f44574c1618cf76f2984f26 SHA256 99e4c2551b58d54518527ae616d01f4258d8d2a1d1b291ef80202b81f0718b72 +EBUILD KiokuDB-0.42.ebuild 1134 RMD160 a0cfb0eac577cfdcd96e36abe72237521326b0ae SHA1 a70ad16bef811d04556d19b253ee83ff69696b1d SHA256 65e6eb2da33a9d03de4f7cb01c3486ccff0c30244f7ebd68706acd85fb5123c5 +EBUILD KiokuDB-0.48.ebuild 1205 RMD160 6c09d5da22aedaf5db5a752709b9aa00aecb4054 SHA1 0b7784cfcd5240c93414260cd6cd8cb53f30863a SHA256 ab627f55e2098457b789780bc5183417deb30bf281c20f783afa6eb2dd998391 +MISC ChangeLog 750 RMD160 51a9a39027e21063c40f6b4641e80704e1db8e74 SHA1 0dae2645be466c45bc0a93343c1c5e032850e6cb SHA256 c0f35c369bdecb6266cc69e36c3a7bb9fa19d10e5cdb4698105928505a1674e1 +>>>>>>> ff1768d5ecab86578d70d4a693563b9767911877 MISC metadata.xml 275 RMD160 d7980d8f5e665a018b30c566bba02d451db23047 SHA1 a7a485be470b9fbb06c3ce88dffce811ffce282c SHA256 45455d078243c6abc929fd08947c2728292cb506ca452ab4ec33221cd7cb6f6c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iQIcBAEBAgAGBQJMYDBCAAoJECvPD7taxqSk95AQAMs+wp6WEbgdC52k7FeOvpel +KGUUURLfzTZRD5b4ja37TbJXlGsg0xXEvjIVf8xuaaD21JXleAtWBzUgs1n5hhik +vIrB5DbTgFX04bQSLWvP99MXI4Ye8bHSHyN5Q1SWwWJpc6paWhfwyoTG62W7gKAl +xi5NIfavQ8WeObT2HQ23p7ncgOiDUgWK0t72Xglm4JwasWsmSvGo2Zk0PS3ZdLTO +2E6h74HRR3lVr3kjkZfXV7kLDKriVni7/X+Hg/qPjn/Bcyeaycunk46lgeZKu/yK +Nrz+jIwEwyhLYx8/jja6Rpm//heq3xGd4wCqkqs3tD8jkXl2FqsFWFm+zWzRWGWy +vRTmgevcOik0gx2JQ5SHYIHRft3kfsX85pDmtxo7usziZ4hc+9ZC39/m4xONPvph +JFvtyKAqRy4CtfzzOuUd/TDdcqjxOPvXS4qsFnCs3foN0O51pIfJF3qhyMsBzErW +pcIqqS4PY5XXN1vtQJYoacUST9DjwP2tRIm//O64BEhwRrzWZgMUyKNDxuzhTUDS +NW8nNlpfcpsTGbBWZSbWCMEyLWAhGBNtZ6Sx7kQ4h/VW0QoQVjGCZsYkbv/XYk4S +f3lqXQCo4GBt1cEwgg5P2bxYdlKdDUVkaq+KezLcJVJjb6z8CKuCaco8emD3rHPc +O0r2g/Mb2LzQBLBvgjon +=FUWd +-----END PGP SIGNATURE----- |