diff options
author | Hans de Graaff <graaff@gentoo.org> | 2008-03-09 10:23:13 +0000 |
---|---|---|
committer | Hans de Graaff <graaff@gentoo.org> | 2008-03-09 10:23:13 +0000 |
commit | ad493ada491d6bc2bab44153aaf8d3cecbd4cca5 (patch) | |
tree | dad581a39e11f02ec2dd68d4eca575f640fd256f /app-misc/alexandria | |
parent | amd64 stable, security bug #212488. (diff) | |
download | historical-ad493ada491d6bc2bab44153aaf8d3cecbd4cca5.tar.gz historical-ad493ada491d6bc2bab44153aaf8d3cecbd4cca5.tar.bz2 historical-ad493ada491d6bc2bab44153aaf8d3cecbd4cca5.zip |
Version bump
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'app-misc/alexandria')
-rw-r--r-- | app-misc/alexandria/ChangeLog | 12 | ||||
-rw-r--r-- | app-misc/alexandria/Manifest | 18 | ||||
-rw-r--r-- | app-misc/alexandria/alexandria-0.6.2.ebuild | 67 | ||||
-rw-r--r-- | app-misc/alexandria/files/alexandria-0.6.2-rake-0.8.1.patch | 147 | ||||
-rw-r--r-- | app-misc/alexandria/files/alexandria-rakefile.patch | 13 | ||||
-rw-r--r-- | app-misc/alexandria/metadata.xml | 4 |
6 files changed, 257 insertions, 4 deletions
diff --git a/app-misc/alexandria/ChangeLog b/app-misc/alexandria/ChangeLog index 82e750bc8402..fd9718e9d869 100644 --- a/app-misc/alexandria/ChangeLog +++ b/app-misc/alexandria/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-misc/alexandria -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/ChangeLog,v 1.20 2007/09/17 20:04:37 phreak Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/ChangeLog,v 1.21 2008/03/09 10:23:12 graaff Exp $ + +*alexandria-0.6.2 (09 Mar 2008) + + 09 Mar 2008; Hans de Graaff <graaff@gentoo.org> + +files/alexandria-0.6.2-rake-0.8.1.patch, + +files/alexandria-rakefile.patch, metadata.xml, +alexandria-0.6.2.ebuild: + Bump version based on ebuild in #207092. Add John Keeping as proxy maintainer + as discussed in the same bug. 17 Sep 2007; Christian Heim <phreak@gentoo.org> metadata.xml: Removing citizen428 from metadata.xml (see #56803 for reference). diff --git a/app-misc/alexandria/Manifest b/app-misc/alexandria/Manifest index 91ef31cfb58f..7474f65a892c 100644 --- a/app-misc/alexandria/Manifest +++ b/app-misc/alexandria/Manifest @@ -1,8 +1,22 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX alexandria-0.6.2-rake-0.8.1.patch 5281 RMD160 d8a7f4c94ae3972d40a51ce59312d6ebcb0fd3d1 SHA1 0f49dfca3b159116fe5dfc45c41f258b2f1767c0 SHA256 ed4dc7560f088f58411473003ddee3cb44623a5e53c22bb59e9cc0e40e845443 +AUX alexandria-rakefile.patch 447 RMD160 0e091640e3666f23b574834d976c0649a5124067 SHA1 5abfcb997c95d0a08d1401df4151dfe25aada1da SHA256 88852e3f4bb5e4edb40b6e89609aeb91dddbed7886fbfed5a52fb8112e888416 DIST alexandria-0.5.1.tar.gz 124613 RMD160 bb153001bbdfc09ca33b467504d8ba4b3bb7a18f SHA1 547be0fe7fd1af80a54468e19fcb89a77f20888e SHA256 a1d1bdc3561320c0c081949237206b8662444dcad68aa6ca482177f9655e2588 DIST alexandria-0.6.0.tar.gz 929188 RMD160 09af6fbc3808077d885c2170661e1fb4cfda4d09 SHA1 a8de8d990b57fd06b1a050a4b5fe0e0b5053ef3b SHA256 fd306274b54462a072150dffddaea8addc191dc1bc16a1f0c6f5f59ffff78661 DIST alexandria-0.6.1.tar.gz 929638 RMD160 908b4234f75ffdb2d413366809b6dd8e6a406734 SHA1 9ed4079d73c1449ad0c2af52fff38f9886797369 SHA256 8f81822ba7a2cef2ce0b8f7d472f59737127d6c926853f4a4e288e11fdf8cf7f +DIST alexandria-0.6.2.tar.gz 1723857 RMD160 9cbc48b3c2c0a3d9cbfeebd789d26bcea9e06fab SHA1 e1e1af71cc322f3b052f4237a6d3e62721ccc2e1 SHA256 e1cb96b0380291bcf82b776904e8b3bde52c1632d9c0ed47fe4f44c582b0c8d7 EBUILD alexandria-0.5.1.ebuild 1562 RMD160 f8ac34cc9efadea7521ee03def7dd040686d6d03 SHA1 51e8ba5dbd0b0c7fddb232236d05d80e4cc3a5d4 SHA256 63354f6db98f1aa19f5bb3f05e753cba6a668805f0e5e46c8aa5050fe1a6e231 EBUILD alexandria-0.6.0.ebuild 1365 RMD160 6114c96fd9c359eb24060ed7129969a948d79505 SHA1 973efdff82e65fdd3990aac1ff02d87ed7004c6b SHA256 5d139c4f2e06c97d2ef461f9f6dda54c6b3906c1d43d6a1f6c1d3336243ddf9b EBUILD alexandria-0.6.1.ebuild 1370 RMD160 a75be2100c5233555d21e15873842686919fb120 SHA1 d51c045f7bdd12c467406d43dfe5827fba97649d SHA256 75e9629a6b9454adee41bed793b800bb844bde1f4d5c064907f728cd94268996 -MISC ChangeLog 2630 RMD160 b7d9c70ee9602d9a9d0d8b7bc95a54a9fb5d98f4 SHA1 bd99664533546ddb0e0ed5c4371017e456220df2 SHA256 315250ecbbea1a25f2ed332774942a6dd761d9c6d02cd9a990aa9f9c50757876 -MISC metadata.xml 178 RMD160 71b6705f62d2eecf095dfd2b8929fefb799d57cf SHA1 8cd8a9de68c81bedcc4822a0aca082376ba4affd SHA256 ded10c0678f5203b8e2e8f32aff5e53d2fac8844f59b4c5b6d59a796b69e664d +EBUILD alexandria-0.6.2.ebuild 1442 RMD160 ba2a9f71a3a1ce9960ff823b9541ef82a3727d5d SHA1 caa4ae526f0b6cd976b992130a45df9ed2ae8ac4 SHA256 dd36e7055b533739fb6c444cdada7aa7a6e71c8e17e1fe2eed902dd9d0b4d7a2 +MISC ChangeLog 2946 RMD160 68a634ed80eabac60b3fefbc0a61092272954618 SHA1 8755f5d254916aa0c6dae3fef2c19bc039107c6c SHA256 5a9b38bde9e4309b38062c265463c7dab504eb47017e8eb0053a3ed1cca11daa +MISC metadata.xml 295 RMD160 42f895a8c3619e0a747f33af56f6420b2138f3d0 SHA1 d99a6ad2e3948fd01f6467859050ae012bf52f93 SHA256 d85e5fba4ce142acc61fa7b7e006665cde7dbe045a4238858b360ff0b23c175b +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFH07qbQUozDL2JlH4RArpaAJ4vENtCSKc6UpV2ObjcrWqD2uyNOACeKuSm +pjnTXzwOtqVa0KDwkLpgEN0= +=pRap +-----END PGP SIGNATURE----- diff --git a/app-misc/alexandria/alexandria-0.6.2.ebuild b/app-misc/alexandria/alexandria-0.6.2.ebuild new file mode 100644 index 000000000000..0e6304c4ccf4 --- /dev/null +++ b/app-misc/alexandria/alexandria-0.6.2.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/alexandria-0.6.2.ebuild,v 1.1 2008/03/09 10:23:12 graaff Exp $ + +inherit ruby gnome2 eutils + +IUSE="" + +DESCRIPTION="A GNOME application to help you manage your book collection" +HOMEPAGE="http://alexandria.rubyforge.org/" +SRC_URI="http://rubyforge.org/frs/download.php/29501/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +USE_RUBY="ruby18" + +DOCS="COPYING ChangeLog README TODO" + +RDEPEND=">=dev-lang/ruby-1.8.0 + >=dev-ruby/ruby-gettext-0.6.1 + >=dev-ruby/ruby-gnome2-0.14.0 + >=dev-ruby/ruby-libglade2-0.12.0 + >=dev-ruby/ruby-gconf2-0.12.0 + >=dev-ruby/ruby-gdkpixbuf2-0.12.0 + >=dev-ruby/ruby-amazon-0.8.3 + >=dev-ruby/ruby-zoom-0.2.0" + +DEPEND="${RDEPEND} + app-text/scrollkeeper + dev-ruby/rake" + +src_unpack() { + unpack "${A}" + cd "${S}" + + epatch "${FILESDIR}/${PN}-rakefile.patch" + epatch "${FILESDIR}/${P}-rake-0.8.1.patch" +} + +src_compile() { + rake || die +} + +src_install() { + export PREFIX="${D}/usr" + rake install || die + + [ -n "${DOCS}" ] && dodoc ${DOCS} + + # Move the installed docs to the gentoo standard directory + for doc in "${D}/usr/share/doc/alexandria/*" + do + dodoc $doc + done + rm -rf "${D}/usr/share/doc/alexandria" +} + +pkg_postinst() { + unset PREFIX + + gnome2_gconf_install + + # For the next line see bug #76726 + "${ROOT}/usr/bin/gconftool-2" --shutdown +} diff --git a/app-misc/alexandria/files/alexandria-0.6.2-rake-0.8.1.patch b/app-misc/alexandria/files/alexandria-0.6.2-rake-0.8.1.patch new file mode 100644 index 000000000000..d99757994d21 --- /dev/null +++ b/app-misc/alexandria/files/alexandria-0.6.2-rake-0.8.1.patch @@ -0,0 +1,147 @@ +# Merge changes from upstream to fix compilation with rake 0.8.1 + +--- tasks.rb.orig 2007-12-19 20:49:17.000000000 +0000 ++++ tasks.rb 2008-02-07 11:33:54.000000000 +0000 +@@ -38,6 +38,7 @@ + # these may be distributed as ordinary libraries, + # or as gems. Try the library versions first. + retrying_with_rubygems = false ++ + begin + require 'rake' + require 'rake/tasklib' +@@ -199,21 +200,35 @@ + desc "Run RSpec specifications" + Spec::Rake::SpecTask.new("spec") do |t| + t.spec_files = @files.specs +- t.spec_opts = ["--format", "specdoc"] ++ t.spec_opts = ["--format", "progress"] + end ++ + namespace :spec do ++ Spec::Rake::SpecTask.new("autotest") do |t| ++ t.spec_files = @files.specs ++ t.spec_opts = ["--format", "progress"] ++ end ++ + desc "Verify test coverage" + Spec::Rake::SpecTask.new("rcov") do |t| +- t.spec_files = FileList['spec/**/*_spec.rb'] ++ t.spec_files = @files.specs + t.spec_opts = ["--format", "specdoc"] + t.rcov_opts = ["--exclude", "spec"] + t.rcov = true + end ++ desc "Generate spec html" + Spec::Rake::SpecTask.new("html") do |t| +- t.spec_files = FileList['spec/**/*_spec.rb'] ++ t.spec_files = @files.specs + t.spec_opts = ["--format", "html"] + t.rcov_opts = ["--exclude", "spec"] + end ++ desc "Profile slowest examples" ++ Spec::Rake::SpecTask.new("profile") do |t| ++ t.spec_files = @files.specs ++ t.spec_opts = ["--format", "profile"] ++ t.rcov_opts = ["--exclude", "spec"] ++ end ++ + desc "Run slower acceptance tests (real world data)" + Spec::Rake::SpecTask.new("acceptance") do |t| + t.spec_files = FileList['spec/acceptance/*_spec.rb'] +@@ -258,8 +273,8 @@ + end + dest = source_path ? dest_basedir + source_path : dest_basedir + FileUtils.mkdir_p dest unless test ?d, dest +- puts "Installing #{file} to #{dest}" +- File.install(file.to_s, dest.to_s, mode) ++ puts "Installing #{file} to #{dest} with #{mode}" ++ FileUtils.install(file.to_s, dest.to_s, :mode => mode) + end + + def define_install_tasks +@@ -318,9 +333,9 @@ + + def base_installation + [ +- ['lib', build.files.libs, rubylib, 0644], +- ['data', build.files.data, sharedir, 0644], +- ['bin', build.files.programs, bindir, 0755] ++ ['lib', build.files.libs, rubylib, 0644], ++ ['data', build.files.data, sharedir, 0644], ++ ['bin', build.files.programs, bindir, 0755] + ] + end + +@@ -329,7 +344,7 @@ + icon_group = [] + build.files.icons.each do |filename| + filename =~ /.*\/(.+)\/.+/ +- size = $1 ++ size = $1 + dest = File.join(icon_dir, size, 'apps') + icon_group << [File.dirname(filename), filename, dest, 0644] + end +@@ -357,8 +372,8 @@ + end + end + [ +- ['doc', docdir_files, doc_dir, 0644], +- ['.', curdir_files, doc_dir, 0644] ++ ['doc', docdir_files, doc_dir, 0644], ++ ['.', curdir_files, doc_dir, 0644] + ] + end + +@@ -388,7 +403,7 @@ + def template_copy(src, dest, data) + src_text = File.open(src).read() + dest_text = src_text.gsub(/#(\w+)#/) { |match| data[$1.intern] } +- FileUtils.mkdir_p(File.dirname(dest)) ++ FileUtils.mkdir_p(File.dirname(dest)) + File.open(dest, 'w') { |f| f.write(dest_text) } + end + +@@ -416,16 +431,16 @@ + # HACK gconf + gconf_dir = File.join(@debinstall.staging_dir, "/usr/share/gconf/schemas") + FileUtils.mkdir_p(gconf_dir) +- File.install("schemas/alexandria.schemas", gconf_dir, 0644) ++ FileUtils.install("schemas/alexandria.schemas", gconf_dir, 0644) + + # HACK copyright + doc_dir = File.join(@debinstall.staging_dir, "/usr/share/doc/#{@name}") + FileUtils.mkdir_p(doc_dir) +- File.install("debian/copyright", doc_dir, 0644) ++ FileUtils.install("debian/copyright", doc_dir, 0644) + FileUtils.rm_f(File.join(doc_dir, 'COPYING')) + FileUtils.rm_f(File.join(doc_dir, 'INSTALL')) +- File.install("debian/README.Debian", doc_dir, 0644) +- File.install("debian/changelog", doc_dir, 0644) ++ FileUtils.install("debian/README.Debian", doc_dir, 0644) ++ FileUtils.install("debian/changelog", doc_dir, 0644) + + autogen_files = ["lib/alexandria/config.rb", + "lib/alexandria/version.rb", +@@ -549,7 +564,7 @@ + end + def locale_for(omf_file) + omf_file =~ /.*-(.+)\.omf/ +- $1 ++ $1 + end + def in_files + FileList["#{@omf_dir}/*.omf.in"] +@@ -566,9 +581,9 @@ + def define_gettext_tasks + # extract translations from PO files into other files + file files.desktop => ["#{files.desktop}.in", +- *@gettext.po_files] do |f| +- system("intltool-merge -d #{@gettext.po_dir} #{f.name}.in #{f.name}") +- end ++ *@gettext.po_files] do |f| ++ raise "Need to install intltool" unless system("intltool-merge -d #{@gettext.po_dir} #{f.name}.in #{f.name}") ++ end + + # create MO files + rule( /\.mo$/ => [ lambda { |dest| @gettext.source_file(dest) }]) do |t| diff --git a/app-misc/alexandria/files/alexandria-rakefile.patch b/app-misc/alexandria/files/alexandria-rakefile.patch new file mode 100644 index 000000000000..6686e0f787ac --- /dev/null +++ b/app-misc/alexandria/files/alexandria-rakefile.patch @@ -0,0 +1,13 @@ +# Remove the post install tasks because it's not properly installed when +# they run and portage does exactly the same things later anyway. + +--- Rakefile.orig 2008-01-23 22:25:02.000000000 +0000 ++++ Rakefile 2008-01-23 22:25:50.000000000 +0000 +@@ -220,7 +220,5 @@ + system("gtk-update-icon-cache -f -t /usr/share/icons/hicolor") # HACK + end + +-task :post_install => [:scrollkeeper, :gconf, :update_icon_cache] +- + + #vim: filetype=ruby syntax=Ruby diff --git a/app-misc/alexandria/metadata.xml b/app-misc/alexandria/metadata.xml index b9eb887dcf92..4102ef204cc8 100644 --- a/app-misc/alexandria/metadata.xml +++ b/app-misc/alexandria/metadata.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer> + <email>john.keeping@lineone.net</email> + <name>John Keeping</name> + </maintainer> <herd>ruby</herd> <herd>gnome</herd> </pkgmetadata> |