Version bump wrt #220016. Patching .desktop file to respect latest specification. Fixing icondir from /usr/share/icons to /usr/share/pixmaps.

Package-Manager: portage-2.1.5_rc6

6 files changed, 80 insertions, 64 deletions

diff --git a/media-gfx/rawstudio/ChangeLog b/media-gfx/rawstudio/ChangeLog
index b096610ffdbc..b8baac4ff67e 100644
--- a/media-gfx/rawstudio/ChangeLog
+++ b/media-gfx/rawstudio/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/rawstudio
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/ChangeLog,v 1.3 2008/02/04 15:08:49 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/ChangeLog,v 1.4 2008/05/03 08:48:45 drac Exp $
+
+*rawstudio-1.0 (03 May 2008)
+
+  03 May 2008; Samuli Suominen <drac@gentoo.org>
+  -files/rawstudio-0.6-desktop-entry.patch,
+  +files/rawstudio-1.0-desktop-entry-and-pixmaps-directory.patch,
+  -rawstudio-0.6.ebuild, -rawstudio-0.7.ebuild, +rawstudio-1.0.ebuild:
+  Version bump wrt #220016. Patching .desktop file to respect latest
+  specification. Fixing icondir from /usr/share/icons to /usr/share/pixmaps.
 
 *rawstudio-0.7 (04 Feb 2008)
 
diff --git a/media-gfx/rawstudio/Manifest b/media-gfx/rawstudio/Manifest
index ade71360e1b2..921e85c486a8 100644
--- a/media-gfx/rawstudio/Manifest
+++ b/media-gfx/rawstudio/Manifest
@@ -1,7 +1,5 @@
-AUX rawstudio-0.6-desktop-entry.patch 596 RMD160 b2690b43595e7dabd41d95b03bedeba53a94172c SHA1 734f4b10265a811638f2778404097d89d5930e66 SHA256 e771c27b76746e26b044bfb3e46ae65e4cef3ad1803b1164561920ef3f1320d5
-DIST rawstudio-0.6.tar.gz 308000 RMD160 610d8646b42ec7d436199a761f1900fc65556b71 SHA1 52d32707c9a4cacfac13e98fd3d49bef63a60733 SHA256 76f29d6a9056902b799ea75daadf37caae84ab7fd3d883045a1fe9b94a33a2ed
-DIST rawstudio-0.7.tar.gz 344502 RMD160 11d8ece053a32a700505f24dab8e8d8fb20e7d69 SHA1 9368680cf01af51d7d192afb9c41155e2baf0e56 SHA256 c6a88ff4d08147793c1fb01448a17f4cd1784209d825636b913b3e7624ac67f5
-EBUILD rawstudio-0.6.ebuild 884 RMD160 2aed1d556eb81b810f0553235ddfbe219aad825a SHA1 31ca145d9aa23635e5939e4a90056b97066461d8 SHA256 fe45278a50510561a4ced15e007e325d99d12140c04e6c0f70c0ab1eec0c9adc
-EBUILD rawstudio-0.7.ebuild 890 RMD160 c69dd074cb04f4d853fc3e82b4a08abaabf5b30c SHA1 9091343dee31502e03ee860b97a8b8e79cf12a66 SHA256 02dab81417f7a6c826f9621f515225376d21b572ae71f843712e0e7f0c20ce08
-MISC ChangeLog 715 RMD160 d70683b491135edbc1fa99caa0637815aca4ca32 SHA1 ca3b43315eb46a00ac981a1b77f0a813cbe3ede9 SHA256 94cf56350685262fd9eec7946cce59ef556adc605a93379d80164ee71eebaefe
+AUX rawstudio-1.0-desktop-entry-and-pixmaps-directory.patch 2529 RMD160 c08f805ccfd5eb12906c5cc56ba1759773088782 SHA1 7551d74318bf3def280647f08b645819bbb3ee3b SHA256 2e10b116a8b50519b8af383e1cceec5aea1489597122abfda3cc74dff1c3e500
+DIST rawstudio-1.0.tar.gz 430154 RMD160 385187bf19b892abcc608a1543b2f09f7b1c376c SHA1 14e8f09107a24c2ec7fc07505c1d774833bb6458 SHA256 707429a3e1335d03f5d2196ee105d7fb8bf2db6e3c6bdd08c9d1a75e7ec493a9
+EBUILD rawstudio-1.0.ebuild 1010 RMD160 d0b6e5a1394080fc17a0c53e662d6afb37cc8226 SHA1 e57c076ffcc12cab62d9c6f4921ec5dbf9193a3b SHA256 7ce68a621c88e6232e4d931867326ef29c0ae0d918601372154bad249a63dfe9
+MISC ChangeLog 1122 RMD160 8bbc5e1da39bc1174cedab0a5d57b2fbb4a2b48d SHA1 bd7f8ceb8b52ed3056707fee766ab957e6dd1d94 SHA256 7903a7685ba53783dabe4be007bb774256eb16660628903edf830763b0277a9e
 MISC metadata.xml 262 RMD160 80d03288b90050618b22a3c6ddf21843d76e0c98 SHA1 95647ad45e3f1043bb02284b0e2b594cdcfb98b6 SHA256 ef5aaebad119de6e1ddeebea34f724697ff33d0a5489dc81a1632c6cf086c401
