version bump and remove old version

Package-Manager: portage-2.2.0_alpha28/cvs/Linux i686

4 files changed, 11 insertions, 29 deletions

diff --git a/app-accessibility/espeak/ChangeLog b/app-accessibility/espeak/ChangeLog
index ae123c49bd08..14a028268254 100644
--- a/app-accessibility/espeak/ChangeLog
+++ b/app-accessibility/espeak/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/espeak
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.94 2011/03/16 18:00:18 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.95 2011/03/22 17:10:56 williamh Exp $
+
+*espeak-1.45.03 (22 Mar 2011)
+
+  22 Mar 2011; William Hubbs <williamh@gentoo.org> -espeak-1.45.02.ebuild,
+  -files/espeak-1.45.02-fix-libname.patch, +espeak-1.45.03.ebuild:
+  version bump and remove old version
 
   16 Mar 2011; William Hubbs <williamh@gentoo.org> -espeak-1.40.02.ebuild,
   -espeak-1.41.01.ebuild, -espeak-1.43.ebuild, -espeak-1.44.05.ebuild,
diff --git a/app-accessibility/espeak/Manifest b/app-accessibility/espeak/Manifest
index ed0884d79c95..9ae50bc6dba0 100644
--- a/app-accessibility/espeak/Manifest
+++ b/app-accessibility/espeak/Manifest
@@ -1,7 +1,6 @@
-AUX espeak-1.45.02-fix-libname.patch 739 RMD160 dcdcf9ade8e1779f444d00bd1537b4d50e2164d6 SHA1 ac05442a5bfea18a0b2ef118a9b9cdb87e46c799 SHA256 9ba83c39cb05b4875445dfb6f49d02fc42924a66a6e4c8d0aeb123d39f7e2fc6
 DIST espeak-1.42.04-source.zip 1537076 RMD160 1b0747501d81acf48241dc6b0da7fb555a1e3927 SHA1 fe3c0e20b994d2332d8841f61ccc2ae016a836b0 SHA256 3791bb853e9283950d58c02396b3b9b1313adf27c0004bcd1e0cdaf87a683eeb
-DIST espeak-1.45.02-source.zip 1891603 RMD160 4f1b0a4627dfa08f10024a78d00fe555e50ad2af SHA1 fcc83fed7381c16a5a213d0d5e3e523914277eae SHA256 1a259c62ff4d21ec525d5e4ea0980af223ec7bba916ab319c9421a32cbfc085a
+DIST espeak-1.45.03-source.zip 1894722 RMD160 7acb21e77b72ab8888a3cbf09d2ffa851c78de0b SHA1 0aef9196e7e1347eb470d50b30d6e5323c4ec7eb SHA256 74ed21cb0f4f4a040db93ffa9f4dac463a53281fe47ef4e63605a3ee3e8e0eea
 EBUILD espeak-1.42.04.ebuild 1961 RMD160 901810ec5faa2ae9e3042bb2c7d867137b4f95bb SHA1 016870da4c1746dc425dbab5b78f7e53586e3ebb SHA256 2e7222b84398d95c473f29ccdedeac8f9be603684a02ce2ee490a9ee5002d8e9
-EBUILD espeak-1.45.02.ebuild 1963 RMD160 de7e87f13d3bfba39af6108142b3678f358edde1 SHA1 b73112c44ab5b7f11418609d53e2f06046a89210 SHA256 2c03f2d424b8865cde098c4673e0ebb0bef0275777a4a1330f81666a1d7f0d79
-MISC ChangeLog 12828 RMD160 1c4e7c1e322a0d04e2aa2f4d1430c3c80d53b569 SHA1 cf3543129aec6afac155635f71850796a96c01c0 SHA256 edc4faee7ead558276a909cd471d44ebdb3765777c7bb2e2dfe6908a833dca0b
+EBUILD espeak-1.45.03.ebuild 1918 RMD160 488a80e2fd134ff1e4a528feffb809aa1abb7c05 SHA1 baee82fb1f62e7429b9ec2e6b4cde797e9aa0be9 SHA256 109fde32df8f70c4e66b0c14574a57b6e0c047dbaf11a3450ccd8631743386aa
+MISC ChangeLog 13040 RMD160 b1599694d9817efbb9ec7aa306e31f0bf409a06c SHA1 7ac6962ec62a33a693559a05d6bd20297299934b SHA256 c309f811d2ce726d1b08005d51f8ead95395c6d9835c84c4cc37ffbc7e761e81
 MISC metadata.xml 229 RMD160 7f8d6a0235529eccff705022803122c9534628d7 SHA1 2295356b566d60c8eb979db0e598de9d1d8ccf49 SHA256 b128d301356b3f98f1d6093b4401c36143ff55fc62636612567b0995739b9e66
diff --git a/app-accessibility/espeak/espeak-1.45.02.ebuild b/app-accessibility/espeak/espeak-1.45.03.ebuild
index 0056b3ba2b82..e3674db483dd 100644
--- a/app-accessibility/espeak/espeak-1.45.02.ebuild
+++ b/app-accessibility/espeak/espeak-1.45.03.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.45.02.ebuild,v 1.1 2011/03/16 17:40:33 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.45.03.ebuild,v 1.1 2011/03/22 17:10:56 williamh Exp $
 
 EAPI="4"
 
@@ -37,7 +37,6 @@ src_prepare() {
 	cd src
 	# gentoo uses portaudio 19.
 	mv -f portaudio19.h portaudio.h
-	epatch "${FILESDIR}"/${P}-fix-libname.patch
 }
 
 src_compile() {
diff --git a/app-accessibility/espeak/files/espeak-1.45.02-fix-libname.patch b/app-accessibility/espeak/files/espeak-1.45.02-fix-libname.patch
deleted file mode 100644
index 8188c4dc9ff4..000000000000
--- a/app-accessibility/espeak/files/espeak-1.45.02-fix-libname.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index a184e85..a884f6f 100755
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -75,7 +75,6 @@ CXXFLAGS=-O2
- 
- 
- all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME)
--	mv $(LIB_NAME) $(LIB_NAME).$(LIBTAG)
- 
- .cpp.o:
- 	$(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions  $<
-@@ -95,6 +94,9 @@ x_%.o: %.cpp
- $(LIB_NAME): $(OBJS2)
- 	$(CXX) $(LDFLAGS) -shared $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ \
- 	$(OBJS2) $(LIBS2)
-+	mv $(LIB_NAME) $(LIB_NAME).$(LIBTAG)
-+	$(LN_SF) $(LIB_NAME).$(LIBTAG) $(LIB_NAME).$(LIB_VERSION)
-+	$(LN_SF) $(LIB_NAME).$(LIB_VERSION) $(LIB_NAME)
- 
- $(STATIC_LIB_NAME): $(OBJS2)
- 	$(AR) cqs $(STATIC_LIB_NAME) $(OBJS2)