net-libs/czmq: Fix missing verison number in pkg-config file, #508864

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 50 insertions, 20 deletions

diff --git a/net-libs/czmq/ChangeLog b/net-libs/czmq/ChangeLog
index 27f470b0bb26..50eee7fd1904 100644
--- a/net-libs/czmq/ChangeLog
+++ b/net-libs/czmq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/czmq
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/ChangeLog,v 1.11 2014/04/24 12:58:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/ChangeLog,v 1.12 2014/04/27 15:56:46 jlec Exp $
+
+  27 Apr 2014; Justin Lecher <jlec@gentoo.org> czmq-2.0.3.ebuild,
+  czmq-2.1.0.ebuild, +files/version.sh:
+  Fix missing verison number in pkg-config file, #508864
 
 *czmq-2.1.0 (24 Apr 2014)
 
diff --git a/net-libs/czmq/Manifest b/net-libs/czmq/Manifest
index a2c8705f460d..7b67aef4d8c7 100644
--- a/net-libs/czmq/Manifest
+++ b/net-libs/czmq/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX version.sh 736 SHA256 5da73f6e4f6a7a66d1d91e8a5b184a4a03e50d063a8742601e28bd2ddbb69a3f SHA512 e7c0c49477a7bc8e01bb84a133bef817a5942e8c13db3cbab05f8fd1a5abcbd821dab4016634363b077c869b93becce4ec1431b3e1d28fa969169cf0b9f6051a WHIRLPOOL 30866f4dc515df42d98e405bb66553a09bb1d4380fa4648632c0c1a41bd7913c54872acf3b1e73f8317b7a5022eb08ac1d7fdd5ecbb95062b522ab703532ba9d
 DIST czmq-1.2.0.tar.gz 418301 SHA256 fe1d92f13ad0ca0d40a540c2b776f158b13782dcf2d2348dd7e3d33337193039 SHA512 c1d6fef16af3ad53498076a0dfce30d6092e14ff362238e4d91653c3575b618ff8f9a046c70736c763f3b2c1ba9abf0eb6b036d7656d99eaedcd586265eba762 WHIRLPOOL fd4a126e72b80f2612fd5a46d811ff31bc727f4b2044582ab426e857667db9531ac5c7e650ff3dc61101940a986021ccdb6d956e4d00c9f601582002a2005587
 DIST czmq-1.4.1.tar.gz 440955 SHA256 7b2074a3b753459a6fdb88d9cc52b725142783793bdbce35d0bfa52fad64425c SHA512 01614da6e3f98b1b123aab828e7b8a4eb3ad75d3308d67d30400871071a70a67d2cd29bcb51023da564f0849aa5fab12de126480205aec673961a82b3c4872a4 WHIRLPOOL a6d3862fe999e8ca1fabadb29cf115b592f031370494935c1f9e547600eb34a61f7011966f2c838ff918d43b4da8508d91e3dca04faaa17a987199636f795487
 DIST czmq-2.0.3.tar.gz 533845 SHA256 adaac33f03d58c3a2ab48be9095df3c4bc876d331c115965b5c48830fa7cd84c SHA512 5ac01dfbb2b0907729d42a807a267812ca1ab22104fc22f440d71264ecae75489d5c9385019da1e77c280735528e3cea677ff27fb823d9debcb26223eb8cf987 WHIRLPOOL 01889dc537f2931111d155641b2c52d2367e6638e1f92f3ca868ed32885d53d820945b8c957a5efa3e561a39a2c8206664d7fbdd1cfdcf176ed0af6713009531
