Let the package to install, fix gtk-doc handling (prebuilt docs are enough like for most of gnome2.eclass consumers), drop old

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

5 files changed, 44 insertions, 353 deletions

diff --git a/media-video/ogmrip/ChangeLog b/media-video/ogmrip/ChangeLog
index 8b2c81657005..dc32cb809945 100644
--- a/media-video/ogmrip/ChangeLog
+++ b/media-video/ogmrip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/ogmrip
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.54 2014/12/02 16:24:49 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.55 2015/01/17 22:30:15 pacho Exp $
+
+  17 Jan 2015; Pacho Ramos <pacho@gentoo.org>
+  -files/ogmrip-0.13.7-deprecated.patch, -ogmrip-0.13.7.ebuild,
+  -ogmrip-0.13.8.ebuild, ogmrip-1.0.1.ebuild:
+  Let the package to install, fix gtk-doc handling (prebuilt docs are enough
+  like for most of gnome2.eclass consumers), drop old
 
   02 Dec 2014; Pacho Ramos <pacho@gentoo.org>
   -files/ogmrip-0.13.6-libnotify-0.7.patch, -files/ogmrip-0.13.6-libpng15.patch,
diff --git a/media-video/ogmrip/files/ogmrip-0.13.7-deprecated.patch b/media-video/ogmrip/files/ogmrip-0.13.7-deprecated.patch
deleted file mode 100644
index 6c7ad57e5b3f..000000000000
--- a/media-video/ogmrip/files/ogmrip-0.13.7-deprecated.patch
+++ /dev/null
@@ -1,148 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -38,7 +38,6 @@
- AM_MAINTAINER_MODE
- 
- CFLAGS="$CFLAGS -g -I/usr/local/include -I.. -Wall -D_FORTIFY_SOURCE=2"
--CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
- CFLAGS="$CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
- 
- CPPFLAGS="$CPPFLAGS -I/usr/local/include -I.. -Wall -D_FORTIFY_SOURCE=2"
---- ChangeLog
-+++ ChangeLog
-@@ -1,5 +1,15 @@
--19 Aug 2011 Olivier Rolland <billl@users.sf.net>
-+9 Oct 2011 Olivier Rolland <billl@users.sf.net>
- 
-+	* configure.in
-+	* src/ogmrip-profile-editor.c
-+	* src/ogmrip-crop-dialog.c
-+	* libogmrip-gtk/ogmrip-source-chooser-widget.c
-+	* libogmrip-gtk/ogmrip-x264-options.c
-+
-+	Removed deprecated GTK+ functions
-+
-+19 Sep 2011 Olivier Rolland <billl@users.sf.net>
-+
- 	Released OGMRip-0.13.7
- 
- 19 Sep 2011 Olivier Rolland <billl@users.sf.net>
---- src/ogmrip-profile-editor.c
-+++ src/ogmrip-profile-editor.c
-@@ -631,6 +631,7 @@
-   {
-     GType codec;
-     GtkTreeModel *model;
-+    GtkTreeIter iter;
-     gboolean exists;
-     gint active;
-     gchar *name;
-@@ -641,11 +642,15 @@
-     codec = ogmrip_profile_editor_dialog_get_video_codec_type (dialog, name);
-     g_free (name);
- 
--    gtk_combo_box_remove_text (GTK_COMBO_BOX (dialog->priv->video_preset_combo), OGMRIP_VIDEO_PRESET_USER);
-+    if (gtk_tree_model_iter_nth_child (model, &iter, NULL, OGMRIP_VIDEO_PRESET_USER))
-+      gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
- 
-     exists = ogmrip_options_plugin_exists (codec);
-     if (exists)
--      gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->priv->video_preset_combo), _("User"));
-+    {
-+      gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-+      gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, _("User"), -1);
-+    }
- 
-     active = gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->priv->video_preset_combo));
-     
---- src/ogmrip-crop-dialog.c
-+++ src/ogmrip-crop-dialog.c
-@@ -218,17 +218,20 @@
- }
- 
- static void
--ogmrip_crop_dialog_scale_value_changed (OGMRipCropDialog *dialog, GtkWidget *scale)
-+ogmrip_crop_dialog_scale_button_released (OGMRipCropDialog *dialog, GdkEventButton *event, GtkWidget *scale)
- {
--  gulong frame;
--  gchar *text;
-+  if (event->button == 1)
-+  {
-+    gulong frame;
-+    gchar *text;
- 
--  frame = (guint) gtk_range_get_value (GTK_RANGE (scale));
--  text = g_strdup_printf (_("Frame %lu of %lu"), frame, dialog->priv->length);
--  gtk_label_set_text (GTK_LABEL (dialog->priv->label), text);
--  g_free (text);
-+    frame = (guint) gtk_range_get_value (GTK_RANGE (scale));
-+    text = g_strdup_printf (_("Frame %lu of %lu"), frame, dialog->priv->length);
-+    gtk_label_set_text (GTK_LABEL (dialog->priv->label), text);
-+    g_free (text);
- 
--  ogmrip_crop_dialog_grab_frame (dialog, frame);
-+    ogmrip_crop_dialog_grab_frame (dialog, frame);
-+  }
- }
- 
- G_DEFINE_TYPE (OGMRipCropDialog, ogmrip_crop_dialog, GTK_TYPE_DIALOG)
-@@ -291,9 +294,8 @@
-   dialog->priv->label = glade_xml_get_widget (xml, "frame-label");
- 
-   dialog->priv->scale = glade_xml_get_widget (xml, "frame-scale");
--  gtk_range_set_update_policy (GTK_RANGE (dialog->priv->scale), GTK_UPDATE_DELAYED);
--  g_signal_connect_swapped (dialog->priv->scale, "value-changed",
--      G_CALLBACK (ogmrip_crop_dialog_scale_value_changed), dialog);
-+  g_signal_connect_swapped (dialog->priv->scale, "button-release-event",
-+      G_CALLBACK (ogmrip_crop_dialog_scale_button_released), dialog);
- 
-   g_object_unref (xml);
- }
---- libogmrip-gtk/ogmrip-source-chooser-widget.c
-+++ libogmrip-gtk/ogmrip-source-chooser-widget.c
-@@ -207,7 +207,12 @@
-   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-   gtk_widget_show (label);
- 
-+#if GTK_CHECK_VERSION(2,24,0)
-+  combo = gtk_combo_box_text_new ();
-+#else
-   combo = gtk_combo_box_new_text ();
-+#endif
-+
-   gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
-   gtk_widget_show (combo);
- 
-@@ -231,7 +236,11 @@
-   {
-     str = g_strdup_printf ("%s (%s)", ogmdvd_languages[i][OGMDVD_LANGUAGE_NAME],
-         ogmdvd_languages[i][OGMDVD_LANGUAGE_ISO639_1]);
-+#if GTK_CHECK_VERSION(2,24,0)
-+    gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), str);
-+#else
-     gtk_combo_box_append_text (GTK_COMBO_BOX (combo), str);
-+#endif
-     g_free (str);
- 
-     if (strncmp (ogmdvd_languages[i][OGMDVD_LANGUAGE_ISO639_1], lang, 2) == 0)
---- libogmrip-gtk/ogmrip-x264-options.c
-+++ libogmrip-gtk/ogmrip-x264-options.c
-@@ -299,9 +299,16 @@
-   gtk_widget_set_sensitive (dialog->me_combo, x264_have_me);
- 
-   if (x264_have_me_tesa)
--    gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->me_combo),
--        _("Transformed Exhaustive search (tesa - even slower)"));
-+  {
-+    GtkTreeModel *model;
-+    GtkTreeIter iter;
- 
-+    model = gtk_combo_box_get_model (GTK_COMBO_BOX (dialog->me_combo));
-+    gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-+    gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-+        0, _("Transformed Exhaustive search (tesa - even slower)"), -1);
-+  }
-+
-   dialog->merange_spin = glade_xml_get_widget (xml, "merange-spin");
-   gtk_widget_set_sensitive (dialog->merange_spin, x264_have_me);
- 
diff --git a/media-video/ogmrip/ogmrip-0.13.7.ebuild b/media-video/ogmrip/ogmrip-0.13.7.ebuild
deleted file mode 100644
index ad858b5dd01c..000000000000
--- a/media-video/ogmrip/ogmrip-0.13.7.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.13.7.ebuild,v 1.4 2012/05/05 08:58:59 jdhore Exp $
-
-EAPI=4
-GCONF_DEBUG=no
-inherit autotools eutils gnome2
-
-DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
-HOMEPAGE="http://ogmrip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="aac dbus dts gtk libnotify matroska mp3 mp4 nls ogm spell srt static-libs theora vorbis x264 xvid"
-
-COMMON_DEPEND=">=dev-libs/glib-2.16:2
-	>=app-i18n/enca-1.9
-	dev-libs/libxml2
-	media-libs/libdvdread
-	>=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?]
-	aac? ( >=media-libs/faac-1.24 )
-	gtk? (
-		>=x11-libs/gtk+-2.12:2
-		gnome-base/libglade
-		gnome-base/gconf
-		dbus? ( dev-libs/dbus-glib )
-		libnotify? ( >=x11-libs/libnotify-0.4.3 )
-		media-video/mplayer[jpeg]
-		)
-	matroska? ( media-video/mkvtoolnix )
-	mp3? ( media-sound/lame )
-	mp4? ( >=media-video/gpac-0.4.2 )
-	ogm? ( media-sound/ogmtools )
-	spell? ( >=app-text/enchant-1.1.0 )
-	srt? ( ||
-		(
-			( >=app-text/tesseract-2 media-libs/tiff )
-			>=app-text/gocr-0.39
-			>=app-text/ocrad-0.15
-		)
-		media-libs/libpng )
-	theora? ( media-libs/libtheora )
-	vorbis? ( media-sound/vorbis-tools )"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext
-		dev-util/intltool )
-	virtual/pkgconfig"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog README TODO"
-
-	G2CONF="
-		$(use_enable gtk gtk-support)
-		$(use_enable dbus dbus-support)
-		$(use_enable spell enchant-support)
-		$(use_enable ogm ogm-support)
-		$(use_enable matroska mkv-support)
-		$(use_enable mp4 mp4-support)
-		$(use_enable xvid xvid-support)
-		$(use_enable x264 x264-support)
-		$(use_enable theora theora-support)
-		$(use_enable vorbis vorbis-support)
-		$(use_enable mp3 mp3-support)
-		$(use_enable aac aac-support)
-		$(use_enable srt srt-support)
-		$(use_enable static-libs static)
-		$(use_enable libnotify libnotify-support)
-		$(use_enable nls)
-		--with-html-dir=/usr/share/doc/${PF}/html"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-deprecated.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_install() {
-	# bug #317607
-	MAKEOPTS="${MAKEOPTS} -j1" \
-		gnome2_src_install
-	find "${D}" -name '*.la' -delete
-}
diff --git a/media-video/ogmrip/ogmrip-0.13.8.ebuild b/media-video/ogmrip/ogmrip-0.13.8.ebuild
deleted file mode 100644
index 47a1f2028077..000000000000
--- a/media-video/ogmrip/ogmrip-0.13.8.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.13.8.ebuild,v 1.1 2012/06/24 18:38:46 hanno Exp $
-
-EAPI=4
-GCONF_DEBUG=no
-inherit gnome2
-
-DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
-HOMEPAGE="http://ogmrip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="aac dbus dts gtk libnotify matroska mp3 mp4 nls ogm spell srt static-libs theora vorbis x264 xvid"
-
-COMMON_DEPEND=">=dev-libs/glib-2.16:2
-	>=app-i18n/enca-1.9
-	dev-libs/libxml2
-	media-libs/libdvdread
-	>=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?]
-	aac? ( >=media-libs/faac-1.24 )
-	gtk? (
-		>=x11-libs/gtk+-2.12:2
-		gnome-base/libglade
-		gnome-base/gconf
-		dbus? ( dev-libs/dbus-glib )
-		libnotify? ( >=x11-libs/libnotify-0.4.3 )
-		media-video/mplayer[jpeg]
-		)
-	matroska? ( media-video/mkvtoolnix )
-	mp3? ( media-sound/lame )
-	mp4? ( >=media-video/gpac-0.4.2 )
-	ogm? ( media-sound/ogmtools )
-	spell? ( >=app-text/enchant-1.1.0 )
-	srt? ( ||
-		(
-			( >=app-text/tesseract-2 media-libs/tiff )
-			>=app-text/gocr-0.39
-			>=app-text/ocrad-0.15
-		)
-		media-libs/libpng )
-	theora? ( media-libs/libtheora )
-	vorbis? ( media-sound/vorbis-tools )"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext
-		dev-util/intltool )
-	virtual/pkgconfig"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog README TODO"
-
-	G2CONF="
-		$(use_enable gtk gtk-support)
-		$(use_enable dbus dbus-support)
-		$(use_enable spell enchant-support)
-		$(use_enable ogm ogm-support)
-		$(use_enable matroska mkv-support)
-		$(use_enable mp4 mp4-support)
-		$(use_enable xvid xvid-support)
-		$(use_enable x264 x264-support)
-		$(use_enable theora theora-support)
-		$(use_enable vorbis vorbis-support)
-		$(use_enable mp3 mp3-support)
-		$(use_enable aac aac-support)
-		$(use_enable srt srt-support)
-		$(use_enable static-libs static)
-		$(use_enable libnotify libnotify-support)
-		$(use_enable nls)
-		--with-html-dir=/usr/share/doc/${PF}/html"
-}
-
-src_install() {
-	# bug #317607
-	MAKEOPTS="${MAKEOPTS} -j1" \
-		gnome2_src_install
-	find "${D}" -name '*.la' -delete
-}
diff --git a/media-video/ogmrip/ogmrip-1.0.1.ebuild b/media-video/ogmrip/ogmrip-1.0.1.ebuild
index ac20f74e9139..b0881180b39f 100644
--- a/media-video/ogmrip/ogmrip-1.0.1.ebuild
+++ b/media-video/ogmrip/ogmrip-1.0.1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-1.0.1.ebuild,v 1.1 2014/08/22 16:33:57 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-1.0.1.ebuild,v 1.2 2015/01/17 22:30:15 pacho Exp $
 
 EAPI=5
 GCONF_DEBUG=no
