add strip-linguas and gnome2_omf_fix to fix #102894

(Portage version: 2.0.51.22-r3)

4 files changed, 81 insertions, 9 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index ebb6b1d5906e..7bde952c9fb3 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/control-center
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.138 2005/10/28 17:21:28 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.139 2005/11/06 04:23:37 allanonjl Exp $
+
+*control-center-1.4.0.5-r2 (06 Nov 2005)
+
+  06 Nov 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +control-center-1.4.0.5-r2.ebuild:
+  add strip-linguas and gnome2_omf_fix to fix #102894
 
   28 Oct 2005; Leonardo Boshell <leonardop@gentoo.org>
   control-center-2.10.2.ebuild, control-center-2.12.1.ebuild:
diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index dcb1783e1150..258b4d124aad 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,14 +1,16 @@
-MD5 02e8b950302f884140fa26517ac19967 ChangeLog 17977
+MD5 008c6b9c25037a272e55b9ab1e8b0826 control-center-1.4.0.5-r2.ebuild 1408
+MD5 4c51b1cfa94b30d5b65e740eaf9f12fe control-center-2.12.1.ebuild 2294
 MD5 d4f0febb27460c43fb258412acde17b8 control-center-1.4.0.5-r1.ebuild 1333
 MD5 411bb0502e1a779a850ab4bb0d582e5c control-center-2.10.2.ebuild 2015
-MD5 4c51b1cfa94b30d5b65e740eaf9f12fe control-center-2.12.1.ebuild 2294
+MD5 9d9124a43bed7c25bfb39865a2114947 ChangeLog 18167
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 cd6f25b991e95ef9f518b4c499f2e2f7 files/digest-control-center-2.10.2 75
+MD5 ce951b06688a38662ed2c0e5e8d0d1bc files/digest-control-center-2.12.1 75
+MD5 c74402dbfb3e7cdb095304cc4751d86a files/control-center-2.9-logout.patch 4083
+MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
+MD5 63670f480e3cafb0d9dc8b3423425071 files/control-center-2.6.0-remove-pmu.patch 1210
 MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
 MD5 f14d2fe3d15320580a2ab5715e6e2d94 files/control-center-2.10.1-pathfix.patch 6670
 MD5 6d346011e61ca1c016c3c391881f9a4a files/control-center-2.11-gentoo_xcursor.patch 527
-MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
-MD5 63670f480e3cafb0d9dc8b3423425071 files/control-center-2.6.0-remove-pmu.patch 1210
-MD5 c74402dbfb3e7cdb095304cc4751d86a files/control-center-2.9-logout.patch 4083
 MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76
-MD5 cd6f25b991e95ef9f518b4c499f2e2f7 files/digest-control-center-2.10.2 75
-MD5 ce951b06688a38662ed2c0e5e8d0d1bc files/digest-control-center-2.12.1 75
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r2 76
diff --git a/gnome-base/control-center/control-center-1.4.0.5-r2.ebuild b/gnome-base/control-center/control-center-1.4.0.5-r2.ebuild
new file mode 100644
index 000000000000..21d18e1aebad
--- /dev/null
+++ b/gnome-base/control-center/control-center-1.4.0.5-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-1.4.0.5-r2.ebuild,v 1.1 2005/11/06 04:23:38 allanonjl Exp $
+
+inherit gnome.org eutils multilib gnome2
+
+DESCRIPTION="The GNOME control-center"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND="<gnome-base/gnome-vfs-1.9.0
+	>=media-libs/gdk-pixbuf-0.11.0-r1"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	>=dev-util/intltool-0.11"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-cflags.patch
+
+
+	# fix bug #102894
+	strip-linguas -i po
+	gnome2_omf_fix
+}
+
+src_compile() {
+	local myconf
+
+	if ! use nls
+	then
+		myconf="--disable-nls"
+	fi
+
+	# Fix build agains gdk-pixbuf-0.12 and later
+	#	CFLAGS="${CFLAGS} `gdk-pixbuf-config --cflags`"
+	# Not needed anymore? uncomment if this bugs.
+
+	./configure --host=${CHOST} \
+		    --prefix=/usr \
+		    --mandir=/usr/share/man \
+		    --sysconfdir=/etc \
+		    --localstatedir=/var/lib \
+			--libdir=/usr/$(get_libdir) \
+		    ${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+	make prefix=${D}/usr \
+		mandir=${D}/usr/share/man \
+		sysconfdir=${D}/etc \
+		localstatedir=${D}/var/lib	\
+		libdir=${D}/usr/$(get_libdir) \
+		install || die
+	dodoc AUTHORS ChangeLog README NEWS
+}
diff --git a/gnome-base/control-center/files/digest-control-center-1.4.0.5-r2 b/gnome-base/control-center/files/digest-control-center-1.4.0.5-r2
new file mode 100644
index 000000000000..4e19c9ae61b6
--- /dev/null
+++ b/gnome-base/control-center/files/digest-control-center-1.4.0.5-r2
@@ -0,0 +1 @@
+MD5 63e731f7c9f5fca354de5de4f881e952 control-center-1.4.0.5.tar.bz2 3382798