Version bump, and add three patches to fix misc glitches.

Package-Manager: portage-2.1.4_rc10

7 files changed, 265 insertions, 8 deletions

diff --git a/media-sound/rubyripper/ChangeLog b/media-sound/rubyripper/ChangeLog
index 7ed3bda1dda8..a67d0e8d9b05 100644
--- a/media-sound/rubyripper/ChangeLog
+++ b/media-sound/rubyripper/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/rubyripper
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rubyripper/ChangeLog,v 1.14 2007/10/22 21:23:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rubyripper/ChangeLog,v 1.15 2007/12/14 18:03:10 flameeyes Exp $
+
+*rubyripper-0.4.4 (14 Dec 2007)
+
+  14 Dec 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/rubyripper-0.4.4-desktopfile.patch,
+  +files/rubyripper-0.4.4-editor-environment.patch,
+  +files/rubyripper-0.4.4-iconinstall.patch, +rubyripper-0.4.4.ebuild:
+  Version bump, and add three patches to fix misc glitches.
 
   22 Oct 2007; Markus Meier <maekke@gentoo.org> rubyripper-0.4.2-r1.ebuild:
   x86 stable, bug #196592
diff --git a/media-sound/rubyripper/Manifest b/media-sound/rubyripper/Manifest
index 15cce57cf09d..d29845fe9b1a 100644
--- a/media-sound/rubyripper/Manifest
+++ b/media-sound/rubyripper/Manifest
@@ -1,8 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX rubyripper-0.4.4-desktopfile.patch 645 RMD160 16f2f4840e61f69ca88c0ce440e6fe6c6e2e8af5 SHA1 7a8d6ead7ef11085cf5a09a26c143546b53a895e SHA256 482d9feed5d544fa3d3732d6b61f46416034c3c78bc0124c4a21874f1e8018c5
+MD5 85f9b4b62ebbdc4ed49e808ca43433ce files/rubyripper-0.4.4-desktopfile.patch 645
+RMD160 16f2f4840e61f69ca88c0ce440e6fe6c6e2e8af5 files/rubyripper-0.4.4-desktopfile.patch 645
+SHA256 482d9feed5d544fa3d3732d6b61f46416034c3c78bc0124c4a21874f1e8018c5 files/rubyripper-0.4.4-desktopfile.patch 645
+AUX rubyripper-0.4.4-editor-environment.patch 919 RMD160 9d0546aa4a7881dd00650ba9a65ad80508410ba8 SHA1 648620ebeab15935e9e6ff27923adef91c5f3f83 SHA256 197ada7aa5e1d0651e1d9d4dc6ebe0d04d524c779bd58c653dd4c84086e5f978
+MD5 234d024c3a383b250b84e2a5ccba99fd files/rubyripper-0.4.4-editor-environment.patch 919
+RMD160 9d0546aa4a7881dd00650ba9a65ad80508410ba8 files/rubyripper-0.4.4-editor-environment.patch 919
+SHA256 197ada7aa5e1d0651e1d9d4dc6ebe0d04d524c779bd58c653dd4c84086e5f978 files/rubyripper-0.4.4-editor-environment.patch 919
+AUX rubyripper-0.4.4-iconinstall.patch 4787 RMD160 89b1e91f7bb5dcd236184732e2e96456a8d048b9 SHA1 ca13e3f6412a27af525974d6f30e391bd2599ce9 SHA256 4eb160c401d50fe08155014b9fa5d7542eb83eb68c8ce4dd6e2b866a748ea869
+MD5 2b6f4bfb31f1a4d228411696a8f50812 files/rubyripper-0.4.4-iconinstall.patch 4787
+RMD160 89b1e91f7bb5dcd236184732e2e96456a8d048b9 files/rubyripper-0.4.4-iconinstall.patch 4787
+SHA256 4eb160c401d50fe08155014b9fa5d7542eb83eb68c8ce4dd6e2b866a748ea869 files/rubyripper-0.4.4-iconinstall.patch 4787
 DIST rubyripper-0.3.tar.bz2 31459 RMD160 50dd5b35b379ec82ecaee2bcfb05f7a06181a9b3 SHA1 0879c65c206982e8b27bb1e463e7dc19d475b0a2 SHA256 60479b284dbe1bd592c0d3bc093912eb2b0b33a04f7ec84e8b576e33ba0b8f88
 DIST rubyripper-0.4.2.tar.bz2 41450 RMD160 57530c174aa4e3cfdfc4a4ea042090d750a5598a SHA1 7f833ab4d6ff394b0fac5371a575dcadfb2a7dfd SHA256 fc8e269a66107195849bd9ffeb574af9c0d832e4a6bd07ae1af20786a72915ff
