Make libattr optional; bug #191989

Package-Manager: portage-2.1.3.9

6 files changed, 147 insertions, 15 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/Manifest b/app-editors/gedit/Manifest
index 6f0c4cf1a259..c7731040c70a 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gedit-2.16.2-no_python_module_docs.patch 730 RMD160 81afcad6cca9d0be7311fca0da788d93368beef4 SHA1 70f11ceb222c58a85f5ce4d08474dbc70b3abfe5 SHA256 7cff8d687f0def86ccabd6bc584e9a57de23e48e9b8fb7d5f241f60ac7c3b38c
 MD5 c9080dd00ae9152286919d162aeddc26 files/gedit-2.16.2-no_python_module_docs.patch 730
 RMD160 81afcad6cca9d0be7311fca0da788d93368beef4 files/gedit-2.16.2-no_python_module_docs.patch 730
@@ -6,6 +9,10 @@ AUX gedit-2.18.1-fbsd.patch 765 RMD160 ace52dfa270fbb4a65db931abc3022ef45fe5e3e
 MD5 d2853bfdd583ede8b941bdb1327514ba files/gedit-2.18.1-fbsd.patch 765
 RMD160 ace52dfa270fbb4a65db931abc3022ef45fe5e3e files/gedit-2.18.1-fbsd.patch 765
 SHA256 c8cc28eb479ee2ac9b53fc0e7d3fdcb2b0dc9b6e7b9255c68a6df0e04b3097b0 files/gedit-2.18.1-fbsd.patch 765
+AUX gedit-2.18.2-libattr.patch 1054 RMD160 b4e3452ed002a972e01ccc9b38f5f15b0f4c0486 SHA1 fd01a5954b0f1d8750d0802f00ba7b44a99ab258 SHA256 78f61a0b32811d986740c4b08c3cd77ad5770ad2f6ba99cbc2bc7ee5e87d8248
+MD5 07a9558c57b270f6a97cc781a2f3c1b6 files/gedit-2.18.2-libattr.patch 1054
+RMD160 b4e3452ed002a972e01ccc9b38f5f15b0f4c0486 files/gedit-2.18.2-libattr.patch 1054
+SHA256 78f61a0b32811d986740c4b08c3cd77ad5770ad2f6ba99cbc2bc7ee5e87d8248 files/gedit-2.18.2-libattr.patch 1054
 DIST gedit-2.16.2.tar.bz2 2851971 RMD160 a15ff0981ee190453fe9a748a601ee03b14a890f SHA1 02e653ed0f8eaf5e147e24d8e4e5291eb94814e3 SHA256 8c5c3d5319d060b0db15c30c48503fde85341fa0f1aa848e99c1f0b825c20b4e
 DIST gedit-2.18.1.tar.bz2 3392618 RMD160 779981214ea91f3d83c726429026553f34149425 SHA1 a9c460872a439ae346e6ec062065d94c9c02bdf0 SHA256 7f6f0e9517a4b8fd741523e04c413e04279ed670001923646f2ea1e2e35929c4
 DIST gedit-2.18.2.tar.bz2 3454560 RMD160 d9845a95ace6dfaf1afb7a3f3e515c48baaf0743 SHA1 3f6a39eea007f4a89f25897b5d99530139032ce6 SHA256 12e4c2e15c1449e92f9f6c7966f4e1829290d5af35b9ec0b9274d8f167a89f44
@@ -13,18 +20,22 @@ EBUILD gedit-2.16.2-r1.ebuild 1545 RMD160 917e38899b41cdb449140dbe0a5c0544343b69
 MD5 d99f373c979788772af4d541353298f2 gedit-2.16.2-r1.ebuild 1545
 RMD160 917e38899b41cdb449140dbe0a5c0544343b69bb gedit-2.16.2-r1.ebuild 1545
 SHA256 83aef95f06acd6758c5780272b903db8806586a3cd81a18bb52056bd6f37dc17 gedit-2.16.2-r1.ebuild 1545
