Cleanout finally as per bug #72615. Removed unnecessary conflict dependancies

13 files changed, 30 insertions, 221 deletions

diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog
index b4d118a71a3a..f890fc623734 100644
--- a/app-crypt/gpgme/ChangeLog
+++ b/app-crypt/gpgme/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gpgme
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.60 2004/10/31 15:21:06 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.61 2004/12/12 01:17:32 dragonheart Exp $
+
+  12 Dec 2004; Daniel Black <dragonheart@gentoo.org> -gpgme-0.3.14.ebuild,
+  -gpgme-0.3.16.ebuild, -gpgme-0.4.0.ebuild, -gpgme-0.4.7.ebuild,
+  gpgme-0.9.0-r1.ebuild, gpgme-1.0.1-r1.ebuild, gpgme-1.0.1.ebuild:
+  Cleanout finally as per bug #72615. Removed unnecessary conflict dependancies
 
   31 Oct 2004; Tom Gall <tgall@gentoo.org> gpgme-0.3.14-r1.ebuild:
   stable on ppc64, bug #64485
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index cb1cb22f41ce..c3970f46123e 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,18 +1,20 @@
-MD5 20fb3aa8b6afd001dbdd969ecd9b35b2 ChangeLog 9902
-MD5 809771b0dfb9946a89d8923e29f4b210 gpgme-0.3.14-r1.ebuild 2390
-MD5 c91f227a64cd1f967b123962e0f32134 gpgme-0.3.14.ebuild 1045
-MD5 b4b67d388151a1919ab97bf9f77c5186 gpgme-0.3.16.ebuild 862
-MD5 c60aa07c58226f4a164ab89cff2616a1 gpgme-0.4.0.ebuild 1564
-MD5 078cdd0af281263b34748a7df7dc51a9 gpgme-0.4.7.ebuild 1553
-MD5 d528d3b25ee8e3eb46a19780cf49cb0d gpgme-0.9.0-r1.ebuild 1337
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 873da497173017bf83c7d13a45dad8fe ChangeLog 10198
 MD5 ce0db60fd655ade98789a1643d4fdd9d metadata.xml 314
-MD5 4b6de8938bb579adfdb6841caa906f48 gpgme-1.0.1-r1.ebuild 1866
-MD5 14e0855597fa0a992c2e4db46e5030f7 gpgme-1.0.1.ebuild 1702
-MD5 438d865640f00b860f2c3f88b21e621e files/digest-gpgme-0.3.14 64
+MD5 809771b0dfb9946a89d8923e29f4b210 gpgme-0.3.14-r1.ebuild 2390
+MD5 9b1c6fc21959b15c403cfde549a031c2 gpgme-0.9.0-r1.ebuild 1236
+MD5 e958efaa26087460a369cae7b7ccfb26 gpgme-1.0.1.ebuild 1596
+MD5 ffb312bbd3c4b52fdae80a79d94082b1 gpgme-1.0.1-r1.ebuild 1763
 MD5 438d865640f00b860f2c3f88b21e621e files/digest-gpgme-0.3.14-r1 64
-MD5 f8d60472ee71707fd01798c5677b15ae files/digest-gpgme-0.3.16 64
-MD5 1e195068762b5aafd2f260d76b108a70 files/digest-gpgme-0.4.0 63
-MD5 f61d73bc505b5a542662b75aa0fa219f files/digest-gpgme-0.4.7 63
 MD5 260bf91983886d989efa3e54792c921d files/digest-gpgme-0.9.0-r1 63
 MD5 c21b6b9b7f8f9f95ba2a8d6d189407ac files/digest-gpgme-1.0.1 63
 MD5 c21b6b9b7f8f9f95ba2a8d6d189407ac files/digest-gpgme-1.0.1-r1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBu5wymdTrptrqvGERApdXAJ9YR0OgxBdq31MKKDb/7wiCLdIY7wCfaMom