+DIST rubyripper-0.4.4.tar.bz2 65649 RMD160 f54a2bf0492f151f6e7895c2bd917a3d95d4af21 SHA1 1b39792cd2d8c957ae93f8fc5c721084475a691e SHA256 c7e9129ff3ea3cae652db129180941b6ccc35f9f282b34e8160060b0e486d937
 EBUILD rubyripper-0.3.ebuild 1157 RMD160 b28efe4cdd8d1d1873b6790cb2488c347e6f354c SHA1 7f4dd926c11ea5be041c8651e441d1ebf11d5164 SHA256 a99ec84aa9993ecf03caad8e8a316549bb1916d4c88e699a6f514c547d1a1f51
 MD5 6fa740585819a140693c3fdfb40e78ae rubyripper-0.3.ebuild 1157
 RMD160 b28efe4cdd8d1d1873b6790cb2488c347e6f354c rubyripper-0.3.ebuild 1157
@@ -11,10 +24,14 @@ EBUILD rubyripper-0.4.2-r1.ebuild 979 RMD160 c57e3979a275bb702859435405167261564
 MD5 e9cd600ec316130f50462d2b245d4c3f rubyripper-0.4.2-r1.ebuild 979
 RMD160 c57e3979a275bb702859435405167261564d4c43 rubyripper-0.4.2-r1.ebuild 979
 SHA256 3e71b443bc15ca8d5d8fcff90c1753dc8788c09e9a1f7d6c6df0183e8a9a9108 rubyripper-0.4.2-r1.ebuild 979
-MISC ChangeLog 2078 RMD160 3dce7046ef4530f23307eb42595af7716c4ee82b SHA1 a3a365c8489a011e01642c7fc4af551739472aaa SHA256 122c2810a3dccc0128c87330e81bff5a2f261f311c0c733a25a60803e2afb8fc
-MD5 0a706183df9f09cfeffd1f635463418c ChangeLog 2078
-RMD160 3dce7046ef4530f23307eb42595af7716c4ee82b ChangeLog 2078
-SHA256 122c2810a3dccc0128c87330e81bff5a2f261f311c0c733a25a60803e2afb8fc ChangeLog 2078
+EBUILD rubyripper-0.4.4.ebuild 1505 RMD160 26a84e52a6e7eec7114c726a0e33719a8a740bec SHA1 51f318d3601f96f9e14bc598ca6cdfe1e0049ea8 SHA256 18829acf2f75dfd6122ea26a946486db558d0cddf898fd4842a58edb4917d858
+MD5 c2ada48fcba79533e78616e3b7aa63ab rubyripper-0.4.4.ebuild 1505
+RMD160 26a84e52a6e7eec7114c726a0e33719a8a740bec rubyripper-0.4.4.ebuild 1505
+SHA256 18829acf2f75dfd6122ea26a946486db558d0cddf898fd4842a58edb4917d858 rubyripper-0.4.4.ebuild 1505
+MISC ChangeLog 2396 RMD160 2b5ded40e905e4b4f2ae1cafeff09205daae6dae SHA1 702d76eb5d7bbfc0440ac19f7f3e2ddc7e3c3125 SHA256 dc70af67aa10c538420231bde6bffae72e812b2c3d59dfb1b1cb524b0adaf62a
+MD5 923e0953d18b2d2d0dfe8ef597d706f0 ChangeLog 2396
+RMD160 2b5ded40e905e4b4f2ae1cafeff09205daae6dae ChangeLog 2396
+SHA256 dc70af67aa10c538420231bde6bffae72e812b2c3d59dfb1b1cb524b0adaf62a ChangeLog 2396
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -25,10 +42,13 @@ SHA256 55808dedefd238fd9760bf98d4aa61656e84eff81efbbbdbdbd7b60e6aed82d1 files/di
 MD5 dbb3671b7e39a679d272e4f0f986161c files/digest-rubyripper-0.4.2-r1 250
 RMD160 2eb1ac2e3bb5f1e979289ffe33775f2eeddaacb6 files/digest-rubyripper-0.4.2-r1 250
 SHA256 65714440a9c82ebed214d1cad00aec21854c1c2c964f821ad9f6a756e943aaef files/digest-rubyripper-0.4.2-r1 250