@@ -8,26 +9,26 @@ DIST czmq-2.1.0.tar.gz 585871 SHA256 d6f30b4b5def57496e7ca665ff306090f7c23c32eb0
 EBUILD czmq-1.2.0-r1.ebuild 968 SHA256 e6a70321f03d800cdd2c6e452cd9b5202fd88c771cadb4367fd596f0d4d2a572 SHA512 f73a78268289e249afea42fcad547e2c169edc346caa33b9e7873f1d615c4bde97438ac9aa3ff19e23fb8a6021f29cbe06d9087f2b43791362a98da13f06766a WHIRLPOOL c246cb7000e0deb5b08c1a5a642f627bf061a0a51276120a9a1fd8ff1ced30e057d45176a707346a72f7cd864345bbd88a766f65cf82981509175e3eeb1a69e3
 EBUILD czmq-1.2.0.ebuild 953 SHA256 671f747fd8c9ce742cca3ac80de7766a35762e6733fca318e80a0b9189df542f SHA512 12a5381ab58ae4d1b2192e5ca6b827be1bf9ee23c8c7e2ec6e2c3d96fdc10f09a84a518b5112e0abbe8182d802007879f08a7f536b9217d5fa6b9ccfc6acc8e1 WHIRLPOOL b31250a6ed79ed722de724cede83aef9784f623c1e3d7f0321adc33e1321d0f09c7f07b20367f739921e3bda77118f9ff1dd05805370a066f85318826828bad4
 EBUILD czmq-1.4.1.ebuild 945 SHA256 20d81116887f12baae54f871782b5f224ab1d7008cd962b2ee37d4c84ce7bfaf SHA512 a51972491a3dd02707a4ba120498839d6caa2edeecc05a94ed83d72be80bf292c7a137def416fe0a67002737a13dd4b6e591cf0437514b749ee8928b5fee8cc5 WHIRLPOOL 44ecc8f6f3fd49e13fb73e3415a3ab045389580a8082683b738893dc05f10f377d344dceebe2f44bd5538bf09ce1c87692195a67dfbf5b577b3e43814382025b
