Version bump and removed old version.

Package-Manager: portage-2.1.4.4

diff --git a/app-accessibility/espeak/ChangeLog b/app-accessibility/espeak/ChangeLog
index 11da7a4fbdb3dae14b1151efed9e663e453448d4..6b0dd783909577000ae945a606cbfb7245060d44 100644 (file)
--- a/app-accessibility/espeak/ChangeLog
+++ b/app-accessibility/espeak/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/espeak
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.34 2008/03/09 17:54:22 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.35 2008/03/10 01:01:41 williamh Exp $
+
+*espeak-1.36 (10 Mar 2008)
+
+  10 Mar 2008; William Hubbs <williamh@gentoo.org>
+  -files/espeak-1.35-makefile.patch, -espeak-1.35.ebuild,
+  +espeak-1.36.ebuild:
+  Version bump and removed old version.
 
   09 Mar 2008; William Hubbs <williamh@gentoo.org>
   files/espeak-1.35-makefile.patch:

diff --git a/app-accessibility/espeak/Manifest b/app-accessibility/espeak/Manifest
index 1376206f51233d41a75470b0f47570348f95386b..c096bbc6d39638ea9bdf94f8368466c6b5844f5e 100644 (file)
--- a/app-accessibility/espeak/Manifest
+++ b/app-accessibility/espeak/Manifest
@@ -1,7 +1,6 @@
-AUX espeak-1.35-makefile.patch 1635 RMD160 7fc66ccc809b33da2f27236969ae900d201a59df SHA1 fd61c047961951ee0900132bfd5fb26310835f29 SHA256 b2c4ab30886be647a4783307b895baaa7956f36428833a84aacfce6b7211248c
 DIST espeak-1.25-source.zip 912952 RMD160 68c06d6ca30b3bf3c5b865151b1c3d720c9a5626 SHA1 2287553f0a80d38487500d7ce42c5221627ef1ae SHA256 981ccad8255677aa6858d7b206cebed183c9d4586ed886da707259e5b379e302
-DIST espeak-1.35-source.zip 1253271 RMD160 daf5ab2f9cd694e04a980caef31f44e6c4314124 SHA1 147641bd99e25f4fa13a8fa8190c17b8179c6c30 SHA256 34b94f9542aed5710cb5303baeabafbb1d2a708dbf3cca0fcf84355ecdb832bb
+DIST espeak-1.36-source.zip 1269634 RMD160 a97023a673f0535b9a40e46f2c977a9557dd5a4a SHA1 c02718d8e135002b6931324e8da509aa749493ef SHA256 245e1a15271e3e8e51a4196336cabc2e164c664c5f73d08789cc2efce91e094a
 EBUILD espeak-1.25.ebuild 1438 RMD160 518d275393a41030ad1122e7e60ec6ed43071f40 SHA1 99c12a17a49679bbccff243e2cc682cb21f3c586 SHA256 4148b52d32ce6be315b2e5a9fda2f3d021b150fcf66b0b4c644dcf6e1cd76955
-EBUILD espeak-1.35.ebuild 1879 RMD160 aee8689dd9dff6be5c224e19a8c58df3ea5043b0 SHA1 e2cbb4c2b57cd07d8b5d8ae65aba8c8ad4a66e74 SHA256 fb415f3bc0133c3629cd4eb1626e5b3dab8269b63cf3b89ab305b3a80c26a699
-MISC ChangeLog 5659 RMD160 a196704b2d62e5d5b5a1b431828af4ef42ecec61 SHA1 d88b1da5e9094564275fcd0dbef53a8b4b5dc8a8 SHA256 ea4cb2c1514fc21dbdbcdb7d7545b42ba58fe3620dfaf6aab81671a31203c3c8
+EBUILD espeak-1.36.ebuild 1836 RMD160 19a9b5b0bc4b9ffa6e3f62d6ef190a90fa737bc0 SHA1 0e85279848527797998b7b2f00ed058a6d4bbd72 SHA256 497f639dd4d0ec2d6eb78de6583eff993c568821142c9c7fac14915e63c8b140
+MISC ChangeLog 5860 RMD160 50d6b7e8238991032679a988bd299d14ba84081e SHA1 9a7e1ad1a220d9a2358d7dfaf4c512c6f1d0596a SHA256 77930aa70b9c4f2d96a73ef01d6fc61ad17cb189ba43df4be2f87d610637c8a6
 MISC metadata.xml 229 RMD160 7f8d6a0235529eccff705022803122c9534628d7 SHA1 2295356b566d60c8eb979db0e598de9d1d8ccf49 SHA256 b128d301356b3f98f1d6093b4401c36143ff55fc62636612567b0995739b9e66

