old

(Portage version: 2.2.0_alpha116/cvs/Linux x86_64, RepoMan options: --force)

5 files changed, 6 insertions, 286 deletions

diff --git a/media-sound/easytag/ChangeLog b/media-sound/easytag/ChangeLog
index 8f216af1988f..3209247c8fab 100644
--- a/media-sound/easytag/ChangeLog
+++ b/media-sound/easytag/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/easytag
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.163 2012/07/29 17:36:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.164 2012/07/29 18:06:49 ssuominen Exp $
+
+  29 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> -easytag-2.1.6-r3.ebuild,
+  -files/easytag-2.1.6-cddb.patch, -files/easytag-2.1.6-desktop_entry.patch,
+  -files/easytag-2.1.6-new_libmp4v2.patch:
+  old
 
   29 Jul 2012; Raúl Porcel <armin76@gentoo.org> easytag-2.1.7-r2.ebuild:
   alpha/sparc stable wrt #376391
diff --git a/media-sound/easytag/easytag-2.1.6-r3.ebuild b/media-sound/easytag/easytag-2.1.6-r3.ebuild
deleted file mode 100644
index d52e3a7c601a..000000000000
--- a/media-sound/easytag/easytag-2.1.6-r3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-2.1.6-r3.ebuild,v 1.10 2012/05/19 09:06:50 ssuominen Exp $
-
-EAPI=2
-inherit eutils fdo-mime
-
-DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
-HOMEPAGE="http://easytag.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="flac mp3 mp4 speex vorbis wavpack"
-
-RDEPEND=">=x11-libs/gtk+-2.12:2
-	mp3? ( >=media-libs/id3lib-3.8.3-r7
-		media-libs/libid3tag )
-	flac? ( media-libs/flac
-		media-libs/libvorbis )
-	mp4? ( >=media-libs/libmp4v2-1.9.0:0 )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	speex? ( media-libs/speex
-		media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-desktop_entry.patch \
-		"${FILESDIR}"/${P}-new_libmp4v2.patch \
-		"${FILESDIR}"/${P}-cddb.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable mp3) \
-		$(use_enable mp3 id3v23) \
-		$(use_enable vorbis ogg) \
-		$(use_enable flac) \
-		$(use_enable mp4) \
-		$(use_enable wavpack) \
-		$(use_enable speex)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog README THANKS TODO USERS-GUIDE
-}
-
-pkg_postinst() { fdo-mime_desktop_database_update; }
-pkg_postrm() { fdo-mime_desktop_database_update; }
diff --git a/media-sound/easytag/files/easytag-2.1.6-cddb.patch b/media-sound/easytag/files/easytag-2.1.6-cddb.patch
deleted file mode 100644
index e7f586afca7c..000000000000
--- a/media-sound/easytag/files/easytag-2.1.6-cddb.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff -ruN easytag-2.1.6.orig/src/cddb.c easytag-2.1.6/src/cddb.c
---- easytag-2.1.6.orig/src/cddb.c	2008-03-22 22:57:29.000000000 +0100
-+++ easytag-2.1.6/src/cddb.c	2009-08-25 23:16:35.000000000 +0200
-@@ -2158,10 +2158,12 @@
-  */
- gboolean Cddb_Search_Album_List_From_String (void)
- {
--    if ( strstr(CDDB_SERVER_NAME_MANUAL_SEARCH,"freedb") != NULL )
--        return Cddb_Search_Album_List_From_String_Freedb();
--    else
-+    if ( strstr(CDDB_SERVER_NAME_MANUAL_SEARCH,"gnudb") != NULL )
-+		// Use of gnudb
-         return Cddb_Search_Album_List_From_String_Gnudb();
-+    else
-+		// Use of freedb
-+        return Cddb_Search_Album_List_From_String_Freedb();
- }
- 
- 
-@@ -2255,7 +2257,7 @@
-     g_free(string);
-     g_free(tmp);
-     g_free(proxy_auth);
--    //g_print("Request : '%s'\n", cddb_in);
-+    //g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
- 
-     // Send the request
-     gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,_("Sending request ..."));
-@@ -2574,7 +2576,7 @@
-                                   );
-         next_page_found = FALSE;
-         g_free(proxy_auth);
--        //g_print("Request : '%s'\n", cddb_in);
-+        //g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
- 
-         // Send the request
-         gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,_("Sending request ..."));
-@@ -3130,7 +3132,7 @@
-                                       (proxy_auth=Cddb_Format_Proxy_Authentification())
-                                       );
-             g_free(proxy_auth);
--            //g_print("Request : '%s'\n", cddb_in);
-+            //g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
- 
-             msg = g_strdup_printf(_("Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."),
-                                 cddb_discid,num_tracks,disc_length);
-@@ -3394,24 +3396,47 @@
-                                              CDDB_USE_PROXY?CDDB_PROXY_PORT:cddb_server_port)) <= 0 )
-             return FALSE;
- 
--        // CDDB Request (ex: GET /~cddb/cddb.cgi?cmd=cddb+read+jazz+0200a401&hello=noname+localhost+EasyTAG+0.31&proto=1 HTTP/1.1\r\nHost: freedb.freedb.org:80\r\nConnection: close)
--        // Without proxy : "GET /~cddb/cddb.cgi?..." but doesn't work with a proxy.
--        // With proxy    : "GET http://freedb.freedb.org/~cddb/cddb.cgi?..."
--        cddb_in = g_strdup_printf("GET %s%s%s?cmd=cddb+read+"
--                                  "%s+%s"
--                                  "&hello=noname+localhost+%s+%s"
--                                  "&proto=6 HTTP/1.1\r\n"
--                                  "Host: %s:%d\r\n"
--                                  "%s"
--                                  "Connection: close\r\n\r\n",
--                                  CDDB_USE_PROXY?"http://":"",CDDB_USE_PROXY?cddb_server_name:"", cddb_server_cgi_path,
--                                  cddbalbum->category,cddbalbum->id,
--                                  APPNAME,VERSION,
--                                  cddb_server_name,cddb_server_port,
--                                  (proxy_auth=Cddb_Format_Proxy_Authentification())
--                                  );
--        g_free(proxy_auth);
--        //g_print("Request : '%s'\n", cddb_in);
-+		if ( strstr(cddb_server_name,"gnudb") != NULL )
-+		{
-+			// For gnudb
-+			// New version of gnudb doesn't use a cddb request, but a http request
-+		    cddb_in = g_strdup_printf("GET %s%s/gnudb/"
-+		                              "%s/%s"
-+		                              " HTTP/1.1\r\n"
-+		                              "Host: %s:%d\r\n"
-+		                              "User-Agent: %s %s\r\n"
-+		                              "%s"
-+		                              "Connection: close\r\n"
-+		                              "\r\n",
-+		                              CDDB_USE_PROXY?"http://":"", CDDB_USE_PROXY?cddb_server_name:"",  // Needed when using proxy
-+		                              cddbalbum->category,cddbalbum->id,
-+		                              cddb_server_name,cddb_server_port,
-+		                              APPNAME,VERSION,
-+		                              (proxy_auth=Cddb_Format_Proxy_Authentification())
-+		                              );
-+		}else
-+		{
-+		    // CDDB Request (ex: GET /~cddb/cddb.cgi?cmd=cddb+read+jazz+0200a401&hello=noname+localhost+EasyTAG+0.31&proto=1 HTTP/1.1\r\nHost: freedb.freedb.org:80\r\nConnection: close)
-+		    // Without proxy : "GET /~cddb/cddb.cgi?..." but doesn't work with a proxy.
-+		    // With proxy    : "GET http://freedb.freedb.org/~cddb/cddb.cgi?..."
-+		    cddb_in = g_strdup_printf("GET %s%s%s?cmd=cddb+read+"
-+		                              "%s+%s"
-+		                              "&hello=noname+localhost+%s+%s"
-+		                              "&proto=6 HTTP/1.1\r\n"
-+		                              "Host: %s:%d\r\n"
-+		                              "%s"
-+		                              "Connection: close\r\n\r\n",
-+		                              CDDB_USE_PROXY?"http://":"",CDDB_USE_PROXY?cddb_server_name:"", cddb_server_cgi_path,
-+		                              cddbalbum->category,cddbalbum->id,
-+		                              APPNAME,VERSION,
-+		                              cddb_server_name,cddb_server_port,
-+		                              (proxy_auth=Cddb_Format_Proxy_Authentification())
-+		                              );
-+		}
-+
-+		
-+		g_free(proxy_auth);
-+        //g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
- 
-         // Send the request
-         gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,_("Sending request ..."));
-@@ -3444,20 +3469,38 @@
-         }
- 
- 
--        // Parse server answer : Check HTTP Header and CDDB Header
-+        // Parse server answer : Check HTTP Header (freedb or gnudb) and CDDB Header (freedb only)
-         file = NULL;
--        if ( Cddb_Read_Http_Header(&file,&cddb_out) <= 0
--          || Cddb_Read_Cddb_Header(&file,&cddb_out) <= 0 )
--        {
--            gchar *msg = g_strdup_printf(_("The server returned a wrong answer! (%s)"),cddb_out);
--            gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
--            Log_Print(LOG_ERROR,"%s",msg);
--            g_free(msg);
--            g_free(cddb_out);
--            if (file)
--                fclose(file);
--            return FALSE;
--        }
-+		if ( strstr(cddb_server_name,"gnudb") != NULL )
-+		{
-+			// For gnudb (don't check CDDB header)
-+			if ( Cddb_Read_Http_Header(&file,&cddb_out) <= 0 )
-+		    {
-+		        gchar *msg = g_strdup_printf(_("The server returned a wrong answer! (%s)"),cddb_out);
-+		        gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
-+		        Log_Print(LOG_ERROR,"%s",msg);
-+		        g_free(msg);
-+		        g_free(cddb_out);
-+		        if (file)
-+		            fclose(file);
-+		        return FALSE;
-+		    }
-+		}else
-+		{
-+			// For freedb
-+			if ( Cddb_Read_Http_Header(&file,&cddb_out) <= 0
-+		      || Cddb_Read_Cddb_Header(&file,&cddb_out) <= 0 )
-+		    {
-+		        gchar *msg = g_strdup_printf(_("The server returned a wrong answer! (%s)"),cddb_out);
-+		        gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
-+		        Log_Print(LOG_ERROR,"%s",msg);
-+		        g_free(msg);
-+		        g_free(cddb_out);
-+		        if (file)
-+		            fclose(file);
-+		        return FALSE;
-+		    }
-+		}
-         g_free(cddb_out);
- 
-     }
diff --git a/media-sound/easytag/files/easytag-2.1.6-desktop_entry.patch b/media-sound/easytag/files/easytag-2.1.6-desktop_entry.patch
deleted file mode 100644
index 5de0c8be6f69..000000000000
--- a/media-sound/easytag/files/easytag-2.1.6-desktop_entry.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Remove x-directory/normal from MimeType or else it replaces Nautilus as
-default Places handler.
-
-http://bugs.gentoo.org/show_bug.cgi?id=272198
-
-diff -ur easytag-2.1.6.orig/easytag.desktop easytag-2.1.6/easytag.desktop
---- easytag-2.1.6.orig/easytag.desktop	2007-11-28 10:54:05.000000000 +0200
-+++ easytag-2.1.6/easytag.desktop	2009-06-06 21:57:57.000000000 +0300
-@@ -21,6 +21,4 @@
- Terminal=false
- Type=Application
- Categories=AudioVideo;AudioVideoEditing;GTK;
--X-Desktop-File-Install-Version=0.14
--MimeType=audio/x-mp3;application/ogg;x-directory/normal;
--
-+MimeType=audio/x-mp3;application/ogg;
diff --git a/media-sound/easytag/files/easytag-2.1.6-new_libmp4v2.patch b/media-sound/easytag/files/easytag-2.1.6-new_libmp4v2.patch
deleted file mode 100644
index 774bf7fb2a5b..000000000000
--- a/media-sound/easytag/files/easytag-2.1.6-new_libmp4v2.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -ur easytag-2.1.6.orig/configure easytag-2.1.6/configure
---- easytag-2.1.6.orig/configure	2008-07-12 17:57:44.000000000 +0300
-+++ easytag-2.1.6/configure	2009-07-10 16:44:39.000000000 +0300
-@@ -22418,12 +22418,12 @@
- /* end confdefs.h.  */
- 
-                 #include <stdio.h>
--                #include <mpeg4ip_config.h>
-+                #include <mp4v2/mp4v2.h>
-                 int main (void)
-                 {
-                     FILE *output;
-                     output=fopen("conftest.mp4v2","w");
--                    fprintf(output,"LIBMP4V2_NAME=%s\nLIBMP4V2_VERSION=%s\n",PACKAGE_TARNAME,PACKAGE_VERSION);
-+                    fprintf(output,"MP4V2_PROJECT_name=%s\nMP4V2_PROJECT_version=%s\n",PACKAGE_TARNAME,PACKAGE_VERSION);
-                     fclose(output);
-                     exit(0);
-                 }
-@@ -22471,7 +22471,7 @@
- 
-                 cat >conftest.$ac_ext <<_ACEOF
- 
--           #include <mp4.h>
-+           #include <mp4v2/mp4v2.h>
-            main () {
-            MP4FileHandle hFile;
-            MP4GetMetadataCoverArt(hFile, NULL, NULL,0); }
-diff -ur easytag-2.1.6.orig/src/mp4_header.c easytag-2.1.6/src/mp4_header.c
---- easytag-2.1.6.orig/src/mp4_header.c	2007-11-28 10:54:35.000000000 +0200
-+++ easytag-2.1.6/src/mp4_header.c	2009-07-10 16:44:54.000000000 +0300
-@@ -44,7 +44,7 @@
- #undef PACKAGE_STRING
- #undef PACKAGE_TARNAME
- #undef PACKAGE_VERSION
--#include <mp4.h>
-+#include <mp4v2/mp4v2.h>
- 
- 
- /****************
-diff -ur easytag-2.1.6.orig/src/mp4_tag.c easytag-2.1.6/src/mp4_tag.c
---- easytag-2.1.6.orig/src/mp4_tag.c	2007-12-11 00:08:11.000000000 +0200
-+++ easytag-2.1.6/src/mp4_tag.c	2009-07-10 16:45:08.000000000 +0300
-@@ -50,7 +50,7 @@
- #undef PACKAGE_STRING
- #undef PACKAGE_TARNAME
- #undef PACKAGE_VERSION
--#include <mp4.h>
-+#include <mp4v2/mp4v2.h>
- 
- 
- /****************