From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-perl/Tk/Manifest | 7 ++ dev-perl/Tk/Tk-804.33.0.ebuild | 52 ++++++++++++ dev-perl/Tk/Tk-804.34.0.ebuild | 64 +++++++++++++++ dev-perl/Tk/files/Tk-804.034-xorg.patch | 57 +++++++++++++ dev-perl/Tk/files/Tk-804.33.0-xorg.patch | 41 ++++++++++ dev-perl/Tk/metadata.xml | 133 +++++++++++++++++++++++++++++++ 6 files changed, 354 insertions(+) create mode 100644 dev-perl/Tk/Manifest create mode 100644 dev-perl/Tk/Tk-804.33.0.ebuild create mode 100644 dev-perl/Tk/Tk-804.34.0.ebuild create mode 100644 dev-perl/Tk/files/Tk-804.034-xorg.patch create mode 100644 dev-perl/Tk/files/Tk-804.33.0-xorg.patch create mode 100644 dev-perl/Tk/metadata.xml (limited to 'dev-perl/Tk') diff --git a/dev-perl/Tk/Manifest b/dev-perl/Tk/Manifest new file mode 100644 index 000000000000..61e55061fb07 --- /dev/null +++ b/dev-perl/Tk/Manifest @@ -0,0 +1,7 @@ +AUX Tk-804.034-xorg.patch 1741 BLAKE2B 06b07dd1d2c189677bffc0be09872f8b480fa1f597103509d2bf5d10bce993a21075936a7b62c793a4eae087b95a0b5c1198f20a2093dfa9f11ea03b9def3787 SHA512 368f68fe1a6c48d01adbd9a411ce38131f11bf9fc260e281f13c81bc5234bc8f2d364deda538db5ab8a88400aba30cd5e319304693e156fc6d7caeebd3fb049c +AUX Tk-804.33.0-xorg.patch 1331 BLAKE2B d912bbb68738201b09cbc0ee6ca2ddca1035614da68bc27c9dea081bcd233cd2508b9bf5d761a816eba0c8b48908cc1865822822d543309524d6ddf79f975da7 SHA512 830eb3ff11671834743fd694efd19ff66882a613dd85d5fe8f90231db10e450b4f921b359b5a07168065870734d102e0f95775c9aa6634fbe2d17670d97ffded +DIST Tk-804.033.tar.gz 6924238 BLAKE2B 72ea4ca69a7602e3c7386254995983e6896c5d722f06e552b423df2dc9d5fc0a70bed6408cc1b797e803560b00a17223503a2807b847360721104a3edc324df2 SHA512 ea56be8246123bbc570d86a7d4f1610349cced91ad92ab740baca4c280822aac2e3acab6334bef60b10a70d5840f331fa40b507aba47a7929f44960df95f2aee +DIST Tk-804.034.tar.gz 6937691 BLAKE2B ee676f82bc805ecb193c2fe999c3d451281a16a4bcd8072f0687859e6634d16cd1db40cc252b1540a3f7b883b4ca585d2b5ef1fa48f12cacffd72ca84693bdc4 SHA512 8d04fd902db72f80f749256453703e40c94fd009c6a196c608dd3bde4eeb99f974a154d5f52b28baa9e67f75529f0180619989c16cae28a9417b647908de04b6 +EBUILD Tk-804.33.0.ebuild 1468 BLAKE2B f7f474e740e9a68be4d00772f1541fc188fd745ed5b529115c6e2bcf1d904a2e63bec1148617924e7de6c26c8e8829cc37dc0d3c2d0f50ae749689308851ec2b SHA512 49c3cf7ddd2a875e8a559a0b84f3f88d6225e96e8585e36f096ddd03bc2b4533a4423f429ec52af46cb73411bb05cd19410227d49c3b1d265489df03303a96a4 +EBUILD Tk-804.34.0.ebuild 1881 BLAKE2B 78baf009b53fe94b49658fcb0a1d308fe8990a91da38cf04967871718749b6415620a825d84893722def1ba7274a0c7c1bedf82623a367eae1d57de2ff2f43fc SHA512 48f3d9e06e46dd7b73a50b16e5a08c96b3f3d5bef7779c99be097513d9dcf94e2fed1fb5e073700709f67c6fad8e7f0d5a4b2ecc1fd632e157972d3acd46a4c4 +MISC metadata.xml 7605 BLAKE2B ce28a121fb707f71f6c4566086bb03e5f1b092ff1143cd73fd63d1b098de0757859514f7d03015451b0385af06de4df56bab939485625d07370e51b20d1b35e1 SHA512 cdde0fac0e4a3ef20a35635f5cf5b05340acd7ae205f5435800c1beb710cc2cac87ca2d4efb0c7175ac04dd5cf27cce08b6e85e12b45bd98623069afbd646b42 diff --git a/dev-perl/Tk/Tk-804.33.0.ebuild b/dev-perl/Tk/Tk-804.33.0.ebuild new file mode 100644 index 000000000000..86e213cd673e --- /dev/null +++ b/dev-perl/Tk/Tk-804.33.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +MODULE_AUTHOR=SREZIC +MODULE_VERSION=804.033 +inherit multilib perl-module + +DESCRIPTION="A Perl Module for Tk" + +LICENSE+=" tcltk BSD" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +IUSE="" + +DEPEND=" + media-libs/freetype + >=media-libs/libpng-1.4:0 + virtual/jpeg + x11-libs/libX11 + x11-libs/libXft" +RDEPEND="${DEPEND}" + +# No test running here, requires an X server, and fails lots anyway. +SRC_TEST="skip" +PATCHES=( + "${FILESDIR}"/${P}-xorg.patch + ) + +src_prepare() { + MAKEOPTS+=" -j1" #333049 + myconf=( X11ROOT=${EPREFIX}/usr XFT=1 -I${EPREFIX}/usr/include/ -l${EPREFIX}/usr/$(get_libdir) ) + mydoc="ToDo VERSIONS" + + perl-module_src_prepare + # fix detection logic for Prefix, bug #385621 + sed -i -e "s:/usr:${EPREFIX}/usr:g" myConfig || die + # having this around breaks with perl-module and a case-IN-sensitive fs + rm build_ptk || die + + # Remove all bundled libs, fixes #488194 + local BUNDLED="PNG/libpng \ + PNG/zlib \ + JPEG/jpeg" + for dir in ${BUNDLED}; do + rm -r "${S}/${dir}" || die "Can't remove bundle" + # Makefile.PL can copy files to ${S}/${dir}, so recreate them back. + mkdir -p "${S}/${dir}" || die "Can't restore bundled dir" + sed -i "\#^${dir}#d" "${S}"/MANIFEST || die 'Can not remove bundled libs from MANIFEST' + done +} diff --git a/dev-perl/Tk/Tk-804.34.0.ebuild b/dev-perl/Tk/Tk-804.34.0.ebuild new file mode 100644 index 000000000000..edfc369512fc --- /dev/null +++ b/dev-perl/Tk/Tk-804.34.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DIST_AUTHOR=SREZIC +DIST_VERSION=804.034 +DIST_EXAMPLES=("examples/*") +inherit multilib perl-module virtualx + +DESCRIPTION="A Perl Module for Tk" + +LICENSE+=" tcltk BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +IUSE="" + +DEPEND=" + media-libs/freetype + >=media-libs/libpng-1.4:0 + virtual/jpeg + x11-libs/libX11 + x11-libs/libXft" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-804.034-xorg.patch +) +PERL_RM_FILES=( "t/pod.t" ) +src_prepare() { + MAKEOPTS+=" -j1" #333049 + myconf=( X11ROOT=${EPREFIX}/usr XFT=1 -I${EPREFIX}/usr/include/ -l${EPREFIX}/usr/$(get_libdir) ) + mydoc="ToDo VERSIONS" + + perl-module_src_prepare + # fix detection logic for Prefix, bug #385621 + sed -i -e "s:/usr:${EPREFIX}/usr:g" myConfig || die + # having this around breaks with perl-module and a case-IN-sensitive fs + rm build_ptk || die + + # Remove all bundled libs, fixes #488194 + local BUNDLED="PNG/libpng \ + PNG/zlib \ + JPEG/jpeg" + + # Move files required for tests temporarily + + mkdir -p "${T}/stash" || die "can't create temporary stash" + mv "${S}/JPEG/jpeg/testimg.jpg" "${T}/stash/testimg.jpg" || die "can't move testimg.jpg" + + for dir in ${BUNDLED}; do + einfo "Removing bundled: ${dir}" + rm -r "${S}/${dir}" || die "Can't remove bundle" + # Makefile.PL can copy files to ${S}/${dir}, so recreate them back. + mkdir -p "${S}/${dir}" || die "Can't restore bundled dir" + sed -i "\#^${dir}#d" "${S}"/MANIFEST || die 'Can not remove bundled libs from MANIFEST' + done + + # Restore test files + mv "${T}/stash/testimg.jpg" "${S}/JPEG/jpeg/testimg.jpg" || die "can't restore testimg.jpg" +} +src_test() { + virtx perl-module_src_test || die "src_test failed" +} diff --git a/dev-perl/Tk/files/Tk-804.034-xorg.patch b/dev-perl/Tk/files/Tk-804.034-xorg.patch new file mode 100644 index 000000000000..fd9ce4185cf3 --- /dev/null +++ b/dev-perl/Tk/files/Tk-804.034-xorg.patch @@ -0,0 +1,57 @@ +From 14428e2e2ab517e935b6c8cd6c3bd90dba429532 Mon Sep 17 00:00:00 2001 +From: Michael Cummings +Date: Wed, 14 Jun 2006 15:06:45 +1200 +Subject: Modify build for users that didnt install xorg meta + +And fix finding X11 headers + +Bug: https://bugs.gentoo.org/128326 +Bug: https://bugs.gentoo.org/198977 +--- + myConfig | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/myConfig b/myConfig +index 6260866b..6b5f3ddd 100755 +--- a/myConfig ++++ b/myConfig +@@ -316,7 +316,7 @@ if ($win_arch eq 'x') { + } + close(XMKMF); + while (defined $uidir) { +- last unless ($uidir =~ s!^.*-I(\S+)/lib/X11/config!!o); ++ last unless ($uidir =~ s!^.*-I(\S+)/lib(64)/X11/config!!o); + $try = $1; + $try =~ s/'x11root'/$ENV{X11ROOT}/; + push(@xdirs,$try); +@@ -365,8 +365,7 @@ if ($win_arch eq 'x') { + # + unless (defined $xlib) + { +- $xlib = &lX11(0,chooseX11(),chooseX11(),,'/usr/X386/lib', +- '/opt/X11/lib') ++ $xlib = &lX11(0,chooseX11(),chooseX11(),,'/usr/X386/lib','/opt/X11/lib','/usr/lib64') + } + + # +@@ -385,7 +384,7 @@ if ($win_arch eq 'x') { + exit 0; + } + +- ($base) = $xlib =~ m#-L(.*)(?:/lib)$#x; ++ ($base) = $xlib =~ m#-L(.*)(?:/lib(64))$#x; + if (defined $X11INC) + { + $xinc = &IX11("$X11INC"); +@@ -397,6 +396,8 @@ if ($win_arch eq 'x') { + { + warn "Cannot find X include files via $base/include\n"; + $xinc = &IX11(map("$_/include",@xdirs), ++ chooseX11(), ++ '/usr/include', + '/usr/openwin/include', + chooseX11(), + chooseX11(), +-- +2.16.2 + diff --git a/dev-perl/Tk/files/Tk-804.33.0-xorg.patch b/dev-perl/Tk/files/Tk-804.33.0-xorg.patch new file mode 100644 index 000000000000..d4284a394930 --- /dev/null +++ b/dev-perl/Tk/files/Tk-804.33.0-xorg.patch @@ -0,0 +1,41 @@ +diff --git a/myConfig b/myConfig +index fcf1933..14033cb 100755 +--- a/myConfig ++++ b/myConfig +@@ -316,7 +316,7 @@ if ($win_arch eq 'x') { + } + close(XMKMF); + while (defined $uidir) { +- last unless ($uidir =~ s!^.*-I(\S+)/lib/X11/config!!o); ++ last unless ($uidir =~ s!^.*-I(\S+)/lib(64)/X11/config!!o); + $try = $1; + $try =~ s/'x11root'/$ENV{X11ROOT}/; + push(@xdirs,$try); +@@ -365,8 +365,7 @@ if ($win_arch eq 'x') { + # + unless (defined $xlib) + { +- $xlib = &lX11(0,chooseX11(),chooseX11(),,'/usr/X386/lib', +- '/opt/X11/lib') ++ $xlib = &lX11(0,chooseX11(),chooseX11(),,'/usr/X386/lib','/opt/X11/lib','/usr/lib64') + } + + # +@@ -385,7 +384,7 @@ if ($win_arch eq 'x') { + exit 0; + } + +- ($base) = $xlib =~ m#-L(.*)(?:/lib)$#x; ++ ($base) = $xlib =~ m#-L(.*)(?:/lib(64))$#x; + if (defined $X11INC) + { + $xinc = &IX11("$X11INC"); +@@ -397,6 +396,8 @@ if ($win_arch eq 'x') { + { + warn "Cannot find X include files via $base/include\n"; + $xinc = &IX11(map("$_/include",@xdirs), ++ chooseX11(), ++ '/usr/include', + '/usr/openwin/include', + chooseX11(), + chooseX11(), diff --git a/dev-perl/Tk/metadata.xml b/dev-perl/Tk/metadata.xml new file mode 100644 index 000000000000..f88353dcea16 --- /dev/null +++ b/dev-perl/Tk/metadata.xml @@ -0,0 +1,133 @@ + + + + + perl@gentoo.org + Gentoo Perl Project + + + Tk + Tie::Watch + Tk + Tk::Adjuster + Tk::Adjuster::Item + Tk::After + Tk::Animation + Tk::Balloon + Tk::Bitmap + Tk::BrowseEntry + Tk::Button + Tk::Canvas + Tk::Checkbutton + Tk::Clipboard + Tk::CmdLine + Tk::ColorDialog + Tk::ColorEditor + Tk::ColorSelect + Tk::Compound + Tk::Configure + Tk::Derived + Tk::Dialog + Tk::DialogBox + Tk::DirTree + Tk::DirTreeDialog + Tk::Dirlist + Tk::DragDrop + Tk::DragDrop::Common + Tk::DragDrop::Local + Tk::DragDrop::Rect + Tk::DragDrop::SunConst + Tk::DragDrop::SunDrop + Tk::DragDrop::SunSite + Tk::DragDrop::Win32Drop + Tk::DragDrop::Win32Site + Tk::DragDrop::XDNDDrop + Tk::DragDrop::XDNDSite + Tk::DropSite + Tk::DummyEncode + Tk::DummyEncode::iso8859_1 + Tk::English + Tk::Entry + Tk::ErrorDialog + Tk::Event + Tk::Event::IO + Tk::FBox + Tk::FileSelect + Tk::FloatEntry + Tk::Font + Tk::Frame + Tk::HList + Tk::IO + Tk::IconList + Tk::Image + Tk::InputO + Tk::ItemStyle + Tk::JPEG + Tk::LabEntry + Tk::LabFrame + Tk::LabRadiobutton + Tk::Label + Tk::LabeledEntryLabeledRadiobutton + Tk::Labelframe + Tk::Listbox + Tk::MMtry + Tk::MMutil + Tk::MainWindow + Tk::MakeDepend + Tk::Menu + Tk::Menu::Button + Tk::Menu::Cascade + Tk::Menu::Checkbutton + Tk::Menu::Item + Tk::Menu::Radiobutton + Tk::Menu::Separator + Tk::Menubar + Tk::Menubutton + Tk::Message + Tk::MsgBox + Tk::Mwm + Tk::NBFrame + Tk::NoteBook + Tk::Optionmenu + Tk::PNG + Tk::Pane + Tk::Panedwindow + Tk::Photo + Tk::Pixmap + Tk::Pretty + Tk::ProgressBar + Tk::ROText + Tk::Radiobutton + Tk::Region + Tk::Reindex + Tk::ReindexedROText + Tk::ReindexedText + Tk::Scale + Tk::Scrollbar + Tk::Spinbox + Tk::Stats + Tk::Submethods + Tk::TList + Tk::Table + Tk::Text + Tk::Text::Tag + Tk::TextEdit + Tk::TextList + Tk::TextUndo + Tk::Tiler + Tk::TixGrid + Tk::Toplevel + Tk::Trace + Tk::Tree + Tk::Widget + Tk::WinPhoto + Tk::Wm + Tk::X + Tk::X11Font + Tk::Xlib + Tk::Xrm + Tk::install + Tk::widgets + WidgetDemo + + -- cgit v1.2.3