proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

4 files changed, 473 insertions, 0 deletions

diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
new file mode 100644
index 000000000000..cb5d50e4193a
--- /dev/null
+++ b/media-gfx/xsane/Manifest
@@ -0,0 +1,2 @@
+DIST xsane-0.998-patches-2.tar.xz 54804 SHA256 84af533cba6309cf44892da8952b6203daa4dcfaf64e2efd1dddc5144e4cab4c SHA512 973ccac2fe3b6089049c1c5ba3e4cb0db29fdc79de372f8a7b461ee108e5bfc3f4a84997552fc3d3b651bbe9f98d247a5974d90e8949089b2ea52118eab6ad1f WHIRLPOOL 2294601aa696c442e8d2b5173b8ee04d158439e0ae02dd22c7d5c8f9fce98c8238a42e0867a5e511d206dd4030f7a15df2a98676471abe1e91870883662add56
+DIST xsane-0.999.tar.gz 2950621 SHA256 5782d23e67dc961c81eef13a87b17eb0144cae3d1ffc5cf7e0322da751482b4b SHA512 73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed WHIRLPOOL 7d50f6ecd8ad671d36a6b92eb365a6361da8d90bfea3136cf7add0890313294903f8cbc75684cbc24e42a028f83922a0308783fb20d89b0d6b14b1f949283ad5
diff --git a/media-gfx/xsane/files/xsane-0.999-lcms2.patch b/media-gfx/xsane/files/xsane-0.999-lcms2.patch
new file mode 100644
index 000000000000..c3d696c28ecf
--- /dev/null
+++ b/media-gfx/xsane/files/xsane-0.999-lcms2.patch
@@ -0,0 +1,372 @@
+From 30af0e2edbf061b71bed9536d826894449f0390d Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Mon, 23 Sep 2013 16:11:31 +0200
+Subject: [PATCH] patch: lcms2
+
+Squashed commit of the following:
+
+commit f975accf7e1a08438b63580ea848457d373200f5
+Author: Nils Philippsen <nils@redhat.com>
+Date:   Mon Sep 23 14:53:45 2013 +0200
+
+    Add support for lcms 2.x.
+---
+ configure.in        | 22 ++++++++++++++----
+ include/config.h.in |  8 ++++++-
+ src/xsane-preview.c |  6 +++--
+ src/xsane-save.c    | 38 ++++++++++++++++++++++++++-----
+ src/xsane-viewer.c  | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++---
+ src/xsane.h         |  8 ++++++-
+ 6 files changed, 130 insertions(+), 17 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index df7b114..3659c97 100644
+--- a/configure.in
++++ b/configure.in
+@@ -130,7 +130,17 @@ if test "${USE_TIFF}" = "yes"; then
+ fi
+ 
+ if test "${USE_LCMS}" = "yes"; then
+-  AC_CHECK_LIB(lcms, cmsOpenProfileFromFile)
++  AC_SEARCH_LIBS(cmsOpenProfileFromFile, [lcms2 lcms])
++  if test "${ac_cv_search_cmsOpenProfileFromFile}" != "no"; then
++    AC_DEFINE(HAVE_LIBLCMS, 1, [Define if LCMS is to be used.])
++  fi
++  if test "${ac_cv_search_cmsOpenProfileFromFile}" == "-llcms2"; then
++    AC_DEFINE(HAVE_LIBLCMS2, 1, [Define if you have liblcms2.])
++  else
++    if test "${ac_cv_search_cmsOpenProfileFromFile}" == "-llcms"; then
++      AC_DEFINE(HAVE_LIBLCMS1, 1, [Define if you have liblcms.])
++    fi
++  fi
+ fi
+ 
+ dnl Checks for library functions.
+@@ -294,10 +304,14 @@ else
+   echo "* - PNG  support deactivated                                   *"
+ fi
+ 
+-if test "${ac_cv_lib_lcms_cmsOpenProfileFromFile}" = "yes"; then
+-  echo "* - LCMS (color management) support activated                  *"
++if test "${ac_cv_search_cmsOpenProfileFromFile}" = "-llcms2"; then
++  echo "* - LCMS (color management) support activated (lcms2)          *"
+ else
+-  echo "* - LCMS (color management) support deactivated                *"
++  if test "${ac_cv_search_cmsOpenProfileFromFile}" = "-llcms"; then
++    echo "* - LCMS (color management) support activated (lcms)           *"
++  else
++    echo "* - LCMS (color management) support deactivated                *"
++  fi
+ fi
+ 
+ echo "*                                                              *"
+diff --git a/include/config.h.in b/include/config.h.in
+index ecc9637..f9a3e40 100755
+--- a/include/config.h.in
++++ b/include/config.h.in
+@@ -290,9 +290,15 @@
+ /* Define if you have libtiff.  */
+ #undef HAVE_LIBTIFF
+ 
+-/* Define if you have liblcms.  */
++/* Define if LCMS is to be used. */
+ #undef HAVE_LIBLCMS
+ 
++/* Define if you have liblcms. */
++#undef HAVE_LIBLCMS1
++
++/* Define if you have liblcms2. */
++#undef HAVE_LIBLCMS2
++
+ #ifndef HAVE_STRNCASECMP
+   /* OS/2 needs this */
+ # define strncasecmp(a, b, c) strnicmp(a, b, c)
+diff --git a/src/xsane-preview.c b/src/xsane-preview.c
+index 6327ca7..6eaf687 100644
+--- a/src/xsane-preview.c
++++ b/src/xsane-preview.c
+@@ -6346,8 +6346,8 @@ int preview_do_color_correction(Preview *p)
+  cmsHPROFILE hOutProfile = NULL;
+  cmsHPROFILE hProofProfile = NULL;
+  cmsHTRANSFORM hTransform = NULL;
+- DWORD input_format, output_format;
+- DWORD cms_flags = 0;
++ cmsUInt32Number input_format, output_format;
++ cmsUInt32Number cms_flags = 0;
+  int proof = 0;
+  char *cms_proof_icm_profile = NULL;
+  int linesize = 0;
+@@ -6355,7 +6355,9 @@ int preview_do_color_correction(Preview *p)
+ 
+   DBG(DBG_proc, "preview_do_color_correction\n");
+ 
++#ifdef HAVE_LIBLCMS1
+   cmsErrorAction(LCMS_ERROR_SHOW);
++#endif
+ 
+   if (preferences.cms_bpc)
+   {
+diff --git a/src/xsane-save.c b/src/xsane-save.c
+index 75e0a63..2d0e44b 100644
+--- a/src/xsane-save.c
++++ b/src/xsane-save.c
+@@ -832,9 +832,9 @@ cmsHTRANSFORM xsane_create_cms_transform(Image_info *image_info, int cms_functio
+  cmsHPROFILE hInProfile = NULL;
+  cmsHPROFILE hOutProfile = NULL;
+  cmsHTRANSFORM hTransform = NULL;
+- DWORD cms_input_format;
+- DWORD cms_output_format;
+- DWORD cms_flags = 0;
++ cmsUInt32Number cms_input_format;
++ cmsUInt32Number cms_output_format;
++ cmsUInt32Number cms_flags = 0;
+ 
+   if (cms_function == XSANE_CMS_FUNCTION_EMBED_SCANNER_ICM_PROFILE)
+   {
+@@ -843,7 +843,9 @@ cmsHTRANSFORM xsane_create_cms_transform(Image_info *image_info, int cms_functio
+ 
+   DBG(DBG_info, "Prepare CMS transform\n");
+ 
++#ifdef HAVE_LIBLCMS1
+   cmsErrorAction(LCMS_ERROR_SHOW);
++#endif
+ 
+   if (cms_bpc)
+   {
+@@ -890,10 +892,18 @@ cmsHTRANSFORM xsane_create_cms_transform(Image_info *image_info, int cms_functio
+     if (image_info->channels == 1) /* == 1 (grayscale) */
+     {
+ #if 1 /* xxx oli */
++# ifdef HAVE_LIBLCMS2
++     cmsToneCurve *Gamma = cmsBuildGamma(NULL, 2.2);
++# else
+      LPGAMMATABLE Gamma = cmsBuildGamma(256, 2.2);
++# endif
+ 
+       hOutProfile = cmsCreateGrayProfile(cmsD50_xyY(), Gamma);
++# ifdef HAVE_LIBLCMS2
++      cmsFreeToneCurve(Gamma);
++# else
+       cmsFreeGamma(Gamma);
++# endif
+ #endif
+     }
+     else
+@@ -2896,7 +2906,11 @@ static int xsane_write_CSA(FILE *outfile, char *input_profile, int intent)
+     return -1;
+   }
+ 
++#ifdef HAVE_LIBLCMS2
++  n = cmsGetPostScriptCSA(NULL, hProfile, intent, 0, NULL, 0);
++#else
+   n = cmsGetPostScriptCSA(hProfile, intent, NULL, 0);
++#endif
+   if (n == 0)
+   {
+     return -2;
+@@ -2908,7 +2922,11 @@ static int xsane_write_CSA(FILE *outfile, char *input_profile, int intent)
+     return -3;
+   }
+ 
++#ifdef HAVE_LIBLCMS2
++  cmsGetPostScriptCSA(NULL, hProfile, intent, 0, buffer, n);
++#else
+   cmsGetPostScriptCSA(hProfile, intent, buffer, n);
++#endif
+   buffer[n] = 0;
+ 
+   fprintf(outfile, "%s", buffer);
+@@ -2927,7 +2945,7 @@ static int xsane_write_CRD(FILE *outfile, char *output_profile, int intent, int
+  cmsHPROFILE hProfile;
+  size_t n;
+  char* buffer;
+- DWORD flags = cmsFLAGS_NODEFAULTRESOURCEDEF;
++ cmsUInt32Number flags = cmsFLAGS_NODEFAULTRESOURCEDEF;
+ 
+   hProfile = cmsOpenProfileFromFile(output_profile, "r");
+   if (!hProfile)
+@@ -2940,7 +2958,11 @@ static int xsane_write_CRD(FILE *outfile, char *output_profile, int intent, int
+     flags |= cmsFLAGS_BLACKPOINTCOMPENSATION;
+   }
+ 
++#ifdef HAVE_LIBLCMS2
++  n = cmsGetPostScriptCRD(NULL, hProfile, intent, flags, NULL, 0);
++#else
+   n = cmsGetPostScriptCRDEx(hProfile, intent, flags, NULL, 0);
++#endif
+   if (n == 0)
+   {
+     return -2;
+@@ -2952,7 +2974,11 @@ static int xsane_write_CRD(FILE *outfile, char *output_profile, int intent, int
+     return -3;
+   }
+ 
++#ifdef HAVE_LIBLCMS2
++  cmsGetPostScriptCRD(NULL, hProfile, intent, flags, buffer, n);
++#else
+   cmsGetPostScriptCRDEx(hProfile, intent, flags, buffer, n);
++#endif
+   buffer[n] = 0;
+ 
+   fprintf(outfile, "%s", buffer);
+@@ -4349,7 +4375,7 @@ static void xsane_jpeg_embed_scanner_icm_profile(j_compress_ptr cinfo_ptr, const
+ {
+  FILE *icm_profile;
+  size_t size, embed_len;
+- LPBYTE embed_buffer;
++ cmsUInt8Number *embed_buffer;
+ 
+   DBG(DBG_proc, "xsane_jpeg_embed_scanner_icm_profile(%s)\n", icm_filename);
+ 
+@@ -4363,7 +4389,7 @@ static void xsane_jpeg_embed_scanner_icm_profile(j_compress_ptr cinfo_ptr, const
+   size = ftell(icm_profile);
+   fseek(icm_profile, 0, SEEK_SET);
+ 
+-  embed_buffer = (LPBYTE) malloc(size + 1);
++  embed_buffer = (cmsUInt8Number *) malloc(size + 1);
+   if (embed_buffer)
+   {
+     embed_len = fread(embed_buffer, 1, size, icm_profile);
+diff --git a/src/xsane-viewer.c b/src/xsane-viewer.c
+index 69a444d..844c077 100644
+--- a/src/xsane-viewer.c
++++ b/src/xsane-viewer.c
+@@ -1795,6 +1795,9 @@ static void xsane_viewer_set_cms_gamut_alarm_color_callback(GtkWidget *widget, g
+ {
+  Viewer *v = (Viewer *) data;
+  int val;
++#ifdef HAVE_LIBLCMS2
++ cmsUInt16Number alarm_codes[cmsMAXCHANNELS];
++#endif
+ 
+   g_signal_handlers_block_by_func(GTK_OBJECT(v->cms_gamut_alarm_color_widget[0]), (GtkSignalFunc) xsane_viewer_set_cms_gamut_alarm_color_callback, v);
+   g_signal_handlers_block_by_func(GTK_OBJECT(v->cms_gamut_alarm_color_widget[1]), (GtkSignalFunc) xsane_viewer_set_cms_gamut_alarm_color_callback, v);
+@@ -1811,6 +1814,49 @@ static void xsane_viewer_set_cms_gamut_alarm_color_callback(GtkWidget *widget, g
+   v->cms_gamut_alarm_color = val;
+   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(v->cms_gamut_alarm_color_widget[v->cms_gamut_alarm_color]), TRUE);
+ 
++#ifdef HAVE_LIBLCMS2
++  switch(v->cms_gamut_alarm_color)
++  {
++    default:
++    case 0: /* black */
++      alarm_codes[0] = (cmsUInt16Number) 0;
++      alarm_codes[1] = (cmsUInt16Number) 0;
++      alarm_codes[2] = (cmsUInt16Number) 0;
++     break;
++
++    case 1: /* gray */
++      alarm_codes[0] = (cmsUInt16Number) 128;
++      alarm_codes[1] = (cmsUInt16Number) 128;
++      alarm_codes[2] = (cmsUInt16Number) 128;
++     break;
++
++    case 2: /* white */
++      alarm_codes[0] = (cmsUInt16Number) 255;
++      alarm_codes[1] = (cmsUInt16Number) 255;
++      alarm_codes[2] = (cmsUInt16Number) 255;
++     break;
++
++    case 3: /* red */
++      alarm_codes[0] = (cmsUInt16Number) 255;
++      alarm_codes[1] = (cmsUInt16Number) 0;
++      alarm_codes[2] = (cmsUInt16Number) 0;
++     break;
++
++    case 4: /* green */
++      alarm_codes[0] = (cmsUInt16Number) 0;
++      alarm_codes[1] = (cmsUInt16Number) 255;
++      alarm_codes[2] = (cmsUInt16Number) 0;
++     break;
++
++    case 5: /* blue */
++      alarm_codes[0] = (cmsUInt16Number) 0;
++      alarm_codes[1] = (cmsUInt16Number) 0;
++      alarm_codes[2] = (cmsUInt16Number) 255;
++     break;
++  }
++
++  cmsSetAlarmCodes(alarm_codes);
++#else
+   switch(v->cms_gamut_alarm_color)
+   {
+     default:
+@@ -1838,6 +1884,7 @@ static void xsane_viewer_set_cms_gamut_alarm_color_callback(GtkWidget *widget, g
+       cmsSetAlarmCodes(0, 0, 255);
+      break;
+   }
++#endif
+ 
+   g_signal_handlers_unblock_by_func(GTK_OBJECT(v->cms_gamut_alarm_color_widget[0]), (GtkSignalFunc) xsane_viewer_set_cms_gamut_alarm_color_callback, v);
+   g_signal_handlers_unblock_by_func(GTK_OBJECT(v->cms_gamut_alarm_color_widget[1]), (GtkSignalFunc) xsane_viewer_set_cms_gamut_alarm_color_callback, v);
+@@ -2172,9 +2219,9 @@ static int xsane_viewer_read_image(Viewer *v)
+  cmsHTRANSFORM hTransform = NULL;
+  int proof = 0;
+  char *cms_proof_icm_profile = NULL;
+- DWORD cms_input_format;
+- DWORD cms_output_format;
+- DWORD cms_flags = 0;
++ cmsUInt32Number cms_input_format;
++ cmsUInt32Number cms_output_format;
++ cmsUInt32Number cms_flags = 0;
+ #endif
+ 
+   /* open imagefile */
+@@ -2203,7 +2250,9 @@ static int xsane_viewer_read_image(Viewer *v)
+ 
+   if ((v->enable_color_management) && (v->cms_enable))
+   {
++#ifdef HAVE_LIBLCMS1
+     cmsErrorAction(LCMS_ERROR_SHOW);
++#endif
+ 
+     if (v->cms_bpc)
+     {
+@@ -2801,6 +2850,9 @@ Viewer *xsane_viewer_new(char *filename, char *selection_filetype, int allow_red
+  GtkWidget *scrolled_window;
+  GtkWidget *zoom_option_menu, *zoom_menu, *zoom_menu_item;
+  int i, selection;
++#ifdef HAVE_LIBLCMS2
++ cmsUInt16Number alarm_codes[cmsMAXCHANNELS];
++#endif
+ 
+   DBG(DBG_proc, "viewer_new(%s)\n", filename);
+ 
+@@ -2830,8 +2882,15 @@ Viewer *xsane_viewer_new(char *filename, char *selection_filetype, int allow_red
+   v->cms_proofing_intent = INTENT_ABSOLUTE_COLORIMETRIC;
+   v->cms_gamut_check = 0;
+   v->cms_gamut_alarm_color = 3; /* red */
++#ifdef HAVE_LIBLCMS2
++  alarm_codes[0] = (cmsUInt16Number) 255;
++  alarm_codes[1] = (cmsUInt16Number) 0;
++  alarm_codes[2] = (cmsUInt16Number) 0;
++  cmsSetAlarmCodes(alarm_codes);
++#else
+   cmsSetAlarmCodes(255, 0, 0);
+ #endif
++#endif
+   if (selection_filetype)
+   {
+     v->selection_filetype = strdup(selection_filetype);
+diff --git a/src/xsane.h b/src/xsane.h
+index 4067d61..adcc0ed 100644
+--- a/src/xsane.h
++++ b/src/xsane.h
+@@ -70,7 +70,13 @@
+ #include <gtk/gtk.h>
+ 
+ #ifdef HAVE_LIBLCMS
+-# include "lcms.h"
++# ifdef HAVE_LIBLCMS2
++#  include "lcms2.h"
++# else
++#  include "lcms.h"
++typedef BYTE cmsUInt8Number;
++typedef DWORD cmsUInt32Number;
++# endif
+ #else
+ # define cmsHTRANSFORM void *
+ #endif
+-- 
+1.8.3.1
+
diff --git a/media-gfx/xsane/metadata.xml b/media-gfx/xsane/metadata.xml
new file mode 100644
index 000000000000..a203d1b2511d
--- /dev/null
+++ b/media-gfx/xsane/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>printing</herd>
+<herd>graphics</herd>
+<maintainer>
+	<email>pacho@gentoo.org</email>
+</maintainer>
+<use>
+        <flag name='ocr'>Enable support for Optical Character Recognition reader</flag>
+</use>
+</pkgmetadata>
diff --git a/media-gfx/xsane/xsane-0.999-r1.ebuild b/media-gfx/xsane/xsane-0.999-r1.ebuild
new file mode 100644
index 000000000000..537097f1dd01
--- /dev/null
+++ b/media-gfx/xsane/xsane-0.999-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="graphical scanning frontend"
+HOMEPAGE="http://www.xsane.org/"
+SRC_URI="
+	http://www.xsane.org/download/${P}.tar.gz
+	http://dev.gentoo.org/~dilfridge/distfiles/${PN}-0.998-patches-2.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="nls jpeg png tiff gimp lcms ocr"
+
+RDEPEND="
+	media-gfx/sane-backends
+	x11-libs/gtk+:2
+	x11-misc/xdg-utils
+	jpeg? ( virtual/jpeg )
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+	gimp? ( media-gfx/gimp )
+	lcms? ( media-libs/lcms:2 )
+"
+
+PDEPEND="ocr? ( app-text/gocr )"
+
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Apply multiple fixes from different distributions
+	# Drop included patch and reuse patchset from prior version
+	rm "${WORKDIR}/${PN}-0.998-patches-2"/005-update-param-crash.patch || die
+	epatch "${WORKDIR}/${PN}-0.998-patches-2"/*.patch
+
+	# Fix compability with libpng15 wrt #377363
+	sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c || die
+
+	# Fix AR calling directly (bug #442606)
+	sed -i -e 's:ar r:$(AR) r:' lib/Makefile.in || die
+	tc-export AR
+
+	# Add support for lcms-2 (from Fedora)
+	epatch "${FILESDIR}/${PN}-0.999-lcms2.patch"
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-gtk2 \
+		$(use_enable nls) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable tiff) \
+		$(use_enable gimp) \
+		$(use_enable lcms)
+}
+
+src_install() {
+	default
+
+	dodoc xsane.*
+
+	# link xsane so it is seen as a plugin in gimp
+	if use gimp; then
+		local plugindir
+		if [ -x "${EPREFIX}"/usr/bin/gimptool ]; then
+			plugindir="$(gimptool --gimpplugindir)/plug-ins"
+		elif [ -x "${EPREFIX}"/usr/bin/gimptool-2.0 ]; then
+			plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
+		else
+			die "Can't find GIMP plugin directory."
+		fi
+		dodir "${plugindir#${EPREFIX}}"
+		dosym /usr/bin/xsane "${plugindir#${EPREFIX}}"/xsane
+	fi
+
+	newicon src/xsane-48x48.png ${PN}.png
+}