-EBUILD gedit-2.18.1-r1.ebuild 1632 RMD160 241b06e8be60ad81874ed7ca3d308cbfa12a1b2a SHA1 25df7eba577ac803c52f5001ef85938830738ca2 SHA256 67d9e44077216f4c781f55d7879d9e0e7bc38ec7e635322459b102a5dbda73d7
-MD5 23a34c17d4eac37f7b80bffa8e8d1627 gedit-2.18.1-r1.ebuild 1632
-RMD160 241b06e8be60ad81874ed7ca3d308cbfa12a1b2a gedit-2.18.1-r1.ebuild 1632
-SHA256 67d9e44077216f4c781f55d7879d9e0e7bc38ec7e635322459b102a5dbda73d7 gedit-2.18.1-r1.ebuild 1632
+EBUILD gedit-2.18.1-r1.ebuild 1793 RMD160 4e8bf71afb40fb996550304b1b618edacc07e4e2 SHA1 c89e25439c3c7d18503d9c0a14eadc69fed73254 SHA256 92f6d51819896a3009e6c51fb5a59928059058ec655a68e2ae23176c5c51d382
+MD5 ebacc199affcbdb40eb515f1a83cdb36 gedit-2.18.1-r1.ebuild 1793
+RMD160 4e8bf71afb40fb996550304b1b618edacc07e4e2 gedit-2.18.1-r1.ebuild 1793
+SHA256 92f6d51819896a3009e6c51fb5a59928059058ec655a68e2ae23176c5c51d382 gedit-2.18.1-r1.ebuild 1793
+EBUILD gedit-2.18.2-r1.ebuild 1801 RMD160 22c693e3ac7fc5a8141e2769b093b75de4139716 SHA1 ecca17691d0806c80a6fa71763544d325a3317e0 SHA256 a5acd7fd1b86d7b044a4514a745284bcca93fdc82a26ecc0f06009dca3d119fe
+MD5 3452c5440b1fb8e43cac1db6592ae1e4 gedit-2.18.2-r1.ebuild 1801
+RMD160 22c693e3ac7fc5a8141e2769b093b75de4139716 gedit-2.18.2-r1.ebuild 1801
+SHA256 a5acd7fd1b86d7b044a4514a745284bcca93fdc82a26ecc0f06009dca3d119fe gedit-2.18.2-r1.ebuild 1801
 EBUILD gedit-2.18.2.ebuild 1645 RMD160 85f2597e8d6fb8892d3dc4ce986c42b4bdd090a9 SHA1 bf5aef097d508eee76b8e1e0b732391a6a49051e SHA256 86ca0a2594c5071bae2a0602d02bc3d79d23451980c602fd1137dc27f21a380a
 MD5 9c3654f2043a36e80d4778f752cdd3c2 gedit-2.18.2.ebuild 1645
 RMD160 85f2597e8d6fb8892d3dc4ce986c42b4bdd090a9 gedit-2.18.2.ebuild 1645
 SHA256 86ca0a2594c5071bae2a0602d02bc3d79d23451980c602fd1137dc27f21a380a gedit-2.18.2.ebuild 1645
-MISC ChangeLog 23356 RMD160 778b6c3b3a2a78b45ccd12940e50246e32811d5d SHA1 0819347124f194bda4426016fb06986907282dd3 SHA256 0e3db0e0d443e74e2b10555993ce17d1bba9af1e63f44436ffeb43da845b9b71
-MD5 03da1e38637bbc345da382fd5dbae149 ChangeLog 23356
-RMD160 778b6c3b3a2a78b45ccd12940e50246e32811d5d ChangeLog 23356
-SHA256 0e3db0e0d443e74e2b10555993ce17d1bba9af1e63f44436ffeb43da845b9b71 ChangeLog 23356
+MISC ChangeLog 23566 RMD160 e06448ecef8489a4e43ce8f765bcb2ea5812fc32 SHA1 614c82addacab05b3778658b9da48f9cff5cd5ee SHA256 418e4d8b604b1b0ca2e905524d217bc8005c7ed57f9c834322006577ca159ec6
+MD5 c0a07e88c7b30b7c29cee7c1158c05fe ChangeLog 23566
+RMD160 e06448ecef8489a4e43ce8f765bcb2ea5812fc32 ChangeLog 23566
+SHA256 418e4d8b604b1b0ca2e905524d217bc8005c7ed57f9c834322006577ca159ec6 ChangeLog 23566
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -38,3 +49,13 @@ SHA256 4c5f2d5ba4fae2d024af7a02e67996a2b3adf0f2637d10ca51af8671372b2af6 files/di
 MD5 134573f2989192cc7c549cac3fed6d0a files/digest-gedit-2.18.2 244
 RMD160 a560ba960b067e6a9cb352519b0477014eeb46ba files/digest-gedit-2.18.2 244
 SHA256 51fc2de6835fd466d9ee8d7e747caeee4aa96721a8ca0263bb8adcd463bf8ffb files/digest-gedit-2.18.2 244
+MD5 134573f2989192cc7c549cac3fed6d0a files/digest-gedit-2.18.2-r1 244
+RMD160 a560ba960b067e6a9cb352519b0477014eeb46ba files/digest-gedit-2.18.2-r1 244
+SHA256 51fc2de6835fd466d9ee8d7e747caeee4aa96721a8ca0263bb8adcd463bf8ffb files/digest-gedit-2.18.2-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFG6WDxomPajV0RnrERAhojAJ0WTifxZyK3rj8vPq2FKjJHScCRHwCcCnyH
+C7XBjHFqDyKI9NkmEhCMIg0=
+=w549
+-----END PGP SIGNATURE-----
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
+}