public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-util/yuicompressor/
@ 2016-01-13 14:23 Patrice Clement
  0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2016-01-13 14:23 UTC (permalink / raw
  To: gentoo-commits

commit:     e2cb74e72ffa4227a07f479895aff1509afcc487
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Jan  8 11:32:58 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Jan  8 11:32:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2cb74e7

dev-util/yuicompressor: use sane source package name

Package-Manager: portage-2.2.26

 dev-util/yuicompressor/Manifest                   | 2 +-
 dev-util/yuicompressor/yuicompressor-2.4.8.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/yuicompressor/Manifest b/dev-util/yuicompressor/Manifest
index 4e9b817..40b0084 100644
--- a/dev-util/yuicompressor/Manifest
+++ b/dev-util/yuicompressor/Manifest
@@ -1 +1 @@
-DIST v2.4.8.tar.gz 1254322 SHA256 199ed2e4a05330b72cc1802347e2ae449112bb955894d44f596c1ef7319167bf SHA512 cb955fc3677f930403f4f97aaad5d6ca5ec6ee834f464005ddfd8d83c4a532180859b72d55a4025b13f05a6a0146a1391d93668452e57035d4fc4f4d7f20d00b WHIRLPOOL 275ce13b4f61c85e610f16016a5b0f5ef75b04f0ff40463a148c8e037521b8a1f983f0b63bbc9c2ea7a14c46a5854d5d586e017518cda0493d4fb25a91d8c2e1
+DIST yuicompressor-2.4.8.tar.gz 1254322 SHA256 199ed2e4a05330b72cc1802347e2ae449112bb955894d44f596c1ef7319167bf SHA512 cb955fc3677f930403f4f97aaad5d6ca5ec6ee834f464005ddfd8d83c4a532180859b72d55a4025b13f05a6a0146a1391d93668452e57035d4fc4f4d7f20d00b WHIRLPOOL 275ce13b4f61c85e610f16016a5b0f5ef75b04f0ff40463a148c8e037521b8a1f983f0b63bbc9c2ea7a14c46a5854d5d586e017518cda0493d4fb25a91d8c2e1

diff --git a/dev-util/yuicompressor/yuicompressor-2.4.8.ebuild b/dev-util/yuicompressor/yuicompressor-2.4.8.ebuild
index 943563b..55738e0 100644
--- a/dev-util/yuicompressor/yuicompressor-2.4.8.ebuild
+++ b/dev-util/yuicompressor/yuicompressor-2.4.8.ebuild
@@ -8,7 +8,7 @@ inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="JavaScript and CSS compressor"
 HOMEPAGE="http://yui.github.io/yuicompressor/"
-SRC_URI="https://github.com/yui/yuicompressor/archive/v${PV}.tar.gz"
+SRC_URI="https://github.com/yui/yuicompressor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/yuicompressor/
@ 2016-01-13 14:23 Patrice Clement
  0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2016-01-13 14:23 UTC (permalink / raw
  To: gentoo-commits

commit:     abd77320fec8fae8b86ffb810bc0e1766d6bd408
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Jan  8 08:50:32 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Jan  8 08:50:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abd77320

dev-util/yuicompressor: adding package

Package-Manager: portage-2.2.26

 dev-util/yuicompressor/Manifest                   |  1 +
 dev-util/yuicompressor/metadata.xml               | 13 +++++++++++
 dev-util/yuicompressor/yuicompressor-2.4.8.ebuild | 27 +++++++++++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/dev-util/yuicompressor/Manifest b/dev-util/yuicompressor/Manifest
new file mode 100644
index 0000000..4e9b817
--- /dev/null
+++ b/dev-util/yuicompressor/Manifest
@@ -0,0 +1 @@
+DIST v2.4.8.tar.gz 1254322 SHA256 199ed2e4a05330b72cc1802347e2ae449112bb955894d44f596c1ef7319167bf SHA512 cb955fc3677f930403f4f97aaad5d6ca5ec6ee834f464005ddfd8d83c4a532180859b72d55a4025b13f05a6a0146a1391d93668452e57035d4fc4f4d7f20d00b WHIRLPOOL 275ce13b4f61c85e610f16016a5b0f5ef75b04f0ff40463a148c8e037521b8a1f983f0b63bbc9c2ea7a14c46a5854d5d586e017518cda0493d4fb25a91d8c2e1

diff --git a/dev-util/yuicompressor/metadata.xml b/dev-util/yuicompressor/metadata.xml
new file mode 100644
index 0000000..41a7cb7
--- /dev/null
+++ b/dev-util/yuicompressor/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>hydrapolic@gmail.com</email>
+		<name>Tomas Mozes</name>
+		<description>Proxy maintainer</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">yui/yuicompressor</remote-id>
+	</upstream>
+</pkgmetadata>

diff --git a/dev-util/yuicompressor/yuicompressor-2.4.8.ebuild b/dev-util/yuicompressor/yuicompressor-2.4.8.ebuild
new file mode 100644
index 0000000..943563b
--- /dev/null
+++ b/dev-util/yuicompressor/yuicompressor-2.4.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JavaScript and CSS compressor"
+HOMEPAGE="http://yui.github.io/yuicompressor/"
+SRC_URI="https://github.com/yui/yuicompressor/archive/v${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.6:*"
+RDEPEND=">=virtual/jre-1.6:*"
+
+src_compile(){
+	eant
+}
+
+src_install() {
+	java-pkg_newjar "build/${P}.jar" "${PN}.jar"
+	java-pkg_dolauncher "${PN}"
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/yuicompressor/
@ 2016-01-13 14:23 Patrice Clement
  0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2016-01-13 14:23 UTC (permalink / raw
  To: gentoo-commits

commit:     8cafde49e6d8299693a08377f2b6337c129d93db
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 14:16:19 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 14:17:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cafde49

dev-util/yuicompressor: Edit DEPEND and RDEPEND.

Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

Gentoo-Bug: 500656

 dev-util/yuicompressor/yuicompressor-2.4.8.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/yuicompressor/yuicompressor-2.4.8.ebuild b/dev-util/yuicompressor/yuicompressor-2.4.8.ebuild
index 55738e0..6ee725b 100644
--- a/dev-util/yuicompressor/yuicompressor-2.4.8.ebuild
+++ b/dev-util/yuicompressor/yuicompressor-2.4.8.ebuild
@@ -14,8 +14,8 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND=">=virtual/jdk-1.6:*"
-RDEPEND=">=virtual/jre-1.6:*"
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
 
 src_compile(){
 	eant


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/yuicompressor/
@ 2016-02-09 10:53 Patrice Clement
  0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2016-02-09 10:53 UTC (permalink / raw
  To: gentoo-commits

commit:     5ae2d15109743a70a9bf284801d9fb41c8435064
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  9 10:49:28 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 10:51:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ae2d151

dev-util/yuicompressor: Unbundle jargs and rhino. Fixes bug 571812.

Thanks Tomáš Mózes <hydrapolic <AT> gmail.com> for helping.

Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 .../yuicompressor/yuicompressor-2.4.8-r1.ebuild    | 40 ++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/dev-util/yuicompressor/yuicompressor-2.4.8-r1.ebuild b/dev-util/yuicompressor/yuicompressor-2.4.8-r1.ebuild
new file mode 100644
index 0000000..0a14be3
--- /dev/null
+++ b/dev-util/yuicompressor/yuicompressor-2.4.8-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JavaScript and CSS compressor"
+HOMEPAGE="http://yui.github.io/yuicompressor/"
+SRC_URI="https://github.com/yui/yuicompressor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-java/jargs:0
+	dev-java/rhino:1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="
+	jargs
+	rhino-1.6
+"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/yuicompressor/
@ 2016-02-09 22:47 James Le Cuirot
  0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2016-02-09 22:47 UTC (permalink / raw
  To: gentoo-commits

commit:     ba17538666435ccc04b65457b8189911f5438fbe
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  9 22:46:53 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 22:47:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba175386

dev-util/yuicompressor: Fix several problems with 2.4.8-r1

2.4.8-r1 was a bit of a lemon.

Rhino can't be unbundled because apart from the custom modifications,
yuicompressor uses 1.7R2, which is substantially different to the
1.7.7 we have in the tree.

This also restores the launcher script, fixes the version number, and
adds the doc and source USE flags.

Package-Manager: portage-2.2.27

 ...4.8-r1.ebuild => yuicompressor-2.4.8-r2.ebuild} | 28 ++++++++++++++--------
 dev-util/yuicompressor/yuicompressor-2.4.8.ebuild  | 27 ---------------------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/dev-util/yuicompressor/yuicompressor-2.4.8-r1.ebuild b/dev-util/yuicompressor/yuicompressor-2.4.8-r2.ebuild
similarity index 50%
rename from dev-util/yuicompressor/yuicompressor-2.4.8-r1.ebuild
rename to dev-util/yuicompressor/yuicompressor-2.4.8-r2.ebuild
index 0a14be3..dbc7496 100644
--- a/dev-util/yuicompressor/yuicompressor-2.4.8-r1.ebuild
+++ b/dev-util/yuicompressor/yuicompressor-2.4.8-r2.ebuild
@@ -4,19 +4,20 @@
 
 EAPI=5
 
+RHINO_JAR="lib/rhino-1.7R2.jar"
+JAVA_PKG_IUSE="doc source"
+
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="JavaScript and CSS compressor"
 HOMEPAGE="http://yui.github.io/yuicompressor/"
 SRC_URI="https://github.com/yui/yuicompressor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 CDEPEND="
-	dev-java/jargs:0
-	dev-java/rhino:1.6"
+	dev-java/jargs:0"
 
 DEPEND="
 	${CDEPEND}
@@ -27,14 +28,21 @@ RDEPEND="
 	>=virtual/jre-1.6"
 
 S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="
-	jargs
-	rhino-1.6
-"
-
+JAVA_GENTOO_CLASSPATH="jargs"
+JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${RHINO_JAR}"
 JAVA_SRC_DIR="src"
 
 java_prepare() {
-	java-pkg_clean
+	# Rhino must stay bundled for now.
+	rm -v lib/jargs*.jar || die
+
+	# Normally build.xml does this.
+	sed -i "s/@VERSION@/${PV}/g" \
+		src/com/yahoo/platform/yui/compressor/YUICompressor.java || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_newjar ${RHINO_JAR} rhino.jar # Install this last!!
+	java-pkg_dolauncher ${PN} --main com.yahoo.platform.yui.compressor.Bootstrap
 }

diff --git a/dev-util/yuicompressor/yuicompressor-2.4.8.ebuild b/dev-util/yuicompressor/yuicompressor-2.4.8.ebuild
deleted file mode 100644
index 6ee725b..0000000
--- a/dev-util/yuicompressor/yuicompressor-2.4.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JavaScript and CSS compressor"
-HOMEPAGE="http://yui.github.io/yuicompressor/"
-SRC_URI="https://github.com/yui/yuicompressor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-src_compile(){
-	eant
-}
-
-src_install() {
-	java-pkg_newjar "build/${P}.jar" "${PN}.jar"
-	java-pkg_dolauncher "${PN}"
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/yuicompressor/
@ 2018-02-11 10:53 Michał Górny
  0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2018-02-11 10:53 UTC (permalink / raw
  To: gentoo-commits

commit:     4634b4badd6a0edb69817cd0eec62d63d9ffa088
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 11 10:47:06 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 10:52:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4634b4ba

dev-util/yuicompressor: Remove useless maintainer <description/>

Remove useless/redundant maintainer <description/>. It does not benefit
bug wrangling, and only wastes developer's time on reading it. Few tips:

- assignee/CC is implied by ordering, there is no reason to repeat it,
- we know that maintainer is maintainer (la la la la la),
- most of adjectives for maintainer are of no value and/or are obvious.

 dev-util/yuicompressor/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-util/yuicompressor/metadata.xml b/dev-util/yuicompressor/metadata.xml
index 5c7f3dccbe1..6e003372fa1 100644
--- a/dev-util/yuicompressor/metadata.xml
+++ b/dev-util/yuicompressor/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomas Mozes</name>
-		<description>Proxy maintainer</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/yuicompressor/
@ 2018-03-29 21:06 Michał Górny
  0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2018-03-29 21:06 UTC (permalink / raw
  To: gentoo-commits

commit:     7c2274e5d0f40275fa29d16d9ca6de644253ea7c
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Wed Mar 28 08:19:58 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 21:06:03 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c2274e5

dev-util/yuicompressor: drop maintainership

Closes: https://github.com/gentoo/gentoo/pull/7679
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-util/yuicompressor/metadata.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/dev-util/yuicompressor/metadata.xml b/dev-util/yuicompressor/metadata.xml
index 6e003372fa1..9d4fd737cf3 100644
--- a/dev-util/yuicompressor/metadata.xml
+++ b/dev-util/yuicompressor/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hydrapolic@gmail.com</email>
-		<name>Tomas Mozes</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">yui/yuicompressor</remote-id>
 	</upstream>


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2018-03-29 21:06 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-29 21:06 [gentoo-commits] repo/gentoo:master commit in: dev-util/yuicompressor/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2018-02-11 10:53 Michał Górny
2016-02-09 22:47 James Le Cuirot
2016-02-09 10:53 Patrice Clement
2016-01-13 14:23 Patrice Clement
2016-01-13 14:23 Patrice Clement
2016-01-13 14:23 Patrice Clement

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox