commit: 28fa069d11315c5c9139ea4edb9c4611aff1f2e6
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 04:52:41 2016 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 05:07:02 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28fa069d
dev-ruby/barby: actually add 0.6.3 and fix metadata
0.6.3 was actually a version of 0.6.2 due to a stuck commit.
0.6.3-r1 now uses the release tag again so it downloads the
proper version.
Also drop unused datamatrix and pdf-writer USE flags which
referenced obsolete and removed packages.
Package-Manager: portage-2.2.26
dev-ruby/barby/Manifest | 3 +-
dev-ruby/barby/barby-0.6.2-r1.ebuild | 124 ---------------------
.../{barby-0.6.3.ebuild => barby-0.6.3-r1.ebuild} | 54 +++------
dev-ruby/barby/metadata.xml | 6 -
4 files changed, 16 insertions(+), 171 deletions(-)
diff --git a/dev-ruby/barby/Manifest b/dev-ruby/barby/Manifest
index 6369681..89eaa3c 100644
--- a/dev-ruby/barby/Manifest
+++ b/dev-ruby/barby/Manifest
@@ -1,2 +1 @@
-DIST barby-0.6.2.tgz 92842 SHA256
fd8be7db0d3214fc2e2f330cc62de7c8d1884311b0230501b9cc9a23ec7f5deb SHA512
bb1a0387cfcabe8e282b1624c09574778cf438a5aa9fddaafd413ffe06726e95a766bc3f8bbb51b39894c267b167ce8b3cfe3cbaf83896a90c3509b81478e3a6
WHIRLPOOL
55a9f2171373735fc6fa7bfff60c4faaa0e1a1ab97facfa9a0025a63f9575858177d2df3c5b39dc140a8d163e46c368e1ec2798351fb8208d58fb5c64e4b0c2b
-DIST barby-0.6.3.tgz 92842 SHA256
fd8be7db0d3214fc2e2f330cc62de7c8d1884311b0230501b9cc9a23ec7f5deb SHA512
bb1a0387cfcabe8e282b1624c09574778cf438a5aa9fddaafd413ffe06726e95a766bc3f8bbb51b39894c267b167ce8b3cfe3cbaf83896a90c3509b81478e3a6
WHIRLPOOL
55a9f2171373735fc6fa7bfff60c4faaa0e1a1ab97facfa9a0025a63f9575858177d2df3c5b39dc140a8d163e46c368e1ec2798351fb8208d58fb5c64e4b0c2b
+DIST barby-0.6.3.tar.gz 92841 SHA256
51546e7f58fc4587ec7977ac924874ac89ee1397ddd11d3fdeaa3a567dcebb92 SHA512
b7415298ee2d8bb17a88b5c647d707a15151d2110834e87c2d598def88290ad90947bc49ded175b44050d8d95510602d374699fd91f2fb873728e8536dc70ef6
WHIRLPOOL
e0272be0adeb828d7745ddbb9ffe61674314943bfd3ad5aaca29a998b38bdd9dbe25d1e4333b182c63edd0240c509a32037c4e9277cdbf0b01723aa261e19a6a
diff --git a/dev-ruby/barby/barby-0.6.2-r1.ebuild
b/dev-ruby/barby/barby-0.6.2-r1.ebuild
deleted file mode 100644
index 0f9792a..0000000
--- a/dev-ruby/barby/barby-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-COMMIT="891b15594b34229b8bdb267c10ab5b5309c03320"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby barcode generator that doesn't rely on 3rd party libraries"
-HOMEPAGE="http://toretore.eu/barby/";
-
-GITHUB_USER="toretore"
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/${COMMIT}.tar.gz ->
${P}.tgz"
-
-RUBY_S="${PN}-${COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="datamatrix test qrcode rmagick pdf-writer prawn png cairo"
-
-ruby_add_rdepend "
- rmagick? ( dev-ruby/rmagick )
- cairo? ( dev-ruby/rcairo )"
-
-ruby_add_rdepend "qrcode? ( dev-ruby/rqrcode )
- png? ( dev-ruby/chunky_png )
- prawn? ( dev-ruby/prawn )"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-# testing requires imagemagick capable of png output
-DEPEND+=" test? ( media-gfx/imagemagick[png] )"
-
-# prawn breaks tests for some reasons, needs to be investigated; code
-# still works though.
-RESTRICT="prawn? ( test )"
-
-all_ruby_prepare() {
- sed -i -e '/[bB]undler/s:^:#:' test/test_helper.rb
-}
-
-each_ruby_prepare() {
- if use datamatrix; then
- sed -i -e '/^end/i s.add_dependency "semacode"'
${RUBY_FAKEGEM_GEMSPEC}
- else
- rm \
- lib/barby/barcode/data_matrix.rb \
- test/data_matrix_test.rb
- fi
-
- if use pdf-writer; then
- sed -i -e '/^end/i s.add_dependency "pdf-writer"'
${RUBY_FAKEGEM_GEMSPEC}
- else
- rm \
- lib/barby/outputter/pdfwriter_outputter.rb \
- test/outputter/pdfwriter_outputter_test.rb
- fi
-
- if use qrcode; then
- sed -i -e '/^end/i s.add_dependency "rqrcode"'
${RUBY_FAKEGEM_GEMSPEC}
- else
- rm \
- lib/barby/barcode/qr_code.rb \
- test/qr_code_test.rb
- fi
-
- if use rmagick; then
- sed -i -e '/^end/i s.add_dependency "rmagick"'
${RUBY_FAKEGEM_GEMSPEC}
- else
- rm \
- lib/barby/outputter/rmagick_outputter.rb \
- test/outputter/rmagick_outputter_test.rb
- fi
-
- if use prawn; then
- sed -i -e '/^end/i s.add_dependency "prawn"'
${RUBY_FAKEGEM_GEMSPEC}
- else
- rm \
- lib/barby/outputter/prawn_outputter.rb \
- test/outputter/prawn_outputter_test.rb
- fi
-
- if use png; then
- sed -i -e '/^end/i s.add_dependency "chunky_png"'
${RUBY_FAKEGEM_GEMSPEC}
- else
- rm \
- lib/barby/outputter/png_outputter.rb \
- test/outputter/png_outputter_test.rb
- fi
-
- if use cairo; then
- sed -i -e '/^end/i s.add_dependency "cairo"'
${RUBY_FAKEGEM_GEMSPEC}
- else
- rm \
- lib/barby/outputter/cairo_outputter.rb \
- test/outputter/cairo_outputter_test.rb
- fi
-
- case ${RUBY} in
- */ruby19)
- rm -f \
- lib/barby/barcode/data_matrix.rb \
- test/data_matrix_test.rb \
- lib/barby/outputter/pdfwriter_outputter.rb \
- test/outputter/pdfwriter_outputter_test.rb
-
- sed -i \
- -e '/semacode/d' \
- -e '/pdf-writer/d' \
- ${RUBY_FAKEGEM_GEMSPEC}
- ;;
- esac
-}
diff --git a/dev-ruby/barby/barby-0.6.3.ebuild
b/dev-ruby/barby/barby-0.6.3-r1.ebuild
similarity index 64%
rename from dev-ruby/barby/barby-0.6.3.ebuild
rename to dev-ruby/barby/barby-0.6.3-r1.ebuild
index fa9b070..83dfd7f 100644
--- a/dev-ruby/barby/barby-0.6.3.ebuild
+++ b/dev-ruby/barby/barby-0.6.3-r1.ebuild
@@ -8,26 +8,22 @@ USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-COMMIT="891b15594b34229b8bdb267c10ab5b5309c03320"
-
inherit ruby-fakegem
DESCRIPTION="Ruby barcode generator that doesn't rely on 3rd party libraries"
HOMEPAGE="http://toretore.eu/barby/";
GITHUB_USER="toretore"
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/${COMMIT}.tar.gz ->
${P}.tgz"
-
-RUBY_S="${PN}-${COMMIT}"
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="datamatrix test qrcode rmagick pdf-writer prawn png cairo"
+IUSE="test qrcode rmagick prawn png cairo"
ruby_add_rdepend "
rmagick? ( dev-ruby/rmagick )
@@ -47,25 +43,9 @@ DEPEND+=" test? ( media-gfx/imagemagick[png] )"
RESTRICT="prawn? ( test )"
all_ruby_prepare() {
- sed -i -e '/[bB]undler/s:^:#:' test/test_helper.rb
-}
+ sed -i -e 's/README/README.md/' Rakefile || die
-each_ruby_prepare() {
- if use datamatrix; then
- sed -i -e '/^end/i s.add_dependency "semacode"'
${RUBY_FAKEGEM_GEMSPEC}
- else
- rm \
- lib/barby/barcode/data_matrix.rb \
- test/data_matrix_test.rb
- fi
-
- if use pdf-writer; then
- sed -i -e '/^end/i s.add_dependency "pdf-writer"'
${RUBY_FAKEGEM_GEMSPEC}
- else
- rm \
- lib/barby/outputter/pdfwriter_outputter.rb \
- test/outputter/pdfwriter_outputter_test.rb
- fi
+ sed -i -e '/[bB]undler/s:^:#:' test/test_helper.rb || die
if use qrcode; then
sed -i -e '/^end/i s.add_dependency "rqrcode"'
${RUBY_FAKEGEM_GEMSPEC}
@@ -107,18 +87,14 @@ each_ruby_prepare() {
test/outputter/cairo_outputter_test.rb
fi
- case ${RUBY} in
- */ruby19)
- rm -f \
- lib/barby/barcode/data_matrix.rb \
- test/data_matrix_test.rb \
- lib/barby/outputter/pdfwriter_outputter.rb \
- test/outputter/pdfwriter_outputter_test.rb
-
- sed -i \
- -e '/semacode/d' \
- -e '/pdf-writer/d' \
- ${RUBY_FAKEGEM_GEMSPEC}
- ;;
- esac
+ rm -f \
+ lib/barby/barcode/data_matrix.rb \
+ test/data_matrix_test.rb \
+ lib/barby/outputter/pdfwriter_outputter.rb \
+ test/outputter/pdfwriter_outputter_test.rb || die
+
+ sed -i \
+ -e '/semacode/d' \
+ -e '/pdf-writer/d' \
+ ${RUBY_FAKEGEM_GEMSPEC} || die
}
diff --git a/dev-ruby/barby/metadata.xml b/dev-ruby/barby/metadata.xml
index abb522b..11d98bf 100644
--- a/dev-ruby/barby/metadata.xml
+++ b/dev-ruby/barby/metadata.xml
@@ -27,12 +27,6 @@
PDF and SVG) using <pkg>dev-ruby/rcairo</pkg>. Not available on
JRuby.
</flag>
- <flag name="datamatrix">
- Add support for datamatrix using <pkg>dev-ruby/semacode</pkg>.
- </flag>
- <flag name="pdf-writer">
- Add support for writing PDFs using <pkg>dev-ruby/pdf-writer</pkg>.
- </flag>
</use>
<upstream>
<remote-id type="github">toretore/barby</remote-id>