+
 inherit gnome2
 
 DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
@@ -13,9 +14,10 @@ SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="aac dbus debug doc dts gtk libnotify matroska mp3 mp4 nls ogm spell srt static-libs theora vorbis x264 xvid"
+IUSE="aac dbus debug dts gtk libnotify matroska mp3 mp4 nls ogm spell srt static-libs theora vorbis x264 xvid"
 
-COMMON_DEPEND=">=dev-libs/glib-2.16:2
+COMMON_DEPEND="
+	>=dev-libs/glib-2.16:2
 	>=app-i18n/enca-1.9
 	dev-libs/libxml2
 	media-libs/libdvdread
@@ -42,41 +44,40 @@ COMMON_DEPEND=">=dev-libs/glib-2.16:2
 		)
 		media-libs/libpng )
 	theora? ( media-libs/libtheora )
-	vorbis? ( media-sound/vorbis-tools )"
+	vorbis? ( media-sound/vorbis-tools )
+"
 RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs"
+	gnome-base/gvfs
+"
 DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
 	nls? ( sys-devel/gettext
 		dev-util/intltool )
-	gtk? ( doc? ( dev-util/gtk-doc ) )
-	virtual/pkgconfig"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog README TODO"
+	virtual/pkgconfig
+"
 
-	G2CONF=""
-	if use gtk; then
-		G2CONF="$(use_enable doc gtk-doc)"
-	fi
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable debug maintainer-mode) \
+		$(use_enable gtk gtk-support) \
+		$(use_enable dbus dbus-support) \
+		$(use_enable spell enchant-support) \
+		$(use_enable ogm ogm-support) \
+		$(use_enable matroska mkv-support) \
+		$(use_enable mp4 mp4-support) \
+		$(use_enable xvid xvid-support) \
+		$(use_enable x264 x264-support) \
+		$(use_enable theora theora-support) \
+		$(use_enable vorbis vorbis-support) \
+		$(use_enable mp3 mp3-support) \
+		$(use_enable aac aac-support) \
+		$(use_enable srt srt-support) \
+		$(use_enable static-libs static) \
+		$(use_enable libnotify libnotify-support) \
+		$(use_enable nls) \
+		--with-html-dir=/usr/share/doc/${PF}/html
+}
 
-	G2CONF="
-		${G2CONF}
-		$(use_enable debug maintainer-mode)
-		$(use_enable gtk gtk-support)
-		$(use_enable dbus dbus-support)
-		$(use_enable spell enchant-support)
-		$(use_enable ogm ogm-support)
-		$(use_enable matroska mkv-support)
-		$(use_enable mp4 mp4-support)
-		$(use_enable xvid xvid-support)
-		$(use_enable x264 x264-support)
-		$(use_enable theora theora-support)
-		$(use_enable vorbis vorbis-support)
-		$(use_enable mp3 mp3-support)
-		$(use_enable aac aac-support)
-		$(use_enable srt srt-support)
-		$(use_enable static-libs static)
-		$(use_enable libnotify libnotify-support)
-		$(use_enable nls)
-		--with-html-dir=/usr/share/doc/${PF}/html"
+src_install() {
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install #528670
 }