+K6FlLl4InyDG4d0U+5JVlAs=
+=svVV
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/gpgme/files/digest-gpgme-0.3.14 b/app-crypt/gpgme/files/digest-gpgme-0.3.14
deleted file mode 100644
index 3562ea6d4238..000000000000
--- a/app-crypt/gpgme/files/digest-gpgme-0.3.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b5351e212aa10336e5d88ebf4babccf7 gpgme-0.3.14.tar.gz 655474
diff --git a/app-crypt/gpgme/files/digest-gpgme-0.3.16 b/app-crypt/gpgme/files/digest-gpgme-0.3.16
deleted file mode 100644
index 3607c91ecc9c..000000000000
--- a/app-crypt/gpgme/files/digest-gpgme-0.3.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0476b219695ea25cb2a97b18b717e381 gpgme-0.3.16.tar.gz 679430
diff --git a/app-crypt/gpgme/files/digest-gpgme-0.4.0 b/app-crypt/gpgme/files/digest-gpgme-0.4.0
deleted file mode 100644
index ebb9f2b6c335..000000000000
--- a/app-crypt/gpgme/files/digest-gpgme-0.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 41e144b403293484bcb3e1409fbe6a35 gpgme-0.4.0.tar.gz 682832
diff --git a/app-crypt/gpgme/files/digest-gpgme-0.4.7 b/app-crypt/gpgme/files/digest-gpgme-0.4.7
deleted file mode 100644
index 436f75a85b32..000000000000
--- a/app-crypt/gpgme/files/digest-gpgme-0.4.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c43a50de6b1220d5a1b59b0deb142e14 gpgme-0.4.7.tar.gz 822365
diff --git a/app-crypt/gpgme/gpgme-0.3.14.ebuild b/app-crypt/gpgme/gpgme-0.3.14.ebuild
deleted file mode 100644
index 1afbb343365c..000000000000
--- a/app-crypt/gpgme/gpgme-0.3.14.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.3.14.ebuild,v 1.17 2004/08/25 14:04:54 dragonheart Exp $
-
-DESCRIPTION="GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications."
-HOMEPAGE="http://www.gnupg.org/gpgme.html"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/gpgme/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
-IUSE="nls doc"
-
-DEPEND=">=sys-libs/zlib-1.1.3
-	>=app-crypt/gnupg-1.0.7
-	!>=app-crypt/gnume-0.9
-	sys-apps/gawk
-	sys-devel/libtool
-	sys-devel/gcc"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-	use nls \
-		|| myconf="--disable-nls"
-
-	myconf="${myconf} --enable-gpgmeplug"
-
-	use doc \
-		&& myconf="${myconf} --enable-maintainer-mode"
-
-	econf ${myconf} || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS README README-alpha THANKS TODO VERSION
-}
diff --git a/app-crypt/gpgme/gpgme-0.3.16.ebuild b/app-crypt/gpgme/gpgme-0.3.16.ebuild
deleted file mode 100644
index ae6e8d45bc8a..000000000000
--- a/app-crypt/gpgme/gpgme-0.3.16.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.3.16.ebuild,v 1.8 2004/08/27 13:57:59 dragonheart Exp $
-
-DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
-HOMEPAGE="http://www.gnupg.org/gpgme.html"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/gpgme/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ppc64"
-IUSE="nls"
-
-DEPEND=">=sys-libs/zlib-1.1.3
-	>=app-crypt/gnupg-1.0.7
-	sys-apps/gawk
-	sys-devel/libtool
-	sys-devel/gcc
-	!>=app-crypt/gpgme-0.9"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_compile() {
-	econf `use_enable nls` || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog NEWS README README-alpha THANKS TODO VERSION
-}
diff --git a/app-crypt/gpgme/gpgme-0.4.0.ebuild b/app-crypt/gpgme/gpgme-0.4.0.ebuild
deleted file mode 100644
index e2a41ae4cb62..000000000000
--- a/app-crypt/gpgme/gpgme-0.4.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.4.0.ebuild,v 1.19 2004/07/14 20:30:26 dragonheart Exp $
-
-DESCRIPTION="GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications."
-HOMEPAGE="http://www.gnupg.org/(en)/related_software/gpgme/index.html"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0.4"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
-IUSE="nls doc"
-
-DEPEND=">=sys-libs/zlib-1.1.3
-	>=app-crypt/gnupg-1.2*
-	sys-apps/gawk
-	sys-devel/libtool
-	sys-devel/gcc"
-
-RDEPEND="nls? ( sys-devel/gettext )
-	dev-libs/libgcrypt"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	mv configure configure.orig
-	sed	-e 's:^\(GPGME_CONFIG_LIBS\)=.*:\1="-lgpgme4":' \
-		-e 's:^\(GPGME_CONFIG_CFLAGS\)=.*:\1="-I/usr/include/gpgme4":' \
-		configure.orig > configure
-	chmod +x configure
-
-	cd ${S}
-	for x in $(find . -name Makefile.in)
-	do
-		mv ${x} ${x}.orig
-		sed	-e 's:libgpgme.la:libgpgme4.la:g' \
-			${x}.orig > ${x}
-	done
-}
-
-src_compile() {
-	econf\
-		$(use_enable nls) \
-		--enable-gpgmeplug \
-		$(use_enable doc maintainer-mode) || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	make includedir="/usr/include/gpgme4" DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS README README-alpha THANKS TODO VERSION
-
-	mv ${D}/usr/bin/gpgme-config ${D}/usr/bin/gpgme4-config
-	for x in $(find ${D}/usr/share/info -name gpgme.\*)
-	do
-		mv ${x} ${x/gpgme.info/gpgme4.info}
-	done
-}
diff --git a/app-crypt/gpgme/gpgme-0.4.7.ebuild b/app-crypt/gpgme/gpgme-0.4.7.ebuild
deleted file mode 100644
index 1baaa733b14d..000000000000
--- a/app-crypt/gpgme/gpgme-0.4.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.4.7.ebuild,v 1.7 2004/08/30 15:40:27 pvdabeel Exp $
-
-DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
-HOMEPAGE="http://www.gnupg.org/(en)/related_software/gpgme/index.html"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0.4"
-KEYWORDS="~x86 ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
-IUSE="nls smime"
-
-DEPEND=">=sys-libs/zlib-1.1.3
-	>=app-crypt/gnupg-1.2*
-	sys-apps/gawk
-	sys-devel/libtool
-	sys-devel/gcc
-	dev-libs/libgpg-error"
-RDEPEND="nls? ( sys-devel/gettext )
-	dev-libs/libgcrypt"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e 's:libgpgme:libgpgme4:g' \
-		`find . -name Makefile.in` doc/gpgme.info
-	sed -i -e 's:gpgme-config:gpgme4-config:g' \
-		configure gpgme/Makefile.in doc/gpgme.info gpgme/gpgme-config.in
-	sed -i -e 's:-lgpgme:-lgpgme4:g' \
-		gpgme/gpgme-config.in doc/gpgme.info configure
-	sed -i -e 's:gpgme\.info:gpgme4.info:g' \
-		doc/Makefile.in doc/gpgme.info
-	sed -i -e 's:gpgme\.m4:gpgme4.m4:g' gpgme/Makefile.in
-	mv gpgme/gpgme{,4}-config.in
-	mv doc/gpgme{,4}.info
-	mv gpgme/libgpgme{,4}.vers
-	mv gpgme/gpgme{,4}.m4
-}
-
-src_compile() {
-	econf \
-		--includedir=/usr/include/gpgme4 \
-		$(use_with smime gpgsm $(which gpgsm)) \
-		`use_enable nls` \
-		|| die "econf failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog NEWS README README-alpha THANKS TODO VERSION
-}
diff --git a/app-crypt/gpgme/gpgme-0.9.0-r1.ebuild b/app-crypt/gpgme/gpgme-0.9.0-r1.ebuild
index 3d9f3f121df0..e03beb29edae 100644
--- a/app-crypt/gpgme/gpgme-0.9.0-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-0.9.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.9.0-r1.ebuild,v 1.11 2004/10/17 13:45:53 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.9.0-r1.ebuild,v 1.12 2004/12/12 01:17:32 dragonheart Exp $
 
 DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
 HOMEPAGE="http://www.gnupg.org/(en)/related_software/gpgme/index.html"