+MD5 da4de24c232b3ded33d58e9cf93faf54 files/digest-rubyripper-0.4.4 250
+RMD160 c630b3df52e60e9998df7d6ab7eb0986b2c9eecc files/digest-rubyripper-0.4.4 250
+SHA256 eafe927dffc5ce8209dabe970b3250b8ac3b667924a75db59c80e0242236a4f9 files/digest-rubyripper-0.4.4 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHHRT7kKaRLQcq0GIRAkzEAJ9DctrTGL9k0ppsbw3LuCmSFT7w+wCfVBau
-A85LCnWF88q3l4CfFI6j0OM=
-=SV7A
+iD8DBQFHYsVkAiZjviIA2XgRAvgaAJsEUPcXi5Mta1cTDti5M5ErzEtJEwCfZzkp
+6ZwSlPk97bxBo3hhR79fEMs=
+=ACmG
 -----END PGP SIGNATURE-----
diff --git a/media-sound/rubyripper/files/digest-rubyripper-0.4.4 b/media-sound/rubyripper/files/digest-rubyripper-0.4.4
new file mode 100644
index 000000000000..57ce04475912
--- /dev/null
+++ b/media-sound/rubyripper/files/digest-rubyripper-0.4.4
@@ -0,0 +1,3 @@
+MD5 15d327875f9e5a694e17709d4276a6c8 rubyripper-0.4.4.tar.bz2 65649
+RMD160 f54a2bf0492f151f6e7895c2bd917a3d95d4af21 rubyripper-0.4.4.tar.bz2 65649
+SHA256 c7e9129ff3ea3cae652db129180941b6ccc35f9f282b34e8160060b0e486d937 rubyripper-0.4.4.tar.bz2 65649
diff --git a/media-sound/rubyripper/files/rubyripper-0.4.4-desktopfile.patch b/media-sound/rubyripper/files/rubyripper-0.4.4-desktopfile.patch
new file mode 100644
index 000000000000..7e94d32b555a
--- /dev/null
+++ b/media-sound/rubyripper/files/rubyripper-0.4.4-desktopfile.patch
@@ -0,0 +1,27 @@
+Fix the desktop file to comply with current desktop file specs.
+
+From: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
+
+
+---
+
+ rubyripper.desktop |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/rubyripper.desktop b/rubyripper.desktop
+index 501564d..350646a 100644
+--- a/rubyripper.desktop
++++ b/rubyripper.desktop
+@@ -1,9 +1,8 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Name=Rubyripper
+ GenericName=Secure Audio Disc Ripper
+ GenericName[nl]=Veilige Audio CD Ripper
+-Icon=rubyripper_22.png
++Icon=rubyripper
+ Exec=rrip_gui
+-Categories=AudioVideo;
+\ No newline at end of file
++Categories=AudioVideo;Audio;
diff --git a/media-sound/rubyripper/files/rubyripper-0.4.4-editor-environment.patch b/media-sound/rubyripper/files/rubyripper-0.4.4-editor-environment.patch
new file mode 100644
index 000000000000..2f1b70f7cdd5
--- /dev/null
+++ b/media-sound/rubyripper/files/rubyripper-0.4.4-editor-environment.patch
@@ -0,0 +1,24 @@
+Check if the EDITOR environment variable is set, in which case use
+
+From: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
+
+that rather than trying to find the default editor almost randomly.
+---
+
+ rubyripper_gtk2.rb |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/rubyripper_gtk2.rb b/rubyripper_gtk2.rb
+index a12c0ff..4492094 100755
+--- a/rubyripper_gtk2.rb
++++ b/rubyripper_gtk2.rb
+@@ -35,7 +35,8 @@ def filemanager #look for default filemanager
+ end
+ 
+ def editor # look for default editor
+-	if installed('mousepad') : return 'mousepad' #Xfce4 editor
++	if ENV['EDITOR'] : return ENV['EDITOR'] # User's setting
++	elsif installed('mousepad') : return 'mousepad' #Xfce4 editor
+ 	elsif installed('kwrite') : return 'kwrite' #Kde editor
+ 	elsif installed('gedit') : return 'gedit' #Gnome editor
+ 	else puts "No editor found. Please tell the developer which editor you use!" ; return 'unknown'
diff --git a/media-sound/rubyripper/files/rubyripper-0.4.4-iconinstall.patch b/media-sound/rubyripper/files/rubyripper-0.4.4-iconinstall.patch
new file mode 100644
index 000000000000..06ce95afb1a1
--- /dev/null
+++ b/media-sound/rubyripper/files/rubyripper-0.4.4-iconinstall.patch
@@ -0,0 +1,113 @@
+Install the icon in proper FDO Icon Theme path, with just rubyripper as name.
+
+From: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
+
+
+---
+
+ configure          |   20 ++++++++++----------
+ rubyripper_gtk2.rb |    4 ++--
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/configure b/configure
+index 2a62554..993ed75 100755
+--- a/configure
++++ b/configure
+@@ -18,7 +18,7 @@
+ $PREFIX='/usr/local'
+ $BINDIR='/bin'
+ $LOCALE='/share/locale'
+-$PIXMAPS='/share/pixmaps'
++$ICONDIR='/share/icons/hicolor'
+ $DESKTOP='/share/applications'
+ $RUBYDIR= "#{$:[0]}"
+ $RUBYDIR= $RUBYDIR[$RUBYDIR.index('/lib')..-1] # remove the prefix
+@@ -33,7 +33,7 @@ if ARGV.include?('--help') || ARGV.include?('-h') || ARGV.length == 0
+ 	puts "--prefix=<destination_dir>  (default: #{$PREFIX})"
+ 	puts "--bindir=<bin_dir>  (default: #{$BINDIR})"
+ 	puts "--locale=<locale_dir>  (default: #{$LOCALE})"
+-	puts "--pixmaps=<pixmaps_dir>  (default: #{$PIXMAPS}"
++	puts "--icondir=<icon_theme_dir>  (default: #{$ICONDIR}"
+ 	puts "--desktop=<desktop_dir>  (default: #{$DESKTOP}"
+ 	puts "--ruby=<ruby_dir>  (default: #{$RUBYDIR})"
+ 	puts ""
+@@ -66,8 +66,8 @@ def update_lib
+ 			if line =~ /LOCALE=/
+ 				file[index] = "LOCALE=[ENV['PWD'] + \"/locale\", \"#{$PREFIX + $LOCALE}\"]"
+ 				break
+-			elsif line =~ /PIXMAPS=/
+-				file[index] = "PIXMAPS=[ENV['PWD'], \"#{$PREFIX + $PIXMAPS}\"]"
++			elsif line =~ /ICONDIR=/
++				file[index] = "ICONDIR=[ENV['PWD'], \"#{$PREFIX + $ICONDIR}\"]"
+ 			elsif line =~ /RUBYDIR=/
+ 				file[index] = "RUBYDIR=[ENV['PWD'], \"#{$PREFIX + $RUBYDIR}\"]"
+ 				break
+@@ -87,8 +87,8 @@ ARGV.each do |argument|
+ 		$BINDIR = argument[9..-1]
+ 	elsif argument[0,9] == "--locale="
+ 		$LOCALE = argument[9..-1]
+-	elsif argument[0,10] == "--pixmaps="
+-		$PIXMAPS = argument[10..-1]
++	elsif argument[0,10] == "--icondir="
++		$ICONDIR = argument[10..-1]
+ 	elsif argument[0,10] == "--desktop="
+ 		$DESKTOP = argument[10..-1]
+ 	elsif argument[0,7] == "--ruby="
+@@ -125,7 +125,7 @@ makefile.puts "#This Makefile is automatically created by configure"
+ makefile.puts ""
+ makefile.puts "BINDIR=#{$PREFIX}#{$BINDIR}"
+ makefile.puts "LOCALE=#{$PREFIX}#{$LOCALE}"
+-makefile.puts "PIXMAPS=#{$PREFIX}#{$PIXMAPS}"
++makefile.puts "ICONDIR=#{$PREFIX}#{$ICONDIR}"
+ makefile.puts "DESKTOP=#{$PREFIX}#{$DESKTOP}"
+ makefile.puts "RUBYDIR=#{$PREFIX}#{$RUBYDIR}"
+ makefile.puts ""
+@@ -137,7 +137,7 @@ makefile.puts "\tinstall -D rr_lib.rb $(prefix)$(DESTDIR)$(RUBYDIR)/rr_lib.rb"
+ 
+ if $GTK2
+ 	makefile.puts "\tinstall -m 755 -D rubyripper_gtk2.rb $(prefix)$(DESTDIR)$(BINDIR)/rrip_gui"
+-	makefile.puts "\tinstall -D rubyripper_22.png $(prefix)$(DESTDIR)$(PIXMAPS)/rubyripper_22.png"
++	makefile.puts "\tinstall -D rubyripper_22.png $(prefix)$(DESTDIR)$(ICONDIR)/22x22/apps/rubyripper.png"
+ 	makefile.puts "\tinstall -D rubyripper.desktop $(prefix)$(DESTDIR)$(DESKTOP)/rubyripper.desktop"
+ end
+ 
+@@ -157,7 +157,7 @@ makefile.puts "\trm $(prefix)$(DESTDIR)$(RUBYDIR)/rr_lib.rb"
+ 
+ if $GTK2
+ 	makefile.puts "\trm $(prefix)$(DESTDIR)$(BINDIR)/rrip_gui"
+-	makefile.puts "\trm $(prefix)$(DESTDIR)$(PIXMAPS)/rubyripper_22.png"
++	makefile.puts "\trm $(prefix)$(DESTDIR)$(ICONDIR)/22x22/apps/rubyripper.png"
+ 	makefile.puts "\trm $(prefix)$(DESTDIR)$(DESKTOP)/rubyripper.desktop"
+ end
+ 
+@@ -185,7 +185,7 @@ puts ""
+ puts "Using the following locations for install:"
+ puts "* Executables: #{$PREFIX}#{$BINDIR}"
+ puts "* Localization files: #{$PREFIX}#{$LOCALE}"
+-puts "* Icon file: #{$PREFIX}#{$PIXMAPS}"
++puts "* Icon file: #{$PREFIX}#{$ICONDIR}"
+ puts "* Desktop file: #{$PREFIX}#{$DESKTOP}"
+ puts "* Ruby library: #{$PREFIX}#{$RUBYDIR}"
+ puts ""
+diff --git a/rubyripper_gtk2.rb b/rubyripper_gtk2.rb
+index 879e155..a12c0ff 100755
+--- a/rubyripper_gtk2.rb
++++ b/rubyripper_gtk2.rb
+@@ -15,7 +15,7 @@
+ #    You should have received a copy of the GNU General Public License
+ #    along with this program.  If not, see <http://www.gnu.org/licenses/>
+ 
+-PIXMAPS=[ENV['PWD'], "/usr/local/share/pixmaps"]
++ICONDIR=[ENV['PWD'], "/usr/local/share/icons/hicolor"]
+ RUBYDIR=[ENV['PWD'], "/usr/local/lib/ruby/site_ruby/1.8"]
+ 
+ begin
+@@ -51,7 +51,7 @@ attr_reader :change_display, :instances
+ 		@instances = {'Preferences' => false, 'Metadata' => false, 'ShortMessage' => false, 'RipStatus' => false, 'DirExists' => false, 'MultipleFreedbHits' => false, 'Summary' => false}
+ 		@current_instance = false
+ 		@gtk_window = Gtk::Window.new('Rubyripper')
+-		PIXMAPS.each{|dir| if File.exist?(file = File.join(dir, 'rubyripper_22.png')) : @gtk_window.icon = Gdk::Pixbuf.new(file) ; break end }
++		ICONDIR.each{|dir| if File.exist?(file = File.join(dir, '/22x22/apps/rubyripper.png')) : @gtk_window.icon = Gdk::Pixbuf.new(file) ; break end }
+ 		@gtk_window.set_default_size(520, 400) #width, height
+ 		
+ 		@hbox1 = Gtk::HBox.new(false,5)
diff --git a/media-sound/rubyripper/rubyripper-0.4.4.ebuild b/media-sound/rubyripper/rubyripper-0.4.4.ebuild
new file mode 100644
index 000000000000..ef74d6e45614
--- /dev/null
+++ b/media-sound/rubyripper/rubyripper-0.4.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rubyripper/rubyripper-0.4.4.ebuild,v 1.1 2007/12/14 18:03:10 flameeyes Exp $
+EAPI="1"
+
+inherit ruby
+
+DESCRIPTION="a secure audio ripper for linux"
+HOMEPAGE="http://code.google.com/p/rubyripper"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flac mp3 vorbis +gtk cli"
+
+ILINGUAS="de hu nl ru"
+
+for lingua in $ILINGUAS; do
+	IUSE="${IUSE} linguas_${lingua}"
+done
+
+DEPEND=""
+RDEPEND="gtk? ( dev-ruby/ruby-gtk2 )
+	dev-ruby/ruby-gettext
+	virtual/eject
+	media-sound/cd-discid
+	media-sound/cdparanoia
+	flac? ( media-libs/flac )
+	mp3? ( media-sound/lame )
+	vorbis? ( media-sound/vorbis-tools )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-iconinstall.patch"
+	epatch "${FILESDIR}/${P}-desktopfile.patch"
+	epatch "${FILESDIR}/${P}-editor-environment.patch"
+}
+
+src_compile() {
+	local myconf="--prefix=/usr"
+	local enable_linguas=""
+
+	for lingua in $ILINGUAS; do
+		use linguas_$lingua && enable_linguas="${enable_linguas},${lingua}"
+	done
+
+	[[ -n ${enable_linguas} ]] && myconf="${myconf} --enable-lang=${enable_linguas#,}"
+
+	use gtk && myconf="${myconf} --enable-gtk2"
+	use cli && myconf="${myconf} --enable-cli"
+
+	./configure ${myconf} || die "./configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+}