summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-06-06 16:16:51 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-06-06 16:16:51 +0000
commit6c033e165b8d03f943de438aa3cc24746b40e925 (patch)
tree252d31be9f6789e1830a60279438643cabf10591 /media-radio
parentFix typo with USE=git and cvs handling #419887 by Bernd Lommerzheim. (diff)
downloadhistorical-6c033e165b8d03f943de438aa3cc24746b40e925.tar.gz
historical-6c033e165b8d03f943de438aa3cc24746b40e925.tar.bz2
historical-6c033e165b8d03f943de438aa3cc24746b40e925.zip
Prune patch from cvs Id line so it actually applies
Package-Manager: portage-2.2.0_alpha109/cvs/Linux x86_64
Diffstat (limited to 'media-radio')
-rw-r--r--media-radio/xastir/ChangeLog6
-rw-r--r--media-radio/xastir/Manifest14
-rw-r--r--media-radio/xastir/files/xastir-2.0.0-proj48.diff7
3 files changed, 14 insertions, 13 deletions
diff --git a/media-radio/xastir/ChangeLog b/media-radio/xastir/ChangeLog
index 0dab21609c16..677e6e2752d9 100644
--- a/media-radio/xastir/ChangeLog
+++ b/media-radio/xastir/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-radio/xastir
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/ChangeLog,v 1.21 2012/06/04 17:51:52 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/ChangeLog,v 1.22 2012/06/06 16:16:50 ssuominen Exp $
+
+ 06 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+ files/xastir-2.0.0-proj48.diff:
+ Punt cvs "* $Id:" from the -proj48.patch wrt #419937 by Teun Blok
04 Jun 2012; Thomas Beierlein <tomjbe@gentoo.org> -xastir-1.9.8-r1.ebuild,
-xastir-2.0.0.ebuild, xastir-2.0.0-r1.ebuild, xastir-2.0.0-r2.ebuild,
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index 004897784be0..dcb5f4bdfc2c 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -5,19 +5,23 @@ AUX xastir-1.9.8-Destdir.diff 630 RMD160 510c390e0c68eaf275ccb6a0d06800efddfd60f
AUX xastir-1.9.8-fortify.diff 4349 RMD160 e5eb39b90696dc03f0dc194343bc4738225aee36 SHA1 9a726fc83e28e974717220e1096f4c6be99417ed SHA256 11d2db08af1af0c5c19ece44b6d51b86010e651381d0ed544743de26a8cf9c62
AUX xastir-1.9.8-scripts.diff 2741 RMD160 68f6b2c5a663b23f83002f3f2b381f7e2470d622 SHA1 e47b3db778066d0fbf5511d2f3b14246b442480a SHA256 44276ac01a0a8da7908444c3d46502fb9a38cea9a73cabbb248b7b68829de517
AUX xastir-2.0.0-Destdir.diff 704 RMD160 9929466f7e0bafc7f8859a93a07a9f5855091c56 SHA1 735ffde57a1fe14eccd311653cca1279ac7d659f SHA256 d8f403965df2d047250ed723dbf13d18ba4877e8cc3ce8a2c7635f70766bcac7
-AUX xastir-2.0.0-proj48.diff 1574 RMD160 b0f55c4ea0d9b0ba4c0fdf9702a0067362a85a17 SHA1 f12ab12761e901e0a306dd2dc1510f707746a3ab SHA256 a6573214142671451d4d632f84b0e915a33f5b4156f1a089f514bccbbeae3a29
+AUX xastir-2.0.0-proj48.diff 1245 RMD160 f8fe0506b1f0df6f4fe8c49b56370f89921f4bc1 SHA1 c2fdaed0c6aac7f1476e51da62efc4f212be0a4f SHA256 03c648a3c8bd5a6c4c28279b5c75457cdeae6f39e3d2e2ebf0cec8dce1b3e544
AUX xastir-2.0.0-scripts.diff 3732 RMD160 d001101f7272f7cc957ad64347410b1ff6b8d549 SHA1 c4920a5cb1b5afaf1fdc05eff0b54cb164370729 SHA256 c0d06a9884d33cc8093d85b6f970dbfa8c24e49520cc2157fa5d6141afe41161
DIST xastir-1.9.8.tar.gz 2471489 RMD160 c5c7d0ab1fe9abfcbda4ddd1db3e97c0548babd5 SHA1 0832e73fd3b2863561e1eabd4ea97abd2ca3e669 SHA256 11006763874bf8a9bcf034f4fd1ff4de4d0038fb26f3df94798f2e89a4a22cdf
DIST xastir-2.0.0.tar.gz 2544827 RMD160 43c7f5c1cf9735b0dbe797a3ccc6aead60f7a7bd SHA1 4dcb6445df134362353a49d34acf866250f205b7 SHA256 a7834f9adc802da8fb45c15656efa2f85a5b930dc414251af4cb6b490ddb7281
EBUILD xastir-1.9.8.ebuild 2005 RMD160 633788d39722676c986385f767df32b8cb729029 SHA1 fc82443b1bf04950541374e4c0ed45d2e23e38a8 SHA256 5b6ce2c3e3515d1a746dc201d6d804c973f280abb6329c7fc578b3794e247e2a
EBUILD xastir-2.0.0-r1.ebuild 2313 RMD160 b1f9cd227ac57c53ccfa4c990a3c12bb0543c55b SHA1 41f0a5b5fb8512363deb3279394bbd11bec4721b SHA256 edcc94444fb8ba1ea1d41f9a42d56ed6c061234691e4a6bbe9046e9bd627bc1c
EBUILD xastir-2.0.0-r2.ebuild 2030 RMD160 5577916f88898657d181f1f3eb9df0a1bc596775 SHA1 2c1c3d8030857232194fd78e6736689f9d4f492a SHA256 5f6605eeba7d2ac8e6e19c0eb42776d0b111fc9ee4578f984413512f9cf98fa8
-MISC ChangeLog 2132 RMD160 6e98fef895a05e6cf7de7b07feb220d902ed365b SHA1 1dce5b97464f57815c3d93266ed4834989e9dae6 SHA256 4268a3df59651f09685efba1d112202bbf5d9775ffa8c0c19a604a3948c21aee
+MISC ChangeLog 2292 RMD160 6691e58e4e5e55e6ddd1bdd48da81328691def6c SHA1 477b7fa70560dc00003b23a8560fcfae04f4ddac SHA256 3df6d95f7185e6f1865d982b71efee40391c0c1fe85e6abd2656f8b7f88cf82c
MISC metadata.xml 601 RMD160 68a4f5fa74bc64c83771fc089045fd7af05b8dea SHA1 5d81b21efb27b3605d4627d2b11296c006af8590 SHA256 9c8d4aeeaa3a07d451671c9646a777c7029fd5ab09217b00b85e6571571f1773
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEARECAAYFAk/NWgsACgkQ/ejvha5XGaN0ZwCgvOdj/3KiQpaTbzfd4fna4osT
-0UcAoIVGZcv+INIMUbwr2nERWz3cS3QY
-=dLkg
+iQEcBAEBAgAGBQJPz4GHAAoJEEdUh39IaPFNI0AH/3zI/8WHE6hwiEoSW2Gr4sJU
+xQX0pg8yszh+kgtzaJZbEU+OGxiUAsGBlPo3px8leDVfeNuvz9H4CbaibZS1ItUW
+fq4adyBbVN5On+obOPSijqxybrlKE7wQFcM4zg2mssX6llApbmoDBrSD9QhSDMnw
+aXqT8444lnUeH4lTZlKMxrZ63dl7Pj0BgWKGDbqYLomTyJPF6sagpwugbVrfoS2L
+T/xRLH/nbMulXor/e3D0FuZAbb4AQ+0q5c9EffeHkJF1dILw1icFgtHYdQKtHx5o
+4UG9CkcwCfsKknmG5fc0QFUDp+dzT6UscHylwbTY0Sud9zOYG8TNDfFI54Pwads=
+=koEs
-----END PGP SIGNATURE-----
diff --git a/media-radio/xastir/files/xastir-2.0.0-proj48.diff b/media-radio/xastir/files/xastir-2.0.0-proj48.diff
index a4cd9feef68c..ea318d56dcb7 100644
--- a/media-radio/xastir/files/xastir-2.0.0-proj48.diff
+++ b/media-radio/xastir/files/xastir-2.0.0-proj48.diff
@@ -12,13 +12,6 @@
#library.
--- src/map_tif.c 2010/01/31 02:12:24 1.45
+++ src/map_tif.c 2012/05/15 15:29:36 1.46
-@@ -1,5 +1,5 @@
- /* -*- c-basic-offset: 4; indent-tabs-mode: nil -*-
-- * $Id: xastir-2.0.0-proj48.diff,v 1.1 2012/06/04 17:51:52 tomjbe Exp $
-+ * $Id: xastir-2.0.0-proj48.diff,v 1.1 2012/06/04 17:51:52 tomjbe Exp $
- *
- * XASTIR, Amateur Station Tracking and Information Reporting
- * Copyright (C) 1999,2000 Frank Giannandrea
@@ -93,7 +93,7 @@
// Needed for GTIFProj4FromLatLong() replacement below