@@ -16,9 +16,7 @@ DEPEND=">=app-crypt/gnupg-1.2.4
 	sys-apps/gawk
 	sys-devel/libtool
 	sys-devel/gcc
-	dev-libs/libgpg-error
-	!<=app-crypt/gpgme-0.3.14
-	!=app-crypt/gpgme-0.3.16"
+	dev-libs/libgpg-error"
 
 # For when gnupg-1.9+ gets unmasked
 #	!smime? ( >=app-crypt/gnupg-1.2.5 )
@@ -26,9 +24,7 @@ DEPEND=">=app-crypt/gnupg-1.2.4
 
 RDEPEND="virtual/libc
 	dev-libs/libgpg-error
-	dev-libs/libgcrypt
-	!<=app-crypt/gpgme-0.3.14
-	!=app-crypt/gpgme-0.3.16"
+	dev-libs/libgcrypt"
 
 src_compile() {
 	if [ -x /usr/bin/gpg2 ]; then
diff --git a/app-crypt/gpgme/gpgme-1.0.1-r1.ebuild b/app-crypt/gpgme/gpgme-1.0.1-r1.ebuild
index af1c44daea5d..42a0ae718029 100644
--- a/app-crypt/gpgme/gpgme-1.0.1-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.0.1-r1.ebuild,v 1.1 2004/10/25 13:59:54 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.0.1-r1.ebuild,v 1.2 2004/12/12 01:17:32 dragonheart Exp $
 
 inherit eutils
 
@@ -19,8 +19,6 @@ DEPEND="sys-apps/gawk
 	sys-devel/libtool
 	sys-devel/gcc
 	>=dev-libs/libgpg-error-0.5
-	!<=app-crypt/gpgme-0.3.14
-	!=app-crypt/gpgme-0.3.16
 	!ia64? ( !ppc64? ( dev-libs/pth ) )
 	!smime? ( >=app-crypt/gnupg-1.2.2 )
 	smime? ( >=app-crypt/gnupg-1.9.6 )"
@@ -34,8 +32,6 @@ RDEPEND="virtual/libc
 	dev-libs/libgcrypt
 	>=app-crypt/gnupg-1.2.2
 	!ia64? ( !ppc64? ( dev-libs/pth ) )
-	!<=app-crypt/gpgme-0.3.14
-	!=app-crypt/gpgme-0.3.16
 	!smime? ( >=app-crypt/gnupg-1.2.2 )
 	smime? ( >=app-crypt/gnupg-1.9.6 )"
 
@@ -64,9 +60,9 @@ src_compile() {
 	emake CFLAGS="${CFLAGS} -I../assuan/"  || die
 }
 
-src_test() {
-	einfo "testing currently broken"
-}
+#src_test() {
+#	einfo "testing currently broken"
+#}
 
 src_install() {
 	emake DESTDIR=${D} install || die
diff --git a/app-crypt/gpgme/gpgme-1.0.1.ebuild b/app-crypt/gpgme/gpgme-1.0.1.ebuild
index 44ec11615c0e..9d2b0b5d2160 100644
--- a/app-crypt/gpgme/gpgme-1.0.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.0.1.ebuild,v 1.1 2004/10/25 13:59:54 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.0.1.ebuild,v 1.2 2004/12/12 01:17:32 dragonheart Exp $
 
 inherit eutils
 
@@ -21,8 +21,6 @@ DEPEND=">=app-crypt/gnupg-1.2.2
 	sys-devel/libtool
 	sys-devel/gcc
 	>=dev-libs/libgpg-error-0.5
-	!<=app-crypt/gpgme-0.3.14
-	!=app-crypt/gpgme-0.3.16
 	!ia64? ( !ppc64? ( dev-libs/pth ) )"
 
 # For when gnupg-1.9+ gets unmasked
@@ -33,9 +31,7 @@ RDEPEND="virtual/libc
 	>=dev-libs/libgpg-error-0.5
 	dev-libs/libgcrypt
 	>=app-crypt/gnupg-1.2.2
-	!ia64? ( !ppc64? ( dev-libs/pth ) )
-	!<=app-crypt/gpgme-0.3.14
-	!=app-crypt/gpgme-0.3.16"
+	!ia64? ( !ppc64? ( dev-libs/pth ) )"
 
 src_compile() {