Version bump and pruning obsoleteness

7 files changed, 12 insertions, 63 deletions

diff --git a/net-im/gaim-encryption/ChangeLog b/net-im/gaim-encryption/ChangeLog
index f824e6084165..6b53d3133696 100644
--- a/net-im/gaim-encryption/ChangeLog
+++ b/net-im/gaim-encryption/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/gaim-encryption
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-encryption/ChangeLog,v 1.22 2004/04/23 14:18:02 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-encryption/ChangeLog,v 1.23 2004/04/24 03:38:35 rizzo Exp $
+
+*gaim-encryption-2.25 (23 Apr 2004)
+
+  23 Apr 2004; Don Seiler <rizzo@gentoo.org>; -gaim-encryption-2.24-r1.ebuild,
+  -gaim-encryption-2.24.ebuild, +gaim-encryption-2.25.ebuild:
+  Version bump and pruning obsoleteness
 
   23 Apr 2004; Don Seiler <rizzo@gentoo.org>;
   +files/gaim-encryption-2.24-gcc2_fix.patch, gaim-encryption-2.24-r1.ebuild:
diff --git a/net-im/gaim-encryption/Manifest b/net-im/gaim-encryption/Manifest
index a42010594c11..fdd0bab41cf7 100644
--- a/net-im/gaim-encryption/Manifest
+++ b/net-im/gaim-encryption/Manifest
@@ -1,5 +1,6 @@
 MD5 68670a03fbde525ebe3f69dd00d50906 gaim-encryption-2.24.ebuild 1488
 MD5 c7f17c30cc58952c71e57a2e23600e49 gaim-encryption-2.21.ebuild 1260
+MD5 43075e2a56654bbc6ced63d28024bc1d gaim-encryption-2.25.ebuild 1492
 MD5 14ed42f1560535ece22aa344fac7584a ChangeLog 2995
 MD5 ab7db4bf9ff48c8de9da14fd12f6c15c metadata.xml 344
 MD5 8006b2fa4b739f0b9919144b66fe1160 gaim-encryption-2.22.ebuild 1260
@@ -8,5 +9,6 @@ MD5 634fb953048e9a3e63ed137b1ecebf46 files/encrypt_api.diff 537
 MD5 24597e0458ae20c16bf8a8b363de4af4 files/digest-gaim-encryption-2.21 72
 MD5 2d945bd60bd6d47a3adbddb2184e3354 files/digest-gaim-encryption-2.22 72
 MD5 951d14a45791f387ee09954239e51cd8 files/digest-gaim-encryption-2.24 72
+MD5 f6d7c4865e839026143ac5f87868ce6b files/digest-gaim-encryption-2.25 72
 MD5 13458d9e2614dd3e3013b074f7b15149 files/gaim-encryption-2.24-gcc2_fix.patch 1051
 MD5 951d14a45791f387ee09954239e51cd8 files/digest-gaim-encryption-2.24-r1 72
diff --git a/net-im/gaim-encryption/files/digest-gaim-encryption-2.24 b/net-im/gaim-encryption/files/digest-gaim-encryption-2.24
deleted file mode 100644
index 9be01742275c..000000000000
--- a/net-im/gaim-encryption/files/digest-gaim-encryption-2.24
+++ /dev/null
@@ -1 +0,0 @@
-MD5 70beb68dbb6413c75423a88e0080e171 gaim-encryption-2.24.tar.gz 357046
diff --git a/net-im/gaim-encryption/files/digest-gaim-encryption-2.24-r1 b/net-im/gaim-encryption/files/digest-gaim-encryption-2.24-r1
deleted file mode 100644
index 9be01742275c..000000000000
--- a/net-im/gaim-encryption/files/digest-gaim-encryption-2.24-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 70beb68dbb6413c75423a88e0080e171 gaim-encryption-2.24.tar.gz 357046
diff --git a/net-im/gaim-encryption/files/digest-gaim-encryption-2.25 b/net-im/gaim-encryption/files/digest-gaim-encryption-2.25
new file mode 100644
index 000000000000..c3708e75b2f8
--- /dev/null
+++ b/net-im/gaim-encryption/files/digest-gaim-encryption-2.25
@@ -0,0 +1 @@
+MD5 24a112d3f8b670203d054a54a8396d72 gaim-encryption-2.25.tar.gz 357356
diff --git a/net-im/gaim-encryption/gaim-encryption-2.24-r1.ebuild b/net-im/gaim-encryption/gaim-encryption-2.24-r1.ebuild
deleted file mode 100644
index d4ed7fd8decc..000000000000
--- a/net-im/gaim-encryption/gaim-encryption-2.24-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-encryption/gaim-encryption-2.24-r1.ebuild,v 1.4 2004/04/23 14:18:02 rizzo Exp $
-
-inherit flag-o-matic
-
-IUSE=""
-DESCRIPTION="GAIM Encryption PlugIn"
-HOMEPAGE="http://gaim-encryption.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~alpha ~ia64 ~hppa ~mips"
-
-DEPEND=">=net-im/gaim-0.77
-	|| ( dev-libs/nss net-www/mozilla )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/encrypt_api.diff
-	epatch ${FILESDIR}/gaim-encryption-2.24-gcc2_fix.patch
-}
-
-src_compile() {
-	local myconf
-	myconf="--with-gaim=/usr/include/gaim"
-
-	NSS_LIB=/usr/lib
-	NSS_INC=/usr/include
-	has_version dev-libs/nss && {
-		# Only need to specify this if no pkgconfig from mozilla
-		myconf="${myconf} --with-nspr-includes=${NSS_INC}/nspr"
-		myconf="${myconf} --with-nss-includes=${NSS_INC}/nss"
-		myconf="${myconf} --with-nspr-libs=${NSS_LIB}"
-		myconf="${myconf} --with-nss-libs=${NSS_LIB}"
-	}
-
-	econf ${myconf} || die "Configuration failed"
-	einfo "Replacing -Os CFLAG with -O2"
-	replace-flags -Os -O2
-
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
-}
-
-src_install() {
-	einstall || die "Install failed"
-	dodoc CHANGELOG COPYING INSTALL NOTES README TODO VERSION WISHLIST
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "This release is not backwards compatible for MSN, Yahoo, or IRC."
-	ewarn "See the release notes at:"
-	ewarn "https://sourceforge.net/project/shownotes.php?release_id=230104"
-	ewarn
-}
diff --git a/net-im/gaim-encryption/gaim-encryption-2.24.ebuild b/net-im/gaim-encryption/gaim-encryption-2.25.ebuild
index 53945531993b..97c250ab3187 100644
--- a/net-im/gaim-encryption/gaim-encryption-2.24.ebuild
+++ b/net-im/gaim-encryption/gaim-encryption-2.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-encryption/gaim-encryption-2.24.ebuild,v 1.2 2004/04/23 01:25:59 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-encryption/gaim-encryption-2.25.ebuild,v 1.1 2004/04/24 03:38:35 rizzo Exp $
 
 inherit flag-o-matic
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~alpha ~ia64 ~hppa ~mips"
 
-DEPEND="~net-im/gaim-0.76
+DEPEND=">=net-im/gaim-0.77
 	|| ( dev-libs/nss net-www/mozilla )"
 
 src_compile() {