diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-12-01 01:50:38 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-12-01 01:50:38 +0000 |
commit | b129f0033b789cd30fee9e38f41935d61ca95389 (patch) | |
tree | 32cb7356654bb997f2aee4fb2f8c2056f0d79bdb /app-office/kword | |
parent | Remove old versions. (diff) | |
download | gentoo-2-b129f0033b789cd30fee9e38f41935d61ca95389.tar.gz gentoo-2-b129f0033b789cd30fee9e38f41935d61ca95389.tar.bz2 gentoo-2-b129f0033b789cd30fee9e38f41935d61ca95389.zip |
Remove old versions.
(Portage version: 2.1.2_rc2-r3)
(Signed Manifest commit)
Diffstat (limited to 'app-office/kword')
-rw-r--r-- | app-office/kword/Manifest | 49 | ||||
-rw-r--r-- | app-office/kword/files/digest-kword-1.4.2-r6 | 3 | ||||
-rw-r--r-- | app-office/kword/files/digest-kword-1.4.2-r7 | 3 | ||||
-rw-r--r-- | app-office/kword/files/digest-kword-1.5.1 | 3 | ||||
-rw-r--r-- | app-office/kword/files/kspread-1.4.2-gcc41.patch | 11 | ||||
-rw-r--r-- | app-office/kword/files/post-1.3-koffice-CAN-2005-3193.diff | 238 | ||||
-rw-r--r-- | app-office/kword/kword-1.4.2-r6.ebuild | 56 | ||||
-rw-r--r-- | app-office/kword/kword-1.4.2-r7.ebuild | 57 | ||||
-rw-r--r-- | app-office/kword/kword-1.5.1.ebuild | 57 |
9 files changed, 14 insertions, 463 deletions
diff --git a/app-office/kword/Manifest b/app-office/kword/Manifest index d4e718a96277..3b6dbf8641a6 100644 --- a/app-office/kword/Manifest +++ b/app-office/kword/Manifest @@ -1,27 +1,8 @@ -AUX kspread-1.4.2-gcc41.patch 451 RMD160 c0d17048a7b1dcb14cd00910a400287652c2b2f1 SHA1 4864b69746b56c2b8e75a7e3d06097a133804b5f SHA256 67d8e5722ad1aadab5811397c68aacd1d8a1d9d5363f95488231f00bb1fd047a -MD5 f1f58cce115f40fcba31a4976b61d260 files/kspread-1.4.2-gcc41.patch 451 -RMD160 c0d17048a7b1dcb14cd00910a400287652c2b2f1 files/kspread-1.4.2-gcc41.patch 451 -SHA256 67d8e5722ad1aadab5811397c68aacd1d8a1d9d5363f95488231f00bb1fd047a files/kspread-1.4.2-gcc41.patch 451 -AUX post-1.3-koffice-CAN-2005-3193.diff 6760 RMD160 756f949cfcbf9fd2ce9237504d9c596970308f88 SHA1 398fe151fc78e06f70789f8c98b880721447fd1a SHA256 efd30eca9230905c884925bd6f6264e885ab2610d7f56a7a65db8f7ab48f548a -MD5 32ff061a8fba0e82d069a8a6fa6932e0 files/post-1.3-koffice-CAN-2005-3193.diff 6760 -RMD160 756f949cfcbf9fd2ce9237504d9c596970308f88 files/post-1.3-koffice-CAN-2005-3193.diff 6760 -SHA256 efd30eca9230905c884925bd6f6264e885ab2610d7f56a7a65db8f7ab48f548a files/post-1.3-koffice-CAN-2005-3193.diff 6760 -DIST koffice-1.4.2.tar.bz2 19486852 RMD160 117d5c50aa81d669002005f39fc03bc3f999b62c SHA1 474ab6d289ff1330c200768b30a3dbe271cd26c5 SHA256 c9d5ba0bbd008ebfc40500b0d69335d94ad9657cb58c5f2d939179de8d23d361 -DIST koffice-1.5.1.tar.bz2 36010120 RMD160 3fb67d50554c081104080d3230ba10f022f4a990 SHA1 d97c4f8eae3e22b7c119454f763a6ce88713edff SHA256 4305018f71934d21a3f16cfc6195ebba8ab062260ae8c3ba1812f1d3658c7119 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST koffice-1.5.2.tar.bz2 35878218 RMD160 eb33d9e74adec0fc3409d38c2bfe84b5dfdd5546 SHA1 e35bd08adfb3bf6acf195dd176147de1d6cf215a SHA256 d57d8a7611337f2678a7e28b100b9ab64148bf5483c01dbd204529f07b148611 DIST koffice-1.6.0.tar.bz2 56718478 RMD160 be09c18005eb33f6dc35ab0359cc97a8a658ce7c SHA1 e34d57d0941884496bd3f99b85787697fb55692e SHA256 9eddaae640ada9bd184f001e2489854daf7094b73e5f15b0b8deffb4cc654ae2 -EBUILD kword-1.4.2-r6.ebuild 1265 RMD160 a317b6af5557928904c4176209f8e20af4776999 SHA1 ff537bcc608693d1af99acce9fe8bc77cff6ea81 SHA256 b61db02be96fb8518829429e4b77dd27b01e6cf62ae4f3f60c9e800558c1d090 -MD5 3d8c253c535cf2140989fbe5587542c2 kword-1.4.2-r6.ebuild 1265 -RMD160 a317b6af5557928904c4176209f8e20af4776999 kword-1.4.2-r6.ebuild 1265 -SHA256 b61db02be96fb8518829429e4b77dd27b01e6cf62ae4f3f60c9e800558c1d090 kword-1.4.2-r6.ebuild 1265 -EBUILD kword-1.4.2-r7.ebuild 1333 RMD160 4a729625847c663af01168c4590553df957b8980 SHA1 c8280ddee9f6d91fe8a6e2e08b496d9a8a0f21e7 SHA256 1dd802babec121ebcb1a2075e742f6433cf87002efe1258a0327dd186935ca60 -MD5 bfd5eee74ef031503a6144743753e0e4 kword-1.4.2-r7.ebuild 1333 -RMD160 4a729625847c663af01168c4590553df957b8980 kword-1.4.2-r7.ebuild 1333 -SHA256 1dd802babec121ebcb1a2075e742f6433cf87002efe1258a0327dd186935ca60 kword-1.4.2-r7.ebuild 1333 -EBUILD kword-1.5.1.ebuild 1281 RMD160 92ec511f2422cc3c717ce0133c6ed76ca9db070c SHA1 e16d958ca524889026f2b8d58a18fb2eb63ae1ce SHA256 adac41a6ffe8fd3aca46119a8722322c3b6ca840c66dfa78174b6cec7d0065a8 -MD5 af709388f0ab11ccc918655c4059a6b0 kword-1.5.1.ebuild 1281 -RMD160 92ec511f2422cc3c717ce0133c6ed76ca9db070c kword-1.5.1.ebuild 1281 -SHA256 adac41a6ffe8fd3aca46119a8722322c3b6ca840c66dfa78174b6cec7d0065a8 kword-1.5.1.ebuild 1281 EBUILD kword-1.5.2.ebuild 1291 RMD160 9e35953a0c3d8c1d9b788ef3bbe23b841b6a45ef SHA1 c34cadd650f97a552c188c0aa707153cfcdad52b SHA256 c0ac6412c24794dc3805648c0242ceaed291b0270e50cc7a1c4f28e1fa2eaab0 MD5 e625c364570c7e89edf3414cc236e4bb kword-1.5.2.ebuild 1291 RMD160 9e35953a0c3d8c1d9b788ef3bbe23b841b6a45ef kword-1.5.2.ebuild 1291 @@ -30,26 +11,24 @@ EBUILD kword-1.6.0.ebuild 1301 RMD160 8f18a33d0081ea606dec0cf17aa0af75b0ad84fb S MD5 a74215a557e51e54ca0b95b0be1736e8 kword-1.6.0.ebuild 1301 RMD160 8f18a33d0081ea606dec0cf17aa0af75b0ad84fb kword-1.6.0.ebuild 1301 SHA256 c0260297eca626a4e771eb8fe4c00c99c2529180d928cf33d659164efd6c8a51 kword-1.6.0.ebuild 1301 -MISC ChangeLog 9309 RMD160 d69d94e21b36287b593bacf7cf8c72959d5758d1 SHA1 a70aeaf12446914e491fc773d055c60470e9c825 SHA256 8526ce69b4b31fe848a8a7993b3547e106664e4e47190097c5c8d673003f61fa -MD5 6fa256a1c27c9a6eb933c0039d3595d6 ChangeLog 9309 -RMD160 d69d94e21b36287b593bacf7cf8c72959d5758d1 ChangeLog 9309 -SHA256 8526ce69b4b31fe848a8a7993b3547e106664e4e47190097c5c8d673003f61fa ChangeLog 9309 +MISC ChangeLog 9543 RMD160 ea4985d1624d2d7c4e5dd65c9ef0fe7c0fae3d2f SHA1 01d9603ca57cd19c5cc34aca1d96079cd398dafe SHA256 79168f6c5a1c8807b9604fe139e7226eac94440d60795cc7813f386c09839f44 +MD5 2bba600ca0621b0f4fd4a9096ed121d2 ChangeLog 9543 +RMD160 ea4985d1624d2d7c4e5dd65c9ef0fe7c0fae3d2f ChangeLog 9543 +SHA256 79168f6c5a1c8807b9604fe139e7226eac94440d60795cc7813f386c09839f44 ChangeLog 9543 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157 -MD5 902823ac54984271d00a3e72454440b1 files/digest-kword-1.4.2-r6 250 -RMD160 c2b4361538cd32dbfd79218c5fef8e4d6818ac3f files/digest-kword-1.4.2-r6 250 -SHA256 40d4d888fb4050306c03d0ea47b3c6c6448301faea176ef95e616071a57aba1e files/digest-kword-1.4.2-r6 250 -MD5 902823ac54984271d00a3e72454440b1 files/digest-kword-1.4.2-r7 250 -RMD160 c2b4361538cd32dbfd79218c5fef8e4d6818ac3f files/digest-kword-1.4.2-r7 250 -SHA256 40d4d888fb4050306c03d0ea47b3c6c6448301faea176ef95e616071a57aba1e files/digest-kword-1.4.2-r7 250 -MD5 c1278e570720330905fa70415bf059cc files/digest-kword-1.5.1 250 -RMD160 5b7151313000b75d298f72d749ae33a6754596ac files/digest-kword-1.5.1 250 -SHA256 86cf9a39992b08b505d0b19f69cd385dd34a3609ba82d583d46e5821a56d093c files/digest-kword-1.5.1 250 MD5 6353f4b1dea05aa025ec83436c25e6b8 files/digest-kword-1.5.2 250 RMD160 9141af51df3c51e43191e4193d1f5c61873599df files/digest-kword-1.5.2 250 SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/digest-kword-1.5.2 250 MD5 3df311d51b7d32b34a55e2b3a9f375d2 files/digest-kword-1.6.0 250 RMD160 089f72ec1cf3c245bb967622bf7acbba8c773ce9 files/digest-kword-1.6.0 250 SHA256 94cfa2bebe4c165ca1e455a9773050546661c01f896551db89c6cbbd1556e3cb files/digest-kword-1.6.0 250 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFFb4ppAiZjviIA2XgRAn7sAJ9aijjspavpKmcpWPKAVZ08g6GQTQCgmxmG +wI1dlcQGvVAMbantSnruzD4= +=K4MP +-----END PGP SIGNATURE----- diff --git a/app-office/kword/files/digest-kword-1.4.2-r6 b/app-office/kword/files/digest-kword-1.4.2-r6 deleted file mode 100644 index 9a2dc2d67d8e..000000000000 --- a/app-office/kword/files/digest-kword-1.4.2-r6 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852 -RMD160 117d5c50aa81d669002005f39fc03bc3f999b62c koffice-1.4.2.tar.bz2 19486852 -SHA256 c9d5ba0bbd008ebfc40500b0d69335d94ad9657cb58c5f2d939179de8d23d361 koffice-1.4.2.tar.bz2 19486852 diff --git a/app-office/kword/files/digest-kword-1.4.2-r7 b/app-office/kword/files/digest-kword-1.4.2-r7 deleted file mode 100644 index 9a2dc2d67d8e..000000000000 --- a/app-office/kword/files/digest-kword-1.4.2-r7 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852 -RMD160 117d5c50aa81d669002005f39fc03bc3f999b62c koffice-1.4.2.tar.bz2 19486852 -SHA256 c9d5ba0bbd008ebfc40500b0d69335d94ad9657cb58c5f2d939179de8d23d361 koffice-1.4.2.tar.bz2 19486852 diff --git a/app-office/kword/files/digest-kword-1.5.1 b/app-office/kword/files/digest-kword-1.5.1 deleted file mode 100644 index e41801980c7a..000000000000 --- a/app-office/kword/files/digest-kword-1.5.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 50897bd5dfd4eba8a0d78a02003a6ec9 koffice-1.5.1.tar.bz2 36010120 -RMD160 3fb67d50554c081104080d3230ba10f022f4a990 koffice-1.5.1.tar.bz2 36010120 -SHA256 4305018f71934d21a3f16cfc6195ebba8ab062260ae8c3ba1812f1d3658c7119 koffice-1.5.1.tar.bz2 36010120 diff --git a/app-office/kword/files/kspread-1.4.2-gcc41.patch b/app-office/kword/files/kspread-1.4.2-gcc41.patch deleted file mode 100644 index 0477c74d1e1f..000000000000 --- a/app-office/kword/files/kspread-1.4.2-gcc41.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kspread-1.4.2/kspread/kspread_cell.h 2005-10-05 12:31:33.000000000 +0200 -+++ kspread-1.4.2-gcc41/kspread/kspread_cell.h 2005-12-02 15:05:50.336931500 +0100 -@@ -596,7 +596,7 @@ - * - * @return the cell that decides the format for the cell in question. - */ -- KSpreadCell *KSpreadCell::ultimateObscuringCell() const; -+ KSpreadCell *ultimateObscuringCell() const; - - /** - * @return the obscuring cell list (might be empty) diff --git a/app-office/kword/files/post-1.3-koffice-CAN-2005-3193.diff b/app-office/kword/files/post-1.3-koffice-CAN-2005-3193.diff deleted file mode 100644 index b1f436e9781f..000000000000 --- a/app-office/kword/files/post-1.3-koffice-CAN-2005-3193.diff +++ /dev/null @@ -1,238 +0,0 @@ -Index: filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc -=================================================================== ---- filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc (revision 409205) -+++ filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc (revision 488234) -@@ -7,6 +7,7 @@ - //======================================================================== - - #include <aconf.h> -+#include <limits.h> - - #ifdef USE_GCC_PRAGMAS - #pragma implementation -@@ -977,6 +978,13 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, - w = wA; - h = hA; - line = (wA + 7) >> 3; -+ -+ if (h < 0 || line <= 0 || h >= INT_MAX / line) { -+ error(-1, "invalid width/height"); -+ data = NULL; -+ return; -+ } -+ - data = (Guchar *)gmalloc(h * line); - } - -@@ -986,6 +994,13 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, - w = bitmap->w; - h = bitmap->h; - line = bitmap->line; -+ -+ if (h < 0 || line <= 0 || h >= INT_MAX / line) { -+ error(-1, "invalid width/height"); -+ data = NULL; -+ return; -+ } -+ - data = (Guchar *)gmalloc(h * line); - memcpy(data, bitmap->data, h * line); - } -@@ -1012,7 +1027,10 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint - } - - void JBIG2Bitmap::expand(int newH, Guint pixel) { -- if (newH <= h) { -+ if (newH <= h || line <= 0 || newH >= INT_MAX / line) { -+ error(-1, "invalid width/height"); -+ gfree(data); -+ data = NULL; - return; - } - data = (Guchar *)grealloc(data, newH * line); -@@ -2505,6 +2523,15 @@ void JBIG2Stream::readHalftoneRegionSeg( - error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment"); - return; - } -+ if (gridH == 0 || gridW >= INT_MAX / gridH) { -+ error(getPos(), "Bad size in JBIG2 halftone segment"); -+ return; -+ } -+ if (w == 0 || h >= INT_MAX / w) { -+ error(getPos(), "Bad size in JBIG2 bitmap segment"); -+ return; -+ } -+ - patternDict = (JBIG2PatternDict *)seg; - bpp = 0; - i = 1; -@@ -3078,6 +3105,11 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef - Guint ltpCX, cx, cx0, cx2, cx3, cx4, tpgrCX0, tpgrCX1, tpgrCX2; - int x, y, pix; - -+ if (w < 0 || h <= 0 || w >= INT_MAX / h) { -+ error(-1, "invalid width/height"); -+ return NULL; -+ } -+ - bitmap = new JBIG2Bitmap(0, w, h); - bitmap->clearToZero(); - -Index: filters/kword/pdf/xpdf/xpdf/Stream.cc -=================================================================== ---- filters/kword/pdf/xpdf/xpdf/Stream.cc (revision 409205) -+++ filters/kword/pdf/xpdf/xpdf/Stream.cc (revision 488234) -@@ -15,6 +15,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <stddef.h> -+#include <limits.h> - #ifndef WIN32 - #include <unistd.h> - #endif -@@ -409,13 +410,28 @@ StreamPredictor::StreamPredictor(Stream - width = widthA; - nComps = nCompsA; - nBits = nBitsA; -+ predLine = NULL; -+ ok = gFalse; -+ -+ if (width <= 0 || nComps <= 0 || nBits <= 0 || -+ nComps >= INT_MAX / nBits || -+ width >= INT_MAX / nComps / nBits) -+ return; - - nVals = width * nComps; -+ if (nVals + 7 <= 0) -+ return; -+ - pixBytes = (nComps * nBits + 7) >> 3; - rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; -+ if (rowBytes < 0) -+ return; -+ - predLine = (Guchar *)gmalloc(rowBytes); - memset(predLine, 0, rowBytes); - predIdx = rowBytes; -+ -+ ok = gTrue; - } - - StreamPredictor::~StreamPredictor() { -@@ -982,6 +998,10 @@ LZWStream::LZWStream(Stream *strA, int p - FilterStream(strA) { - if (predictor != 1) { - pred = new StreamPredictor(this, predictor, columns, colors, bits); -+ if ( !pred->isOk()) { -+ delete pred; -+ pred = NULL; -+ } - } else { - pred = NULL; - } -@@ -1227,6 +1247,11 @@ CCITTFaxStream::CCITTFaxStream(Stream *s - endOfLine = endOfLineA; - byteAlign = byteAlignA; - columns = columnsA; -+ if (columns < 1 || columns + 2 < 0 || columns + 3 < 0 || -+ (columns + 2) >= INT_MAX / sizeof(short) || (columns + 3) >= INT_MAX / sizeof(short)) { -+ error(-1, "invalid number of columns"); -+ exit(1); -+ } - rows = rowsA; - endOfBlock = endOfBlockA; - black = blackA; -@@ -2861,6 +2886,11 @@ GBool DCTStream::readBaselineSOF() { - height = read16(); - width = read16(); - numComps = str->getChar(); -+ if (numComps <= 0 || numComps > 4) { -+ numComps = 0; -+ error(getPos(), "Bad number of components in DCT stream"); -+ return gFalse; -+ } - if (prec != 8) { - error(getPos(), "Bad DCT precision %d", prec); - return gFalse; -@@ -2887,6 +2917,11 @@ GBool DCTStream::readProgressiveSOF() { - height = read16(); - width = read16(); - numComps = str->getChar(); -+ if (numComps <= 0 || numComps > 4) { -+ numComps = 0; -+ error(getPos(), "Bad number of components in DCT stream"); -+ return gFalse; -+ } - if (prec != 8) { - error(getPos(), "Bad DCT precision %d", prec); - return gFalse; -@@ -2909,6 +2944,11 @@ GBool DCTStream::readScanInfo() { - - length = read16() - 2; - scanInfo.numComps = str->getChar(); -+ if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) { -+ scanInfo.numComps = 0; -+ error(getPos(), "Bad number of components in DCT stream"); -+ return gFalse; -+ } - --length; - if (length != 2 * scanInfo.numComps + 3) { - error(getPos(), "Bad DCT scan info block"); -@@ -2976,12 +3016,12 @@ GBool DCTStream::readHuffmanTables() { - while (length > 0) { - index = str->getChar(); - --length; -- if ((index & 0x0f) >= 4) { -+ if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) { - error(getPos(), "Bad DCT Huffman table"); - return gFalse; - } - if (index & 0x10) { -- index &= 0x0f; -+ index &= 0x03; - if (index >= numACHuffTables) - numACHuffTables = index+1; - tbl = &acHuffTables[index]; -@@ -3069,9 +3109,11 @@ int DCTStream::readMarker() { - do { - do { - c = str->getChar(); -+ if(c == EOF) return EOF; - } while (c != 0xff); - do { - c = str->getChar(); -+ if(c == EOF) return EOF; - } while (c == 0xff); - } while (c == 0x00); - return c; -@@ -3179,6 +3221,10 @@ FlateStream::FlateStream(Stream *strA, i - FilterStream(strA) { - if (predictor != 1) { - pred = new StreamPredictor(this, predictor, columns, colors, bits); -+ if ( !pred->isOk()) { -+ delete pred; -+ pred = NULL; -+ } - } else { - pred = NULL; - } -Index: filters/kword/pdf/xpdf/xpdf/Stream.h -=================================================================== ---- filters/kword/pdf/xpdf/xpdf/Stream.h (revision 409205) -+++ filters/kword/pdf/xpdf/xpdf/Stream.h (revision 488234) -@@ -227,6 +227,7 @@ public: - - int lookChar(); - int getChar(); -+ GBool isOk() { return ok; } - - private: - -@@ -242,6 +243,7 @@ private: - int rowBytes; // bytes per line - Guchar *predLine; // line buffer - int predIdx; // current index in predLine -+ GBool ok; - }; - - //------------------------------------------------------------------------ diff --git a/app-office/kword/kword-1.4.2-r6.ebuild b/app-office/kword/kword-1.4.2-r6.ebuild deleted file mode 100644 index 07fff962bee0..000000000000 --- a/app-office/kword/kword-1.4.2-r6.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.4.2-r6.ebuild,v 1.8 2006/03/02 12:38:51 agriffis Exp $ - -KMNAME=koffice -MAXKOFFICEVER=${PV} -inherit kde-meta eutils - -DESCRIPTION="KOffice word processor." -HOMEPAGE="http://www.koffice.org/" -LICENSE="GPL-2 LGPL-2" - -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86" -IUSE="" - -RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs) - $(deprange $PV $MAXKOFFICEVER app-office/kspread) - >=app-text/wv2-0.1.8 - >=media-gfx/imagemagick-5.5.2" - -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -KMCOPYLIB=" - libkformula lib/kformula - libkofficecore lib/kofficecore - libkofficeui lib/kofficeui - libkopainter lib/kopainter - libkoscript lib/koscript - libkotext lib/kotext - libkwmf lib/kwmf - libkowmf lib/kwmf - libkstore lib/store - libkspreadcommon kspread" - -KMEXTRACTONLY=" - lib/ - kspread/" - -KMCOMPILEONLY="filters/liboofilter" - -KMEXTRA="filters/kword" - -need-kde 3.3 - -PATCHES="${FILESDIR}/post-1.3-koffice-CAN-2005-3193.diff" - -src_unpack() { - kde-meta_src_unpack unpack - - # We need to compile liboofilter first - echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am - - kde-meta_src_unpack makefiles -} diff --git a/app-office/kword/kword-1.4.2-r7.ebuild b/app-office/kword/kword-1.4.2-r7.ebuild deleted file mode 100644 index 8f13a375183f..000000000000 --- a/app-office/kword/kword-1.4.2-r7.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.4.2-r7.ebuild,v 1.2 2006/09/19 10:15:11 corsair Exp $ - -KMNAME=koffice -MAXKOFFICEVER=${PV} -inherit kde-meta eutils - -DESCRIPTION="KOffice word processor." -HOMEPAGE="http://www.koffice.org/" -LICENSE="GPL-2 LGPL-2" - -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86" -IUSE="" - -RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs) - $(deprange $PV $MAXKOFFICEVER app-office/kspread) - >=app-text/wv2-0.1.8 - >=media-gfx/imagemagick-5.5.2 - >=app-text/libwpd-0.8.2" - -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -KMCOPYLIB=" - libkformula lib/kformula - libkofficecore lib/kofficecore - libkofficeui lib/kofficeui - libkopainter lib/kopainter - libkoscript lib/koscript - libkotext lib/kotext - libkwmf lib/kwmf - libkowmf lib/kwmf - libkstore lib/store - libkspreadcommon kspread" - -KMEXTRACTONLY=" - lib/ - kspread/" - -KMCOMPILEONLY="filters/liboofilter" - -KMEXTRA="filters/kword" - -need-kde 3.3 - -PATCHES="${FILESDIR}/kspread-1.4.2-gcc41.patch ${FILESDIR}/post-1.3-koffice-CAN-2005-3193.diff" - -src_unpack() { - kde-meta_src_unpack unpack - - # We need to compile liboofilter first - echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am - - kde-meta_src_unpack makefiles -} diff --git a/app-office/kword/kword-1.5.1.ebuild b/app-office/kword/kword-1.5.1.ebuild deleted file mode 100644 index 732af305233c..000000000000 --- a/app-office/kword/kword-1.5.1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.5.1.ebuild,v 1.5 2006/09/07 14:19:44 gustavoz Exp $ - -KMNAME=koffice -MAXKOFFICEVER=${PV} -inherit kde-meta eutils - -DESCRIPTION="KOffice word processor." -HOMEPAGE="http://www.koffice.org/" -LICENSE="GPL-2 LGPL-2" - -SLOT="0" -KEYWORDS="~alpha ~amd64 ppc ppc64 sparc ~x86" -IUSE="" - -RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs) - $(deprange $PV $MAXKOFFICEVER app-office/kspread) - >=app-text/wv2-0.1.8 - >=media-gfx/imagemagick-5.5.2 - >=app-text/libwpd-0.8.2" - -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -KMCOPYLIB="libkformula lib/kformula - libkofficecore lib/kofficecore - libkofficeui lib/kofficeui - libkopainter lib/kopainter - libkotext lib/kotext - libkwmf lib/kwmf - libkowmf lib/kwmf - libkstore lib/store - libkspreadcommon kspread" - -KMEXTRACTONLY=" - lib/ - kspread/" - -KMCOMPILEONLY="filters/liboofilter" - -KMEXTRA="filters/kword" - -need-kde 3.4 - -src_unpack() { - kde-meta_src_unpack unpack - - # We need to compile libs first - echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am - - for i in $(find ${S}/lib -iname "*\.ui"); do - ${QTDIR}/bin/uic ${i} > ${i%.ui}.h - done - - kde-meta_src_unpack makefiles -} |