Fix .desktop file, license to GPL-3, install bundled documentation, and more. Bug 185922, thanks to Kevin Fullerton and Daniel Pielmeier.

Package-Manager: portage-2.1.3_rc8

6 files changed, 34 insertions, 76 deletions

diff --git a/media-sound/rubyripper/ChangeLog b/media-sound/rubyripper/ChangeLog
index 0cef7ba3b933..191d2c8e5cc7 100644
--- a/media-sound/rubyripper/ChangeLog
+++ b/media-sound/rubyripper/ChangeLog
@@ -1,6 +1,13 @@
 # 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.11 2007/07/13 00:50:47 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rubyripper/ChangeLog,v 1.12 2007/07/20 08:35:34 drac Exp $
+
+*rubyripper-0.4.2-r1 (20 Jul 2007)
+
+  20 Jul 2007; Samuli Suominen <drac@gentoo.org>
+  +rubyripper-0.4.2-r1.ebuild:
+  Fix .desktop file, license to GPL-3, install bundled documentation, and
+  more. Bug 185922, thanks to Kevin Fullerton and Daniel Pielmeier.
 
 *rubyripper-0.4.2 (13 Jul 2007)
 
diff --git a/media-sound/rubyripper/Manifest b/media-sound/rubyripper/Manifest
index 412fee46fa99..e0d947a048ad 100644
--- a/media-sound/rubyripper/Manifest
+++ b/media-sound/rubyripper/Manifest
@@ -1,22 +1,17 @@
 DIST rubyripper-0.3.tar.bz2 31459 RMD160 50dd5b35b379ec82ecaee2bcfb05f7a06181a9b3 SHA1 0879c65c206982e8b27bb1e463e7dc19d475b0a2 SHA256 60479b284dbe1bd592c0d3bc093912eb2b0b33a04f7ec84e8b576e33ba0b8f88
-DIST rubyripper-0.4.1.tar.bz2 29527 RMD160 08461ad440f5ce07e0222097a7bce0d768336aba SHA1 81c96a0b6de6bcc42c92ec7375ea1988989edbee SHA256 6ae78613ef102b9d1d2550856dd1763a638ebb3b8dbb1bd4a99b3f6857031d08
 DIST rubyripper-0.4.2.tar.bz2 41450 RMD160 57530c174aa4e3cfdfc4a4ea042090d750a5598a SHA1 7f833ab4d6ff394b0fac5371a575dcadfb2a7dfd SHA256 fc8e269a66107195849bd9ffeb574af9c0d832e4a6bd07ae1af20786a72915ff
 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
 SHA256 a99ec84aa9993ecf03caad8e8a316549bb1916d4c88e699a6f514c547d1a1f51 rubyripper-0.3.ebuild 1157
