Depend on the split gnome-python packages, bug #248786; respect CFLAGS/LDFLAGS

Package-Manager: portage-2.2_rc23/cvs/Linux i686

4 files changed, 125 insertions, 6 deletions

diff --git a/x11-misc/revelation/ChangeLog b/x11-misc/revelation/ChangeLog
index a0f2bf85abb9..61d3d3e95f46 100644
--- a/x11-misc/revelation/ChangeLog
+++ b/x11-misc/revelation/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/revelation
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/revelation/ChangeLog,v 1.11 2008/10/05 23:16:42 nyhm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/revelation/ChangeLog,v 1.12 2009/01/22 18:12:53 nyhm Exp $
+
+*revelation-0.4.11-r2 (22 Jan 2009)
+
+  22 Jan 2009; Tristan Heaven <nyhm@gentoo.org>
+  +files/revelation-0.4.11-build.patch, +revelation-0.4.11-r2.ebuild:
+  Depend on the split gnome-python packages, bug #248786; respect
+  CFLAGS/LDFLAGS
 
 *revelation-0.4.11-r1 (05 Oct 2008)
 
diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest
index ca3e257c8194..8bb44c4c1ada 100644
--- a/x11-misc/revelation/Manifest
+++ b/x11-misc/revelation/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX revelation-0.4.11-build.patch 1520 RMD160 3831c1989d5742a7bdbe929de6022244dbb9459c SHA1 8f593005ffc3b6134cee77c773cf9d4ee8e76c83 SHA256 211f9ae91733edc195fd8d97d3d7f1d9656f2c717422ee551393ae62248c900c
 AUX revelation-0.4.11-list-index.patch 484 RMD160 bba307ddcb513d4eb3a992abfbbc84d621f30214 SHA1 476e25be6fc0d3eb45ed6d955c3f15e9101fa28b SHA256 eb999a96294d500925eea0bde83ea7f67823afbdbe90e8d09670f1caedc9a729
 DIST revelation-0.4.11.tar.bz2 639842 RMD160 7253dd746cb992cd9bdb8220ee03a1dad6b2af5d SHA1 6adec19f57bfed5e365a39ed23f4d8185a01a2e7 SHA256 82c321ed75dbb6f6e36afd3275598cae3d880fab60c7a0ec6ead08184635efeb
 EBUILD revelation-0.4.11-r1.ebuild 1102 RMD160 b8e467090bc02261a2e595a912ee44f577b727ca SHA1 e44020ed2e1e0c4cb84081e5374d3b740dc8651b SHA256 06f409734d594fbbbeddd83685b54a691f73557412e71886279f4acbc0a2792c
+EBUILD revelation-0.4.11-r2.ebuild 1218 RMD160 4439e02df172003ccc57a1fb2e3a28e5e61520fb SHA1 881efebade8f6910b2063d5ba1b8eef72e42ea28 SHA256 66977abd484e90ec8cd98cfaa460e4dd7eb1db5e52b2499ee3530c6a47464a9a
 EBUILD revelation-0.4.11.ebuild 1055 RMD160 62ab703dac6b0c5908e1be49bb8fb3875f598de6 SHA1 bddd47119ecf200b15e4b4207835ea5d43dccf14 SHA256 cb1607a801cda44fe4eb0ae4aa83584ac78c225f4c1a28da01fdb5d581153448
-MISC ChangeLog 1605 RMD160 da510e0571e7c2327f7f50cf3145a9d68b2a840e SHA1 41be7c90520af8fa6a42cccae82f7ba4eb6edff8 SHA256 7f79a39088c493923d193cfcbc97efc43b15506ca5220d8f472667b9aa32a29e
+MISC ChangeLog 1844 RMD160 5c24aed2e163fd37d22cd10d68393f856b31dd29 SHA1 8c239a665320f2cd83012f136ba5fd081f5b627f SHA256 b94939b4e813033ef1c7b48af8d686baef1d328f3e736399a85cbc466f73cfe8
 MISC metadata.xml 253 RMD160 33155d552badd3133f93e25bfcd82b62d296deb9 SHA1 b30245f00aae656e7a024b2ab4b8ad8e5549250f SHA256 2ddc2634b7e897546998869bcf0803bfbf4940cb75da9e45a2a8f421b4dabfd3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjpSuAACgkQdz7hIScOURFG6wCdEjTRndYVmHxlTuhf5MVhyYZE