diff --git a/media-gfx/rawstudio/files/rawstudio-0.6-desktop-entry.patch b/media-gfx/rawstudio/files/rawstudio-0.6-desktop-entry.patch
deleted file mode 100644
index c9c0cef821d8..000000000000
--- a/media-gfx/rawstudio/files/rawstudio-0.6-desktop-entry.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur rawstudio-0.6.orig/rawstudio.desktop rawstudio-0.6/rawstudio.desktop
---- rawstudio-0.6.orig/rawstudio.desktop	2007-08-14 17:37:50.000000000 +0300
-+++ rawstudio-0.6/rawstudio.desktop	2008-01-21 21:02:06.000000000 +0200
-@@ -1,12 +1,12 @@
- [Desktop Entry]
- Version=1.0
- Type=Application
--Categories=Application;Graphics;Photography;GTK;
-+Categories=Graphics;Photography;GTK;
- Name=Rawstudio
- GenericName=Raw converter
- Comment=Open source raw-image converter and manipulation application
- Exec=rawstudio %F
- StartupNotify=true
--Icon=rawstudio.png
-+Icon=rawstudio
- MimeType=image/x-dcraw;
- 
diff --git a/media-gfx/rawstudio/files/rawstudio-1.0-desktop-entry-and-pixmaps-directory.patch b/media-gfx/rawstudio/files/rawstudio-1.0-desktop-entry-and-pixmaps-directory.patch
new file mode 100644
index 000000000000..d9d771ae0068
--- /dev/null
+++ b/media-gfx/rawstudio/files/rawstudio-1.0-desktop-entry-and-pixmaps-directory.patch
@@ -0,0 +1,56 @@
+diff -ur rawstudio-1.0.orig/pixmaps/Makefile.in rawstudio-1.0/pixmaps/Makefile.in
+--- rawstudio-1.0.orig/pixmaps/Makefile.in	2008-04-19 02:30:28.000000000 +0300
++++ rawstudio-1.0/pixmaps/Makefile.in	2008-05-03 11:40:35.000000000 +0300
+@@ -162,7 +162,7 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-icondir = $(datadir)/icons
++icondir = $(datadir)/pixmaps
+ icon_DATA = rawstudio.png
+ rawstudiodir = $(datadir)/pixmaps/rawstudio
+ rawstudio_DATA = overlay_deleted.png \
+diff -ur rawstudio-1.0.orig/rawstudio.desktop rawstudio-1.0/rawstudio.desktop
+--- rawstudio-1.0.orig/rawstudio.desktop	2008-04-19 02:14:50.000000000 +0300
++++ rawstudio-1.0/rawstudio.desktop	2008-05-03 11:37:43.000000000 +0300
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Version=1.0
+ Type=Application
+-Categories=Application;Graphics;Photography;GTK;
++Categories=Graphics;Photography;GTK;
+ Name=Rawstudio
+ Name[it]=Rawstudio
+ Name[pl]=Rawstudio
+@@ -16,6 +16,6 @@
+ Comment[ru]=Свободная программа для проявки цифровых негативов
+ Exec=rawstudio %F
+ StartupNotify=true
+-Icon=rawstudio.png
++Icon=rawstudio
+ MimeType=image/x-dcraw;
+ 
+diff -ur rawstudio-1.0.orig/src/gtk-interface.c rawstudio-1.0/src/gtk-interface.c
+--- rawstudio-1.0.orig/src/gtk-interface.c	2008-04-19 02:51:40.000000000 +0300
++++ rawstudio-1.0/src/gtk-interface.c	2008-05-03 11:41:11.000000000 +0300
+@@ -985,7 +985,7 @@
+ 	GdkColor bgcolor = {0, 0, 0, 0 };
+ 	GString *window_title = g_string_new(_("Rawstudio"));
+ 	
+-	gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR "/icons/" PACKAGE ".png", NULL);
++	gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE ".png", NULL);
+ 	rs->window = gui_window_make(rs);
+ 	gtk_widget_show(rs->window);
+ 
+diff -ur rawstudio-1.0.orig/src/rawstudio.c rawstudio-1.0/src/rawstudio.c
+--- rawstudio-1.0.orig/src/rawstudio.c	2008-04-19 02:14:49.000000000 +0300
++++ rawstudio-1.0/src/rawstudio.c	2008-05-03 11:40:55.000000000 +0300
+@@ -929,7 +929,7 @@
+ check_install()
+ {
+ #define TEST_FILE_ACCESS(path) do { if (g_access(path, R_OK)!=0) g_debug("Cannot access %s\n", path);} while (0)
+-	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/icons/" PACKAGE ".png");
++	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE ".png");
+ 	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_priority1.png");
+ 	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_priority2.png");
+ 	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_priority3.png");
diff --git a/media-gfx/rawstudio/rawstudio-0.7.ebuild b/media-gfx/rawstudio/rawstudio-0.7.ebuild
deleted file mode 100644
index 1597f9093e66..000000000000
--- a/media-gfx/rawstudio/rawstudio-0.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/rawstudio-0.7.ebuild,v 1.1 2008/02/04 15:08:49 drac Exp $
-
-inherit eutils
-
-DESCRIPTION="a program to read and manipulate raw images from digital cameras."
-HOMEPAGE="http://rawstudio.org"
-SRC_URI="http://${PN}.org/files/release/${P}.tar.gz"
-
-LICENSE="GPL-2 CCPL-Attribution-NoDerivs-2.5"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/jpeg
-	media-libs/tiff
-	>=x11-libs/gtk+-2
-	>=dev-libs/libxml2-2.4
-	media-libs/lcms
-	>=gnome-base/gconf-2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.6-desktop-entry.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-gfx/rawstudio/rawstudio-0.6.ebuild b/media-gfx/rawstudio/rawstudio-1.0.ebuild
index c044d3ac1ae5..185c051f6d1f 100644
--- a/media-gfx/rawstudio/rawstudio-0.6.ebuild
+++ b/media-gfx/rawstudio/rawstudio-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/rawstudio-0.6.ebuild,v 1.2 2008/02/04 10:07:25 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/rawstudio-1.0.ebuild,v 1.1 2008/05/03 08:48:45 drac Exp $
 
 inherit eutils
 
@@ -15,10 +15,11 @@ IUSE=""
 
 RDEPEND="media-libs/jpeg
 	media-libs/tiff
-	>=x11-libs/gtk+-2
+	>=x11-libs/gtk+-2.8
 	>=dev-libs/libxml2-2.4
 	media-libs/lcms
-	>=gnome-base/gconf-2"
+	>=gnome-base/gconf-2
+	sys-apps/dbus"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/gettext"
@@ -26,7 +27,12 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-desktop-entry.patch
+	epatch "${FILESDIR}"/${P}-desktop-entry-and-pixmaps-directory.patch
+}
+
+src_compile() {
+	econf --disable-dependency-tracking
+	emake || die "emake failed."
 }
 
 src_install() {