From: Vlastimil Babka Date: Sun, 29 Apr 2007 10:52:50 +0000 (+0000) Subject: Revbump for migration to gen-2 eclasses and building from source instead of just... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2ba9c6f2c9d3ec2f74d17e11bbe444005fff469e;p=gentoo.git Revbump for migration to gen-2 eclasses and building from source instead of just installing upstream's jar. Introduces jgoodies-looks-1.2 dependency that upstream bundles in its jar. Package-Manager: portage-2.1.2.5 --- diff --git a/media-gfx/opcion/ChangeLog b/media-gfx/opcion/ChangeLog index 57db3ae25d7a..716855f1c645 100644 --- a/media-gfx/opcion/ChangeLog +++ b/media-gfx/opcion/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-gfx/opcion -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/opcion/ChangeLog,v 1.7 2006/11/22 08:27:07 opfer Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/opcion/ChangeLog,v 1.8 2007/04/29 10:52:50 caster Exp $ + +*opcion-1.1.1-r1 (29 Apr 2007) + + 29 Apr 2007; Vlastimil Babka + +files/opcion-1.1.1-fix-source.patch, +opcion-1.1.1-r1.ebuild: + Revbump for migration to gen-2 eclasses and building from source instead of + just installing upstream's jar. Introduces jgoodies-looks-1.2 dependency + that upstream bundles in its jar. 22 Nov 2006; Christian Faulhammer opcion-1.1.1.ebuild: stable x86, bug #155740 diff --git a/media-gfx/opcion/Manifest b/media-gfx/opcion/Manifest index 892c2633a936..e4d78bbfea6f 100644 --- a/media-gfx/opcion/Manifest +++ b/media-gfx/opcion/Manifest @@ -1,15 +1,21 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX opcion-1.1.1-fix-source.patch 408 RMD160 ae7b04815f119bb5ad6b3a321d98693e13b75812 SHA1 0203ee88b745a88da71c1ced45cece59b2d8929a SHA256 a2bf5eadbb98f2fb43d8ac8ae5c2ea2ee91509c54f3516d9781f2fa9e3a5097a +MD5 2b529f42a4a730408204ad172f6f2317 files/opcion-1.1.1-fix-source.patch 408 +RMD160 ae7b04815f119bb5ad6b3a321d98693e13b75812 files/opcion-1.1.1-fix-source.patch 408 +SHA256 a2bf5eadbb98f2fb43d8ac8ae5c2ea2ee91509c54f3516d9781f2fa9e3a5097a files/opcion-1.1.1-fix-source.patch 408 DIST Opcion_v1.1.1.jar 354717 RMD160 12b78fcf76b87acb9609a0d1cada2d5e7647048a SHA1 fe14310aed805a3d32a9aeddbcd21f2a64497ad3 SHA256 b28dd5a013aebf923585d8c7c09468c48f503ed594622ebce8babce00cd54bc4 +DIST Opcion_v1.1.1_src.zip 319793 RMD160 7c0009798996601f24beffb89539fe9a6774d948 SHA1 0438c6f452a0fa70c3bc0a0be36ab5ba890cbe69 SHA256 f1af9606c63e200d860d01c2f7bd241031b857928b939fb8044d27aabf83f298 +EBUILD opcion-1.1.1-r1.ebuild 1332 RMD160 d09649436f48d2ba658da8c65ee33e47e7fffe64 SHA1 2ba3c0fe11064d35a2f5011bdb209594c1d6aeef SHA256 67b946647c3717f64517f4d6d03da3999806a571b712856c113c62b1ce3b2165 +MD5 f2d3b67ac025af88c6153a9afaaeb8b0 opcion-1.1.1-r1.ebuild 1332 +RMD160 d09649436f48d2ba658da8c65ee33e47e7fffe64 opcion-1.1.1-r1.ebuild 1332 +SHA256 67b946647c3717f64517f4d6d03da3999806a571b712856c113c62b1ce3b2165 opcion-1.1.1-r1.ebuild 1332 EBUILD opcion-1.1.1.ebuild 735 RMD160 c128494936ee9b22a038d15c5619478c551c6aad SHA1 d0df261922f0a20d0b148f5a6da28a1eb6848571 SHA256 493639501d4ef56a3f3c3cf4e4e468b1ad469ec0d6faeec26483e2534cc20ae6 MD5 6b4e1af3b669e9fa1e882532dd036050 opcion-1.1.1.ebuild 735 RMD160 c128494936ee9b22a038d15c5619478c551c6aad opcion-1.1.1.ebuild 735 SHA256 493639501d4ef56a3f3c3cf4e4e468b1ad469ec0d6faeec26483e2534cc20ae6 opcion-1.1.1.ebuild 735 -MISC ChangeLog 921 RMD160 803deb823715589ac20feae683b38e0321848a91 SHA1 ae8727100272e68eb80eb5227849d5fa2218bacd SHA256 32c4e34a29fd86976a273198d56fc2fd11af0ba20b8f930380f6052a752f39e7 -MD5 685e88999b342cb6aa24a38ef5bf1927 ChangeLog 921 -RMD160 803deb823715589ac20feae683b38e0321848a91 ChangeLog 921 -SHA256 32c4e34a29fd86976a273198d56fc2fd11af0ba20b8f930380f6052a752f39e7 ChangeLog 921 +MISC ChangeLog 1260 RMD160 7411c5d19b62fbbd1e36755cb6771b0cab95d408 SHA1 cfe6e43f2b52a142e1e078ee1f8173ce771b1ba0 SHA256 e88734d441a96e015d0e1f0aa73e33eede7d1070cd188dc805cf4aecee1f901e +MD5 f3fb268bbfacc7a00bb0a2ead982cce3 ChangeLog 1260 +RMD160 7411c5d19b62fbbd1e36755cb6771b0cab95d408 ChangeLog 1260 +SHA256 e88734d441a96e015d0e1f0aa73e33eede7d1070cd188dc805cf4aecee1f901e ChangeLog 1260 MISC metadata.xml 158 RMD160 e563fdca0707ee5927deab77f2e5ef79816384ca SHA1 8e4ca6d183e52cdbea8cfba08b7a7910e648fc84 SHA256 9a8722fb0b5a1992b3942e85f23df4e08f10cabc2d783ca887479abe115b3ea8 MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158 RMD160 e563fdca0707ee5927deab77f2e5ef79816384ca metadata.xml 158 @@ -17,10 +23,6 @@ SHA256 9a8722fb0b5a1992b3942e85f23df4e08f10cabc2d783ca887479abe115b3ea8 metadata MD5 54bdb0d4b9d5541de97706d90a40ef7c files/digest-opcion-1.1.1 232 RMD160 4bc90a94e570b69c799d336908ec74a17245e529 files/digest-opcion-1.1.1 232 SHA256 7966d8a1a885e4da36ff8a4a04df8d02882d910cc80860919efa40bed8f65570 files/digest-opcion-1.1.1 232 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFFZAnfNQqtfCuFneMRAriwAJ9hA/J45EK+iZEZwYK1qpMab+LP3ACfR3et -hngkamILChq0Vg5L/1oT7/A= -=H3al ------END PGP SIGNATURE----- +MD5 b384ffbc3fa72c011f780583d87f85a6 files/digest-opcion-1.1.1-r1 244 +RMD160 a41d17ffd70d0a08d86051c7c29225daf4af8aa9 files/digest-opcion-1.1.1-r1 244 +SHA256 b256c0c1722ac2d3560a0b536ee14b3144f2afff57bf768c8151c9c7def31b27 files/digest-opcion-1.1.1-r1 244 diff --git a/media-gfx/opcion/files/digest-opcion-1.1.1-r1 b/media-gfx/opcion/files/digest-opcion-1.1.1-r1 new file mode 100644 index 000000000000..30c664c5a7fa --- /dev/null +++ b/media-gfx/opcion/files/digest-opcion-1.1.1-r1 @@ -0,0 +1,3 @@ +MD5 3780702c2a400d7f46c9030d8c4db654 Opcion_v1.1.1_src.zip 319793 +RMD160 7c0009798996601f24beffb89539fe9a6774d948 Opcion_v1.1.1_src.zip 319793 +SHA256 f1af9606c63e200d860d01c2f7bd241031b857928b939fb8044d27aabf83f298 Opcion_v1.1.1_src.zip 319793 diff --git a/media-gfx/opcion/files/opcion-1.1.1-fix-source.patch b/media-gfx/opcion/files/opcion-1.1.1-fix-source.patch new file mode 100644 index 000000000000..4c5f1dc9c9e3 --- /dev/null +++ b/media-gfx/opcion/files/opcion-1.1.1-fix-source.patch @@ -0,0 +1,15 @@ +--- FontViewer/components/AAToggleButton.java 2007-04-29 12:20:16.000000000 +0200 ++++ FontViewer/components/AAToggleButton.java 2007-04-29 12:10:53.000000000 +0200 +@@ -38,7 +38,11 @@ + this.setToolTipText(fname + " (" + floc + ")"); + } + +- public String getFName() { ++ public AAToggleButton(String s) { ++ super(s); ++ } ++ ++ public String getFName() { + return fname; + } + diff --git a/media-gfx/opcion/opcion-1.1.1-r1.ebuild b/media-gfx/opcion/opcion-1.1.1-r1.ebuild new file mode 100644 index 000000000000..adbefc025a8f --- /dev/null +++ b/media-gfx/opcion/opcion-1.1.1-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/opcion/opcion-1.1.1-r1.ebuild,v 1.1 2007/04/29 10:52:50 caster Exp $ + +inherit java-pkg-2 + +MY_P="Opcion_v${PV}" + +DESCRIPTION="Free font viewer written in Java" +HOMEPAGE="http://opcion.sourceforge.net/" +SRC_URI="mirror://sourceforge/opcion/${MY_P}_src.zip" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" +COMMON_DEP="=dev-java/jgoodies-looks-1.2*" +RDEPEND=">=virtual/jre-1.4 + ${COMMON_DEP}" +DEPEND=">=virtual/jdk-1.4 + ${COMMON_DEP}" + +S=${WORKDIR} + +src_unpack() { + unpack ${A} + cd "${S}" + + # add missing constructor + epatch "${FILESDIR}/${P}-fix-source.patch" + + # calls nonexisting constructor and seems unused + rm FontViewer/windows/test.java || die + + rm -rf com/jgoodies || die + find . -name '*.class' -delete || die + rm *.txt || die +} + +src_compile() { + find . -name '*.java' > "${T}/src.list" + local cp="$(java-pkg_getjars jgoodies-looks-1.2)" + mkdir build || die + # quite icky way to copy resources + cp -R FontViewer com build || die + find build -name '*.java' -delete + ejavac -nowarn -classpath "${cp}" -d build "@${T}/src.list" + jar cf ${PN}.jar -C build . || die +} + +src_install() { + java-pkg_dojar ${PN}.jar + + java-pkg_dolauncher ${PN} --main FontViewer.Opcion +}