-EBUILD rubyripper-0.4.1.ebuild 1031 RMD160 6ecf32727232136895a83872707c500c60969a42 SHA1 105b8d79a2d81a415e87e81a5bff59a861811350 SHA256 d6e41b59c5ec6a398cc7720c9630af4248b1d8494e5c3c83907fd629308f00a4
-MD5 914c880e5b9817e8e9894d2aaa8ce33b rubyripper-0.4.1.ebuild 1031
-RMD160 6ecf32727232136895a83872707c500c60969a42 rubyripper-0.4.1.ebuild 1031
-SHA256 d6e41b59c5ec6a398cc7720c9630af4248b1d8494e5c3c83907fd629308f00a4 rubyripper-0.4.1.ebuild 1031
-EBUILD rubyripper-0.4.2.ebuild 1029 RMD160 c0a177bc4a94ad34844d1c1c28e375b22f145c50 SHA1 bf559e275a98eb936a527c75bca9241798476cf4 SHA256 c3afcf0d89cf6b7c110890a411ba69464b352f63c274e46343259585d4f3e6a6
-MD5 ec32cc3eb7d9401de8f9024b2a1c4e09 rubyripper-0.4.2.ebuild 1029
-RMD160 c0a177bc4a94ad34844d1c1c28e375b22f145c50 rubyripper-0.4.2.ebuild 1029
-SHA256 c3afcf0d89cf6b7c110890a411ba69464b352f63c274e46343259585d4f3e6a6 rubyripper-0.4.2.ebuild 1029
-MISC ChangeLog 1626 RMD160 9591e1c80c18a00e88fd5c296115229d88c820a9 SHA1 ac9ee0739080a8e0ea848a7392b18c520d2a6027 SHA256 4846e7c353037f3e0805164b09eafb5f5a42a584a7afb4ef4c183ba5ffd3c4a9
-MD5 fdec628370e62c1e3ebfaf80f79dfe42 ChangeLog 1626
-RMD160 9591e1c80c18a00e88fd5c296115229d88c820a9 ChangeLog 1626
-SHA256 4846e7c353037f3e0805164b09eafb5f5a42a584a7afb4ef4c183ba5ffd3c4a9 ChangeLog 1626
+EBUILD rubyripper-0.4.2-r1.ebuild 979 RMD160 19e6c9def8297457d1cd2e621844052b433aeaf8 SHA1 1f54a828eecb51596ac474ef5d34faf8559fd867 SHA256 9f825b0cd3fa62b56d59a2268080f929bc58daed8bcf23d71e6c4b4c1750e5ff
+MD5 c0036b1041025ba21c0d60caa7005eeb rubyripper-0.4.2-r1.ebuild 979
+RMD160 19e6c9def8297457d1cd2e621844052b433aeaf8 rubyripper-0.4.2-r1.ebuild 979
+SHA256 9f825b0cd3fa62b56d59a2268080f929bc58daed8bcf23d71e6c4b4c1750e5ff rubyripper-0.4.2-r1.ebuild 979
+MISC ChangeLog 1882 RMD160 a54b812ee174bb420e2898ecfaaac7b420b7b2ed SHA1 02d389c30c3d0fa841ab8fbcbcd1165b278e744e SHA256 7bad4018b08d21df9f3a5bfad0a7f0014ff48fbd7cca84e60919c7f332a9f82c
+MD5 9e93951f70ae992b34fb0cb2a8940976 ChangeLog 1882
+RMD160 a54b812ee174bb420e2898ecfaaac7b420b7b2ed ChangeLog 1882
+SHA256 7bad4018b08d21df9f3a5bfad0a7f0014ff48fbd7cca84e60919c7f332a9f82c ChangeLog 1882
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -24,9 +19,6 @@ SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata
 MD5 f6d48c879dcbfda097e0d1d9143cc4ae files/digest-rubyripper-0.3 244
 RMD160 911397b2912d9fcbfd401ef0ce0247f1d48b55c0 files/digest-rubyripper-0.3 244
 SHA256 55808dedefd238fd9760bf98d4aa61656e84eff81efbbbdbdbd7b60e6aed82d1 files/digest-rubyripper-0.3 244
