Make libattr optional; bug #191989

(Portage version: 2.1.3.9)

5 files changed, 118 insertions, 7 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index d1b2d29a21cd..41307bee47a7 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/gedit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.198 2007/09/12 23:01:12 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.199 2007/09/13 16:09:17 dang Exp $
+
+*gedit-2.18.2-r1 (13 Sep 2007)
+
+  13 Sep 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gedit-2.18.2-libattr.patch, gedit-2.18.1-r1.ebuild,
+  +gedit-2.18.2-r1.ebuild:
+  Make libattr optional; bug #191989
 
   12 Sep 2007; Gilles Dartiguelongue <eva@gentoo.org>
   gedit-2.16.2-r1.ebuild, gedit-2.18.1-r1.ebuild, gedit-2.18.2.ebuild:
diff --git a/app-editors/gedit/files/digest-gedit-2.18.2-r1 b/app-editors/gedit/files/digest-gedit-2.18.2-r1
new file mode 100644
index 000000000000..32243429307e
--- /dev/null
+++ b/app-editors/gedit/files/digest-gedit-2.18.2-r1
@@ -0,0 +1,3 @@
+MD5 7e8bf29bd6bf0d17ceaf42d9bd5d94e6 gedit-2.18.2.tar.bz2 3454560
+RMD160 d9845a95ace6dfaf1afb7a3f3e515c48baaf0743 gedit-2.18.2.tar.bz2 3454560
+SHA256 12e4c2e15c1449e92f9f6c7966f4e1829290d5af35b9ec0b9274d8f167a89f44 gedit-2.18.2.tar.bz2 3454560
diff --git a/app-editors/gedit/files/gedit-2.18.2-libattr.patch b/app-editors/gedit/files/gedit-2.18.2-libattr.patch
new file mode 100644
index 000000000000..19d8c34c8747
--- /dev/null
+++ b/app-editors/gedit/files/gedit-2.18.2-libattr.patch
@@ -0,0 +1,28 @@
+Author: Doug Goldstein <cardoe@gentoo.org>
+Date: Thr Sep 13 10:08:24 2007 +0400
+ remove shadow depend on libattr and make it user config'd
+
+  removes the shadow depend on libattr and makes it user configurable.
+  leaves the default to yes as is currently in gedit, however it fails
+  if libattr is not found so that it's not a shadow depend.
+
+--- gedit-2.18.2/configure.ac.old	2007-06-24 12:06:30.000000000 -0400
++++ gedit-2.18.2/configure.ac	2007-09-13 10:21:12.000000000 -0400
+@@ -138,8 +138,15 @@
+ dnl ================================================================
+ dnl libattr checks
+ dnl ================================================================
+-
+-AC_CHECK_LIB(attr, attr_copy_fd)
++AC_ARG_WITH([attr],
++	AS_HELP_STRING([--without-attr],[Don't use libattr support]),
++	[],
++	[with_attr=yes])
++
++if test "x$with_attr" = "xyes"; then
++	AC_CHECK_LIB([attr], [attr_copy_fd], [],
++		AC_MSG_ERROR([*** attr library (libattr) not found]))
++fi
+ 
+ dnl ================================================================
+ dnl Start of pkg-config checks
diff --git a/app-editors/gedit/gedit-2.18.1-r1.ebuild b/app-editors/gedit/gedit-2.18.1-r1.ebuild
index 55c0f64aefc5..f93451353396 100644
--- a/app-editors/gedit/gedit-2.18.1-r1.ebuild
+++ b/app-editors/gedit/gedit-2.18.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.18.1-r1.ebuild,v 1.13 2007/09/12 23:01:12 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.18.1-r1.ebuild,v 1.14 2007/09/13 16:09:17 dang Exp $
 
-inherit gnome2 eutils
+inherit gnome2 eutils autotools
 
 DESCRIPTION="A text editor for the GNOME desktop"
 HOMEPAGE="http://www.gnome.org/"
@@ -10,13 +10,13 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc python spell"
+IUSE="acl doc python spell"
 
 RDEPEND=">=gnome-base/gconf-2
-	sys-apps/attr
+	acl? ( sys-apps/attr )
 	>=dev-libs/glib-2.12
 	>=x11-libs/gtk+-2.10
-	>=x11-libs/gtksourceview-1.8.0
+	=x11-libs/gtksourceview-1.8*
 	>=gnome-base/libgnomeui-2.16
 	>=gnome-base/libglade-2.5.1
 	>=gnome-base/libgnomeprintui-2.12.1
@@ -46,7 +46,7 @@ if [[ "${ARCH}" == "PPC" ]] ; then
 fi
 
 pkg_setup() {
-	G2CONF="$(use_enable python) $(use_enable spell)"
+	G2CONF="$(use_enable python) $(use_enable spell) $(use_with acl attr)"
 }
 
 src_unpack() {
@@ -60,4 +60,9 @@ src_unpack() {
 
 	# chown on fbsd doesn't have --reference.  Bug #183691
 	epatch "${FILESDIR}"/${P}-fbsd.patch
+
+	# Make libattr optional; bug #191989
+	epatch "${FILESDIR}"/${PN}-2.18.2-libattr.patch
+
+	AT_M4DIR="./m4" eautoreconf
 }
diff --git a/app-editors/gedit/gedit-2.18.2-r1.ebuild b/app-editors/gedit/gedit-2.18.2-r1.ebuild
new file mode 100644
index 000000000000..78784b8b3189
--- /dev/null
+++ b/app-editors/gedit/gedit-2.18.2-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.18.2-r1.ebuild,v 1.1 2007/09/13 16:09:17 dang Exp $
+
+inherit gnome2 eutils autotools
+
+DESCRIPTION="A text editor for the GNOME desktop"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="acl doc python spell"
+
+RDEPEND=">=gnome-base/gconf-2
+	acl? ( sys-apps/attr )
+	>=dev-libs/glib-2.12
+	>=x11-libs/gtk+-2.10
+	=x11-libs/gtksourceview-1.8*
+	>=gnome-base/libgnomeui-2.16
+	>=gnome-base/libglade-2.5.1
+	>=gnome-base/libgnomeprintui-2.12.1
+	>=gnome-base/gnome-vfs-2.16
+	spell? (
+		>=app-text/enchant-1.2
+		app-text/iso-codes
+	)
+	python? (
+		>=dev-python/pygtk-2.9.7
+		>=dev-python/pygobject-2.11.5
+		>=dev-python/gnome-python-desktop-2.15.90
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=app-text/scrollkeeper-0.3.11
+	>=dev-util/intltool-0.35
+	>=app-text/gnome-doc-utils-0.3.2"
+
+DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README THANKS TODO"
+
+if [[ "${ARCH}" == "PPC" ]] ; then
+	# HACK HACK HACK: someone fix this garbage
+	MAKEOPTS="${MAKEOPTS} -j1"
+fi
+
+pkg_setup() {
+	G2CONF="$(use_enable python) $(use_enable spell) $(use_with acl attr)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Remove symbols that are not meant to be part of the docs, and
+	# break compilation if USE="doc -python" (bug #158638).
+	if use !python && use doc; then
+		epatch "${FILESDIR}"/${PN}-2.16.2-no_python_module_docs.patch
+	fi
+
+	# chown on fbsd doesn't have --reference.  Bug #183691
+	epatch "${FILESDIR}"/${PN}-2.18.1-fbsd.patch
+
+	# Make libattr optional; bug #191989
+	epatch "${FILESDIR}"/${P}-libattr.patch
+
+	AT_M4DIR="./m4" eautoreconf
+}