version bump

(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

4 files changed, 184 insertions, 2 deletions

diff --git a/media-sound/quark/ChangeLog b/media-sound/quark/ChangeLog
index da77eab90dc3..2544785787aa 100644
--- a/media-sound/quark/ChangeLog
+++ b/media-sound/quark/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/quark
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quark/ChangeLog,v 1.19 2012/05/31 16:06:31 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quark/ChangeLog,v 1.20 2012/05/31 16:09:44 hasufell Exp $
+
+*quark-3.24 (31 May 2012)
+
+  31 May 2012; Julian Ospald <hasufell@gentoo.org> +quark-3.24.ebuild,
+  +files/quark-3.24-build.patch, metadata.xml:
+  version bump
 
   31 May 2012; Julian Ospald <hasufell@gentoo.org> quark-3.21.ebuild:
   fix underlinking wrt #367859, fix homepage
diff --git a/media-sound/quark/files/quark-3.24-build.patch b/media-sound/quark/files/quark-3.24-build.patch
new file mode 100644
index 000000000000..479af4b11fac
--- /dev/null
+++ b/media-sound/quark/files/quark-3.24-build.patch
@@ -0,0 +1,107 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu May 31 13:46:18 UTC 2012
+Subject: build system
+
+fix underlinking ( https://bugs.gentoo.org/show_bug.cgi?id=367859 )
+remove DEPRECATED flags ( https://bugs.gentoo.org/show_bug.cgi?id=387823 )
+fix permissions on schema files
+make icondir modifiable
+
+--- configure.ac
++++ configure.ac
+@@ -41,6 +41,10 @@
+ AC_SUBST(GTHREAD_CFLAGS)
+ AC_SUBST(GTHREAD_LIBS)
+ 
++PKG_CHECK_MODULES(X11, [x11])
++AC_SUBST(X11_CFLAGS)
++AC_SUBST(X11_LIBS)
++
+ AC_ARG_ENABLE(gconf,
+   [  --disable-gconf         disable use of gconf (for embedded targets)],
+   [], [enable_gconf="yes"])
+@@ -64,6 +68,13 @@
+ fi
+ AM_CONDITIONAL(USE_GCONF, test "$enable_gconf" = "yes")
+ 
++AC_ARG_WITH([icondir],
++	    [AC_HELP_STRING([--with-icondir=DIR],
++			    [where icon gets installed to (default: datadir/pixmaps)])],
++	    [icondir="$withval"],
++	    [icondir="$datadir/pixmaps"])
++AC_SUBST(icondir)
++
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_FILES([
+   Makefile
+--- quark/Makefile.am
++++ quark/Makefile.am
+@@ -1,7 +1,6 @@
+ localedir=$(datadir)/locale
+ 
+ AM_CPPFLAGS=$(GLIB_CFLAGS) $(GTHREAD_CFLAGS) $(GNOMEVFS_CFLAGS) $(GCONF_CFLAGS) $(XINE_CFLAGS) \
+-  -DG_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED \
+   -DLOCALEDIR=\"$(localedir)\"
+ 
+ bin_PROGRAMS = quark
+@@ -30,7 +29,7 @@
+ 	gconftool-2 --makefile-install-rule $<
+ endif
+ 	$(INSTALL) -d $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
+-	$(INSTALL) $< $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
++	$(INSTALL_DATA) $< $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
+ 
+ uninstall-local:
+ 	$(RM) $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/quark.schemas
+--- strange-quark/Makefile.am
++++ strange-quark/Makefile.am
+@@ -6,14 +6,13 @@
+   $(GTK_CFLAGS) \
+   $(GCONF_CFLAGS) \
+   $(GDK_PIXBUF_CFLAGS) \
+-  -DG_DISABLE_DEPRECATED \
+   -DG_LOG_DOMAIN=\"strange-quark\" \
+-  -DPIXMAPDIR=\"$(pixmapdir)\" \
++  -DPIXMAPDIR=\"$(icondir)\" \
+   -DLOCALEDIR=\"$(localedir)\"
+ 
+ bin_PROGRAMS = strange-quark
+ 
+-strange_quark_LDADD = $(GTK_LIBS) $(GCONF_LIBS)
++strange_quark_LDADD = $(GTK_LIBS) $(GCONF_LIBS) $(X11_LIBS)
+ strange_quark_SOURCES = \
+   gettext.h \
+   main.c \
+@@ -43,7 +42,7 @@
+ 	gconftool-2 --makefile-install-rule $<
+ endif
+ 	$(INSTALL) -d $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
+-	$(INSTALL) $< $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
++	$(INSTALL_DATA) $< $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
+ 
+ uninstall-local:
+ 	$(RM) $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/strange-quark.schemas
+--- pixmaps/Makefile.am
++++ pixmaps/Makefile.am
+@@ -1,8 +1,5 @@
+-pixmapdir = $(datadir)/pixmaps
+-
+-pixmap_DATA = \
+-  quark.png \
+-  quark48.png
++icon_DATA = \
++  quark.png
+ 
+ EXTRA_DIST = \
+   quark.png \
+--- strange-quark/quark.desktop
++++ strange-quark/quark.desktop
+@@ -3,7 +3,7 @@
+ Name=Quark Music Player
+ Comment=Play music from the system tray
+ Exec=strange-quark
+-Icon=quark48.png
++Icon=quark.png
+ Terminal=false
+ Type=Application
+ Categories=Application;AudioVideo;
diff --git a/media-sound/quark/metadata.xml b/media-sound/quark/metadata.xml
index e1774e3d9ad7..55d06d8daede 100644
--- a/media-sound/quark/metadata.xml
+++ b/media-sound/quark/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+	<herd>sound</herd>
+	<use>
+		<flag name="gnome">Provides tray-icon and enables gconf support</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/quark/quark-3.24.ebuild b/media-sound/quark/quark-3.24.ebuild
new file mode 100644
index 000000000000..0d901537fbdb
--- /dev/null
+++ b/media-sound/quark/quark-3.24.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quark/quark-3.24.ebuild,v 1.1 2012/05/31 16:09:44 hasufell Exp $
+
+EAPI=4
+# I don't want gnome2 eclass
+inherit autotools eutils fdo-mime gnome2-utils
+
+DESCRIPTION="Quark is the Anti-GUI Music Player with a cool Docklet!"
+HOMEPAGE="http://hsgg.github.com/quark/"
+SRC_URI="http://hsgg.github.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gnome"
+
+RDEPEND="dev-libs/glib:2
+	gnome-base/gnome-vfs:2
+	media-libs/xine-lib
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	gnome? ( gnome-base/gconf:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS README"
+
+src_prepare() {
+	# sandbox violations
+	gnome2_environment_reset
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+
+	# fix underlinking wrt #367859
+	# remove DEPRECATED flags wrt #387823
+	epatch "${FILESDIR}"/${P}-build.patch
+	eautoreconf
+}
+
+src_configure() {
+	# debug switch only provides cflags
+	econf \
+		--disable-debug \
+		--with-icondir=/usr/share/icons/hicolor/48x48/apps \
+		$(use_enable gnome gconf)
+}
+
+pkg_preinst() {
+	use gnome && gnome2_gconf_savelist
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if use gnome ; then
+		gnome2_gconf_install
+		gnome2_schemas_update
+	fi
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use gnome && gnome2_schemas_update
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}