-MD5 157412c7a7553a1ab9db32fad5545efe files/digest-rubyripper-0.4.1 250
-RMD160 50f0bf8fc05656d185952a1554e965a932e0d802 files/digest-rubyripper-0.4.1 250
-SHA256 e2c2e92bb359fcfcc83a7e38073dbe204e0ceae477cfeb6d578e480cd9a8bfa0 files/digest-rubyripper-0.4.1 250
-MD5 dbb3671b7e39a679d272e4f0f986161c files/digest-rubyripper-0.4.2 250
-RMD160 2eb1ac2e3bb5f1e979289ffe33775f2eeddaacb6 files/digest-rubyripper-0.4.2 250
-SHA256 65714440a9c82ebed214d1cad00aec21854c1c2c964f821ad9f6a756e943aaef files/digest-rubyripper-0.4.2 250
+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
diff --git a/media-sound/rubyripper/files/digest-rubyripper-0.4.1 b/media-sound/rubyripper/files/digest-rubyripper-0.4.1
deleted file mode 100644
index 7c8649d7a774..000000000000
--- a/media-sound/rubyripper/files/digest-rubyripper-0.4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0d8f6553562601cff3cc53725f935c48 rubyripper-0.4.1.tar.bz2 29527
-RMD160 08461ad440f5ce07e0222097a7bce0d768336aba rubyripper-0.4.1.tar.bz2 29527
-SHA256 6ae78613ef102b9d1d2550856dd1763a638ebb3b8dbb1bd4a99b3f6857031d08 rubyripper-0.4.1.tar.bz2 29527
diff --git a/media-sound/rubyripper/files/digest-rubyripper-0.4.2 b/media-sound/rubyripper/files/digest-rubyripper-0.4.2-r1
index 5b7ce3f8587e..5b7ce3f8587e 100644
--- a/media-sound/rubyripper/files/digest-rubyripper-0.4.2
+++ b/media-sound/rubyripper/files/digest-rubyripper-0.4.2-r1
diff --git a/media-sound/rubyripper/rubyripper-0.4.1.ebuild b/media-sound/rubyripper/rubyripper-0.4.1.ebuild
deleted file mode 100644
index 78e1f9b3f4fc..000000000000
--- a/media-sound/rubyripper/rubyripper-0.4.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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.1.ebuild,v 1.1 2007/05/12 17:17:36 beandog Exp $
-
-inherit ruby
-
-DESCRIPTION="A secure audio ripper for linux"
-HOMEPAGE="http://code.google.com/p/rubyripper/"
-SRC_URI="http://rubyripper.googlecode.com/files/${P}.tar.bz2"
-IUSE="flac mp3 vorbis"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-RDEPEND="dev-ruby/ruby-libglade2
-	virtual/eject
-	media-sound/cd-discid
-	media-sound/cdparanoia
-	flac? ( media-libs/flac )
-	mp3? ( media-sound/lame )
-	vorbis? ( media-sound/vorbis-tools )"
-
-SLOT="0"
-
-src_install() {
-	newbin rubyripper_cli.rb rrip-cli
-	newbin rubyripper_gtk2.rb rrip-gui
-	dodir /usr/share/rubyripper
-	insinto /usr/share/rubyripper
-	doins rubyripper.glade
-	doins rubyripper_22.png
-	doruby rr_lib.rb
-}
-
-pkg_postinst() {
-	echo ""
-	elog "Rubyripper now has cli and gui versions, which are installed"
-	elog "as rrip-cli and rrip-gui respectively."
-	echo ""
-}
diff --git a/media-sound/rubyripper/rubyripper-0.4.2.ebuild b/media-sound/rubyripper/rubyripper-0.4.2-r1.ebuild
index b420cf1ebc63..1674e685f94a 100644
--- a/media-sound/rubyripper/rubyripper-0.4.2.ebuild
+++ b/media-sound/rubyripper/rubyripper-0.4.2-r1.ebuild
@@ -1,15 +1,18 @@
 # 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.2.ebuild,v 1.1 2007/07/13 00:50:47 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rubyripper/rubyripper-0.4.2-r1.ebuild,v 1.1 2007/07/20 08:35:34 drac Exp $
 
 inherit ruby
 
-DESCRIPTION="A secure audio ripper for linux"
-HOMEPAGE="http://code.google.com/p/rubyripper/"
-SRC_URI="http://rubyripper.googlecode.com/files/${P}.tar.bz2"
-IUSE="flac mp3 vorbis"
-LICENSE="GPL-2"
+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"
+
 RDEPEND="dev-ruby/ruby-gtk2
 	virtual/eject
 	media-sound/cd-discid
@@ -18,21 +21,18 @@ RDEPEND="dev-ruby/ruby-gtk2
 	mp3? ( media-sound/lame )
 	vorbis? ( media-sound/vorbis-tools )"
 
-SLOT="0"
-
 src_install() {
-	newbin rubyripper_cli.rb rrip-cli
-	newbin rubyripper_gtk2.rb rrip-gui
-	insinto /usr/share/pixmaps
-	doins rubyripper_22.png
-	insinto /usr/share/applications
-	doins rubyripper.desktop
+	newbin rubyripper_cli.rb rrip_cli
+	newbin rubyripper_gtk2.rb rrip_gui
+	doicon rubyripper_22.png
+	domenu rubyripper.desktop
 	doruby rr_lib.rb
+	dodoc README
 }
 
 pkg_postinst() {
 	echo ""
 	elog "Rubyripper now has cli and gui versions, which are installed"
-	elog "as rrip-cli and rrip-gui respectively."
+	elog "as rrip_cli and rrip_gui respectively."
 	echo ""
 }