diff --git a/app-accessibility/espeak/espeak-1.35.ebuild b/app-accessibility/espeak/espeak-1.36.ebuild
similarity index 94%
rename from app-accessibility/espeak/espeak-1.35.ebuild
rename to app-accessibility/espeak/espeak-1.36.ebuild
index 2871f5dbdbb6c5950ef9ccc6c8dc7e3de3c65441..ae5b01fb352728d42b7c8796124d682a5c54fa7c 100644 (file)
--- a/app-accessibility/espeak/espeak-1.35.ebuild
+++ b/app-accessibility/espeak/espeak-1.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.35.ebuild,v 1.1 2008/03/08 18:28:56 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.36.ebuild,v 1.1 2008/03/10 01:01:41 williamh Exp $
 
 inherit eutils
 
@@ -33,8 +33,6 @@ pkg_setup() {
 src_unpack() {
        unpack ${A}
 
-       epatch "${FILESDIR}"/${P}-makefile.patch
-
        # portaudio.h is by default the same as portaudio18.h, but use the version
        # 19 API if available
        if use portaudio; then

diff --git a/app-accessibility/espeak/files/espeak-1.35-makefile.patch b/app-accessibility/espeak/files/espeak-1.35-makefile.patch
deleted file mode 100644 (file)
index 85c78f1..0000000
--- a/app-accessibility/espeak/files/espeak-1.35-makefile.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- espeak-1.35-source/src/Makefile.orig       2008-03-09 12:23:30.000000000 -0500
-+++ espeak-1.35-source/src/Makefile    2008-03-09 12:42:37.000000000 -0500
-@@ -30,12 +30,14 @@
- 
- ifeq ($(AUDIO),pulseaudio)
- WAVE=wave_pulse.cpp
--LIB_AUDIO=pulse
--USE_AUDIO=USE_PULSEAUDIO
-+LIB_AUDIO=-lpulse
-+USE_AUDIO=-DUSE_PULSEAUDIO
-+else ifeq ($(AUDIO),portaudio)
-+WAVE=wave.cpp
-+LIB_AUDIO=-lportaudio
-+USE_AUDIO=-DUSE_PORTAUDIO
- else
- WAVE=wave.cpp
--LIB_AUDIO=portaudio
--USE_AUDIO=USE_PORTAUDIO
- endif
- 
- speak_SOURCES = speak.cpp compiledict.cpp dictionary.cpp intonation.cpp \
-@@ -51,24 +53,24 @@
- 
- SRCS1=$(speak_SOURCES)
- OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
--LIBS1=-lstdc++ -l$(LIB_AUDIO) -lpthread $(EXTRA_LIBS)
-+LIBS1=-lstdc++ $(LIB_AUDIO) -lpthread $(EXTRA_LIBS)
- 
- SRCS2=$(libespeak_SOURCES)
- OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
--LIBS2=-lstdc++ -l$(LIB_AUDIO) -lpthread
-+LIBS2=-lstdc++ $(LIB_AUDIO) -lpthread
- 
- SRCS3 = espeak.cpp
- OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
- LIBS3=-lstdc++ -L . -lespeak
- 
--CXXFLAGS=-O2 -D$(USE_AUDIO)
-+CXXFLAGS=-O2
- 
- 
- all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME)
-       mv $(LIB_NAME) $(LIB_NAME).$(LIBTAG)
- 
- .cpp.o:
--      $(CXX) $(CXXFLAGS) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions  $<
-+      $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions  $<
- 
- $(BIN_NAME): $(OBJS1)
-       $(CXX) -o $@ $(OBJS1) $(LIBS1)
-@@ -79,7 +81,7 @@
- 
- 
- x_%.o: %.cpp
--      $(CXX) $(CXXFLAGS) -Wall -fpic -pedantic \
-+      $(CXX) $(CXXFLAGS) $(USE_AUDIO) -Wall -fpic -pedantic \
-       -I. -D LIBRARY -c -fno-exceptions  $<  -o x_$*.o
- 
- $(LIB_NAME): $(OBJS2)