From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1MCBGE-0005iq-In for garchives@archives.gentoo.org; Thu, 04 Jun 2009 11:37:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 81A43E044D; Thu, 4 Jun 2009 11:37:29 +0000 (UTC) Received: from mailfilter4.ihug.co.nz (mailfilter4.ihug.co.nz [203.109.136.4]) by pigeon.gentoo.org (Postfix) with ESMTP id 6D78CE0449; Thu, 4 Jun 2009 11:37:28 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AtQBADhPJ0p2XQPV/2dsb2JhbAAIz2OEDAWGBg X-IronPort-AV: E=Sophos;i="4.41,305,1241352000"; d="scan'208";a="174439502" Received: from 118-93-3-213.dsl.dyn.ihug.co.nz (HELO [192.168.0.3]) ([118.93.3.213]) by smtp.mailfilter4.ihug.co.nz with ESMTP; 04 Jun 2009 23:37:22 +1200 Message-ID: <4A27B20E.2080202@gentoo.org> Date: Thu, 04 Jun 2009 23:37:50 +1200 From: Alistair Bush User-Agent: Thunderbird 2.0.0.21 (X11/20090325) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-java@lists.gentoo.org MIME-Version: 1.0 To: gentoo-java@lists.gentoo.org CC: gentoo-dev@lists.gentoo.org Subject: [gentoo-java] java-utils-2.eclass patch. Support for BUILD_DEPEND being recorded within package.env. X-Enigmail-Version: 0.95.7 OpenPGP: url= Content-Type: multipart/mixed; boundary="------------050909020503030907070506" X-Archives-Salt: 082907d4-1676-400e-85ce-819755e0a1ff X-Archives-Hash: 4e321bc3e3d0200347c9de223dd281d7 This is a multi-part message in MIME format. --------------050909020503030907070506 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Firstly, fellow developer please review this eclass patch and read on if you are interested in what it actually does. Java developers: The following patch adds 3 new values to our package.env PVR and CATEGORY being the easy ones. These are being added because I think they should be there and they will help with implementing a paludis re-emerge-everything-java script. the 3rd BUILD_DEPEND records the packages/jars that have been passed as parameters to our java functions ( jar-from, getjars, getjar ) and also have --build-only specified. The format is exactly like package.env's DEPEND variable. The main reason for this patch is to allow Serkan to add --build-only dependencies to the classpath for java-dep-check. java-config support is not currently planned but this may change if need be. Here are some example package.env files. # more /var/tmp/portage/app-office/hourglass-0.7.2/image/usr/share/hourglass/package.env DESCRIPTION="A PSP (personal software process) time tracking utility written in Java" GENERATION="2" SLOT="0" CATEGORY="app-office" PVR="0.7.2" CLASSPATH="/usr/share/hourglass/lib/hourglass.jar" DEPEND="log4j.jar@log4j:jcommon.jar@jcommon-1.0:jdom.jar@jdom-1.0" VM=">=virtual/jre-1.5" BUILD_DEPEND="ant.jar@ant-core" TARGET="1.5" SOURCE="1.5" JAVADOC_PATH="/usr/share/doc/hourglass-0.7.2/html/api" JAVA_SOURCES="/usr/share/hourglass/sources//hourglass-src.zip" MERGE_VM="sun-jdk-1.7" MERGE_COMPILER="javac" # more /var/tmp/portage/dev-java/sbaz-1.25/image/usr/share/sbaz/package.env DESCRIPTION="A system used by Scala enthusiasts to share computer files with each other." GENERATION="2" SLOT="0" CATEGORY="dev-java" PVR="1.25" CLASSPATH="/usr/share/sbaz/lib/sbaz.jar" DEPEND="scala-library.jar@scala" VM=">=virtual/jre-1.5" BUILD_DEPEND="servlet-api.jar@servlet-api-2.4:ant-contrib" TARGET="1.5" SOURCE="1.5" MERGE_VM="sun-jdk-1.7" MERGE_COMPILER="javac --------------050909020503030907070506 Content-Type: text/plain; name="java-utils-2.eclass.patch" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="java-utils-2.eclass.patch" LS0tIGphdmEtdXRpbHMtMi5lY2xhc3Mub2xkCTIwMDktMDYtMDQgMTk6NDY6MzcuNzExNjY4 OTYyICsxMjAwCisrKyBqYXZhLXV0aWxzLTIuZWNsYXNzCTIwMDktMDYtMDQgMjI6MTM6MjIu Njk0Njg0MDg1ICsxMjAwCkBAIC04NzQsNiArODc0LDcgQEAKIAlsb2NhbCBkZXN0ZGlyPSIu IgogCWxvY2FsIGRlZXA9IiIKIAlsb2NhbCB2aXJ0dWFsPSIiCisJbG9jYWwgcmVjb3JkX2ph cj0iIgogCiAJW1sgIiR7RUJVSUxEX1BIQVNFfSIgPT0gInRlc3QiIF1dICYmIGJ1aWxkX29u bHk9ImJ1aWxkIgogCkBAIC05MTgsNyArOTE5LDcgQEAKIAkJCVtbIC16ICIke2J1aWxkX29u bHl9IiBdXSAmJiBqYXZhLXBrZ19yZWNvcmQtamFyXyAiJHtwa2d9IgogCQlkb25lCiAJCSMg c2V0dGluZyB0aGlzIGRpc2FibGVzIGZ1cnRoZXIgcmVjb3JkLWphcl8gY2FsbHMgbGF0ZXIK LQkJYnVpbGRfb25seT0iYnVpbGQiCisJCXJlY29yZF9qYXI9InRydWUiCiAJZWxzZQogCQlq YXZhLXBrZ19lbnN1cmUtZGVwICIke2J1aWxkX29ubHl9IiAiJHt0YXJnZXRfcGtnfSIKIAlm aQpAQCAtOTI4LDcgKzkyOSw3IEBACiAJaWYgW1sgLXogIiR7YnVpbGRfb25seX0iICYmIC1u ICIke3ZpcnR1YWx9IiBdXTsgdGhlbgogCQlqYXZhLXBrZ19yZWNvcmQtamFyXyAiJHt0YXJn ZXRfcGtnfSIKIAkJIyBzZXR0aW5nIHRoaXMgZGlzYWJsZXMgZnVydGhlciByZWNvcmQtamFy c18gY2FsbHMgbGF0ZXIKLQkJYnVpbGRfb25seT0iYnVpbGQiCisJCXJlY29yZF9qYXI9InRy dWUiCiAJZmkKIAogCXB1c2hkICR7ZGVzdGRpcn0gPiAvZGV2L251bGwgXApAQCAtOTQ2LDEz ICs5NDcsMjUgQEAKIAkJCVtbIC1mICIke3RhcmdldF9qYXJ9IiBdXSAgJiYgcm0gIiR7dGFy Z2V0X2phcn0iCiAJCQlsbiAtc25mICIke2phcn0iIFwKIAkJCQl8fCBkaWUgIkZhaWxlZCB0 byBtYWtlIHN5bWxpbmsgZnJvbSAke2phcn0gdG8gJHtqYXJfbmFtZX0iCi0JCQlbWyAteiAi JHtidWlsZF9vbmx5fSIgXV0gJiYgamF2YS1wa2dfcmVjb3JkLWphcl8gIiR7dGFyZ2V0X3Br Z30iICIke2phcn0iCi0JCSMgb3RoZXJ3aXNlLCBpZiB0aGUgY3VycmVudCBqYXIgaXMgdGhl IHRhcmdldCBqYXIsIGxpbmsgaXQKKwkJCWlmIFtbIC16ICIke3JlY29yZF9qYXJ9IiBdXTsg dGhlbgorCQkJCWlmIFtbIC16ICIke2J1aWxkX29ubHl9IiBdXTsgdGhlbgorCQkJCQlqYXZh LXBrZ19yZWNvcmQtamFyXyAiJHt0YXJnZXRfcGtnfSIgIiR7amFyfSIKKwkJCQllbHNlCisJ CQkJCWphdmEtcGtnX3JlY29yZC1qYXJfIC0tYnVpbGQtb25seSAiJHt0YXJnZXRfcGtnfSIg IiR7amFyfSIKKwkJCQlmaQorCQkJZmkKKwkJCSMgb3RoZXJ3aXNlLCBpZiB0aGUgY3VycmVu dCBqYXIgaXMgdGhlIHRhcmdldCBqYXIsIGxpbmsgaXQKIAkJZWxpZiBbWyAiJHtqYXJfbmFt ZX0iID09ICIke3RhcmdldF9qYXJ9IiBdXSA7IHRoZW4KIAkJCVtbIC1mICIke2Rlc3RqYXJ9 IiBdXSAgJiYgcm0gIiR7ZGVzdGphcn0iCiAJCQlsbiAtc25mICIke2phcn0iICIke2Rlc3Rq YXJ9IiBcCiAJCQkJfHwgZGllICJGYWlsZWQgdG8gbWFrZSBzeW1saW5rIGZyb20gJHtqYXJ9 IHRvICR7ZGVzdGphcn0iCi0JCQlbWyAteiAiJHtidWlsZF9vbmx5fSIgXV0gJiYgamF2YS1w a2dfcmVjb3JkLWphcl8gIiR7dGFyZ2V0X3BrZ30iICIke2phcn0iCisJCQlpZiBbWyAteiAi JHtyZWNvcmRfamFyfSIgXV07IHRoZW4KKwkJCQlpZiBbWyAteiAiJHtidWlsZF9vbmx5fSIg XV07IHRoZW4KKwkJCQkJamF2YS1wa2dfcmVjb3JkLWphcl8gIiR7dGFyZ2V0X3BrZ30iICIk e2phcn0iCisJCQkJZWxzZQorCQkJCQlqYXZhLXBrZ19yZWNvcmQtamFyXyAtLWJ1aWxkLW9u bHkgIiR7dGFyZ2V0X2phcn0iICIke2phcn0iCisJCQkJZmkKKwkJCWZpCiAJCQlwb3BkID4g L2Rldi9udWxsCiAJCQlyZXR1cm4gMAogCQlmaQpAQCAtMTAzNSwxMiArMTA0OCwxMyBAQAog CQlqYXZhLXBrZ19lbnN1cmUtZGVwICIke2J1aWxkX29ubHl9IiAiJHtwa2d9IgogCWRvbmUK IAotCSMgT25seSByZWNvcmQgamFycyB0aGF0IGFyZW4ndCBidWlsZC1vbmx5Ci0JaWYgW1sg LXogIiR7YnVpbGRfb25seX0iIF1dOyB0aGVuCi0JCWZvciBwa2cgaW4gJHtwa2dzLy8sLyB9 OyBkbworCWZvciBwa2cgaW4gJHtwa2dzLy8sLyB9OyBkbworCQlpZiBbWyAteiAiJHtidWls ZF9vbmx5fSIgXV07IHRoZW4KIAkJCWphdmEtcGtnX3JlY29yZC1qYXJfICIke3BrZ30iCi0J CWRvbmUKLQlmaQorCQllbHNlCisJCQlqYXZhLXBrZ19yZWNvcmQtamFyXyAtLWJ1aWxkLW9u bHkgIiR7cGtnfSIKKwkJZmkKKwlkb25lCiAKIAllY2hvICIke2phcnN9IgogfQpAQCAtMTA3 MSw2ICsxMDg1LDcgQEAKIAogCWxvY2FsIGJ1aWxkX29ubHk9IiIKIAlsb2NhbCB2aXJ0dWFs PSIiCisJbG9jYWwgcmVjb3JkX2phcj0iIgogCiAJW1sgIiR7RUJVSUxEX1BIQVNFfSIgPT0g InRlc3QiIF1dICYmIGJ1aWxkX29ubHk9ImJ1aWxkIgogCkBAIC0xMTA2LDggKzExMjEsMTIg QEAKIAkjIFJlY29yZCB0aGUgcGFja2FnZShWaXJ0dWFsKSBhcyBhIGRlcGVuZGVuY3kgYW5k IHRoZW4gc2V0IGJ1aWxkX29ubHkKIAkjIFNvIHRoYXQgaW5kaXZpZHVhbCBqYXJzIGFyZSBu b3QgcmVjb3JkZWQuCiAJaWYgW1sgLW4gIiR7dmlydHVhbH0iIF1dOyB0aGVuCi0JCWphdmEt cGtnX3JlY29yZC1qYXJfICIke3BrZ30iCi0JCWJ1aWxkX29ubHk9InRydWUiCisJCWlmIFtb IC16ICIke2J1aWxkX29ubHl9IiBdXTsgdGhlbgorCQkJamF2YS1wa2dfcmVjb3JkLWphcl8g IiR7cGtnfSIKKwkJZWxzZQorCQkJamF2YS1wa2dfcmVjb3JkLWphcl8gLS1idWlsZC1vbmx5 ICIke3BrZ30iCisJCWZpCisJCXJlY29yZF9qYXI9InRydWUiCiAJZmkKIAogCWZvciBqYXIg aW4gJHtjbGFzc3BhdGgvLzovIH07IGRvCkBAIC0xMTE3LDcgKzExMzYsMTMgQEAKIAogCQlp ZiBbWyAiJChiYXNlbmFtZSAke2phcn0pIiA9PSAiJHt0YXJnZXRfamFyfSIgXV0gOyB0aGVu CiAJCQkjIE9ubHkgcmVjb3JkIGphcnMgdGhhdCBhcmVuJ3QgYnVpbGQtb25seQotCQkJW1sg LXogIiR7YnVpbGRfb25seX0iIF1dICYmIGphdmEtcGtnX3JlY29yZC1qYXJfICIke3BrZ30i ICIke2phcn0iCisJCQlpZiBbWyAteiAiJHtyZWNvcmRfamFyfSIgXV07IHRoZW4KKwkJCQlp ZiBbWyAteiAiJHtidWlsZF9vbmx5fSIgXV07IHRoZW4KKwkJCQkJamF2YS1wa2dfcmVjb3Jk LWphcl8gIiR7cGtnfSIgIiR7amFyfSIKKwkJCQllbHNlCisJCQkJCWphdmEtcGtnX3JlY29y ZC1qYXJfIC0tYnVpbGQtb25seSAiJHtwa2d9IiAiJHtqYXJ9IgorCQkJCWZpCisJCQlmaQog CQkJZWNobyAiJHtqYXJ9IgogCQkJcmV0dXJuIDAKIAkJZmkKQEAgLTIyNDMsNiArMjI2OCw4 IEBACiAJCQllY2hvICJERVNDUklQVElPTj1cIiR7REVTQ1JJUFRJT059XCIiCiAJCQllY2hv ICJHRU5FUkFUSU9OPVwiMlwiIgogCQkJZWNobyAiU0xPVD1cIiR7U0xPVH1cIiIKKwkJCWVj aG8gIkNBVEVHT1JZPVwiJHtDQVRFR09SWX1cIiIKKwkJCWVjaG8gIlBWUj1cIiR7UFZSfVwi IgogCiAJCQlbWyAtbiAiJHtKQVZBX1BLR19DTEFTU1BBVEh9IiBdXSAmJiBlY2hvICJDTEFT U1BBVEg9XCIke0pBVkFfUEtHX0NMQVNTUEFUSH1cIiIKIAkJCVtbIC1uICIke0pBVkFfUEtH X0xJQlJBUll9IiBdXSAmJiBlY2hvICJMSUJSQVJZX1BBVEg9XCIke0pBVkFfUEtHX0xJQlJB Ull9XCIiCkBAIC0yMjUyLDYgKzIyNzksOCBAQAogCQkJW1sgLWYgIiR7SkFWQV9QS0dfT1BU SU9OQUxfREVQRU5EX0ZJTEV9IiBdXSBcCiAJCQkJJiYgZWNobyAiT1BUSU9OQUxfREVQRU5E PVwiJChjYXQgIiR7SkFWQV9QS0dfT1BUSU9OQUxfREVQRU5EX0ZJTEV9IiB8IHVuaXEgfCB0 ciAnXG4nICc6JylcIiIKIAkJCWVjaG8gIlZNPVwiJChlY2hvICR7UkRFUEVORH0gJHtERVBF TkR9IHwgc2VkIC1lICdzLyAvXG4vZycgfCBzZWQgLW4gLWUgJy92aXJ0dWFsXC9cKGpyZVx8 amRrXCkvIHsgcDtxIH0nKVwiIiAjIFRPRE8gY2xlYW51cCAhCisJCQlbWyAtZiAiJHtKQVZB X1BLR19CVUlMRF9ERVBFTkRfRklMRX0iIF1dIFwKKwkJCQkmJiBlY2hvICJCVUlMRF9ERVBF TkQ9XCIkKGNhdCAiJHtKQVZBX1BLR19CVUlMRF9ERVBFTkRfRklMRX0iIHwgdW5pcSB8IHRy ICdcbicgJzonKVwiIgogCQkpID4gIiR7SkFWQV9QS0dfRU5WfSIKIAogCQkjIHJlZ2lzdGVy IHRhcmdldC9zb3VyY2UKQEAgLTIyOTQsMjAgKzIzMjMsMjYgQEAKICMKICMgUmVjb3JkIGFu IChvcHRpb25hbCkgZGVwZW5kZW5jeSB0byB0aGUgcGFja2FnZS5lbnYKICMgQHBhcmFtIC0t b3B0aW9uYWwgLSByZWNvcmQgZGVwZW5kZW5jeSBhcyBvcHRpb25hbAorIyBAcGFyYW0gLS1i dWlsZCAtIHJlY29yZCBkZXBlbmRlbmN5IGFzIGJ1aWxkX29ubHkKICMgQHBhcmFtICQxIC0g cGFja2FnZSB0byByZWNvcmQKICMgQHBhcmFtICQyIC0gKG9wdGlvbmFsKSBqYXIgb2YgcGFj a2FnZSB0byByZWNvcmQKICMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBKQVZBX1BLR19E RVBFTkRfRklMRT0iJHtUfS9qYXZhLXBrZy1kZXBlbmQiCiBKQVZBX1BLR19PUFRJT05BTF9E RVBFTkRfRklMRT0iJHtUfS9qYXZhLXBrZy1vcHRpb25hbC1kZXBlbmQiCitKQVZBX1BLR19C VUlMRF9ERVBFTkRfRklMRT0iJHtUfS9qYXZhLXBrZy1idWlsZC1kZXBlbmQiCiAKIGphdmEt cGtnX3JlY29yZC1qYXJfKCkgewogCWRlYnVnLXByaW50LWZ1bmN0aW9uICR7RlVOQ05BTUV9 ICQqCiAKIAlsb2NhbCBkZXBlbmRfZmlsZT0iJHtKQVZBX1BLR19ERVBFTkRfRklMRX0iCi0J aWYgW1sgIiR7MX0iID09ICItLW9wdGlvbmFsIiBdXTsgdGhlbgotCQlkZXBlbmRfZmlsZT0i JHtKQVZBX1BLR19PUFRJT05BTF9ERVBFTkRfRklMRX0iCi0JCXNoaWZ0Ci0JZmkKKwljYXNl ICIkezF9IiBpbgorCQkiLS1vcHRpb25hbCIpIGRlcGVuZF9maWxlPSIke0pBVkFfUEtHX09Q VElPTkFMX0RFUEVORF9GSUxFfSI7IHNoaWZ0OzsKKwkJIi0tYnVpbGQtb25seSIpIGRlcGVu ZF9maWxlPSIke0pBVkFfUEtHX0JVSUxEX0RFUEVORF9GSUxFfSI7IHNoaWZ0OzsKKwllc2Fj CisJI2lmIFtbICIkezF9IiA9PSAiLS1vcHRpb25hbCIgXV07IHRoZW4KKwkjCWRlcGVuZF9m aWxlPSIke0pBVkFfUEtHX09QVElPTkFMX0RFUEVORF9GSUxFfSIKKwkjCXNoaWZ0CisJI2Zp CiAKIAlsb2NhbCBwa2c9JHsxfSBqYXI9JHsyfSBhcHBlbmQKIAlpZiBbWyAteiAiJHtqYXJ9 IiBdXTsgdGhlbgo= --------------050909020503030907070506--