-EBUILD czmq-2.0.3.ebuild 781 SHA256 a42418f66070a2af65c9dc481b58354e138d154221ecce1e920e56af307ed7e9 SHA512 693bb299170432752aa2519dd99028fceb3b1c491845fecc61f6bbaa6888abb1a336bf93e013c4755bec858b87f98b421133043a7c08d8a48cc02be975dca981 WHIRLPOOL f88aafdd5a44833581a6c4e12b65c6e792a7bf07b9dc97c07b15d12445d02d7d8f69c16f7b32363bdd45938907b57d04ef8bd2fc673e15a6df825b928b547ce5
-EBUILD czmq-2.1.0.ebuild 796 SHA256 331f3afae5d73d96b75b7f1e6dfbcc0b8ab2ee2fdb958a7905e18da97b5c6105 SHA512 12eb13669f6f8dba63c4f489ce3cbf5c1e55192460df8aeaf2d629ede05b31821fbda7e9f2e87de1714c4dd164f05a9cd4f6265018c75963e31fdf75a51e2058 WHIRLPOOL 9587adfafd1c907815a188dd28ae0dd4e7a9578a0005bf86568d8d1eefb2261ebb5baa30fd7a5226632d9f53cc41fe819f7dc74929c2d66c9664de96ce4a60ea
-MISC ChangeLog 1702 SHA256 8a8ef14281e84a27da12e3574c023d5e179914e10c117fedb0116f08962b1958 SHA512 9a21bbf09f962ea661bc2a08c008e4cbab2de3aa9c8ff169bc6169a31b30803836c2eba43653203d1f014d913842f21f34ab68af70cbecba59bcaf8c39efb77d WHIRLPOOL 831f2aca77bbdf779e1a646c55c8d9d59ac17845828ca04f641bcfa4a85ff0090b29dfad818f70c186eb14a23bca38ebfa599fda0d829a2704b249fc8297eeb0
+EBUILD czmq-2.0.3.ebuild 860 SHA256 e2a6fbc174126ebab5e5bdf0b3b533dcbb883b96513f9d53944e6f7d7b406c9f SHA512 65e04d27bf141a2f3078b383a8dd1d5092921c980f413fbd7c8c6be1966b0a0b7ed519b07f7dccd2dd37cde30b7cda4314a56cf2972e9b9234c94a8d1ec6733e WHIRLPOOL e90abc6a6be46357fb4b5ca1e7d79b594bde0cb3dbbda362d9ea618b275c8c35d10de706dc5db13c113eb577c4671724aedbe3ed2064ba25dc045d161787d6bf
+EBUILD czmq-2.1.0.ebuild 875 SHA256 359e182d2e0c0b201fb437fd3a813a607430aae37d9dbbd32c1f791c0b845bf2 SHA512 131b050a485db968ffcef887a94c8685824e4f82334363e81e29bbd41184ed1c66881f27cf29ef1a122bce50413be5f6ed018d40be9ed14672f4271388c49540 WHIRLPOOL 1cf2604b19fb3d28eb6cba15179816101f3e80f91425f764b846b870d12ee03724b2b3cdabc12d4df255a803ffc9f001555d4d35d7674faaeeb615633929f4d2
+MISC ChangeLog 1866 SHA256 8cc64cc84b681985ddefa76bf7b7d3067b5cea1114cd7888812aae7d1d096571 SHA512 eac6bbb49d3677b1b8f0d67209cb1bf04198342e464639323492fbb1c42ae13fea7130fe2519d6a5c174feac1448f1d1f5f4fc6f9da3adc985b5bc15738178a3 WHIRLPOOL f1c01e646eb1184315ec792d392a259235cbdf432cfca8c5874e1f9922e4490f2c811368e365860f10a070341e3cd9d6c4be108452502993f2cabc881ae8ccc1
 MISC metadata.xml 236 SHA256 feedd499ae6ddebc364ebb0f38d08bfbcc6b5d499f805a307a9367fb82dd12e8 SHA512 02882c2ecdf4fe400bf3e4455df1feae173e12b6fbb09181ea50541bb9dbf43780a0ab00fa799ccf5b7f2c27dcf9d854e16146cfb336ff3270a7b4369e451860 WHIRLPOOL b6580a9428931142ea961e985e6b5c736ab716eefb85706692c780c11f97d6019be488493c2e2a51b7ae8b480be80276edddb2858fe19684d48df64433475e06
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCgBmBQJTWQqCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJTXSqSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirZv0P/0ORhN44/2ggwf5JOfyHn7kP
-Wjm2sEmJJe0chtU78ip3N5/fe5jH75OYP1wtIaEIOjhxwAxiBhUlKRYf2LUhMlWK
-zMqIbXhq9w9A/4pcCQ62Cp75edk3W0vvrAb4gL5A+/SD7/cg8faC8brypvgwXcZu
-k655ulBo955Xg3EIzW2pRaf2oLYjxMq9yUB1KHFVYwyKXT7wiw2pDCSQFisijFLT
-YBKeUKfuiJnZ7TTeUpZztszqvLzVqlsc0o8+0z07ueJIbhBnf0/vl2p1rOhZOHSY
-3KnG81e52+2X0M+ml5XZUeux8l7HK8Z0V7TJFdcO1CdT6BF2X7dc4OmZw3haZzeq
-z+9gK8Q8QmFPcrUET2y4vyV4DLdfj0WNG9RRqMMPQkP7QgLGHD2lMhQmbJ2a0D5b
-nJPP7gtr9rhgLI5i9StyAD5hIQ67vvXVt9ZwQWQfc6WBiOvjtLO9lM6FwKi5vN8B
-mcvOr7ep+ztrrwSL8BoiahTNg9vAvRuVaDAAlokiRrT8DpuBHHw5uSniLf1gErV+
-mY+zmlYjvs4iPnUfTaDKeWhWQgkaKKBZzUSZ8hvTYoKa21PBY3abQ43e9moOwC7G
-xZj11MkeKiPnZr9vhdg6YHKvDHCZYQw5xz2VWQl6vJcKg4Uaf9BfM+GQxZTMuwVa
-K4tsfR+XHnDz85GNrowG
-=Io6L
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirOf8P/jpY8xt1GgWBrfRbNQ2LHZZz
+kIvfoMEcPfNeqiXZJ67xQV7EkBPW3fhfXPjhSnuph4aO56eZrnl0H8pi1y7YqRKq
+7gjvyEDQRqQ2v49phUUeij2ia32JHyZf2qmK9fC2/wzkSJ6pOGGOf85ASmQZvjPu
+sIN/VVmczNuJVm9MEvuA3THjtDSFKwpRf4zEN/wPCb+oCEuj2wT56hpMfsRpptTH
+5nVChO4BL/9Hlw3QrTe0hHnV5RHGybDxI1QLpMBUq0hx0/YbXA7rbF02fYSB15l/
+266T8Kq3XX8xgy8Eh6FSOjYhaz4wEl0g9o0E65nghW/WFPonDx09MvdQjKXPpRLM
+Ti7VO3xg1xA0EpgOTR1kuKEnWmc4/iqE18ASJnhEmEXsZUvA/yFkxI99mp4AoaZS
+qm4SD+JtSNF6o2W5RCZQHoGo90oLLMMFGS+OLKdKuiTEXDK0KckJLOe+Ugau78Yo
+UeeCGCkmxRvJeJ0z/sxanevZ4skil/+47YpdD21ubriPDOYUVr8g2WDe+ja90YKu
+shHlq+1Mt7ESXW6ox3YWh1DToN9/HJcoImvdIA9eR5YugQQteRfSJtVMHCTUUHQo
+suFdbvYMGrje68E0APxecaw4xPTiS8NU4BM05dFwShpyhvQqxBnux72nCigfT7g3
+ilK4IlTNOu2Ov3yPWB6+
+=szDp
 -----END PGP SIGNATURE-----
