From: Pacho Ramos Date: Sat, 17 Jan 2015 22:30:17 +0000 (+0000) Subject: Let the package to install, fix gtk-doc handling (prebuilt docs are enough like for... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9dadb96b86f3bb0951d94ae058319e5da32382b6;p=gentoo.git Let the package to install, fix gtk-doc handling (prebuilt docs are enough like for most of gnome2.eclass consumers), drop old Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4 --- 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 + -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 -files/ogmrip-0.13.6-libnotify-0.7.patch, -files/ogmrip-0.13.6-libpng15.patch, diff --git a/media-video/ogmrip/Manifest b/media-video/ogmrip/Manifest index 0df58a920f63..f6a7c004b2bb 100644 --- a/media-video/ogmrip/Manifest +++ b/media-video/ogmrip/Manifest @@ -1,19 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX ogmrip-0.13.7-deprecated.patch 5144 SHA256 020832730a1aa25be84ff5eba10135962eb32b89f9f54d93b78297bcaad037a4 SHA512 ca43d80ee082cec3a79a8c75d859cadfcf07633e1a09e705387e38bab5fdd3d1557a6eaa871bd9c6ffdd40874109360f5ad36ec4960d208d694a1da31a73e4fb WHIRLPOOL e1ad74c3c49a94d9eea554a049c2a9430f55df0c42ce26b73eb7d9b4029008941fefc3a6d72af1d51a14ba7f29c093e6622cb356d062b31fbae1cc795b8951b3 -DIST ogmrip-0.13.7.tar.gz 3246395 SHA256 362060e4c1944f020f9a491d9a8af53cd3bf4f94d4f5beb8d3d855ebf17d9c2a -DIST ogmrip-0.13.8.tar.gz 3254176 SHA256 ea6a75e6cc4fe7df1ed65648af208c87748959a6b372847b1005c3b92cc5a423 SHA512 6bc924a1c6e074e7eac3053440f669cd66c0121138f67f56e33cdf52c83c9cc13bc13c2cf8f153ecbe3234f3a61f73c5299077522b07313dd54a16d1af1e952e WHIRLPOOL 73eb92713c7e8016447f1ca0c53da5bd09afe27614efc7c3660943f1a9c3d02ba64a9c291f5e4b28db9f6bb52da145cdccee644862313b04f4761c02df2a62e8 DIST ogmrip-1.0.1.tar.gz 3276396 SHA256 1c7bb9a346f94a0b6ba783d71df7d21ce021b2f179f5c1a2ebf870366d53ed56 SHA512 22261b1a5086fc05139e8b9924b75d9a5a5e85b18e245e32545687e72273b485fe1c5041b89db653c6e2e9714518e17ea955435a20ac26fcc875fa8d1a90994c WHIRLPOOL 7b0f34763c4cbd5d0295a08fceaca1b230d817b4dbff490c4fbc9593ab9ec3aaa1c7f2287f37fbc07d874eeff136021bf7fdb5fd8204601487890e9a23a1a251 -EBUILD ogmrip-0.13.7.ebuild 2393 SHA256 7141c4e41665e3ab9885eb3c087e1d31bb4cc15f5ce09cdea3ae41eb58dc8e76 SHA512 17504d10d2baba596b84dee7c503ed2c2ed86c5ec3ab8717905b8dfc3f663af9b35bc1953007c977ae7322e9ada0f6cf56df353b16393d2d98007d11b1e8c384 WHIRLPOOL 226dd9d2ffab84f08d74fdabff12da7bcc1e5d3b46c8411931e2e4495ffd348c9e44a4d09e596b70a10cb4bdab84f8bbdd21d982c6138032a96fb6f4376eb810 -EBUILD ogmrip-0.13.8.ebuild 2279 SHA256 e8c3a0557ba7939c68919765f945b74d178eccd9194951e7d278161952bbe60c SHA512 beea8e32d32ca18d277c58eaebb46619c1736c9fc009db8aa6e46450c0945bb14d6ea1a0be60b4f5c5785aa34f72aef3f4fff70a2865cb2771ba1f12c8ad0a9e WHIRLPOOL f2e76432af83083c401b219b99026a10b63b66f638230a64f4ddfb8ce28fba405811db2e6ecba4da1fa6153f87139760fa7664630772cce09d9f91ee5b6f68dc -EBUILD ogmrip-1.0.1.ebuild 2328 SHA256 de620ffac2aadbbd0b2f3b5ae5ecfafee353c8a2bb69a6d8c8c56076a952364a SHA512 d1cb3ffed133d14d84ddcfb3fa7993da1f26817d0e611a55a9f7b39e97f4938f2aa9d4f44cb4cfe7db9e51339cff1591d07850c3e32a4d7f9b424f3eb63c1add WHIRLPOOL 80a8943bd4aff1a5c4a9c12c7717d9661261982d99a3b5933fb808d40800220cff79f6d46d7b43bffafe97c329205e9ae19a713c957cd1f86b47aecc4ca48e55 -MISC ChangeLog 9565 SHA256 6dde60e24c83cacbb51ab388c8073d1fa4d10e9a1f7b82041e8ce997f72712be SHA512 56ca9fb0004a1f674fbb9b2d6543d6e45b37cbd603073b7da675fb6a6a9f41e6d8aab5858d7d5a5902ac053b9b1ca4ce78f3c709e7a4093ab2dd581c5d9a3b15 WHIRLPOOL 6c28a3a04850533119936a1780f6c1f0163eb130649afc4bf368bbd15ce07e3b757d6f415107c2fb121cd9b162ff6a8780fa3b59a52f5b5b8873063c83239014 +EBUILD ogmrip-1.0.1.ebuild 2316 SHA256 2dd2e0f5b7ff95ce303afba66fb27391eb133b4278029d0fc690a8530320bfb5 SHA512 22fe9d56c1526006af7e8591a5638c7eab397d69263afc6a590e5efd1e40db98ca220da819c44d84bf7548d9323624c4f7daba6d86896516a5b241efeff4b8e6 WHIRLPOOL 0c6f598e5f3a819444e1b2f8f2739d803257575f685907c441abd3b1e9f1157087d13a97d2a688d77015d9be64bb647251350962a8d53c35bca97d27c2247655 +MISC ChangeLog 9853 SHA256 10766fa014338b061e60bdd5bf4d620785dc004b393d31be54ee501cbd950424 SHA512 a3ef1607debbf3a3df2715b2a5c3adba52b2b8575b640c5179109e001d808e91eb3153ba5a7be276bbbd8f57ec78d518e0a8ed31c7ea5704834dfd4e448a0dc1 WHIRLPOOL 7d352cffa27d415b97f4e6760a7a718ccd5d046ea95a3fe5c1732e89f9f7cd974f8e5c2f3203acfd0a1c656a4bc6728eb26abde6472ded924756947e1ffd599f MISC metadata.xml 482 SHA256 9a7cf4a12e38da3aca14a7c332b379c7ce2f5e067a0f76e9d43d3d5c17f5be68 SHA512 6ffb888783698d2880666b63571d2e360d03148818e03742d79f6fe8098b0eb147ffd3a950321f6b82c1baaac5c50bc63441e1ef9af98063b868b822448d4d58 WHIRLPOOL 01cda267c9fd79bf453ea328354fca1fa2bf7c6b2c7d2eba6d1bcc0bbcf8ce534a0e5f4694a248feaa9a10a603f765ea41bba1978c31c33a468cb65111ffcc6c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlR959IACgkQCaWpQKGI+9SymgCfaxBkNmf1iO0ApOFn90rY2+gR -v+AAniSaNLJ3xEmEiyc7xB4C5ul5Fnav -=Rfns +iEYEAREIAAYFAlS64ngACgkQCaWpQKGI+9TwwACfXwELVUrgDV9RqpLRRbk1CQI8 +fCMAn0C70HZ+wOqrUNWVqEX8bHjSMByB +=zJ1G -----END PGP SIGNATURE----- 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 -+9 Oct 2011 Olivier Rolland - -+ * 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 -+ - Released OGMRip-0.13.7 - - 19 Sep 2011 Olivier Rolland ---- 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 }