-RHYAoLk/+D+mp8YShNTE1S+hCduCNCSc
-=FAKf
+iEYEARECAAYFAkl4tysACgkQdz7hIScOURGCiQCfdCmAsDK4zUS9cKErhjqDdXXB
+qSQAn2LgMdbKb27GD6zvAH7CH4QZ3X0z
+=dak4
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/revelation/files/revelation-0.4.11-build.patch b/x11-misc/revelation/files/revelation-0.4.11-build.patch
new file mode 100644
index 000000000000..0a4fe1a17dfb
--- /dev/null
+++ b/x11-misc/revelation/files/revelation-0.4.11-build.patch
@@ -0,0 +1,58 @@
+--- acinclude.m4
++++ acinclude.m4
+@@ -83,7 +83,6 @@
+ AC_DEFUN([RVL_PYGTK], [
+ 	PKG_CHECK_MODULES(PYGTK, [pygtk-2.0 >= 2.8.0])
+ 	PKG_CHECK_MODULES(GNOME_PYTHON, [gnome-python-2.0 >= 2.10.0])
+-	PKG_CHECK_MODULES(GNOME_PYTHON_EXTRAS, [gnome-python-extras-2.0 >= 2.10.0])
+ 
+ 	AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no)
+ 
+--- configure.ac
++++ configure.ac
+@@ -12,6 +12,7 @@
+ 
+ dnl check for dependencies
+ AC_PROG_CC()
++AC_PROG_LIBTOOL
+ 
+ RVL_PYTHON_PATH(2.3)
+ RVL_PYGTK()
+--- src/wrap/crack/crack.c
++++ src/wrap/crack/crack.c
+@@ -24,8 +24,6 @@
+ 
+ #define FILENAME_MAXLEN 512
+ 
+-static char DEFAULT_DICTPATH[] = "/usr/local/share/revelation/pwdict";
+-
+ static char crack_FascistCheck_doc [] =
+ 	"arguments: passwd, dictpath (optional)\n"
+ 	"\n"
+--- src/wrap/crack/Makefile.am
++++ src/wrap/crack/Makefile.am
+@@ -5,19 +5,9 @@
+ # $Id: revelation-0.4.11-build.patch,v 1.1 2009/01/22 18:12:53 nyhm Exp $
+ #
+ 
+-module_PROGRAMS	= crack.so
+ moduledir	= $(pyexecdir)/revelation
+-CLEANFILES	= crack.c
+-EXTRA_DIST	= crack.c.in
+-
+-crack.c: crack.c.in
+-	sed \
+-		-e "s|\@CRACK_DICTPATH\@|@CRACK_DICTPATH@|" \
+-		crack.c.in >crack.c
+-
+-crack.o: crack.c
+-	$(CC) -pthread -fno-strict-aliasing -fPIC -I${PYTHON_INCLUDE} -c crack.c -o crack.o
+-
+-crack.so: crack.o
+-	$(CC) -Wl --export-dynamic -pthread -shared crack.o -lcrack -o crack.so
+-
++module_LTLIBRARIES	= crack.la
++crack_la_SOURCES	= crack.c
++crack_la_CFLAGS	= -Wall
++crack_la_CPPFLAGS	= -I$(PYTHON_INCLUDE) -DDEFAULT_DICTPATH="\"$(CRACK_DICTPATH)\""
++crack_la_LDFLAGS	= -module
diff --git a/x11-misc/revelation/revelation-0.4.11-r2.ebuild b/x11-misc/revelation/revelation-0.4.11-r2.ebuild
new file mode 100644
index 000000000000..58624365a7ff
--- /dev/null
+++ b/x11-misc/revelation/revelation-0.4.11-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/revelation/revelation-0.4.11-r2.ebuild,v 1.1 2009/01/22 18:12:53 nyhm Exp $
+
+inherit autotools eutils multilib python gnome2
+
+DESCRIPTION="A password manager for GNOME"
+HOMEPAGE="http://oss.codepoet.no/revelation/"
+SRC_URI="ftp://oss.codepoet.no/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-python/pygtk
+	dev-python/pycrypto
+	dev-python/gnome-applets-python
+	dev-python/gconf-python
+	dev-python/gnome-vfs-python
+	dev-python/libbonobo-python
+	dev-python/libgnome-python
+	sys-libs/cracklib"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_unpack() {
+	gnome2_src_unpack
+	ln -sf $(type -P true) py-compile
+	epatch \
+		"${FILESDIR}"/${P}-list-index.patch \
+		"${FILESDIR}"/${P}-build.patch
+	eautoreconf
+}
+
+src_compile() {
+	gnome2_src_compile \
+		--disable-dependency-tracking \
+		--disable-desktop-update \
+		--disable-mime-update
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	python_version
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup
+}