diff --git a/net-libs/czmq/czmq-2.0.3.ebuild b/net-libs/czmq/czmq-2.0.3.ebuild
index d0360ef76834..ca5d15d7d772 100644
--- a/net-libs/czmq/czmq-2.0.3.ebuild
+++ b/net-libs/czmq/czmq-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/czmq-2.0.3.ebuild,v 1.3 2014/04/24 12:58:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/czmq-2.0.3.ebuild,v 1.4 2014/04/27 15:56:46 jlec Exp $
 
 EAPI=5
 
@@ -29,6 +29,8 @@ DOCS=( NEWS README AUTHORS ChangeLog )
 
 src_prepare() {
 	sed -i -e 's|-Werror||g' configure.ac || die
+	cp "${FILESDIR}"/version.sh "${S}" || die
+	chmod 775 "${S}"/version.sh || die
 	autotools-utils_src_prepare
 }
 
diff --git a/net-libs/czmq/czmq-2.1.0.ebuild b/net-libs/czmq/czmq-2.1.0.ebuild
index 9098df119d38..ee36ef8fa17b 100644
--- a/net-libs/czmq/czmq-2.1.0.ebuild
+++ b/net-libs/czmq/czmq-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/czmq-2.1.0.ebuild,v 1.1 2014/04/24 12:58:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/czmq/czmq-2.1.0.ebuild,v 1.2 2014/04/27 15:56:46 jlec Exp $
 
 EAPI=5
 
@@ -31,6 +31,8 @@ DOCS=( NEWS AUTHORS )
 
 src_prepare() {
 	sed -i -e 's|-Werror||g' configure.ac || die
+	cp "${FILESDIR}"/version.sh "${S}" || die
+	chmod 775 "${S}"/version.sh || die
 	autotools-utils_src_prepare
 }
 
diff --git a/net-libs/czmq/files/version.sh b/net-libs/czmq/files/version.sh
new file mode 100644
index 000000000000..527ba285ebbb
--- /dev/null
+++ b/net-libs/czmq/files/version.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# This script extracts the version from the project header file
+#
+project=$1
+if [ ! -f include/$project.h ]; then
+    echo "version.sh: error: include/$project.h does not exist" 1>&2
+    exit 1
+fi
+MAJOR=`egrep '^#define .*_VERSION_MAJOR +[0-9]+$' include/$project.h`
+MINOR=`egrep '^#define .*_VERSION_MINOR +[0-9]+$' include/$project.h`
+PATCH=`egrep '^#define .*_VERSION_PATCH +[0-9]+$' include/$project.h`
+if [ -z "$MAJOR" -o -z "$MINOR" -o -z "$PATCH" ]; then
+    echo "version.sh: error: could not extract version from include/$project.h" 1>&2
+    exit 1
+fi
+MAJOR=`echo $MAJOR | awk '{ print $3 }'`
+MINOR=`echo $MINOR | awk '{ print $3 }'`
+PATCH=`echo $PATCH | awk '{ print $3 }'`
+echo $MAJOR.$MINOR.$PATCH | tr -d '\n'
+